X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=420b6a67129eb743fc10a9563f1c84bd12b63f66;hp=cc5e0c51a1cfff898169c98a642a85ca7e83014b;hb=19663b6c5766b06c73148fdf803ce3555052a23e;hpb=7006c85b72b5eff7cfc935624711cf0bfdaa1508

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index cc5e0c5..420b6a6 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -21,217 +21,218 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
-#include "device.h"
 #include "gsubr.h"
-#include "gui-button.h"
-#include "gui-element.h"
 #include "gui-environment.h"
-#include "gui-font.h"
-#include "gui-image.h"
-#include "gui-listbox.h"
-#include "gui-scrollbar.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"
 
-extern "C" {
 
-  void
-  init_gui_environment (void)
-  {
-    init_gui_environment_type ();
-    DEFINE_GSUBR ("add-image!", 3, 0, 1, irr_gui_addImage);
-    DEFINE_GSUBR ("add-listbox!", 2, 0, 1, irr_gui_addListBox);
-    DEFINE_GSUBR ("add-scrollbar!", 3, 0, 1, irr_gui_addScrollBar);
-    DEFINE_GSUBR ("add-static-text!", 3, 0, 1, irr_gui_addStaticText);
-    DEFINE_GSUBR ("get-built-in-font", 1, 0, 0, irr_gui_getBuiltInFont);
-    DEFINE_GSUBR ("get-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
-    DEFINE_GSUBR ("get-skin", 1, 0, 0, irr_gui_getSkin);
-  }
+using namespace irr;
+
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addButton (SCM gui_environment,
+                               SCM rectangle,
+                               SCM parent,
+                               SCM id,
+                               SCM text,
+                               SCM tooltiptext)
+{
+  gui::IGUIButton* button =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addButton (scm_to_rect_s32 (rectangle),
+               (TParent)scm_to_pointer (parent),
+               scm_to_int32 (id),
+               scm_to_wide_char_string (text),
+               scm_to_wide_char_string (tooltiptext));
+  return scm_from_pointer ((void*)button, NULL);
+}
 
-  DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
-                       init_gui_environment_type, gui_environment_p,
-                       wrap_gui_environment, unwrap_gui_environment);
 
-  SCM
-  irr_getGUIEnvironment (SCM wrapped_obj)
-  {
-    irr::gui::IGUIEnvironment* gui_environment;
-    if (device_p (wrapped_obj))
-      {
-        gui_environment = unwrap_device (wrapped_obj)->getGUIEnvironment ();
-      }
-    else
-      {
-        scm_error (scm_arg_type_key, NULL, "Cannot get GUI environment from object: ~S",
-                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
-      }
-    return wrap_gui_environment (gui_environment);
-  }
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addEditBox (SCM gui_environment,
+                                SCM text,
+                                SCM rectangle,
+                                SCM border,
+                                SCM parent,
+                                SCM id)
+{
+  gui::IGUIEditBox* editbox =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addEditBox (scm_to_wide_char_string (text),
+                scm_to_rect_s32 (rectangle),
+                scm_to_bool (border),
+                (TParent)scm_to_pointer (parent),
+                scm_to_int32 (id));
+  return scm_from_pointer ((void*)editbox, NULL);
+}
 
-  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_addListBox (SCM wrapped_gui_environment,
-                      SCM rectangle,
-                      SCM rest)
-  {
-    SCM parent = SCM_BOOL_F;
-    SCM id = scm_from_int32 (-1);
-    SCM draw_background = SCM_BOOL_F;
-
-    scm_c_bind_keyword_arguments ("add-listbox!", rest, (scm_t_keyword_arguments_flags)0,
-                                  scm_from_utf8_keyword ("parent"), &parent,
-                                  scm_from_utf8_keyword ("id"), &id,
-                                  scm_from_utf8_keyword ("draw-background"), &draw_background,
-                                  SCM_UNDEFINED);
-
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIListBox* listbox =
-      guienv->addListBox (scm_to_rect_s32 (rectangle),
-                          scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
-                          scm_to_int32 (id),
-                          scm_to_bool (draw_background));
-    return wrap_gui_listbox (listbox);
-  }
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addImage (SCM gui_environment,
+                              SCM image,
+                              SCM position,
+                              SCM use_alpha_channel,
+                              SCM parent,
+                              SCM id,
+                              SCM text)
+{
+  gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_pointer (gui_environment);
+  gui::IGUIImage* new_image =
+    guienv->addImage ((video::ITexture*)scm_to_pointer (image),
+                      scm_to_position2d_s32 (position),
+                      scm_to_bool (use_alpha_channel),
+                      (TParent)scm_to_pointer (parent),
+                      scm_to_int32 (id),
+                      scm_to_wide_char_string (text));
+  return scm_from_pointer ((void*) new_image, NULL);
+}
 
-  SCM
-  irr_gui_addScrollBar (SCM wrapped_gui_environment,
-                        SCM horizontal,
-                        SCM rectangle,
-                        SCM rest)
-  {
-    SCM parent = SCM_BOOL_F;
-    SCM id = scm_from_int32 (-1);
-
-    scm_c_bind_keyword_arguments ("add-scrollbar!", rest, (scm_t_keyword_arguments_flags)0,
-                                  scm_from_utf8_keyword ("parent"), &parent,
-                                  scm_from_utf8_keyword ("id"), &id,
-                                  SCM_UNDEFINED);
-
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIScrollBar* scrollbar =
-      guienv->addScrollBar (scm_to_bool (horizontal),
-                            scm_to_rect_s32 (rectangle),
-                            scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
-                            scm_to_int32 (id));
-    return wrap_gui_scrollbar (scrollbar);
-  }
 
-  SCM
-  irr_gui_addStaticText (SCM wrapped_gui_environment,
-                         SCM text,
-                         SCM rectangle,
-                         SCM rest)
-  {
-    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 (word_wrap),
-                             scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
-                             scm_to_int32 (id),
-                             scm_to_bool (fill_background));
-    return wrap_gui_static_text (staticText);
-  }
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addListBox (SCM gui_environment,
+                                SCM rectangle,
+                                SCM parent,
+                                SCM id,
+                                SCM draw_background)
+{
+  gui::IGUIListBox* listbox =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addListBox (scm_to_rect_s32 (rectangle),
+                (TParent)scm_to_pointer (parent),
+                scm_to_int32 (id),
+                scm_to_bool (draw_background));
+  return scm_from_pointer ((void*)listbox, NULL);
+}
 
-  SCM
-  irr_gui_getBuiltInFont (SCM wrapped_gui_environment)
-  {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIFont* font = guienv->getBuiltInFont ();
-    return wrap_gui_font (font);
-  }
 
-  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);
-  }
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
+                                  SCM horizontal,
+                                  SCM rectangle,
+                                  SCM parent,
+                                  SCM id)
+{
+  gui::IGUIScrollBar* scrollbar =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addScrollBar (scm_to_bool (horizontal),
+                  scm_to_rect_s32 (rectangle),
+                  (TParent)scm_to_pointer (parent),
+                  scm_to_int32 (id));
+  return scm_from_pointer ((void*)scrollbar, NULL);
+}
 
