]> git.jsancho.org Git - guile-irrlicht.git/commitdiff
call remote procs from guile code
authorJavier Sancho <jsf@jsancho.org>
Mon, 11 May 2020 06:15:17 +0000 (08:15 +0200)
committerJavier Sancho <jsf@jsancho.org>
Mon, 11 May 2020 06:15:17 +0000 (08:15 +0200)
23 files changed:
irrlicht/base.scm
irrlicht/device.scm
irrlicht/foreign.scm
irrlicht/gui.scm
irrlicht/io.scm
irrlicht/irr.scm
irrlicht/scene.scm
src/animated-mesh-scene-node.cpp
src/animated-mesh.cpp
src/box3d.cpp
src/cursor-control.cpp
src/device.cpp
src/file-system.cpp
src/gui-environment.cpp
src/gui-in-out-fader.cpp
src/gui-listbox.cpp
src/gui-scrollbar.cpp
src/gui-skin.cpp
src/gui-toolbar.cpp
src/reference-counted.cpp
src/scene-manager.cpp
src/scene-node.cpp
src/video-driver.cpp

index 4f08eefec60e192deb3a85ae478069861d4611a8..4a5d9ae91a405265da9c1e46f2b9aaf9d4aa2c85 100644 (file)
@@ -22,7 +22,9 @@
   #:use-module (oop goops)
   #:use-module (system foreign)
   #:export (<irrlicht-base>
