get-cursor-control set-visible!

diff --git a/examples/02.Quake3Map.scm b/examples/02.Quake3Map.scm
index 47c81254b679a84f2e213aa9327a9d8006f7c49d..a79b8492c478c7358cb1247d517c97806550e5c8 100644 (file)
--- a/examples/02.Quake3Map.scm
+++ b/examples/02.Quake3Map.scm
@@ -72,14 +72,14 @@
 
 ;; FPS camera
 (add-camera-scene-node-fps! scene-manager)
-(set-visible-cursor! (get-cursor-control device) #f)
+(set-visible! (get-cursor-control device) #f)
 
 ;; loop
 (define last-fps -1)
-(while (device-run? device)
+(while (run device)
   (cond ((is-window-active? device)
          (begin-scene driver #:color '(255 200 200 200))
-         (scene-draw-all scene-manager)
+         (draw-all scene-manager)
          (end-scene driver)
 
          (let ((fps (get-fps driver)))
@@ -92,5 +92,5 @@
          (yield device))))
 
 ;; delete device
-(device-drop! device)
+(drop! device)
 (exit #t)

diff --git a/src/cursor-control.cpp b/src/cursor-control.cpp
index 4a870e81029f47ee7974e0d711ce5fd5b325229f..ada992f7fbb0bb0319ec161a3bbb02414ef0f00f 100644 (file)
--- a/src/cursor-control.cpp
+++ b/src/cursor-control.cpp
@@ -21,7 +21,9 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
+
 #include "cursor-control.h"
+#include "device.h"
 #include "position2d.h"
 #include "wrapped.h"
 
@@ -31,12 +33,22 @@ extern "C" {
   init_cursor_control (void)
   {
     init_cursor_control_type ();
+    scm_c_define_gsubr ("get-cursor-control", 1, 0, 0, (scm_t_subr)irr_getCursorControl);
+    scm_c_export ("get-cursor-control", NULL);
   }
 
   DEFINE_WRAPPED_TYPE (irr::gui::ICursorControl*, "cursor-control",
                        init_cursor_control_type, cursor_control_p,
                        wrap_cursor_control, unwrap_cursor_control);
 
+  SCM
+  irr_getCursorControl (SCM wrapped_device)
+  {
+    irr::gui::ICursorControl* cursor_control =
+      unwrap_device (wrapped_device)->getCursorControl ();
+    return wrap_cursor_control (cursor_control);
+  }
+
   SCM
   irr_gui_setPosition (SCM wrapped_cursor_control,
                        SCM position)

diff --git a/src/cursor-control.h b/src/cursor-control.h
index 91918817720f2ffde14b392cdf9b797e2725d12c..d7a4bc5fff7dbb526f8a093dde6c716a06ddf887 100644 (file)
--- a/src/cursor-control.h
+++ b/src/cursor-control.h
@@ -34,6 +34,9 @@ extern "C" {
   DECLARE_WRAPPED_TYPE (irr::gui::ICursorControl*, init_cursor_control_type,
                         cursor_control_p, wrap_cursor_control, unwrap_cursor_control);
 
+  SCM
+  irr_getCursorControl (SCM wrapped_device);
+
   SCM
   irr_gui_setPosition (SCM wrapped_cursor_control,
                        SCM position);

diff --git a/src/misc.cpp b/src/misc.cpp
index 9997fdd811a08dc5997d011ac1403651ae11d783..bd3e037bb0ad43be3ee3f1e95d8972177d4111e4 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -23,6 +23,7 @@
 #include <libguile.h>
 
 #include "cursor-control.h"
+#include "gui-element.h"
 #include "mesh-scene-node.h"
 #include "misc.h"
 #include "scene-node.h"
@@ -36,7 +37,8 @@ extern "C" {
   {
     scm_c_define_gsubr ("get-name", 1, 0, 0, (scm_t_subr)irr_getName);
     scm_c_define_gsubr ("set-position!", 2, 0, 0, (scm_t_subr)irr_setPosition);
-    scm_c_export ("get-name", "set-position!", NULL);
+    scm_c_define_gsubr ("set-visible!", 2, 0, 0, (scm_t_subr)irr_setVisible);
+    scm_c_export ("get-name", "set-position!", "set-visible!", NULL);
   }
 
   SCM
@@ -72,4 +74,28 @@ extern "C" {
       }
   }
 
+  SCM
+  irr_setVisible (SCM wrapped_obj,
+                  SCM visible)
+  {
+    if (cursor_control_p (wrapped_obj))
+      {
+        unwrap_cursor_control (wrapped_obj)->setVisible (scm_to_bool (visible));
+      }
+    else if (gui_element_p (wrapped_obj))
+      {
+        unwrap_gui_element (wrapped_obj)->setVisible (scm_to_bool (visible));
+      }
+    else if (scene_node_p (wrapped_obj))
+      {
+        unwrap_scene_node (wrapped_obj)->setVisible (scm_to_bool (visible));
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot set visibility for object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+    return SCM_UNSPECIFIED;
+  }
+
 }

diff --git a/src/misc.h b/src/misc.h
index 6fb1d11f9d8db1a82418752b16bc41b85e1a2d90..d7c7b27f6eb453356d97ceae4230407c286edbb3 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -37,6 +37,10 @@ extern "C" {
   irr_setPosition (SCM wrapped_obj,
                    SCM position);
 
+  SCM
+  irr_setVisible (SCM wrapped_obj,
+                  SCM visible);
+
 }
 
 #endif