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

diff --git a/irrlicht/irr.scm b/irrlicht/irr.scm
index 16cbf0d..6fcd715 100644
--- a/irrlicht/irr.scm
+++ b/irrlicht/irr.scm
@@ -26,17 +26,62 @@
 
 ;; IReferenceCounted
 (define-class <reference-counted> (<irrlicht-base>)
-  (irr-class #:init-value "IReferenceCounted" #:getter irr-class))
+  (irr-class #:init-value "IReferenceCounted"))
 
 (define-method (drop! (obj <reference-counted>))
-  ((get-irrlicht-proc "drop" obj)
-   (irr-pointer obj)))
+  (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 "IEventReceiver" #:getter irr-class))
+  (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 <event-receiver>)
+(export <timer> get-time)