From 8acb4684a364e62389afc512304e6270d9b67244 Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Sat, 11 Apr 2020 17:02:51 +0200 Subject: [PATCH] add-image! --- Makefile.am | 1 + src/gui-environment.cpp | 33 +++++++++++++++++++++++++++++++++ src/gui-environment.h | 6 ++++++ src/gui-image.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ src/gui-image.h | 38 ++++++++++++++++++++++++++++++++++++++ src/guile-irrlicht.cpp | 2 ++ 6 files changed, 120 insertions(+) create mode 100644 src/gui-image.cpp create mode 100644 src/gui-image.h diff --git a/Makefile.am b/Makefile.am index 2cd0772..7f90662 100644 --- 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 011e9d7..3268ab0 100644 --- 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 dd3f597..85ea250 100644 --- 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 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 + + 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 + . +*/ + +#include +#include + +#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 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 + + 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 + . +*/ + +#ifndef __GUILE_IRRLICHT_GUI_IMAGE_H_INCLUDED__ +#define __GUILE_IRRLICHT_GUI_IMAGE_H_INCLUDED__ + +#include +#include +#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 1d7636a..d0560c1 100644 --- 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 (); -- 2.39.5