+            irr-class
             irr-pointer))
 
 (define-class <irrlicht-base> ()
-  (irr-pointer #:init-value %null-pointer #:accessor irr-pointer #:init-keyword #:irr-pointer))
+  (irr-class #:init-value "" #:getter irr-class)
+  (irr-pointer #:init-value %null-pointer #:getter irr-pointer #:init-keyword #:irr-pointer))
index 6049016fc1f8b5a2f5f92900ae128606c1f0f8d0..b75d4d3f7b87d75e4bcf8ba3d967b1a9791d4232 100644 (file)
@@ -29,7 +29,8 @@
 
 
 ;; IrrlichtDevice
-(define-class <irrlicht-device> (<reference-counted>))
+(define-class <irrlicht-device> (<reference-counted>)
+  (irr-class #:init-value "IrrlichtDevice" #:getter irr-class))
 
 (define* (create-device #:key
                         (device-type 'software)
@@ -46,7 +47,7 @@
 
   (make <irrlicht-device>
     #:irr-pointer
-    (irr_createDevice
+    ((get-irrlicht-proc "createDevice")
      device-type
      window-size
      bits
 
 (define-method (get-gui-environment (device <irrlicht-device>))
   (make <gui-environment>
-    #:irr-pointer (irr_IrrlichtDevice_getGUIEnvironment (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getGUIEnvironment" device) (irr-pointer device))))
 
 (define-method (get-scene-manager (device <irrlicht-device>))
   (make <scene-manager>
-    #:irr-pointer (irr_IrrlichtDevice_getSceneManager (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getSceneManager" device) (irr-pointer device))))
 
 (define-method (get-video-driver (device <irrlicht-device>))
   (make <video-driver>
-    #:irr-pointer (irr_IrrlichtDevice_getVideoDriver (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getVideoDriver" device) (irr-pointer device))))
 
 (define-method (set-window-caption! (device <irrlicht-device>) text)
-  (irr_IrrlichtDevice_setWindowCaption (irr-pointer device) text))
+  ((get-irrlicht-proc "setWindowCaption" device)
+   (irr-pointer device) text))
 
 (export create-device get-gui-environment get-scene-manager get-video-driver set-window-caption!)
index ff46223674e7aa73a341b563502c496e40cb2ea1..f6e203622f55db18eae8907fce38f3c26533c4dd 100644 (file)
 ;;; <http://www.gnu.org/licenses/>.
 
 
-(define-module (irrlicht foreign))
+(define-module (irrlicht foreign)
+  #:use-module (irrlicht base)
+  #:export (get-irrlicht-proc))
 
-(load-extension "libguile-irrlicht" "init_guile_irrlicht")
+;; We use a hash table to store foreign irrlicht methods related with their
+;; classes
+;; This is needed because we need to "simulate" C++ inheritance
+(define remote-proc-table (make-hash-table))
+
+(define (get-irrlicht-proc proc-name . objects)
+  (let* ((name (if (null? objects)
+                   proc-name
+                   (let ((classes (map irr-class objects)))
+                     (string-join (cons (car classes) (cons proc-name (cdr classes))) "_"))))
+         (proc (hash-ref remote-proc-table name)))
+    (cond ((not proc)
+           (load-extension "libguile-irrlicht" "init_guile_irrlicht")
+           (let ((new-proc (eval-string name)))
+             (hash-set! remote-proc-table name new-proc)
+             new-proc))
+          (else
+           proc))))
index e6e4ab3135320e1a9b925fe1f4172d4b50beed08..aa12d37424a7f70d806d9576f187f5d4a381f502 100644 (file)
 
 
 ;; IGUIElement
-(define-class <gui-element> (<attribute-exchanging-object> <event-receiver>))
+(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>))
+(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
          (fill-background #f))
     (make <gui-static-text>
       #:irr-pointer
-      (irr_gui_IGUIEnvironment_addStaticText (irr-pointer gui-environment)
-                                             text
-                                             rectangle
-                                             border
-                                             word-wrap
-                                             (irr-pointer parent)
-                                             id
-                                             fill-background))))
+      ((get-irrlicht-proc "addStaticText" gui-environment parent)
+       (irr-pointer gui-environment)
+       text
+       rectangle
+       border
+       word-wrap
+       (irr-pointer parent)
+       id
+       fill-background))))
 
 (export <gui-environment> add-static-text!)
 
 
 ;; IGUIStaticText
-(define-class <gui-static-text> (<gui-element>))
+(define-class <gui-static-text> (<gui-element>)
+  (irr-class #:init-value "IGUIStaticText" #:getter irr-class))
 
 (export <gui-static-text>)
index 73961bb7655efdde69536940d86766a6419d4287..0229ac32316b68e7a26c784da7da1a931152f837 100644 (file)
@@ -25,6 +25,7 @@
 
 
 ;; IAttributeExchangingObject
-(define-class <attribute-exchanging-object> (<reference-counted>))
+(define-class <attribute-exchanging-object> (<reference-counted>)
+  (irr-class #:init-value "IAttributeExchangingObject" #:getter irr-class))
 
 (export <attribute-exchanging-object>)
index 07e506acdeaefc9ff62518fceb042382b35ea52d..270679317380172d444f3a309243f87dce69d93b 100644 (file)
 
 
 ;; IReferenceCounted
-(define-class <reference-counted> (<irrlicht-base>))
+(define-class <reference-counted> (<irrlicht-base>)
+  (irr-class #:init-value "IReferenceCounted" #:getter irr-class))
 
 (export <reference-counted>)
 
 
 ;; IEventReceiver
-(define-class <event-receiver> (<irrlicht-base>))
+(define-class <event-receiver> (<irrlicht-base>)
+  (irr-class #:init-value "IEventReceiver" #:getter irr-class))
 
 (export <event-receiver>)
index 27f89465e4ae8c88ce54c9c93fbe7c0a248dfc81..e5cd4225fe1b386c93fea5dd1a6010d84725c3ea 100644 (file)
@@ -25,6 +25,7 @@
 
 
 ;; ISceneManager
-(define-class <scene-manager> (<reference-counted>))
+(define-class <scene-manager> (<reference-counted>)
+  (irr-class #:init-value "ISceneManager" #:getter irr-class))
 
 (export <scene-manager>)
index 474ef8f0f20445a630904fe65d5727fd03a1ca0f..498a196529e513d62c2d8828a88fd57958063f9f 100644 (file)
@@ -30,9 +30,9 @@ using namespace irr;
 
 
 SCM
-scene_IAnimatedMeshSceneNode_setFrameLoop (SCM animated_mesh_scene_node,
-                                           SCM begin,
-                                           SCM end)
+IAnimatedMeshSceneNode_setFrameLoop (SCM animated_mesh_scene_node,
+                                     SCM begin,
+                                     SCM end)
 {
   return scm_from_bool
     (((scene::IAnimatedMeshSceneNode*)scm_to_pointer (animated_mesh_scene_node))->
@@ -42,8 +42,8 @@ scene_IAnimatedMeshSceneNode_setFrameLoop (SCM animated_mesh_scene_node,
 
 
 SCM
-scene_IAnimatedMeshSceneNode_setMD2Animation (SCM animated_mesh_scene_node,
-                                              SCM anim)
+IAnimatedMeshSceneNode_setMD2Animation (SCM animated_mesh_scene_node,
+                                        SCM anim)
 {
   return scm_from_bool
     (((scene::IAnimatedMeshSceneNode*)scm_to_pointer (animated_mesh_scene_node))->
@@ -56,10 +56,10 @@ extern "C" {
   void
   init_animated_mesh_scene_node (void)
   {
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setFrameLoop", 3, 0, 0,
-                  scene_IAnimatedMeshSceneNode_setFrameLoop);
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setMD2Animation", 2, 0, 0,
-                  scene_IAnimatedMeshSceneNode_setMD2Animation);
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setFrameLoop", 3, 0, 0,
+                  IAnimatedMeshSceneNode_setFrameLoop);
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setMD2Animation", 2, 0, 0,
+                  IAnimatedMeshSceneNode_setMD2Animation);
   }
 
 }
index c7013b20363c9353902f12d81ca6f2b9b9780f2f..80b6229d8adb941b85563029767dc4b6cd63a415 100644 (file)
@@ -29,8 +29,8 @@ using namespace irr;
 
 
 SCM
-scene_IAnimatedMesh_setAnimationSpeed (SCM animated_mesh,
-                                       SCM frames_per_second)
+IAnimatedMesh_setAnimationSpeed (SCM animated_mesh,
+                                 SCM frames_per_second)
 {
   ((scene::IAnimatedMesh*)scm_to_pointer (animated_mesh))->
     setAnimationSpeed (scm_to_double (frames_per_second));
@@ -43,8 +43,7 @@ extern "C" {
   void
   init_animated_mesh (void)
   {
-    DEFINE_GSUBR ("scene_IAnimatedMesh_setAnimationSpeed", 2, 0, 0,
-                  scene_IAnimatedMesh_setAnimationSpeed);
+    DEFINE_GSUBR ("IAnimatedMesh_setAnimationSpeed", 2, 0, 0, IAnimatedMesh_setAnimationSpeed);
   }
 
 }
index f9a688b7c848ea9f598b38660afdddecce04f7bd..71571b1013b9e59772ca4ac1b02e20e787039fd3 100644 (file)
@@ -30,8 +30,8 @@ using namespace irr;
 
 
 SCM
-core_aabbox3d_addInternalPoint (SCM box3d,
-                                SCM point)
+aabbox3d_addInternalPoint (SCM box3d,
+                           SCM point)
 {
   ((core::aabbox3df*)scm_to_pointer (box3d))->addInternalPoint (scm_to_vector3df (point));
   return SCM_UNSPECIFIED;
@@ -39,7 +39,7 @@ core_aabbox3d_addInternalPoint (SCM box3d,
 
 
 SCM
-core_aabbox3d_make ()
+aabbox3d_make ()
 {
   core::aabbox3df* aabbox = new core::aabbox3df ();
   return scm_from_pointer ((void*)aabbox, NULL);
@@ -47,8 +47,8 @@ core_aabbox3d_make ()
 
 
 SCM
-core_aabbox3d_reset (SCM box3d,
-                     SCM init_value)
+aabbox3d_reset (SCM box3d,
+                SCM init_value)
 {
   ((core::aabbox3df*)scm_to_pointer (box3d))->reset (scm_to_vector3df (init_value));
   return SCM_UNSPECIFIED;
@@ -60,12 +60,9 @@ extern "C" {
   void
   init_box3d (void)
   {
-    DEFINE_GSUBR ("core_aabbox3d_addInternalPoint", 2, 0, 0,
-                  core_aabbox3d_addInternalPoint);
-    DEFINE_GSUBR ("core_aabbox3d_make", 0, 0, 0,
-                  core_aabbox3d_make);
-    DEFINE_GSUBR ("core_aabbox3d_reset", 2, 0, 0,
-                  core_aabbox3d_reset);
+    DEFINE_GSUBR ("aabbox3d_addInternalPoint", 2, 0, 0, aabbox3d_addInternalPoint);
+    DEFINE_GSUBR ("aabbox3d_make", 0, 0, 0, aabbox3d_make);
+    DEFINE_GSUBR ("aabbox3d_reset", 2, 0, 0, aabbox3d_reset);
   }
 
 }
index 4efe056d14627248c4a2e2a76de6f5e57711fdad..79e31d9806bc5ca246673de2da2fd2262c39340e 100644 (file)
@@ -30,7 +30,7 @@ using namespace irr;
 
 
 SCM
-gui_ICursorControl_getPosition (SCM cursor_control)
+ICursorControl_getPosition (SCM cursor_control)
 {
   return scm_from_position2d_s32
     (((gui::ICursorControl*)scm_to_pointer (cursor_control))->getPosition ());
@@ -38,8 +38,8 @@ gui_ICursorControl_getPosition (SCM cursor_control)
 
 
 SCM
-gui_ICursorControl_setPosition (SCM cursor_control,
-                                SCM position)
+ICursorControl_setPosition (SCM cursor_control,
+                            SCM position)
 {
   ((gui::ICursorControl*)scm_to_pointer (cursor_control))->
     setPosition (scm_to_position2d_s32 (position));
@@ -52,10 +52,8 @@ extern "C" {
   void
   init_cursor_control (void)
   {
-    DEFINE_GSUBR ("gui_ICursorControl_getPosition", 1, 0, 0,
-                  gui_ICursorControl_getPosition);
-    DEFINE_GSUBR ("gui_ICursorControl_setPosition", 2, 0, 0,
-                  gui_ICursorControl_setPosition);
+    DEFINE_GSUBR ("ICursorControl_getPosition", 1, 0, 0, ICursorControl_getPosition);
+    DEFINE_GSUBR ("ICursorControl_setPosition", 2, 0, 0, ICursorControl_setPosition);
   }
 
 }
index 63db119696fe5513bdd2c94238b903ad77db948f..ed551705389337c09e789d110d54ba0ac2f6ac1b 100644 (file)
 using namespace irr;
 
 
-template <typename TEventReceiver>
 SCM
-createDevice (SCM device_type,
-              SCM window_size,
-              SCM bits,
-              SCM fullscreen,
-              SCM stencilbuffer,
-              SCM vsync,
-              SCM receiver)
+irr_createDevice (SCM device_type,
+                  SCM window_size,
+                  SCM bits,
+                  SCM fullscreen,
+                  SCM stencilbuffer,
+                  SCM vsync,
+                  SCM receiver)
 {
   IrrlichtDevice* device =
     createDevice (scm_to_driver_type (device_type),
@@ -48,7 +47,7 @@ createDevice (SCM device_type,
                   scm_to_bool (fullscreen),
                   scm_to_bool (stencilbuffer),
                   scm_to_bool (vsync),
-                  (TEventReceiver)scm_to_pointer (receiver));
+                  (IEventReceiver*)scm_to_pointer (receiver));
   return scm_from_pointer ((void*)device, NULL);
 }
 
@@ -167,7 +166,7 @@ extern "C" {
   void
   init_device (void)
   {
-    DEFINE_GSUBR ("createDevice_IEventReceiver", 7, 0, 0, createDevice<IEventReceiver*>);
+    DEFINE_GSUBR ("createDevice", 7, 0, 0, irr_createDevice);
     DEFINE_GSUBR ("IrrlichtDevice_getCursorControl", 1, 0, 0, IrrlichtDevice_getCursorControl);
     DEFINE_GSUBR ("IrrlichtDevice_getFileSystem", 1, 0, 0, IrrlichtDevice_getFileSystem);
     DEFINE_GSUBR ("IrrlichtDevice_getGUIEnvironment", 1, 0, 0, IrrlichtDevice_getGUIEnvironment);
index 76892ef7a74ac78a86113ff06659b36b5b996b2d..5b872a5d1fbb5ffc9085c1ede2d25911c6544920 100644 (file)
@@ -30,13 +30,13 @@ using namespace irr;
 
 
 SCM
-io_IFileSystem_addFileArchive (SCM file_system,
-                               SCM filename,
-                               SCM ignore_case,
-                               SCM ignore_paths,
-                               SCM archive_type,
-                               SCM password,
-                               SCM ret_archive)
+IFileSystem_addFileArchive (SCM file_system,
+                            SCM filename,
+                            SCM ignore_case,
+                            SCM ignore_paths,
+                            SCM archive_type,
+                            SCM password,
+                            SCM ret_archive)
 {
   io::IFileArchive* retArchive = (io::IFileArchive*)scm_to_pointer (ret_archive);
   io::IFileArchive** retArchiveReference = 0;
@@ -61,7 +61,7 @@ extern "C" {
   void
   init_file_system (void)
   {
-    DEFINE_GSUBR ("io_IFileSystem_addFileArchive", 7, 0, 0, io_IFileSystem_addFileArchive);
+    DEFINE_GSUBR ("IFileSystem_addFileArchive", 7, 0, 0, IFileSystem_addFileArchive);
   }
 
 }
index 420b6a67129eb743fc10a9563f1c84bd12b63f66..92e4a7b5b6a08a0e3d3d2096f11d1c1547d9236d 100644 (file)
@@ -33,12 +33,12 @@ using namespace irr;
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addButton (SCM gui_environment,
-                               SCM rectangle,
-                               SCM parent,
-                               SCM id,
-                               SCM text,
-                               SCM tooltiptext)
+IGUIEnvironment_addButton (SCM gui_environment,
+                           SCM rectangle,
+                           SCM parent,
+                           SCM id,
+                           SCM text,
+                           SCM tooltiptext)
 {
   gui::IGUIButton* button =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -53,12 +53,12 @@ gui_IGUIEnvironment_addButton (SCM gui_environment,
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addEditBox (SCM gui_environment,
-                                SCM text,
-                                SCM rectangle,
-                                SCM border,
-                                SCM parent,
-                                SCM id)
+IGUIEnvironment_addEditBox (SCM gui_environment,
+                            SCM text,
+                            SCM rectangle,
+                            SCM border,
+                            SCM parent,
+                            SCM id)
 {
   gui::IGUIEditBox* editbox =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -73,13 +73,13 @@ gui_IGUIEnvironment_addEditBox (SCM gui_environment,
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addImage (SCM gui_environment,
-                              SCM image,
-                              SCM position,
-                              SCM use_alpha_channel,
-                              SCM parent,
-                              SCM id,
-                              SCM text)
+IGUIEnvironment_addImage (SCM gui_environment,
+                          SCM image,
+                          SCM position,
+                          SCM use_alpha_channel,
+                          SCM parent,
+                          SCM id,
+                          SCM text)
 {
   gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_pointer (gui_environment);
   gui::IGUIImage* new_image =
@@ -95,11 +95,11 @@ gui_IGUIEnvironment_addImage (SCM gui_environment,
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addListBox (SCM gui_environment,
-                                SCM rectangle,
-                                SCM parent,
-                                SCM id,
-                                SCM draw_background)
+IGUIEnvironment_addListBox (SCM gui_environment,
+                            SCM rectangle,
+                            SCM parent,
+                            SCM id,
+                            SCM draw_background)
 {
   gui::IGUIListBox* listbox =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -113,11 +113,11 @@ gui_IGUIEnvironment_addListBox (SCM gui_environment,
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
-                                  SCM horizontal,
-                                  SCM rectangle,
-                                  SCM parent,
-                                  SCM id)
+IGUIEnvironment_addScrollBar (SCM gui_environment,
+                              SCM horizontal,
+                              SCM rectangle,
+                              SCM parent,
+                              SCM id)
 {
   gui::IGUIScrollBar* scrollbar =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -131,14 +131,14 @@ gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addStaticText (SCM gui_environment,
-                                   SCM text,
-                                   SCM rectangle,
-                                   SCM border,
-                                   SCM word_wrap,
-                                   SCM parent,
-                                   SCM id,
-                                   SCM fill_background)
+IGUIEnvironment_addStaticText (SCM gui_environment,
+                               SCM text,
+                               SCM rectangle,
+                               SCM border,
+                               SCM word_wrap,
+                               SCM parent,
+                               SCM id,
+                               SCM fill_background)
 {
   gui::IGUIStaticText* static_text =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -155,12 +155,12 @@ gui_IGUIEnvironment_addStaticText (SCM gui_environment,
 
 template <typename TParent>
 SCM
-gui_IGUIEnvironment_addWindow (SCM gui_environment,
-                               SCM rectangle,
-                               SCM modal,
-                               SCM text,
-                               SCM parent,
-                               SCM id)
+IGUIEnvironment_addWindow (SCM gui_environment,
+                           SCM rectangle,
+                           SCM modal,
+                           SCM text,
+                           SCM parent,
+                           SCM id)
 {
   gui::IGUIWindow* window =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -174,7 +174,7 @@ gui_IGUIEnvironment_addWindow (SCM gui_environment,
 
 
 SCM
-gui_IGUIEnvironment_drawAll (SCM gui_environment)
+IGUIEnvironment_drawAll (SCM gui_environment)
 {
   ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->drawAll ();
   return SCM_UNSPECIFIED;
@@ -182,7 +182,7 @@ gui_IGUIEnvironment_drawAll (SCM gui_environment)
 
 
 SCM
-gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment)
+IGUIEnvironment_getBuiltInFont (SCM gui_environment)
 {
   gui::IGUIFont* font =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getBuiltInFont ();
@@ -191,8 +191,8 @@ gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment)
 
 
 SCM
-gui_IGUIEnvironment_getFont (SCM gui_environment,
-                             SCM filename)
+IGUIEnvironment_getFont (SCM gui_environment,
+                         SCM filename)
 {
   gui::IGUIFont* font =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -202,7 +202,7 @@ gui_IGUIEnvironment_getFont (SCM gui_environment,
 
 
 SCM
-gui_IGUIEnvironment_getSkin (SCM gui_environment)
+IGUIEnvironment_getSkin (SCM gui_environment)
 {
   gui::IGUISkin* skin =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getSkin ();
@@ -215,24 +215,24 @@ extern "C" {
   void
   init_gui_environment (void)
   {
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
-                  gui_IGUIEnvironment_addButton<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
-                  gui_IGUIEnvironment_addEditBox<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
-                  gui_IGUIEnvironment_addImage<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
-                  gui_IGUIEnvironment_addListBox<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
-                  gui_IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
-                  gui_IGUIEnvironment_addStaticText<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
-                  gui_IGUIEnvironment_addWindow<gui::IGUIElement*>);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_drawAll", 1, 0, 0, gui_IGUIEnvironment_drawAll);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_getBuiltInFont", 1, 0, 0, gui_IGUIEnvironment_getBuiltInFont);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_getFont", 2, 0, 0, gui_IGUIEnvironment_getFont);
-    DEFINE_GSUBR ("gui_IGUIEnvironment_getSkin", 1, 0, 0, gui_IGUIEnvironment_getSkin);
+    DEFINE_GSUBR ("IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
+                  IGUIEnvironment_addButton<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
+                  IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
+                  IGUIEnvironment_addImage<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
+                  IGUIEnvironment_addListBox<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
+                  IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
+                  IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
+                  IGUIEnvironment_addWindow<gui::IGUIElement*>);
+    DEFINE_GSUBR ("IGUIEnvironment_drawAll", 1, 0, 0, IGUIEnvironment_drawAll);
+    DEFINE_GSUBR ("IGUIEnvironment_getBuiltInFont", 1, 0, 0, IGUIEnvironment_getBuiltInFont);
+    DEFINE_GSUBR ("IGUIEnvironment_getFont", 2, 0, 0, IGUIEnvironment_getFont);
+    DEFINE_GSUBR ("IGUIEnvironment_getSkin", 1, 0, 0, IGUIEnvironment_getSkin);
   }
 
 }
index e571b30530d5e9e35262edf3abf41d3dfa177285..028c84d19a705a8271fe46c4ac35653c31067be9 100644 (file)
@@ -30,9 +30,9 @@ using namespace irr;
 
 
 SCM
-gui_IGUIInOutFader_setColor (SCM in_out_fader,
-                             SCM color,
-                             SCM dest_color)
+IGUIInOutFader_setColor (SCM in_out_fader,
+                         SCM color,
+                         SCM dest_color)
 {
   gui::IGUIInOutFader* fader = (gui::IGUIInOutFader*)scm_to_pointer (in_out_fader);
   if (dest_color == SCM_UNDEFINED)
@@ -53,7 +53,7 @@ extern "C" {
   void
   init_gui_in_out_fader (void)
   {
-    DEFINE_GSUBR ("gui_IGUIInOutFader_setColor", 2, 1, 0, gui_IGUIInOutFader_setColor);
+    DEFINE_GSUBR ("IGUIInOutFader_setColor", 2, 1, 0, IGUIInOutFader_setColor);
   }
 
 }
index ee82efface87ed52538933acc89f931c71fbfea9..08b3b2230c3b981d44bbe11430b4f367968f85e7 100644 (file)
@@ -30,9 +30,9 @@ using namespace irr;
 
 
 SCM
-gui_IGUIListBox_addItem (SCM gui_listbox,
-                         SCM text,
-                         SCM icon)
+IGUIListBox_addItem (SCM gui_listbox,
+                     SCM text,
+                     SCM icon)
 {
   gui::IGUIListBox* listbox = (gui::IGUIListBox*)scm_to_pointer (gui_listbox);
   u32 item_id;
@@ -54,7 +54,7 @@ extern "C" {
   void
   init_gui_listbox (void)
   {
-    DEFINE_GSUBR ("gui_IGUIListBox_addItem", 2, 1, 0, gui_IGUIListBox_addItem);
+    DEFINE_GSUBR ("IGUIListBox_addItem", 2, 1, 0, IGUIListBox_addItem);
   }
 
 }
index b67413effe2317d3b8f7833fc8849f3626a1c393..37f4f951ff0c0e9b49100e139c8fd89c5edb9027 100644 (file)
@@ -29,7 +29,7 @@ using namespace irr;
 
 
 SCM
-gui_IGUIScrollBar_getPos (SCM gui_scrollbar)
+IGUIScrollBar_getPos (SCM gui_scrollbar)
 {
   return scm_from_int32
     (((gui::IGUIScrollBar*)scm_to_pointer (gui_scrollbar))->getPos ());
@@ -37,8 +37,8 @@ gui_IGUIScrollBar_getPos (SCM gui_scrollbar)
 
 
 SCM
-gui_IGUIScrollBar_setMax (SCM gui_scrollbar,
-                          SCM max)
+IGUIScrollBar_setMax (SCM gui_scrollbar,
+                      SCM max)
 {
   ((gui::IGUIScrollBar*) scm_to_pointer (gui_scrollbar))->setMax (scm_to_int32 (max));
   return SCM_UNSPECIFIED;
@@ -46,8 +46,8 @@ gui_IGUIScrollBar_setMax (SCM gui_scrollbar,
 
 
 SCM
-gui_IGUIScrollBar_setPos (SCM gui_scrollbar,
-                          SCM pos)
+IGUIScrollBar_setPos (SCM gui_scrollbar,
+                      SCM pos)
 {
   ((gui::IGUIScrollBar*) scm_to_pointer (gui_scrollbar))->setPos (scm_to_int32 (pos));
   return SCM_UNSPECIFIED;
@@ -59,9 +59,9 @@ extern "C" {
   void
   init_gui_scrollbar (void)
   {
-    DEFINE_GSUBR ("gui_IGUIScrollBar_getPos", 1, 0, 0, gui_IGUIScrollBar_getPos);
-    DEFINE_GSUBR ("gui_IGUIScrollBar_setMax", 2, 0, 0, gui_IGUIScrollBar_setMax);
-    DEFINE_GSUBR ("gui_IGUIScrollBar_setPos", 2, 0, 0, gui_IGUIScrollBar_setPos);
+    DEFINE_GSUBR ("IGUIScrollBar_getPos", 1, 0, 0, IGUIScrollBar_getPos);
+    DEFINE_GSUBR ("IGUIScrollBar_setMax", 2, 0, 0, IGUIScrollBar_setMax);
+    DEFINE_GSUBR ("IGUIScrollBar_setPos", 2, 0, 0, IGUIScrollBar_setPos);
   }
 
 }
index b6e0ae1dfcb71f3d5d7fff6a84f83c2f94b83a79..abe13f554f9e600634959e20ed0a2b1d493affb1 100644 (file)
@@ -30,8 +30,8 @@ using namespace irr;
 
 
 SCM
-irr_gui_IGUISkin_getColor (SCM gui_skin,
-                           SCM color)
+IGUISkin_getColor (SCM gui_skin,
+                   SCM color)
 {
   gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
   video::SColor scolor = skin->getColor (scm_to_default_color (color));
@@ -40,8 +40,8 @@ irr_gui_IGUISkin_getColor (SCM gui_skin,
 
 
 SCM
-irr_gui_IGUISkin_getFont (SCM gui_skin,
-                          SCM which)
+IGUISkin_getFont (SCM gui_skin,
+                  SCM which)
 {
   gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
   gui::IGUIFont* font = skin->getFont (scm_to_default_font (which));
@@ -50,9 +50,9 @@ irr_gui_IGUISkin_getFont (SCM gui_skin,
 
 
 SCM
-irr_gui_IGUISkin_setColor (SCM gui_skin,
-                           SCM which,
-                           SCM new_color)
+IGUISkin_setColor (SCM gui_skin,
+                   SCM which,
+                   SCM new_color)
 {
   gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
   skin->setColor (scm_to_default_color (which),
@@ -62,9 +62,9 @@ irr_gui_IGUISkin_setColor (SCM gui_skin,
 
 
 SCM
-irr_gui_IGUISkin_setFont (SCM gui_skin,
-                          SCM font,
-                          SCM which)
+IGUISkin_setFont (SCM gui_skin,
+                  SCM font,
+                  SCM which)
 {
   gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
   skin->setFont ((gui::IGUIFont*) scm_to_pointer (font),
@@ -78,10 +78,10 @@ extern "C" {
   void
   init_gui_skin (void)
   {
-    DEFINE_GSUBR ("irr_gui_IGUISkin_getColor", 2, 0, 0, irr_gui_IGUISkin_getColor);
-    DEFINE_GSUBR ("irr_gui_IGUISkin_getFont", 2, 0, 0, irr_gui_IGUISkin_getFont);
-    DEFINE_GSUBR ("irr_gui_IGUISkin_setColor", 3, 0, 0, irr_gui_IGUISkin_setColor);
-    DEFINE_GSUBR ("irr_gui_IGUISkin_setFont", 3, 0, 0, irr_gui_IGUISkin_setFont);
+    DEFINE_GSUBR ("IGUISkin_getColor", 2, 0, 0, IGUISkin_getColor);
+    DEFINE_GSUBR ("IGUISkin_getFont", 2, 0, 0, IGUISkin_getFont);
+    DEFINE_GSUBR ("IGUISkin_setColor", 3, 0, 0, IGUISkin_setColor);
+    DEFINE_GSUBR ("IGUISkin_setFont", 3, 0, 0, IGUISkin_setFont);
   }
 
 }
index 1f38bdbcdcba46fc6e8622cb8456645b4e08962e..fb3ca10862ff8ad2b5b4f0d0081e7e513a4d8345 100644 (file)
@@ -30,14 +30,14 @@ using namespace irr;
 
 
 SCM
-irr_gui_IGUIToolBar_addButton (SCM gui_toolbar,
-                               SCM id,
-                               SCM text,
-                               SCM tooltiptext,
-                               SCM img,
-                               SCM pressedimg,
-                               SCM is_push_button,
-                               SCM use_alpha_channel)
+IGUIToolBar_addButton (SCM gui_toolbar,
+                       SCM id,
+                       SCM text,
+                       SCM tooltiptext,
+                       SCM img,
+                       SCM pressedimg,
+                       SCM is_push_button,
+                       SCM use_alpha_channel)
 {
   gui::IGUIToolBar* toolbar = (gui::IGUIToolBar*) scm_to_pointer (gui_toolbar);
   gui::IGUIButton* button =
@@ -57,7 +57,7 @@ extern "C" {
   void
   init_gui_toolbar (void)
   {
-    DEFINE_GSUBR ("irr_gui_IGUIToolBar_addButton", 8, 0, 0, irr_gui_IGUIToolBar_addButton);
+    DEFINE_GSUBR ("IGUIToolBar_addButton", 8, 0, 0, IGUIToolBar_addButton);
   }
 
 }
index 3e099d142419d7d91548dbbaabc4f24fb2e1f5e3..ea019b0d27418139cc68c187eab4d221bf1e2f5d 100644 (file)
@@ -41,8 +41,7 @@ extern "C" {
   void
   init_reference_counted (void)
   {
-    DEFINE_GSUBR ("IReferenceCounted_drop_IrrlichtDevice", 1, 0, 0,
-                  IReferenceCounted_drop<IrrlichtDevice*>);
+    DEFINE_GSUBR ("IrrlichtDevice_drop", 1, 0, 0, IReferenceCounted_drop<IrrlichtDevice*>);
   }
 
 }
index 51e561ad4c5159861294c5d03e8dc63dde7689cb..f96938389ceeb51816574eb28f56924882cf693f 100644 (file)
@@ -31,14 +31,14 @@ using namespace irr;
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
-                                              SCM mesh,
-                                              SCM parent,
-                                              SCM id,
-                                              SCM position,
-                                              SCM rotation,
-                                              SCM scale,
-                                              SCM also_add_if_mesh_pointer_zero)
+ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
+                                        SCM mesh,
+                                        SCM parent,
+                                        SCM id,
+                                        SCM position,
+                                        SCM rotation,
+                                        SCM scale,
+                                        SCM also_add_if_mesh_pointer_zero)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IAnimatedMeshSceneNode* node =
@@ -55,12 +55,12 @@ scene_ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCameraSceneNode (SCM scene_manager,
-                                        SCM parent,
-                                        SCM position,
-                                        SCM lookat,
-                                        SCM id,
-                                        SCM make_active)
+ISceneManager_addCameraSceneNode (SCM scene_manager,
+                                  SCM parent,
+                                  SCM position,
+                                  SCM lookat,
+                                  SCM id,
+                                  SCM make_active)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ICameraSceneNode* camera =
@@ -75,8 +75,8 @@ scene_ISceneManager_addCameraSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
-                                           SCM rest)
+ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
+                                     SCM rest)
 {
   SCM parent;
   SCM rotate_speed;
@@ -121,13 +121,13 @@ scene_ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCubeSceneNode (SCM scene_manager,
-                                      SCM size,
-                                      SCM parent,
-                                      SCM id,
-                                      SCM position,
-                                      SCM rotation,
-                                      SCM scale)
+ISceneManager_addCubeSceneNode (SCM scene_manager,
+                                SCM size,
+                                SCM parent,
+                                SCM id,
+                                SCM position,
+                                SCM rotation,
+                                SCM scale)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IMeshSceneNode* node =
@@ -143,16 +143,16 @@ scene_ISceneManager_addCubeSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCustomSceneNode (SCM scene_manager,
-                                        SCM proc_render,
-                                        SCM proc_get_bounding_box,
-                                        SCM proc_get_material_count,
-                                        SCM proc_get_material,
-                                        SCM parent,
-                                        SCM id,
-                                        SCM position,
-                                        SCM rotation,
-                                        SCM scale)
+ISceneManager_addCustomSceneNode (SCM scene_manager,
+                                  SCM proc_render,
+                                  SCM proc_get_bounding_box,
+                                  SCM proc_get_material_count,
+                                  SCM proc_get_material,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM position,
+                                  SCM rotation,
+                                  SCM scale)
 {
   class CustomSceneNode : public scene::ISceneNode
   {
@@ -229,12 +229,12 @@ scene_ISceneManager_addCustomSceneNode (SCM scene_manager,
 
 template <typename TParent, typename TMesh>
 SCM
-scene_ISceneManager_addOctreeSceneNode (SCM scene_manager,
-                                        SCM mesh,
-                                        SCM parent,
-                                        SCM id,
-                                        SCM minimal_polys_per_node,
-                                        SCM also_add_if_mesh_pointer_zero)
+ISceneManager_addOctreeSceneNode (SCM scene_manager,
+                                  SCM mesh,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM minimal_polys_per_node,
+                                  SCM also_add_if_mesh_pointer_zero)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IMeshSceneNode* node =
@@ -249,14 +249,14 @@ scene_ISceneManager_addOctreeSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addSphereSceneNode (SCM scene_manager,
-                                        SCM radius,
-                                        SCM poly_count,
-                                        SCM parent,
-                                        SCM id,
-                                        SCM position,
-                                        SCM rotation,
-                                        SCM scale)
+ISceneManager_addSphereSceneNode (SCM scene_manager,
+                                  SCM radius,
+                                  SCM poly_count,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM position,
+                                  SCM rotation,
+                                  SCM scale)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IMeshSceneNode* node =
@@ -272,13 +272,13 @@ scene_ISceneManager_addSphereSceneNode (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_createFlyCircleAnimator (SCM scene_manager,
-                                             SCM center,
-                                             SCM radius,
-                                             SCM speed,
-                                             SCM direction,
-                                             SCM start_position,
-                                             SCM radius_ellipsoid)
+ISceneManager_createFlyCircleAnimator (SCM scene_manager,
+                                       SCM center,
+                                       SCM radius,
+                                       SCM speed,
+                                       SCM direction,
+                                       SCM start_position,
+                                       SCM radius_ellipsoid)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ISceneNodeAnimator* anim =
@@ -293,12 +293,12 @@ scene_ISceneManager_createFlyCircleAnimator (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_createFlyStraightAnimator (SCM scene_manager,
-                                               SCM start_point,
-                                               SCM end_point,
-                                               SCM time_for_way,
-                                               SCM loop,
-                                               SCM pingpong)
+ISceneManager_createFlyStraightAnimator (SCM scene_manager,
+                                         SCM start_point,
+                                         SCM end_point,
+                                         SCM time_for_way,
+                                         SCM loop,
+                                         SCM pingpong)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ISceneNodeAnimator* anim =
@@ -312,8 +312,8 @@ scene_ISceneManager_createFlyStraightAnimator (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_createRotationAnimator (SCM scene_manager,
-                                            SCM rotation_speed)
+ISceneManager_createRotationAnimator (SCM scene_manager,
+                                      SCM rotation_speed)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ISceneNodeAnimator* anim =
@@ -323,7 +323,7 @@ scene_ISceneManager_createRotationAnimator (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_drawAll (SCM scene_manager)
+ISceneManager_drawAll (SCM scene_manager)
 {
   ((scene::ISceneManager*) scm_to_pointer (scene_manager))->drawAll ();
   return SCM_UNSPECIFIED;
@@ -331,8 +331,8 @@ scene_ISceneManager_drawAll (SCM scene_manager)
 
 
 SCM
-scene_ISceneManager_getMesh (SCM scene_manager,
-                             SCM filename)
+ISceneManager_getMesh (SCM scene_manager,
+                       SCM filename)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IAnimatedMesh* mesh = smgr->getMesh(scm_to_utf8_stringn (filename, NULL));
@@ -341,7 +341,7 @@ scene_ISceneManager_getMesh (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_getRootSceneNode (SCM scene_manager)
+ISceneManager_getRootSceneNode (SCM scene_manager)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   return scm_from_pointer ((void*) smgr->getRootSceneNode (), NULL);
@@ -353,32 +353,31 @@ extern "C" {
   void
   init_scene_manager (void)
   {
-    DEFINE_GSUBR ("scene_ISceneManager_addAnimatedMeshSceneNode_ISceneNode", 8, 0, 0,
-                  scene_ISceneManager_addAnimatedMeshSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCameraSceneNode_ISceneNode", 6, 0, 0,
-                  scene_ISceneManager_addCameraSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCameraSceneNodeFPS_ISceneNode", 1, 0, 1,
-                  scene_ISceneManager_addCameraSceneNodeFPS<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCubeSceneNode_ISceneNode", 7, 0, 0,
-                  scene_ISceneManager_addCubeSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCustomSceneNode_ISceneNode", 10, 0, 0,
-                  scene_ISceneManager_addCustomSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addOctreeSceneNode_ISceneNode_IAnimatedMesh", 6, 0, 0,
-                  (scene_ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IAnimatedMesh*>));
-    DEFINE_GSUBR ("scene_ISceneManager_addOctreeSceneNode_ISceneNode_IMesh", 6, 0, 0,
-                  (scene_ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IMesh*>));
-    DEFINE_GSUBR ("scene_ISceneManager_addSphereSceneNode_ISceneNode", 8, 0, 0,
-                  scene_ISceneManager_addSphereSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_createFlyCircleAnimator", 7, 0, 0,
-                  scene_ISceneManager_createFlyCircleAnimator);
-    DEFINE_GSUBR ("scene_ISceneManager_createFlyStraightAnimator", 6, 0, 0,
-                  scene_ISceneManager_createFlyStraightAnimator);
-    DEFINE_GSUBR ("scene_ISceneManager_createRotationAnimator", 2, 0, 0,
-                  scene_ISceneManager_createRotationAnimator);
-    DEFINE_GSUBR ("scene_ISceneManager_drawAll", 1, 0, 0, scene_ISceneManager_drawAll);
-    DEFINE_GSUBR ("scene_ISceneManager_getMesh", 2, 0, 0, scene_ISceneManager_getMesh);
-    DEFINE_GSUBR ("scene_ISceneManager_getRootSceneNode", 1, 0, 0,
-                  scene_ISceneManager_getRootSceneNode);
+    DEFINE_GSUBR ("ISceneManager_addAnimatedMeshSceneNode_ISceneNode", 8, 0, 0,
+                  ISceneManager_addAnimatedMeshSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCameraSceneNode_ISceneNode", 6, 0, 0,
+                  ISceneManager_addCameraSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCameraSceneNodeFPS_ISceneNode", 1, 0, 1,
+                  ISceneManager_addCameraSceneNodeFPS<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCubeSceneNode_ISceneNode", 7, 0, 0,
+                  ISceneManager_addCubeSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCustomSceneNode_ISceneNode", 10, 0, 0,
+                  ISceneManager_addCustomSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addOctreeSceneNode_ISceneNode_IAnimatedMesh", 6, 0, 0,
+                  (ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IAnimatedMesh*>));
+    DEFINE_GSUBR ("ISceneManager_addOctreeSceneNode_ISceneNode_IMesh", 6, 0, 0,
+                  (ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IMesh*>));
+    DEFINE_GSUBR ("ISceneManager_addSphereSceneNode_ISceneNode", 8, 0, 0,
+                  ISceneManager_addSphereSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_createFlyCircleAnimator", 7, 0, 0,
+                  ISceneManager_createFlyCircleAnimator);
+    DEFINE_GSUBR ("ISceneManager_createFlyStraightAnimator", 6, 0, 0,
+                  ISceneManager_createFlyStraightAnimator);
+    DEFINE_GSUBR ("ISceneManager_createRotationAnimator", 2, 0, 0,
+                  ISceneManager_createRotationAnimator);
+    DEFINE_GSUBR ("ISceneManager_drawAll", 1, 0, 0, ISceneManager_drawAll);
+    DEFINE_GSUBR ("ISceneManager_getMesh", 2, 0, 0, ISceneManager_getMesh);
+    DEFINE_GSUBR ("ISceneManager_getRootSceneNode", 1, 0, 0, ISceneManager_getRootSceneNode);
   }
 
 }
index 08a133669364bb21e703c93b9ce60c3b2993c4eb..0caea376d6837f06d7a8d70c32bd92ca35cac3f8 100644 (file)
@@ -33,8 +33,8 @@ using namespace irr;
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_addAnimator (SCM scene_node,
-                              SCM animator)
+ISceneNode_addAnimator (SCM scene_node,
+                        SCM animator)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->addAnimator ((scene::ISceneNodeAnimator*) scm_to_pointer (animator));
@@ -44,7 +44,7 @@ scene_ISceneNode_addAnimator (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_getAbsoluteTransformation (SCM scene_node)
+ISceneNode_getAbsoluteTransformation (SCM scene_node)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   return scm_from_matrix4 (node->getAbsoluteTransformation ());
@@ -53,7 +53,7 @@ scene_ISceneNode_getAbsoluteTransformation (SCM scene_node)
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_getPosition (SCM scene_node)
+ISceneNode_getPosition (SCM scene_node)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   return scm_from_vector3df (node->getPosition ());
@@ -62,9 +62,9 @@ scene_ISceneNode_getPosition (SCM scene_node)
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setMaterialFlag (SCM scene_node,
-                                  SCM flag,
-                                  SCM newvalue)
+ISceneNode_setMaterialFlag (SCM scene_node,
+                            SCM flag,
+                            SCM newvalue)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setMaterialFlag (scm_to_material_flag (flag), scm_to_bool (newvalue));
@@ -74,9 +74,9 @@ scene_ISceneNode_setMaterialFlag (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setMaterialTexture (SCM scene_node,
-                                     SCM texture_layer,
-                                     SCM texture)
+ISceneNode_setMaterialTexture (SCM scene_node,
+                               SCM texture_layer,
+                               SCM texture)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setMaterialTexture (scm_to_uint32 (texture_layer),
@@ -87,8 +87,8 @@ scene_ISceneNode_setMaterialTexture (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setPosition (SCM scene_node,
-                              SCM position)
+ISceneNode_setPosition (SCM scene_node,
+                        SCM position)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setPosition (scm_to_vector3df (position));
@@ -98,8 +98,8 @@ scene_ISceneNode_setPosition (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setRotation (SCM scene_node,
-                              SCM rotation)
+ISceneNode_setRotation (SCM scene_node,
+                        SCM rotation)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setRotation (scm_to_vector3df (rotation));
@@ -109,8 +109,8 @@ scene_ISceneNode_setRotation (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setScale (SCM scene_node,
-                           SCM scale)
+ISceneNode_setScale (SCM scene_node,
+                     SCM scale)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setScale (scm_to_vector3df (scale));
@@ -123,51 +123,51 @@ extern "C" {
   void
   init_scene_node (void)
   {
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_addAnimator", 2, 0, 0,
-                  scene_ISceneNode_addAnimator<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_IMeshSceneNode_addAnimator", 2, 0, 0,
-                  scene_ISceneNode_addAnimator<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_addAnimator", 2, 0, 0,
-                  scene_ISceneNode_addAnimator<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_ISceneNode_getAbsoluteTransformation", 1, 0, 0,
-                  scene_ISceneNode_getAbsoluteTransformation<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IMeshSceneNode_getPosition", 1, 0, 0,
-                  scene_ISceneNode_getPosition<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_getPosition", 1, 0, 0,
-                  scene_ISceneNode_getPosition<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setMaterialFlag", 3, 0, 0,
-                  scene_ISceneNode_setMaterialFlag<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_IMeshSceneNode_setMaterialFlag", 3, 0, 0,
-                  scene_ISceneNode_setMaterialFlag<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setMaterialFlag", 3, 0, 0,
-                  scene_ISceneNode_setMaterialFlag<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setMaterialTexture", 3, 0, 0,
-                  scene_ISceneNode_setMaterialTexture<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_IMeshSceneNode_setMaterialTexture", 3, 0, 0,
-                  scene_ISceneNode_setMaterialTexture<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setMaterialTexture", 3, 0, 0,
-                  scene_ISceneNode_setMaterialTexture<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IMeshSceneNode_setPosition", 2, 0, 0,
-                  scene_ISceneNode_setPosition<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setPosition", 2, 0, 0,
-                  scene_ISceneNode_setPosition<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setRotation", 2, 0, 0,
-                  scene_ISceneNode_setRotation<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ICameraSceneNode_setRotation", 2, 0, 0,
-                  scene_ISceneNode_setRotation<scene::ICameraSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setRotation", 2, 0, 0,
-                  scene_ISceneNode_setRotation<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setScale", 2, 0, 0,
-                  scene_ISceneNode_setScale<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setScale", 2, 0, 0,
-                  scene_ISceneNode_setScale<scene::ISceneNode*>);
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_addAnimator", 2, 0, 0,
+                  ISceneNode_addAnimator<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("IMeshSceneNode_addAnimator", 2, 0, 0,
+                  ISceneNode_addAnimator<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_addAnimator", 2, 0, 0,
+                  ISceneNode_addAnimator<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("ISceneNode_getAbsoluteTransformation", 1, 0, 0,
+                  ISceneNode_getAbsoluteTransformation<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IMeshSceneNode_getPosition", 1, 0, 0,
+                  ISceneNode_getPosition<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_getPosition", 1, 0, 0,
+                  ISceneNode_getPosition<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setMaterialFlag", 3, 0, 0,
+                  ISceneNode_setMaterialFlag<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("IMeshSceneNode_setMaterialFlag", 3, 0, 0,
+                  ISceneNode_setMaterialFlag<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setMaterialFlag", 3, 0, 0,
+                  ISceneNode_setMaterialFlag<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setMaterialTexture", 3, 0, 0,
+                  ISceneNode_setMaterialTexture<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("IMeshSceneNode_setMaterialTexture", 3, 0, 0,
+                  ISceneNode_setMaterialTexture<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setMaterialTexture", 3, 0, 0,
+                  ISceneNode_setMaterialTexture<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IMeshSceneNode_setPosition", 2, 0, 0,
+                  ISceneNode_setPosition<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setPosition", 2, 0, 0,
+                  ISceneNode_setPosition<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setRotation", 2, 0, 0,
+                  ISceneNode_setRotation<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("ICameraSceneNode_setRotation", 2, 0, 0,
+                  ISceneNode_setRotation<scene::ICameraSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setRotation", 2, 0, 0,
+                  ISceneNode_setRotation<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setScale", 2, 0, 0,
+                  ISceneNode_setScale<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setScale", 2, 0, 0,
+                  ISceneNode_setScale<scene::ISceneNode*>);
   }
 
 }
index 643ad89e809b488f34cc3581b1705b46896e282a..e2cb9cf332809d62f82a4adb01966ae40a8e0bda 100644 (file)
@@ -34,12 +34,12 @@ using namespace irr;
 
 
 SCM
-video_IVideoDriver_beginScene (SCM video_driver,
-                               SCM back_buffer,
-                               SCM z_buffer,
-                               SCM color,
-                               SCM video_data,
-                               SCM source_rect)
+IVideoDriver_beginScene (SCM video_driver,
+                         SCM back_buffer,
+                         SCM z_buffer,
+                         SCM color,
+                         SCM video_data,
+                         SCM source_rect)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
 
@@ -60,11 +60,11 @@ video_IVideoDriver_beginScene (SCM video_driver,
 
 
 SCM
-video_IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
-                                            SCM vertices,
-                                            SCM indices,
-                                            SCM v_type,
-                                            SCM p_type)
+IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
+                                      SCM vertices,
+                                      SCM indices,
+                                      SCM v_type,
+                                      SCM p_type)
 {
   // Build vertex array
   u32 vertex_count = scm_to_uint32 (scm_length (vertices));
@@ -104,7 +104,7 @@ video_IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
 
 
 SCM
-video_IVideoDriver_endScene (SCM video_driver)
+IVideoDriver_endScene (SCM video_driver)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   return scm_from_bool (driver->endScene ());
@@ -112,7 +112,7 @@ video_IVideoDriver_endScene (SCM video_driver)
 
 
 SCM
-video_IVideoDriver_getFPS (SCM video_driver)
+IVideoDriver_getFPS (SCM video_driver)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   return scm_from_int32 (driver->getFPS ());
@@ -120,8 +120,8 @@ video_IVideoDriver_getFPS (SCM video_driver)
 
 
 SCM
-video_IVideoDriver_getTexture (SCM video_driver,
-                               SCM filename)
+IVideoDriver_getTexture (SCM video_driver,
+                         SCM filename)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   video::ITexture* texture = driver->getTexture (scm_to_utf8_stringn (filename, NULL));
@@ -130,8 +130,8 @@ video_IVideoDriver_getTexture (SCM video_driver,
 
 
 SCM
-video_IVideoDriver_setMaterial (SCM video_driver,
-                                SCM material)
+IVideoDriver_setMaterial (SCM video_driver,
+                          SCM material)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   driver->setMaterial (*((video::SMaterial*) scm_to_pointer (material)));
@@ -140,9 +140,9 @@ video_IVideoDriver_setMaterial (SCM video_driver,
 
 
 SCM
-video_IVideoDriver_setTransform (SCM video_driver,
-                                 SCM state,
-                                 SCM mat)
+IVideoDriver_setTransform (SCM video_driver,
+                           SCM state,
+                           SCM mat)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   driver->setTransform (scm_to_transformation_state (state),
@@ -156,14 +156,14 @@ extern "C" {
   void
   init_video_driver (void)
   {
-    DEFINE_GSUBR ("video_IVideoDriver_beginScene", 6, 0, 0, video_IVideoDriver_beginScene);
-    DEFINE_GSUBR ("video_IVideoDriver_drawVertexPrimitiveList", 5, 0, 1,
-                  video_IVideoDriver_drawVertexPrimitiveList);
-    DEFINE_GSUBR ("video_IVideoDriver_endScene", 1, 0, 0, video_IVideoDriver_endScene);
-    DEFINE_GSUBR ("video_IVideoDriver_getFPS", 1, 0, 0, video_IVideoDriver_getFPS);
-    DEFINE_GSUBR ("video_IVideoDriver_getTexture", 2, 0, 0, video_IVideoDriver_getTexture);
-    DEFINE_GSUBR ("video_IVideoDriver_setMaterial", 2, 0, 0, video_IVideoDriver_setMaterial);
-    DEFINE_GSUBR ("video_IVideoDriver_setTransform", 3, 0, 0, video_IVideoDriver_setTransform);
+    DEFINE_GSUBR ("IVideoDriver_beginScene", 6, 0, 0, IVideoDriver_beginScene);
+    DEFINE_GSUBR ("IVideoDriver_drawVertexPrimitiveList", 5, 0, 1,
+                  IVideoDriver_drawVertexPrimitiveList);
+    DEFINE_GSUBR ("IVideoDriver_endScene", 1, 0, 0, IVideoDriver_endScene);
+    DEFINE_GSUBR ("IVideoDriver_getFPS", 1, 0, 0, IVideoDriver_getFPS);
+    DEFINE_GSUBR ("IVideoDriver_getTexture", 2, 0, 0, IVideoDriver_getTexture);
+    DEFINE_GSUBR ("IVideoDriver_setMaterial", 2, 0, 0, IVideoDriver_setMaterial);
+    DEFINE_GSUBR ("IVideoDriver_setTransform", 3, 0, 0, IVideoDriver_setTransform);
   }
 
 }