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

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index ca59a31..1ee3e5d 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -21,65 +21,202 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
-#include "device.h"
-#include "gui-element.h"
+#include "gsubr.h"
 #include "gui-environment.h"
-#include "gui-static-text.h"
+#include "position2d.h"
 #include "rect.h"
 #include "wchar.h"
 #include "wrapped.h"
 
-extern "C" {
-
-  void
-  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_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);
-  }
-
-  SCM
-  irr_gui_addStaticText (SCM wrappedGUIEnvironment,
-                         SCM text,
-                         SCM rectangle,
-                         SCM border,
-                         SCM wordWrap,
-                         SCM parent,
-                         SCM id,
-                         SCM fillBackground)
-  {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrappedGUIEnvironment);
-    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_is_false (parent) ? 0 : unwrap_gui_element (parent),
-                             scm_to_int32 (id),
-                             scm_to_bool (fillBackground));
-    return wrap_gui_static_text (staticText);
-  }
+using namespace irr;
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addButton (SCM gui_environment,
+                           SCM rectangle,
+                           SCM parent,
+                           SCM id,
+                           SCM text,
+                           SCM tooltiptext)
+{
+  gui::IGUIButton* button =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addButton (scm_to_rect_s32 (rectangle),
+               (TParent)scm_to_irr_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);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addEditBox (SCM gui_environment,
+                            SCM text,
+                            SCM rectangle,
+                            SCM border,
+                            SCM parent,
+                            SCM id)
+{
+  gui::IGUIEditBox* editbox =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addEditBox (scm_to_wide_char_string (text),
+                scm_to_rect_s32 (rectangle),
+                scm_to_bool (border),
+                (TParent)scm_to_irr_pointer (parent),
+                scm_to_int32 (id));
+  return scm_from_pointer ((void*)editbox, NULL);
+}
+
+template <typename TParent>
+SCM
+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_irr_pointer (gui_environment);
+  gui::IGUIImage* new_image =
+    guienv->addImage ((video::ITexture*)scm_to_irr_pointer (image),
+                      scm_to_position2d_s32 (position),
+                      scm_to_bool (use_alpha_channel),
+                      (TParent)scm_to_irr_pointer (parent),
+                      scm_to_int32 (id),
+                      scm_to_wide_char_string (text));
+  return scm_from_pointer ((void*) new_image, NULL);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addListBox (SCM gui_environment,
+                            SCM rectangle,
+                            SCM parent,
+                            SCM id,
+                            SCM draw_background)
+{
+  gui::IGUIListBox* listbox =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addListBox (scm_to_rect_s32 (rectangle),
+                (TParent)scm_to_irr_pointer (parent),
+                scm_to_int32 (id),
+                scm_to_bool (draw_background));
+  return scm_from_pointer ((void*)listbox, NULL);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addScrollBar (SCM gui_environment,
+                              SCM horizontal,
+                              SCM rectangle,
+                              SCM parent,
+                              SCM id)
+{
+  gui::IGUIScrollBar* scrollbar =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addScrollBar (scm_to_bool (horizontal),
+                  scm_to_rect_s32 (rectangle),
+                  (TParent)scm_to_irr_pointer (parent),
+                  scm_to_int32 (id));
+  return scm_from_pointer ((void*)scrollbar, NULL);
+}
+
+template <typename TParent>
+SCM
+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_irr_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_irr_pointer (parent),
+                   scm_to_int32 (id),
+                   scm_to_bool (fill_background));
+  return scm_from_pointer ((void*)static_text, NULL);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addWindow (SCM gui_environment,
+                           SCM rectangle,
+                           SCM modal,
+                           SCM text,
+                           SCM parent,
+                           SCM id)
+{
+  gui::IGUIWindow* window =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addWindow (scm_to_rect_s32 (rectangle),
+               scm_to_bool (modal),
+               scm_to_wide_char_string (text),
+               (TParent)scm_to_irr_pointer (parent),
+               scm_to_int32 (id));
+  return scm_from_pointer ((void*)window, NULL);
+}
+
+SCM
+IGUIEnvironment_drawAll (SCM gui_environment)
+{
+  ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->drawAll ();
+  return SCM_UNSPECIFIED;
+}
+
+SCM
+IGUIEnvironment_getBuiltInFont (SCM gui_environment)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getBuiltInFont ();
+  return scm_from_pointer ((void*)font, NULL);
+}
+
+SCM
+IGUIEnvironment_getFont (SCM gui_environment,
+                         SCM filename)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    getFont (scm_to_utf8_stringn (filename, NULL));
+  return scm_from_pointer ((void*)font, NULL);
+}
+
+SCM
+IGUIEnvironment_getSkin (SCM gui_environment)
+{
+  gui::IGUISkin* skin =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getSkin ();
+  return scm_from_pointer ((void*)skin, NULL);
+}
 
+void
+init_gui_environment (void)
+{
+  DEFINE_GSUBR ("IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addButton<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
+                IGUIEnvironment_addImage<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
+                IGUIEnvironment_addListBox<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
+                IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
+                IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addWindow<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_drawAll", 1, 0, 0, IGUIEnvironment_drawAll);
+  DEFINE_GSUBR ("IGUIEnvironment_getBuiltInFont", 1, 0, 0, IGUIEnvironment_getBuiltInFont);
+  DEFINE_GSUBR ("IGUIEnvironment_getFont", 2, 0, 0, IGUIEnvironment_getFont);
+  DEFINE_GSUBR ("IGUIEnvironment_getSkin", 1, 0, 0, IGUIEnvironment_getSkin);
 }