From 01297d58b47a2e1c3579678c74f53491901b567e Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Sat, 9 May 2020 13:42:40 +0200 Subject: [PATCH] gui-environment --- src/gui-environment.cpp | 132 +++++++++++++++++++--------------------- src/gui-environment.h | 34 +++-------- 2 files changed, 74 insertions(+), 92 deletions(-) diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp index 828a61a..00ca228 100644 --- a/src/gui-environment.cpp +++ b/src/gui-environment.cpp @@ -21,7 +21,6 @@ #include #include - #include "gsubr.h" #include "gui-environment.h" #include "position2d.h" @@ -34,12 +33,12 @@ using namespace irr; template 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 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,13 +73,13 @@ irr_gui_IGUIEnvironment_addEditBox (SCM gui_environment, template 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))-> @@ -96,11 +95,11 @@ irr_gui_IGUIEnvironment_addImage (SCM gui_environment, template 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 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 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 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,7 @@ irr_gui_IGUIEnvironment_addWindow (SCM gui_environment, SCM -irr_gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment) +gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment) { gui::IGUIFont* font = ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getBuiltInFont (); @@ -184,8 +183,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 +194,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 +207,23 @@ extern "C" { void init_gui_environment (void) { - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addButton_IGUIElement", 6, 0, 0, - irr_gui_IGUIEnvironment_addButton); - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0, - irr_gui_IGUIEnvironment_addEditBox); - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addImage_IGUIElement", 7, 0, 0, - irr_gui_IGUIEnvironment_addImage); - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0, - irr_gui_IGUIEnvironment_addListBox); - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0, - irr_gui_IGUIEnvironment_addScrollBar); - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0, - irr_gui_IGUIEnvironment_addStaticText); - DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0, - irr_gui_IGUIEnvironment_addWindow); - 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); + DEFINE_GSUBR ("gui_IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0, + gui_IGUIEnvironment_addEditBox); + DEFINE_GSUBR ("gui_IGUIEnvironment_addImage_IGUIElement", 7, 0, 0, + gui_IGUIEnvironment_addImage); + DEFINE_GSUBR ("gui_IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0, + gui_IGUIEnvironment_addListBox); + DEFINE_GSUBR ("gui_IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0, + gui_IGUIEnvironment_addScrollBar); + DEFINE_GSUBR ("gui_IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0, + gui_IGUIEnvironment_addStaticText); + DEFINE_GSUBR ("gui_IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0, + gui_IGUIEnvironment_addWindow); + 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); } } diff --git a/src/gui-environment.h b/src/gui-environment.h index 46f9178..663c419 100644 --- a/src/gui-environment.h +++ b/src/gui-environment.h @@ -24,32 +24,28 @@ #include #include -#include "wrapped.h" - template SCM -irr_gui_IGUIEnvironment_addButton (SCM gui_environment, +gui_IGUIEnvironment_addButton (SCM gui_environment, SCM rectangle, SCM parent, SCM id, SCM text, SCM tooltiptext); - template SCM -irr_gui_IGUIEnvironment_addEditBox (SCM gui_environment, +gui_IGUIEnvironment_addEditBox (SCM gui_environment, SCM text, SCM rectangle, SCM border, SCM parent, SCM id); - template SCM -irr_gui_IGUIEnvironment_addImage (SCM gui_environment, +gui_IGUIEnvironment_addImage (SCM gui_environment, SCM image, SCM position, SCM use_alpha_channel, @@ -57,28 +53,25 @@ irr_gui_IGUIEnvironment_addImage (SCM gui_environment, SCM id, SCM text); - template SCM -irr_gui_IGUIEnvironment_addListBox (SCM gui_environment, +gui_IGUIEnvironment_addListBox (SCM gui_environment, SCM rectangle, SCM parent, SCM id, SCM draw_background); - template SCM -irr_gui_IGUIEnvironment_addScrollBar (SCM gui_environment, +gui_IGUIEnvironment_addScrollBar (SCM gui_environment, SCM horizontal, SCM rectangle, SCM parent, SCM id); - template SCM -irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment, +gui_IGUIEnvironment_addStaticText (SCM gui_environment, SCM text, SCM rectangle, SCM border, @@ -87,35 +80,28 @@ irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment, SCM id, SCM fill_background); - template SCM -irr_gui_IGUIEnvironment_addWindow (SCM gui_environment, +gui_IGUIEnvironment_addWindow (SCM gui_environment, SCM rectangle, SCM modal, SCM text, SCM parent, SCM id); - SCM -irr_gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment); - +gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment); SCM -irr_gui_IGUIEnvironment_getFont (SCM gui_environment, +gui_IGUIEnvironment_getFont (SCM gui_environment, SCM filename); - SCM -irr_gui_IGUIEnvironment_getSkin (SCM gui_environment); - +gui_IGUIEnvironment_getSkin (SCM gui_environment); extern "C" { - void init_gui_environment (void); - } #endif -- 2.39.5