X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fgui.scm;h=aa12d37424a7f70d806d9576f187f5d4a381f502;hb=98052b04792129db97286fdd77ef3b0de8912286;hp=495a9c748e05905a643005bfb1ce3fb3d9592c20;hpb=e01650cfcde81068b3b5819b64f9b641905b3b76;p=guile-irrlicht.git

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index 495a9c7..aa12d37 100644
--- a/irrlicht/gui.scm
+++ b/irrlicht/gui.scm
@@ -1,5 +1,5 @@
 ;;; guile-irrlicht --- FFI bindings for Irrlicht Engine
-;;; Copyright (C) 2019 Javier Sancho <jsf@jsancho.org>
+;;; Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
 ;;;
 ;;; This file is part of guile-irrlicht.
 ;;;
@@ -19,36 +19,49 @@
 
 
 (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:)
-  #:use-module (irrlicht rect)
-  #:use-module (irrlicht util)
-  #:export (add-static-text!
-            gui-draw-all
-            set-visible-cursor!))
-
-(define* (add-static-text! gui-env text rectangle
-                           #:key
-                           (border #f)
-                           (word-wrap #t)
-                           (parent %null-pointer)
-                           (id -1)
-                           (fill-background #f))
-  (ffi-gui:add-static-text gui-env
-                           (string->pointer text)
-                           (rect->pointer rectangle)
-                           (bool->integer border)
-                           (bool->integer word-wrap)
-                           parent
-                           id
-                           (bool->integer fill-background)))
-
-(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
-   (bool->integer visible)))
+  #:use-module (oop goops)
+  #:use-module (ice-9 optargs)
+  #:use-module (irrlicht base)
+  #:use-module (irrlicht foreign)
+  #:use-module (irrlicht io)
+  #:use-module (irrlicht irr))
+
+
+;; IGUIElement
+(define-class <gui-element> (<attribute-exchanging-object> <event-receiver>)
+  (irr-class #:init-value "IGUIElement" #:getter irr-class))
+
+(export <gui-element>)
+
+
+;; IGUIEnvironment
+(define-class <gui-environment> (<reference-counted>)
+  (irr-class #:init-value "IGUIEnvironment" #:getter irr-class))
+
+(define-method (add-static-text! (gui-environment <gui-environment>) text rectangle . rest)
+  (let-keywords rest #f
+        ((border #f)
+         (word-wrap #t)
+         (parent (make <gui-element>))
+         (id -1)
+         (fill-background #f))
+    (make <gui-static-text>
+      #:irr-pointer
+      ((get-irrlicht-proc "addStaticText" gui-environment parent)
+       (irr-pointer gui-environment)
+       text
+       rectangle
+       border
+       word-wrap
+       (irr-pointer parent)
+       id
+       fill-background))))
+
+(export <gui-environment> add-static-text!)
+
+
+;; IGUIStaticText
+(define-class <gui-static-text> (<gui-element>)
+  (irr-class #:init-value "IGUIStaticText" #:getter irr-class))
+
+(export <gui-static-text>)