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

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 828a61a..420b6a6 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -21,7 +21,6 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "gsubr.h"
 #include "gui-environment.h"
 #include "position2d.h"
@@ -34,12 +33,12 @@ using namespace irr;
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addButton (SCM gui_environment,
-                                   SCM rectangle,
-                                   SCM parent,
-                                   SCM id,
-                                   SCM text,
-                                   SCM tooltiptext)
+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))->
@@ -54,12 +53,12 @@ irr_gui_IGUIEnvironment_addButton (SCM gui_environment,
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addEditBox (SCM gui_environment,
-                                    SCM text,
-                                    SCM rectangle,
-                                    SCM border,
-                                    SCM parent,
-                                    SCM id)
+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))->
@@ -74,33 +73,33 @@ irr_gui_IGUIEnvironment_addEditBox (SCM gui_environment,
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addImage (SCM gui_environment,
-                                  SCM image,
-                                  SCM position,
-                                  SCM use_alpha_channel,
-                                  SCM parent,
-                                  SCM id,
-                                  SCM text)
+gui_IGUIEnvironment_addImage (SCM gui_environment,
+                              SCM image,
+                              SCM position,
+                              SCM use_alpha_channel,
+                              SCM parent,
+                              SCM id,
+                              SCM text)
 {
-  gui::IGUIImage* image =
-    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
-    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*)image, NULL);
+  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);
 }
 
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addListBox (SCM gui_environment,
-                                    SCM rectangle,
-                                    SCM parent,
-                                    SCM id,
-                                    SCM draw_background)
+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))->
@@ -114,11 +113,11 @@ irr_gui_IGUIEnvironment_addListBox (SCM gui_environment,
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
-                                      SCM horizontal,
-                                      SCM rectangle,
-                                      SCM parent,
-                                      SCM id)
+gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
+                                  SCM horizontal,
+                                  SCM rectangle,
+                                  SCM parent,
+                                  SCM id)
 {
   gui::IGUIScrollBar* scrollbar =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -132,14 +131,14 @@ irr_gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
-                                       SCM text,
-                                       SCM rectangle,
-                                       SCM border,
-                                       SCM word_wrap,
-                                       SCM parent,
-                                       SCM id,
-                                       SCM fill_background)
+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))->
@@ -156,12 +155,12 @@ irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
 
 template <typename TParent>
 SCM
-irr_gui_IGUIEnvironment_addWindow (SCM gui_environment,
-                                   SCM rectangle,
-                                   SCM modal,
-                                   SCM text,
-                                   SCM parent,
-                                   SCM id)
+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))->
@@ -175,7 +174,15 @@ irr_gui_IGUIEnvironment_addWindow (SCM gui_environment,
 
 
 SCM
-irr_gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment)
+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 ();
@@ -184,8 +191,8 @@ irr_gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment)
 
 
 SCM
-irr_gui_IGUIEnvironment_getFont (SCM gui_environment,
-                                 SCM filename)
+gui_IGUIEnvironment_getFont (SCM gui_environment,
+                             SCM filename)
 {
   gui::IGUIFont* font =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
@@ -195,7 +202,7 @@ irr_gui_IGUIEnvironment_getFont (SCM gui_environment,
 
 
 SCM
-irr_gui_IGUIEnvironment_getSkin (SCM gui_environment)
+gui_IGUIEnvironment_getSkin (SCM gui_environment)
 {
   gui::IGUISkin* skin =
     ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getSkin ();
@@ -208,26 +215,24 @@ extern "C" {
   void
   init_gui_environment (void)
   {
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
-                  irr_gui_IGUIEnvironment_addButton<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
-                  irr_gui_IGUIEnvironment_addEditBox<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
-                  irr_gui_IGUIEnvironment_addImage<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
-                  irr_gui_IGUIEnvironment_addListBox<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
-                  irr_gui_IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
-                  irr_gui_IGUIEnvironment_addStaticText<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
-                  irr_gui_IGUIEnvironment_addWindow<gui::IGUIElement*>);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_getBuiltInFont", 1, 0, 0,
-                  irr_gui_IGUIEnvironment_getBuiltInFont);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_getFont", 2, 0, 0,
-                  irr_gui_IGUIEnvironment_getFont);
-    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_getSkin", 1, 0, 0,
-                  irr_gui_IGUIEnvironment_getSkin);
+    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);
   }
 
 }