X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-in-out-fader.cpp;h=ea296a532dfa0a08e36026493b2da32d551b6de0;hb=79e12d94cc21232477796a4e76fc2ddb5d88f9dc;hp=41dfc3fcca12cdbed85e40cc029d87a75cb03bd9;hpb=e793a98b7a84ae3a5ff2ededb0625e55cf991f0f;p=guile-irrlicht.git

diff --git a/src/gui-in-out-fader.cpp b/src/gui-in-out-fader.cpp
index 41dfc3f..ea296a5 100644
--- a/src/gui-in-out-fader.cpp
+++ b/src/gui-in-out-fader.cpp
@@ -21,39 +21,33 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "color.h"
+#include "gsubr.h"
 #include "gui-in-out-fader.h"
 #include "wrapped.h"
 
-extern "C" {
-
-  void
-  init_gui_in_out_fader (void)
-  {
-    init_gui_in_out_fader_type ();
-  }
-
-  DEFINE_WRAPPED_TYPE (irr::gui::IGUIInOutFader*, "gui-in-out-fader",
-                       init_gui_in_out_fader_type, gui_in_out_fader_p,
-                       wrap_gui_in_out_fader, unwrap_gui_in_out_fader);
-
-  SCM
-  irr_gui_IGUIInOutFader_setColor (SCM wrapped_in_out_fader,
-                                   SCM color,
-                                   SCM dest_color)
-  {
-    irr::gui::IGUIInOutFader* fader = unwrap_gui_in_out_fader (wrapped_in_out_fader);
-    if (dest_color == SCM_UNDEFINED)
-      {
-        fader->setColor (scm_to_color (color));
-      }
-    else
-      {
-        fader->setColor (scm_to_color (color),
-                         scm_to_color (dest_color));
-      }
-    return SCM_UNSPECIFIED;
-  }
+using namespace irr;
+
+SCM
+IGUIInOutFader_setColor (SCM in_out_fader,
+                         SCM color,
+                         SCM dest_color)
+{
+  gui::IGUIInOutFader* fader = (gui::IGUIInOutFader*)scm_to_irr_pointer (in_out_fader);
+  if (dest_color == SCM_UNDEFINED)
+    {
+      fader->setColor (scm_to_color (color));
+    }
+  else
+    {
+      fader->setColor (scm_to_color (color),
+                       scm_to_color (dest_color));
+    }
+  return SCM_UNSPECIFIED;
+}
 
+void
+init_gui_in_out_fader (void)
+{
+  DEFINE_GSUBR ("IGUIInOutFader_setColor", 2, 1, 0, IGUIInOutFader_setColor);
 }