X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=irrlicht%2Firr.scm;h=6fcd7155b4fc32baeaf294b46360c825de09cc2c;hp=8704c1598d07856dd3289084f7b7b4baa183b8a5;hb=002163db179e6409ea5744f1b8194b9f758054d8;hpb=c9c098c6a9363eb59f435eb195a4bc5b9098b1dd

diff --git a/irrlicht/irr.scm b/irrlicht/irr.scm
index 8704c15..6fcd715 100644
--- a/irrlicht/irr.scm
+++ b/irrlicht/irr.scm
@@ -21,45 +21,67 @@
 (define-module (irrlicht irr)
   #:use-module (oop goops)
   #:use-module (irrlicht base)
-  #:use-module (irrlicht foreign)
-  #:export (<reference-counted>
-            <irrlicht-device>
-            create-device))
+  #:use-module (irrlicht foreign))
 
 
 ;; IReferenceCounted
 (define-class <reference-counted> (<irrlicht-base>)
-  (irr-class #:init-value "irr::IReferenceCounted" #:getter irrlicht-class))
+  (irr-class #:init-value "IReferenceCounted"))
+
+(define-method (drop! (obj <reference-counted>))
+  (let ((drop (get-irrlicht-proc "drop" obj)))
+    (drop obj)))
+
+(export <reference-counted> drop!)
+
+
+;; SEvent
+(define-class <event> (<irrlicht-base>)
+  (irr-class #:init-value "SEvent"))
+
+(define-method (get-event-gui-caller (event <event>))
+  (let ((SGUIEvent_Caller (get-irrlicht-proc "SGUIEvent_Caller" event)))
+    (SGUIEvent_Caller event)))
+
+(define-method (get-event-key (event <event>))
+  (let ((SKeyInput_Key (get-irrlicht-proc "SKeyInput_Key" event)))
+    (SKeyInput_Key event)))
+
+(define-method (get-event-key-pressed (event <event>))
+  (let ((SKeyInput_PressedDown (get-irrlicht-proc "SKeyInput_PressedDown" event)))
+    (SKeyInput_PressedDown event)))
+
+(define-method (get-event-type (event <event>))
+  (let ((EventType (get-irrlicht-proc "EventType" event)))
+    (EventType event)))
+
+(export <event> get-event-gui-caller get-event-key get-event-key-pressed get-event-type)
 
 
 ;; IEventReceiver
 (define-class <event-receiver> (<irrlicht-base>)
-  (irr-class #:init-value "irr::IEventReceiver" #:getter irrlicht-class))
-
-
-;; IrrlichtDevice
-(define-class <irrlicht-device> (<reference-counted>)
-  (irr-class #:init-value "irr::IrrlichtDevice" #:getter irrlicht-class))
-
-(define* (create-device #:key
-                        (device-type 'software)
-                        (window-size '(640 480))
-                        (bits 16)
-                        (fullscreen #f)
-                        (stencilbuffer #f)
-                        (vsync #f)
-                        (receiver (make <event-receiver>)))
-  (if (not (is-a? receiver <event-receiver>))
-      (error
-       "In procedure create-device: Wrong type argument (expecting <event-receiver>):"
-       receiver))
-
-  (make <irrlicht-device>
-    #:ptr
-    (irr_createDevice device-type
-                      window-size
-                      bits
-                      fullscreen
-                      stencilbuffer
-                      vsync
-                      (wrapped-obj receiver))))
+  (irr-class #:init-value "IEventReceiver"))
+
+(define (make-event-receiver proc-on-event)
+  (let ((IEventReceiver_make (get-irrlicht-proc "IEventReceiver_make")))
+    (IEventReceiver_make proc-on-event)))
+
+(export <event-receiver> make-event-receiver)
+
+
+;; SKeyMap
+(define-class <key-map> (<irrlicht-base>)
+  (irr-class #:init-value "SKeyMap"))
+
+(export <key-map>)
+
+
+;; ITimer
+(define-class <timer> (<reference-counted>)
+  (irr-class #:init-value "ITimer"))
+
+(define-method (get-time (timer <timer>))
+  (let ((getTime (get-irrlicht-proc "getTime" timer)))
+    (getTime timer)))
+
+(export <timer> get-time)