X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=3268ab02adfcbb3f67eafc60a25a7cb9cac317a8;hb=70aa0b0ae288706f138a295f85c60fa6609b7198;hp=ca59a3196a809e167c39fbf365f6e21f38d884e1;hpb=9a256c6c6a756378cb53c89d42e362bbaa2fc5c0;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index ca59a31..3268ab0 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -23,10 +23,14 @@
 #include <libguile.h>
 
 #include "device.h"
+#include "gsubr.h"
 #include "gui-element.h"
 #include "gui-environment.h"
+#include "gui-image.h"
 #include "gui-static-text.h"
+#include "position2d.h"
 #include "rect.h"
+#include "texture.h"
 #include "wchar.h"
 #include "wrapped.h"
 
@@ -36,8 +40,9 @@ extern "C" {
   init_gui_environment (void)
   {
     init_gui_environment_type ();
-    scm_c_define_gsubr ("add-static-text!", 8, 0, 0, (scm_t_subr)irr_gui_addStaticText);
-    scm_c_define_gsubr ("get-gui-environment", 1, 0, 0, (scm_t_subr)irr_getGUIEnvironment);
+    DEFINE_GSUBR ("add-image!", 3, 0, 1, irr_gui_addImage);
+    DEFINE_GSUBR ("add-static-text!", 3, 0, 1, irr_gui_addStaticText);
+    DEFINE_GSUBR ("get-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
   }
 
   DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
@@ -61,24 +66,63 @@ extern "C" {
   }
 
   SCM
-  irr_gui_addStaticText (SCM wrappedGUIEnvironment,
+  irr_gui_addImage (SCM wrapped_gui_environment,
+                    SCM image,
+                    SCM position,
+                    SCM rest)
+  {
+    SCM use_alpha_channel = SCM_BOOL_T;
+    SCM parent = SCM_BOOL_F;
+    SCM id = scm_from_int32 (-1);
+    SCM text = SCM_BOOL_F;
+
+    scm_c_bind_keyword_arguments ("add-image!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("use_alpha_channel"), &use_alpha_channel,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("text"), &text,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUIImage* guiImage =
+      guienv->addImage (unwrap_texture (image),
+                        scm_to_position2d_s32 (position),
+                        scm_to_bool (use_alpha_channel),
+                        scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                        scm_to_int32 (id),
+                        scm_is_false (text) ? 0 : scm_to_wide_char_string (text));
+    return wrap_gui_image (guiImage);
+  }
+
+  SCM
+  irr_gui_addStaticText (SCM wrapped_gui_environment,
                          SCM text,
                          SCM rectangle,
-                         SCM border,
-                         SCM wordWrap,
-                         SCM parent,
-                         SCM id,
-                         SCM fillBackground)
+                         SCM rest)
   {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrappedGUIEnvironment);
+    SCM border = SCM_BOOL_F;
+    SCM word_wrap = SCM_BOOL_T;
+    SCM parent = SCM_BOOL_F;
+    SCM id = scm_from_int32 (-1);
+    SCM fill_background = SCM_BOOL_F;
+
+    scm_c_bind_keyword_arguments ("add-static-text!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("border"), &border,
+                                  scm_from_utf8_keyword ("word-wrap"), &word_wrap,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("fill-background"), &fill_background,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
     irr::gui::IGUIStaticText* staticText =
       guienv->addStaticText (scm_to_wide_char_string (text),
                              scm_to_rect_s32 (rectangle),
                              scm_to_bool (border),
-                             scm_to_bool (wordWrap),
+                             scm_to_bool (word_wrap),
                              scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
                              scm_to_int32 (id),
-                             scm_to_bool (fillBackground));
+                             scm_to_bool (fill_background));
     return wrap_gui_static_text (staticText);
   }