Wrapped s3dvertex type

[guile-irrlicht.git] / irrlicht / bindings / video.scm

diff --git a/irrlicht/bindings/video.scm b/irrlicht/bindings/video.scm
index 20445520e7b4b0162773235d975d611e92b566ee..7816686b02ca761598996e63f7d0e0fdabba9042 100644 (file)
--- a/irrlicht/bindings/video.scm
+++ b/irrlicht/bindings/video.scm
@@ -19,9 +19,9 @@
 
 
 (define-module (irrlicht bindings video)
-  #:use-module (system foreign))
-
-(define cirr (dynamic-link "libCIrrlicht"))
+  #:use-module (system foreign)
+  #:use-module ((irrlicht bindings core) #:prefix ffi-core:)
+  #:use-module (irrlicht util foreign))
 
 ;; E_DRIVER_TYPE enum
 (define-public EDT_NULL            0)
@@ -57,35 +57,43 @@
 
 ;; scolor struct
 (define-public scolor
-  (list uint32 uint32 uint32 uint32))
+  (list uint8 uint8 uint8 uint8))
+
+(define-public (scolor->pointer data)
+  (make-c-struct scolor (reverse data)))
 
 ;; Driver functions
-(define-public begin-scene
-  (pointer->procedure
-   int
-   (dynamic-func "irr_video_beginScene" cirr)
-   (list '* int int '* '* '*)))
-
-(define-public end-scene
-  (pointer->procedure
-   int
-   (dynamic-func "irr_video_endScene" cirr)
-   (list '*)))
-
-(define-public get-fps
-  (pointer->procedure
-   int
-   (dynamic-func "irr_video_getFPS" cirr)
-   (list '*)))
-
-(define-public get-texture
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_video_getTexture" cirr)
-   (list '* '*)))
-
-(define-public get-video-driver-name
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_video_getName" cirr)
-   (list '*)))
+(define-foreign begin-scene
+  int "irr_video_beginScene" (list '* int int '* '* '*))
+
+(define-foreign end-scene
+  int "irr_video_endScene" (list '*))
+
+(define-foreign get-fps
+  int "irr_video_getFPS" (list '*))
+
+(define-foreign get-texture
+  '* "irr_video_getTexture" (list '* '*))
+
+(define-foreign get-video-driver-name
+  '* "irr_video_getName" (list '*))
+
+;; s3dvertex struct
+(define-wrapped-pointer-type s3dvertex
+  s3dvertex?
+  pointer->s3dvertex s3dvertex->pointer
+  (lambda (vertex port)
+    (format port "#<s3dvertex ~x>"
+            (pointer-address (s3dvertex->pointer vertex)))))
+
+(export s3dvertex->pointer)
+
+(define s3dvertex-type
+  (list ffi-core:vector3df
+        ffi-core:vector3df
+        scolor
+        ffi-core:vector2df))
+
+(define-public (make-s3dvertex position normal color t-coords)
+  (pointer->s3dvertex
+   (make-c-struct s3dvertex-type (list position normal color t-coords))))