add-image!

diff --git a/Makefile.am b/Makefile.am
index 2cd0772ad77d035fc696be3f567189d83da125d2..7f906627361e45ef3b604ad7e067451427916ad5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ libguile_irrlicht_la_SOURCES = \
   src/file-system.cpp \
   src/gui-element.cpp \
   src/gui-environment.cpp \
+  src/gui-image.cpp \
   src/gui-static-text.cpp \
   src/guile-irrlicht.cpp \
   src/keymap.cpp \

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 011e9d7a70bd82f904e553f625f02f2bf7911599..3268ab02adfcbb3f67eafc60a25a7cb9cac317a8 100644 (file)
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -26,8 +26,11 @@
 #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"
 
@@ -37,6 +40,7 @@ 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);
   }
@@ -61,6 +65,35 @@ 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,

diff --git a/src/gui-environment.h b/src/gui-environment.h
index dd3f597d051d6239de7bc2c3a561a831d5a04ef6..85ea2506b1884cf4306857abc95ae563900d291c 100644 (file)
--- a/src/gui-environment.h
+++ b/src/gui-environment.h
@@ -37,6 +37,12 @@ extern "C" {
   SCM
   irr_getGUIEnvironment (SCM wrapped_obj);
 
+  SCM
+  irr_gui_addImage (SCM wrapped_gui_environment,
+                    SCM image,
+                    SCM position,
+                    SCM rest);
+
   SCM
   irr_gui_addStaticText (SCM wrapped_gui_environment,
                          SCM text,

diff --git a/src/gui-image.cpp b/src/gui-image.cpp
new file mode 100644 (file)
index 0000000..a9c3f25
--- /dev/null
+++ b/src/gui-image.cpp
@@ -0,0 +1,40 @@
+/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine
+
+   Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
+
+   This file is part of guile-irrlicht.
+
+   guile-irrlicht is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   guile-irrlicht is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with guile-irrlicht. If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#include <irrlicht/irrlicht.h>
+#include <libguile.h>
+
+#include "gui-image.h"
+#include "wrapped.h"
+
+extern "C" {
+
+  void
+  init_gui_image (void)
+  {
+    init_gui_image_type ();
+  }
+
+  DEFINE_WRAPPED_TYPE (irr::gui::IGUIImage*, "gui-image",
+                       init_gui_image_type, gui_image_p,
+                       wrap_gui_image, unwrap_gui_image);
+
+}

diff --git a/src/gui-image.h b/src/gui-image.h
new file mode 100644 (file)
index 0000000..8eaf1ed
--- /dev/null
+++ b/src/gui-image.h
@@ -0,0 +1,38 @@
+/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine
+
+   Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
+
+   This file is part of guile-irrlicht.
+
+   guile-irrlicht is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   guile-irrlicht is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with guile-irrlicht. If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __GUILE_IRRLICHT_GUI_IMAGE_H_INCLUDED__
+#define __GUILE_IRRLICHT_GUI_IMAGE_H_INCLUDED__
+
+#include <irrlicht/irrlicht.h>
+#include <libguile.h>
+#include "wrapped.h"
+
+extern "C" {
+
+  void
+  init_gui_image (void);
+
+  DECLARE_WRAPPED_TYPE (irr::gui::IGUIImage*, init_gui_image_type,
+                        gui_image_p, wrap_gui_image, unwrap_gui_image);
+}
+
+#endif

diff --git a/src/guile-irrlicht.cpp b/src/guile-irrlicht.cpp
index 1d7636a3545a08655b4d68406e49adfd8c29fa4a..d0560c11caebf4f5982a07c83b22916e08ec4c3e 100644 (file)
--- a/src/guile-irrlicht.cpp
+++ b/src/guile-irrlicht.cpp
@@ -33,6 +33,7 @@
 #include "gsubr.h"
 #include "gui-element.h"
 #include "gui-environment.h"
+#include "gui-image.h"
 #include "gui-static-text.h"
 #include "guile-irrlicht.h"
 #include "keymap.h"
@@ -65,6 +66,7 @@ extern "C" {
     init_file_system ();
     init_gui_element ();
     init_gui_environment ();
+    init_gui_image ();
     init_gui_static_text ();
     init_keymap ();
     init_material ();