X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fbindings%2Fscene.scm;h=74b1535a75cafa07001aa7a273d8dc3fe651f128;hb=2a0373b3eda4407e2e41a4e8fc3a7333bb789a89;hp=752825bfc265c4f468b7ebf67ecaa251ae836cb5;hpb=954186a692ada723b904a9a28a7b9043deeb7552;p=guile-irrlicht.git

diff --git a/irrlicht/bindings/scene.scm b/irrlicht/bindings/scene.scm
index 752825b..74b1535 100644
--- a/irrlicht/bindings/scene.scm
+++ b/irrlicht/bindings/scene.scm
@@ -19,9 +19,8 @@
 
 
 (define-module (irrlicht bindings scene)
-  #:use-module (system foreign))
-
-(define cirr (dynamic-link "libCIrrlicht"))
+  #:use-module (system foreign)
+  #:use-module (irrlicht util foreign))
 
 ;;  irr_scene_EMD2_ANIMATION_TYPE enum
 (define-public EMAT_STAND                 0)
@@ -48,62 +47,38 @@
 (define-public EMAT_COUNT                21)
 
 ;; Scene functions
-(define-public add-animated-mesh-scene-node
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_scene_addAnimatedMeshSceneNode" cirr)
-   (list '* '* '* int '* '* '* int)))
+(define-foreign add-animated-mesh-scene-node
+  '* "irr_scene_addAnimatedMeshSceneNode" (list '* '* '* int '* '* '* int))
+
+(define-foreign add-camera-scene-node
+  '* "irr_scene_addCameraSceneNode" (list '* '* '* '* int int))
+
+(define-foreign add-camera-scene-node-fps
+  '* "irr_scene_addCameraSceneNodeFPS" (list '* '* float float int '* int int float int int))
 
-(define-public add-camera-scene-node
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_scene_addCameraSceneNode" cirr)
-   (list '* '* '* '* int int)))
+(define-foreign add-custom-scene-node
+  '* "irr_scene_addCustomSceneNode" (list '* '* int '* '* '* '* '* '* '*))
 
-(define-public add-camera-scene-node-fps
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_scene_addCameraSceneNodeFPS" cirr)
-   (list '* '* float float int '* int int float int int)))
+(define-foreign add-octree-scene-node
+  '* "irr_scene_addOctreeSceneNode" (list '* '* '* int int int))
 
-(define-public add-octree-scene-node-am
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_scene_addOctreeSceneNodeAM" cirr)
-   (list '* '* '* int int int)))
+(define-foreign draw-all
+  void "irr_scene_drawAll" (list '*))
 
-(define-public draw-all
-  (pointer->procedure
-   void
-   (dynamic-func "irr_scene_drawAll" cirr)
-   (list '*)))
+(define-foreign get-mesh
+  '* "irr_scene_getMesh" (list '* '*))
 
-(define-public get-mesh
-  (pointer->procedure
-   '*
-   (dynamic-func "irr_scene_getMesh" cirr)
-   (list '* '*)))
+(define-foreign get-root-scene-node
+  '* "irr_scene_getRootSceneNode" (list '*))
 
-(define-public set-material-flag-am
-  (pointer->procedure
-   void
-   (dynamic-func "irr_scene_setMaterialFlagAM" cirr)
-   (list '* int int)))
+(define-foreign set-material-flag
+  void "irr_scene_setMaterialFlag" (list '* int int))
 
-(define-public set-material-texture-am
-  (pointer->procedure
-   void
-   (dynamic-func "irr_scene_setMaterialTextureAM" cirr)
-   (list '* int '*)))
+(define-foreign set-material-texture
+  void "irr_scene_setMaterialTexture" (list '* int '*))
 
-(define-public set-md2-animation
-  (pointer->procedure
-   void
-   (dynamic-func "irr_scene_setMD2Animation" cirr)
-   (list '* int)))
+(define-foreign set-md2-animation
+  void "irr_scene_setMD2Animation" (list '* int))
 
-(define-public set-position
-  (pointer->procedure
-   void
-   (dynamic-func "irr_scene_setPosition" cirr)
-   (list '* '*)))
+(define-foreign set-position
+  void "irr_scene_setPosition" (list '* '*))