Unwrap Irrlicht objects in C++ instead of Guile

[guile-irrlicht.git] / irrlicht / gui.scm

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index 2299574df1378cf49bd34d625b6f203bf748baa5..3d0e091e06b47ef11b44c0d4700f229580e056a1 100644 (file)
--- 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,23 +19,53 @@
 
 
 (define-module (irrlicht gui)
-  #:export (add-static-text!))
-
-(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 #f)
-                           (id -1)
-                           (fill-background #f))
-  (irr-add-static-text! guienv
-                        text
-                        rectangle
-                        border
-                        word-wrap
-                        parent
-                        id
-                        fill-background))
+  #: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)
+       gui-environment
+       text
+       rectangle
+       border
+       word-wrap
+       parent
+       id
+       fill-background))))
+
+(define-method (draw-all (gui-environment <gui-environment>))
+  ((get-irrlicht-proc "drawAll" gui-environment)
+   gui-environment))
+
+(export <gui-environment> add-static-text! draw-all)
+
+
+;; IGUIStaticText
+(define-class <gui-static-text> (<gui-element>)
+  (irr-class #:init-value "IGUIStaticText" #:getter irr-class))
+
+(export <gui-static-text>)