X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fgui.scm;h=2299574df1378cf49bd34d625b6f203bf748baa5;hb=704cf6c2cc3d308c625071f6e03bd20ed2d833f8;hp=641cf4715a46ef90e761b81a53a86da1a8e1c838;hpb=eaa186435f0c641c53841d8d15581525bd542249;p=guile-irrlicht.git

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index 641cf47..2299574 100644
--- a/irrlicht/gui.scm
+++ b/irrlicht/gui.scm
@@ -19,34 +19,23 @@
 
 
 (define-module (irrlicht gui)
-  #:use-module (ice-9 match)
-  #:use-module (system foreign)
-  #:use-module ((irrlicht bindings core) #:prefix ffi-core:)
-  #:use-module ((irrlicht bindings gui) #:prefix ffi-gui:)
-  #:export (add-static-text!
-            gui-draw-all
-            set-visible-cursor!))
+  #:export (add-static-text!))
 
-(define* (add-static-text! gui-env text rectangle
+(load-extension "libguile-irrlicht" "init_guile_irrlicht")
+
+(define irr-add-static-text! add-static-text!)
+(define* (add-static-text! guienv text rectangle
                            #:key
                            (border #f)
                            (word-wrap #t)
-                           (parent %null-pointer)
+                           (parent #f)
                            (id -1)
                            (fill-background #f))
-  (ffi-gui:add-static-text gui-env
-                           (string->pointer text)
-                           (make-c-struct ffi-core:rect rectangle)
-                           (if border 1 0)
-                           (if word-wrap 1 0)
-                           parent
-                           id
-                           (if fill-background 1 0)))
-
-(define (gui-draw-all gui-env)
-  (ffi-gui:draw-all gui-env))
-
-(define (set-visible-cursor! cursor-control visible)
-  (ffi-gui:set-visible-cursor
-   cursor-control
-   (if visible 1 0)))
+  (irr-add-static-text! guienv
+                        text
+                        rectangle
+                        border
+                        word-wrap
+                        parent
+                        id
+                        fill-background))