X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fguile-irrlicht.cpp;h=7ea6f7ac7ea3ec7bbdac787cdf6f4640af1f303e;hb=a7852a8af5c3dc6a58da64a908c4f00fcbe584d1;hp=1d7636a3545a08655b4d68406e49adfd8c29fa4a;hpb=a1fe598c49e7222ec5a01ad62b49026825f595d9;p=guile-irrlicht.git

diff --git a/src/guile-irrlicht.cpp b/src/guile-irrlicht.cpp
index 1d7636a..7ea6f7a 100644
--- a/src/guile-irrlicht.cpp
+++ b/src/guile-irrlicht.cpp
@@ -28,13 +28,13 @@
 #include "cursor-control.h"
 #include "device.h"
 #include "event-receiver.h"
-#include "file-archive.h"
-#include "file-system.h"
+#include "file-list.h"
 #include "gsubr.h"
+#include "gui.h"
 #include "gui-element.h"
 #include "gui-environment.h"
-#include "gui-static-text.h"
 #include "guile-irrlicht.h"
+#include "io.h"
 #include "keymap.h"
 #include "material.h"
 #include "mesh.h"
@@ -44,6 +44,7 @@
 #include "scene-node.h"
 #include "scene-node-animator.h"
 #include "texture.h"
+#include "timer.h"
 #include "vertex3d.h"
 #include "video-driver.h"
 #include "wchar.h"
@@ -61,11 +62,8 @@ extern "C" {
     init_cursor_control ();
     init_device ();
     init_event_receiver ();
-    init_file_archive ();
-    init_file_system ();
-    init_gui_element ();
-    init_gui_environment ();
-    init_gui_static_text ();
+    init_gui ();
+    init_io ();
     init_keymap ();
     init_material ();
     init_mesh ();
@@ -75,12 +73,15 @@ extern "C" {
     init_scene_node ();
     init_scene_node_animator ();
     init_texture ();
+    init_timer ();
     init_vertex3d ();
     init_video_driver ();
 
     // Shared procedures (used by two or more objects)
     DEFINE_GSUBR ("draw-all", 1, 0, 0, irr_drawAll);
+    DEFINE_GSUBR ("get-id", 1, 1, 0, irr_getID);
     DEFINE_GSUBR ("get-name", 1, 0, 0, irr_getName);
+    DEFINE_GSUBR ("get-position", 1, 1, 0, irr_getPosition);
     DEFINE_GSUBR ("set-material!", 2, 0, 0, irr_setMaterial);
     DEFINE_GSUBR ("set-material-flag!", 3, 0, 0, irr_setMaterialFlag);
     DEFINE_GSUBR ("set-position!", 2, 0, 0, irr_setPosition);
@@ -106,6 +107,29 @@ extern "C" {
     return SCM_UNSPECIFIED;
   }
 
+  SCM
+  irr_getID (SCM wrapped_obj,
+             SCM index)
+  {
+    if (file_list_p (wrapped_obj))
+      {
+        return scm_from_uint32 (unwrap_file_list (wrapped_obj)->getID (scm_to_uint32 (index)));
+      }
+    else if (gui_element_p (wrapped_obj))
+      {
+        return scm_from_int32 (unwrap_gui_element (wrapped_obj)->getID ());
+      }
+    else if (scene_node_p (wrapped_obj))
+      {
+        return scm_from_int32 (unwrap_scene_node (wrapped_obj)->getID ());
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot get id from object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+  }
+
   SCM
   irr_getName (SCM wrapped_obj)
   {
@@ -120,6 +144,25 @@ extern "C" {
       }
   }
 
+  SCM
+  irr_getPosition (SCM wrapped_obj,
+                   SCM i)
+  {
+    if (cursor_control_p (wrapped_obj))
+      {
+        return irr_gui_getPosition (wrapped_obj);
+      }
+    else if (is_scene_node_object (wrapped_obj))
+      {
+        return irr_scene_getPosition (wrapped_obj);
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot get position from object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+  }
+
   SCM
   irr_setMaterial (SCM wrapped_obj,
                    SCM material)
@@ -140,9 +183,7 @@ extern "C" {
                        SCM flag,
                        SCM newvalue)
   {
-    if (animated_mesh_scene_node_p (wrapped_obj) ||
-        mesh_scene_node_p (wrapped_obj) ||
-        scene_node_p (wrapped_obj))
+    if (is_scene_node_object (wrapped_obj))
       {
         return irr_scene_ISceneNode_setMaterialFlag (wrapped_obj, flag, newvalue);
       }
@@ -161,7 +202,7 @@ extern "C" {
       {
         return irr_gui_setPosition (wrapped_obj, position);
       }
-    else if (scene_node_p (wrapped_obj) || mesh_scene_node_p (wrapped_obj))
+    else if (is_scene_node_object (wrapped_obj))
       {
         return irr_scene_setPosition (wrapped_obj, position);
       }
@@ -186,7 +227,7 @@ extern "C" {
       {
         SET_VISIBLE (unwrap_gui_element (wrapped_obj));
       }
-    else if (scene_node_p (wrapped_obj))
+    else if (is_scene_node_object (wrapped_obj))
       {
         SET_VISIBLE (unwrap_scene_node (wrapped_obj));
       }