X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fcolor.cpp;h=9308abc696d671f793dc231f599c71630cb50a6d;hb=3bb58c2b45af12c0f9c9eac648e67ac6fa90e104;hp=5ed16fe324100f2d623722e07db11190f68bae22;hpb=5e5b0caed972e0b225199551aff09c399edb8d3c;p=guile-irrlicht.git

diff --git a/src/color.cpp b/src/color.cpp
index 5ed16fe..9308abc 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -23,16 +23,23 @@
 #include <libguile.h>
 #include "color.h"
 
-extern "C" {
-
-  irr::video::SColor
-  scm_to_color (SCM color)
-  {
-    return irr::video::SColor
-      (scm_to_uint32 (scm_car (color)),
-       scm_to_uint32 (scm_cadr (color)),
-       scm_to_uint32 (scm_caddr (color)),
-       scm_to_uint32 (scm_cadddr (color)));
-  }
+using namespace irr;
+
+SCM
+scm_from_color (video::SColor color)
+{
+  return scm_list_4 (scm_from_uint32 (color.getAlpha ()),
+                     scm_from_uint32 (color.getRed ()),
+                     scm_from_uint32 (color.getGreen ()),
+                     scm_from_uint32 (color.getBlue ()));
+}
 
+video::SColor
+scm_to_color (SCM color)
+{
+  return video::SColor
+    (scm_to_uint32 (scm_car (color)),
+     scm_to_uint32 (scm_cadr (color)),
+     scm_to_uint32 (scm_caddr (color)),
+     scm_to_uint32 (scm_cadddr (color)));
 }