X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=6a461917eab775e058afb4628dcc2012a9622c77;hb=60376e14c4cc35b3c8d7e069b083881b5ffe9032;hp=dfe3a0a2fe710ce414bf332fb9c2c7c3f0baecd3;hpb=69ed7f57e6295034fa64ab2bf6d10da6882860ef;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index dfe3a0a..6a46191 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -26,8 +26,12 @@
 #include "gsubr.h"
 #include "gui-element.h"
 #include "gui-environment.h"
+#include "gui-image.h"
+#include "gui-skin.h"
 #include "gui-static-text.h"
+#include "position2d.h"
 #include "rect.h"
+#include "texture.h"
 #include "wchar.h"
 #include "wrapped.h"
 
@@ -37,8 +41,10 @@ extern "C" {
   init_gui_environment (void)
   {
     init_gui_environment_type ();
+    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_GSUBR ("get-skin", 1, 0, 0, irr_gui_getSkin);
   }
 
   DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
@@ -61,17 +67,46 @@ extern "C" {
     return wrap_gui_environment (gui_environment);
   }
 
+  SCM
+  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 rest)
   {
-    SCM border = scm_from_bool (0);
-    SCM word_wrap = scm_from_bool (1);
-    SCM parent = scm_from_bool (0);
+    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_from_bool (0);
+    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,
@@ -93,4 +128,12 @@ extern "C" {
     return wrap_gui_static_text (staticText);
   }
 
+  SCM
+  irr_gui_getSkin (SCM wrapped_gui_environment)
+  {
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUISkin* skin = guienv->getSkin ();
+    return wrap_gui_skin (skin);
+  }
+
 }