-  SCM
-  irr_gui_IGUIEnvironment_addButton (SCM wrapped_gui_environment,
-                                     SCM rectangle,
-                                     SCM rest)
-  {
-    SCM parent = SCM_BOOL_F;
-    SCM id = scm_from_int32 (-1);
-    SCM text = SCM_BOOL_F;
-    SCM tooltiptext = SCM_BOOL_F;
-
-    scm_c_bind_keyword_arguments ("add-button!", rest, (scm_t_keyword_arguments_flags)0,
-                                  scm_from_utf8_keyword ("parent"), &parent,
-                                  scm_from_utf8_keyword ("id"), &id,
-                                  scm_from_utf8_keyword ("text"), &text,
-                                  scm_from_utf8_keyword ("tooltiptext"), &tooltiptext,
-                                  SCM_UNDEFINED);
-
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIButton* button =
-      guienv->addButton (scm_to_rect_s32 (rectangle),
-                         scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
-                         scm_to_int32 (id),
-                         scm_is_false (text) ? 0 : scm_to_wide_char_string (text),
-                         scm_is_false (tooltiptext) ? 0 : scm_to_wide_char_string (tooltiptext));
-    return wrap_gui_button (button);
-  }
 
-  SCM
-  irr_gui_IGUIEnvironment_getFont (SCM wrapped_gui_environment,
-                                   SCM filename)
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addStaticText (SCM gui_environment,
+                                   SCM text,
+                                   SCM rectangle,
+                                   SCM border,
+                                   SCM word_wrap,
+                                   SCM parent,
+                                   SCM id,
+                                   SCM fill_background)
+{
+  gui::IGUIStaticText* static_text =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addStaticText (scm_to_wide_char_string (text),
+                   scm_to_rect_s32 (rectangle),
+                   scm_to_bool (border),
+                   scm_to_bool (word_wrap),
+                   (TParent)scm_to_pointer (parent),
+                   scm_to_int32 (id),
+                   scm_to_bool (fill_background));
+  return scm_from_pointer ((void*)static_text, NULL);
+}
+
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addWindow (SCM gui_environment,
+                               SCM rectangle,
+                               SCM modal,
+                               SCM text,
+                               SCM parent,
+                               SCM id)
+{
+  gui::IGUIWindow* window =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addWindow (scm_to_rect_s32 (rectangle),
+               scm_to_bool (modal),
+               scm_to_wide_char_string (text),
+               (TParent)scm_to_pointer (parent),
+               scm_to_int32 (id));
+  return scm_from_pointer ((void*)window, NULL);
+}
+
+
+SCM
+gui_IGUIEnvironment_drawAll (SCM gui_environment)
+{
+  ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->drawAll ();
+  return SCM_UNSPECIFIED;
+}
+
+
+SCM
+gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getBuiltInFont ();
+  return scm_from_pointer ((void*)font, NULL);
+}
+
+
+SCM
+gui_IGUIEnvironment_getFont (SCM gui_environment,
+                             SCM filename)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    getFont (scm_to_utf8_stringn (filename, NULL));
+  return scm_from_pointer ((void*)font, NULL);
+}
+
+
+SCM
+gui_IGUIEnvironment_getSkin (SCM gui_environment)
+{
+  gui::IGUISkin* skin =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getSkin ();
+  return scm_from_pointer ((void*)skin, NULL);
+}
+
+
+extern "C" {
+
+  void
+  init_gui_environment (void)
   {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIFont* font = guienv->getFont (scm_to_utf8_stringn (filename, NULL));
-    return wrap_gui_font (font);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
+                  gui_IGUIEnvironment_addButton<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
+                  gui_IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
+                  gui_IGUIEnvironment_addImage<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
+                  gui_IGUIEnvironment_addListBox<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
+                  gui_IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
+                  gui_IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
+                  gui_IGUIEnvironment_addWindow<gui::IGUIElement*>);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_drawAll", 1, 0, 0, gui_IGUIEnvironment_drawAll);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_getBuiltInFont", 1, 0, 0, gui_IGUIEnvironment_getBuiltInFont);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_getFont", 2, 0, 0, gui_IGUIEnvironment_getFont);
+    DEFINE_GSUBR ("gui_IGUIEnvironment_getSkin", 1, 0, 0, gui_IGUIEnvironment_getSkin);
   }
 
 }