X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fgui.scm;h=4708d371a3c706f0ca65f439e9d33c809830235f;hb=7611ebfeeae5ed59751f108214ee7a00aea20b7b;hp=3d0e091e06b47ef11b44c0d4700f229580e056a1;hpb=c4d9e46f268b4f7f738dd77685c632991125cec9;p=guile-irrlicht.git

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index 3d0e091..4708d37 100644
--- a/irrlicht/gui.scm
+++ b/irrlicht/gui.scm
@@ -23,20 +23,81 @@
   #:use-module (ice-9 optargs)
   #:use-module (irrlicht base)
   #:use-module (irrlicht foreign)
-  #:use-module (irrlicht io)
-  #:use-module (irrlicht irr))
+  #:use-module ((irrlicht io) #:select (<attribute-exchanging-object>))
+  #:use-module ((irrlicht irr) #:select (<event-receiver> <reference-counted>)))
+
+
+;; ICursorControl
+(define-class <cursor-control> (<reference-counted>)
+  (irr-class #:init-value "ICursorControl"))
+
+(define-method (set-visible! (cursor-control <cursor-control>) visible)
+  (let ((setVisible (get-irrlicht-proc "setVisible" cursor-control)))
+    (setVisible cursor-control visible)))
+
+(export <cursor-control> set-visible!)
 
 
 ;; IGUIElement
 (define-class <gui-element> (<attribute-exchanging-object> <event-receiver>)
-  (irr-class #:init-value "IGUIElement" #:getter irr-class))
+  (irr-class #:init-value "IGUIElement"))
 
-(export <gui-element>)
+(define-method (get-id (element <gui-element>))
+  (let ((getID (get-irrlicht-proc "getID" element)))
+    (getID element)))
+
+(export <gui-element> get-id)
 
 
 ;; IGUIEnvironment
 (define-class <gui-environment> (<reference-counted>)
-  (irr-class #:init-value "IGUIEnvironment" #:getter irr-class))
+  (irr-class #:init-value "IGUIEnvironment"))
+
+(define-method (add-button! (gui-environment <gui-environment>) rectangle . rest)
+  (let-keywords rest #f
+        ((parent (make <gui-element>))
+         (id -1)
+         (text "")
+         (tooltiptext ""))
+    (let* ((addButton (get-irrlicht-proc "addButton" gui-environment parent))
+           (button (addButton gui-environment rectangle parent id text tooltiptext)))
+      (mem-wrapped button))))
+
+(define-method (add-editbox! (gui-environment <gui-environment>) text rectangle . rest)
+  (let-keywords rest #f
+        ((border #t)
+         (parent (make <gui-element>))
+         (id -1))
+    (let* ((addEditBox (get-irrlicht-proc "addEditBox" gui-environment parent))
+           (editbox (addEditBox gui-environment text rectangle border parent id)))
+      (mem-wrapped editbox))))
+
+(define-method (add-image! (gui-environment <gui-environment>) image pos . rest)
+  (let-keywords rest #f
+        ((use-alpha-channel #t)
+         (parent (make <gui-element>))
+         (id -1)
+         (text ""))
+    (let* ((addImage (get-irrlicht-proc "addImage" gui-environment parent))
+           (img (addImage gui-environment image pos use-alpha-channel parent id text)))
+      (mem-wrapped img))))
+
+(define-method (add-listbox! (gui-environment <gui-environment>) rectangle . rest)
+  (let-keywords rest #f
+        ((parent (make <gui-element>))
+         (id -1)
+         (draw-background #f))
+    (let* ((addListBox (get-irrlicht-proc "addListBox" gui-environment parent))
+           (listbox (addListBox gui-environment rectangle parent id draw-background)))
+      (mem-wrapped listbox))))
+
+(define-method (add-scrollbar! (gui-environment <gui-environment>) horizontal rectangle . rest)
+  (let-keywords rest #f
+        ((parent (make <gui-element>))
+         (id -1))
+    (let* ((addScrollBar (get-irrlicht-proc "addScrollBar" gui-environment parent))
+           (scrollbar (addScrollBar gui-environment horizontal rectangle parent id)))
+      (mem-wrapped scrollbar))))
 
 (define-method (add-static-text! (gui-environment <gui-environment>) text rectangle . rest)
   (let-keywords rest #f
@@ -45,27 +106,136 @@
          (parent (make <gui-element>))
          (id -1)
          (fill-background #f))
-    (make <gui-static-text>
-      #:irr-pointer
-      ((get-irrlicht-proc "addStaticText" gui-environment parent)
-       gui-environment
-       text
-       rectangle
-       border
-       word-wrap
-       parent
-       id
-       fill-background))))
+    (let* ((addStaticText (get-irrlicht-proc "addStaticText" gui-environment parent))
+           (static-text (addStaticText gui-environment text rectangle border word-wrap parent
+                                       id fill-background)))
+      (mem-wrapped static-text))))
+
+(define-method (add-window! (gui-environment <gui-environment>) rectangle . rest)
+  (let-keywords rest #f
+        ((modal #f)
+         (text "")
+         (parent (make <gui-element>))
+         (id -1))
+    (let* ((addWindow (get-irrlicht-proc "addWindow" gui-environment parent))
+           (window (addWindow gui-environment rectangle modal text parent id)))
+      (mem-wrapped window))))
 
 (define-method (draw-all (gui-environment <gui-environment>))
   ((get-irrlicht-proc "drawAll" gui-environment)
    gui-environment))
 
-(export <gui-environment> add-static-text! draw-all)
+(define-method (get-built-in-font (gui-environment <gui-environment>))
+  (let ((getBuiltInFont (get-irrlicht-proc "getBuiltInFont" gui-environment)))
+    (getBuiltInFont gui-environment)))
+
+(define-method (get-font (gui-environment <gui-environment>) filename)
+  (let* ((getFont (get-irrlicht-proc "getFont" gui-environment))
+         (font (getFont gui-environment filename)))
+    (if (null-object? font)
+        (error "In procedure get-font: Font unavailable")
+        font)))
+
+(define-method (get-skin (gui-environment <gui-environment>))
+  (let ((getSkin (get-irrlicht-proc "getSkin" gui-environment)))
+    (getSkin gui-environment)))
+
+(export <gui-environment> add-button! add-editbox! add-image! add-listbox! add-scrollbar!
+        add-static-text! add-window! draw-all get-built-in-font get-font get-skin)
 
 
 ;; IGUIStaticText
 (define-class <gui-static-text> (<gui-element>)
-  (irr-class #:init-value "IGUIStaticText" #:getter irr-class))
+  (irr-class #:init-value "IGUIStaticText"))
+
+(define-method (set-override-color! (static-text <gui-static-text>) color)
+  (let ((setOverrideColor (get-irrlicht-proc "setOverrideColor" static-text)))
+    (setOverrideColor static-text color)))
+
+(export <gui-static-text> set-override-color!)
+
+
+;; IGUIImage
+(define-class <gui-image> (<gui-element>)
+  (irr-class #:init-value "IGUIImage"))
+
+(export <gui-image>)
+
+
+;; IGUISkin
+(define-class <gui-skin> (<attribute-exchanging-object>)
+  (irr-class #:init-value "IGUISkin"))
+
+(define-method (get-color (skin <gui-skin>) color)
+  (let ((getColor (get-irrlicht-proc "getColor" skin)))
+    (getColor skin color)))
+
+(define-method (set-font! (skin <gui-skin>) font . rest)
+  (let-keywords rest #f
+        ((which 'default))
+    (let ((setFont (get-irrlicht-proc "setFont" skin)))
+      (setFont skin font which))))
+
+(define-method (set-color! (skin <gui-skin>) which new-color)
+  (let ((setColor (get-irrlicht-proc "setColor" skin)))
+    (setColor skin which new-color)))
+
+(export <gui-skin> get-color set-font! set-color!)
+
+
+;; IGUIFont
+(define-class <gui-font> (<reference-counted>)
+  (irr-class #:init-value "IGUIFont"))
+
+(export <gui-font>)
+
+
+;; IGUIButton
+(define-class <gui-button> (<gui-element>)
+  (irr-class #:init-value "IGUIButton"))
+
+(export <gui-button>)
+
+
+;; IGUIScrollBar
+(define-class <gui-scrollbar> (<gui-element>)
+  (irr-class #:init-value "IGUIScrollBar"))
+
+(define-method (get-position (scrollbar <gui-scrollbar>))
+  (let ((getPos (get-irrlicht-proc "getPos" scrollbar)))
+    (getPos scrollbar)))
+
+(define-method (set-max! (scrollbar <gui-scrollbar>) max)
+  (let ((setMax (get-irrlicht-proc "setMax" scrollbar)))
+    (setMax scrollbar max)))
+
+(define-method (set-position! (scrollbar <gui-scrollbar>) pos)
+  (let ((setPos (get-irrlicht-proc "setPos" scrollbar)))
+    (setPos scrollbar pos)))
+
+(export <gui-scrollbar> get-position set-max! set-position!)
+
+
+;; IGUIListBox
+(define-class <gui-listbox> (<gui-element>)
+  (irr-class #:init-value "IGUIListBox"))
+
+(define-method (add-item! (listbox <gui-listbox>) text)
+  (let ((addItem (get-irrlicht-proc "addItem" listbox)))
+    (addItem listbox text)))
+
+(export <gui-listbox> add-item!)
+
+
+;; IGUIEditBox
+(define-class <gui-editbox> (<gui-element>)
+  (irr-class #:init-value "IGUIEditBox"))
+
+(export <gui-editbox>)
+
+
+;; IGUIWindow
+(define-class <gui-window> (<gui-element>)
+  (irr-class #:init-value "IGUIWindow"))
 
-(export <gui-static-text>)
+(export <gui-window>)