gosu 0.15.1 → 0.15.2

data/src/Text.cpp

@@ -7,6 +7,7 @@
 #include <cmath>
 #include <algorithm>
 #include <vector>
+#include <stdexcept>
 using namespace std;
 
 double Gosu::text_width(const u32string& text,

data/src/TextInputWrapper.cpp

@@ -0,0 +1,101 @@
+#include <Gosu/Gosu.hpp>
+
+namespace Gosu
+{
+class TextInputForWrapper : public Gosu::TextInput
+{
+public:
+    TextInputForWrapper();
+    std::string filter(std::string text) const override;
+    std::function<void (const char *text)> filter_callback;
+    std::string filter_result = "";
+};
+} // namespace Gosu
+
+Gosu::TextInputForWrapper::TextInputForWrapper() : Gosu::TextInput()
+{
+}
+
+std::string Gosu::TextInputForWrapper::filter(std::string text) const
+{
+    if (filter_callback != nullptr) {
+        filter_callback(text.c_str());
+        return filter_result;
+    }
+    else {
+        return text;
+    }
+}
+
+extern "C" {
+#include <Gosu/TextInput.h>
+
+Gosu_TextInput *Gosu_TextInput_create()
+{
+    return reinterpret_cast<Gosu_TextInput *>(new Gosu::TextInputForWrapper());
+}
+
+const char *Gosu_TextInput_text(Gosu_TextInput *text_input)
+{
+    thread_local std::string string;
+    string = reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->text();
+
+    return string.c_str();
+}
+
+void Gosu_TextInput_set_text(Gosu_TextInput *text_input, const char *text)
+{
+    reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->set_text(text);
+}
+
+unsigned Gosu_TextInput_caret_pos(Gosu_TextInput *text_input)
+{
+    return reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->caret_pos();
+}
+
+void Gosu_TextInput_set_caret_pos(Gosu_TextInput *text_input, unsigned pos)
+{
+    return reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->set_caret_pos(pos);
+}
+
+unsigned Gosu_TextInput_selection_start(Gosu_TextInput *text_input)
+{
+    return reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->selection_start();
+}
+
+void Gosu_TextInput_set_selection_start(Gosu_TextInput *text_input, unsigned pos)
+{
+    return reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->set_selection_start(pos);
+}
+
+void Gosu_TextInput_set_filter(Gosu_TextInput *text_input, void function(void *data, const char *text), void *data)
+{
+    reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->filter_callback = [=](const char *text) { function(data, text); };
+}
+
+void Gosu_TextInput_set_filter_result(Gosu_TextInput *text_input, const char *result)
+{
+    reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->filter_result = result;
+}
+
+void Gosu_TextInput_insert_text(Gosu_TextInput *text_input, const char *text)
+{
+    reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->insert_text(text);
+}
+
+void Gosu_TextInput_delete_backward(Gosu_TextInput *text_input)
+{
+    reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->delete_backward();
+}
+
+void Gosu_TextInput_delete_forward(Gosu_TextInput *text_input)
+{
+    reinterpret_cast<Gosu::TextInputForWrapper *>(text_input)->delete_forward();
+}
+
+void Gosu_TextInput_destroy(Gosu_TextInput *text_input)
+{
+    delete (reinterpret_cast<Gosu::TextInputForWrapper *>(text_input));
+}
+
+}

data/src/TrueTypeFont.cpp

@@ -1,6 +1,7 @@
 #include "TrueTypeFont.hpp"
 #include <Gosu/IO.hpp>
 #include <Gosu/Text.hpp>
+#include <stdexcept>
 
 // Disable comma warnings in stb headers.
 #ifdef __GNUC__

data/src/WindowWrapper.cpp

@@ -0,0 +1,289 @@
+#include <Gosu/Gosu.hpp>
+
+namespace Gosu
+{
+class WindowForWrapper : public Gosu::Window
+{
+public:
+    WindowForWrapper(int width, int height, bool fullscreen, double update_interval, bool resizable);
+    void update() override;
+    void draw() override;
+    void default_button_down(unsigned btn); // Enables fullscreen toggle
+    void button_down(Gosu::Button btn) override;
+    void button_up(Gosu::Button btn) override;
+    void drop(const std::string &filename) override;
+    bool needs_redraw() const override;
+    bool needs_cursor() const override;
+    void close() override;
+
+    void close_immediately();
+
+    std::function<void ()> update_callback;
+    std::function<void ()> draw_callback;
+    std::function<void (unsigned btn)> button_down_callback;
+    std::function<void (unsigned btn)> button_up_callback;
+    std::function<void (const char *filename)> drop_callback;
+    std::function<bool ()> needs_redraw_callback;
+    std::function<bool ()> needs_cursor_callback;
+    std::function<void ()> close_callback;
+};
+} // namespace Gosu
+
+Gosu::WindowForWrapper::WindowForWrapper(int width, int height, bool fullscreen,
+                                         double update_interval, bool resizable)
+    : Gosu::Window(width, height, fullscreen, update_interval, resizable)
+{
+}
+
+void Gosu::WindowForWrapper::update()
+{
+    if (update_callback != nullptr) {
+        update_callback();
+    }
+}
+
+void Gosu::WindowForWrapper::draw()
+{
+    if (draw_callback != nullptr) {
+        draw_callback();
+    }
+}
+
+void Gosu::WindowForWrapper::default_button_down(unsigned btn)
+{
+    Gosu::Window::button_down(Gosu::ButtonName(btn));
+}
+
+void Gosu::WindowForWrapper::button_down(Gosu::Button btn)
+{
+    if (button_down_callback != nullptr) {
+        button_down_callback(btn.id());
+    }
+}
+
+void Gosu::WindowForWrapper::button_up(Gosu::Button btn)
+{
+    if (button_up_callback != nullptr) {
+        button_up_callback(btn.id());
+    }
+}
+
+void Gosu::WindowForWrapper::drop(const std::string &filename)
+{
+    if (drop_callback != nullptr) {
+        drop_callback(filename.c_str());
+    }
+}
+
+bool Gosu::WindowForWrapper::needs_redraw() const
+{
+    if (needs_redraw_callback != nullptr) {
+        return needs_redraw_callback();
+    }
+    else {
+        return true;
+    }
+}
+
+bool Gosu::WindowForWrapper::needs_cursor() const
+{
+    if (needs_cursor_callback != nullptr) {
+        return needs_cursor_callback();
+    }
+    else {
+        return false;
+    }
+}
+
+void Gosu::WindowForWrapper::close()
+{
+    if (close_callback != nullptr) {
+        close_callback();
+    }
+    else {
+        Gosu::Window::close();
+    }
+}
+
+void Gosu::WindowForWrapper::close_immediately()
+{
+    Gosu::Window::close();
+}
+
+extern "C" {
+#include <Gosu/Window.h>
+#include <Gosu/TextInput.h>
+
+// Constructor
+Gosu_Window *Gosu_Window_create(int width, int height, bool fullscreen, double update_interval, bool resizable)
+{
+    return reinterpret_cast<Gosu_Window *>(new Gosu::WindowForWrapper(width, height, fullscreen, update_interval, resizable));
+};
+
+// Callbacks
+void Gosu_Window_set_draw(Gosu_Window *window, void function(void *data), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->draw_callback = [=]() { function(data); };
+}
+
+void Gosu_Window_set_update(Gosu_Window *window, void function(void *data), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->update_callback = [=]() { function(data); };
+}
+
+void Gosu_Window_set_button_down(Gosu_Window *window, void function(void *data, unsigned btn), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->button_down_callback = [=](unsigned btn) { function(data, btn); };
+}
+
+void Gosu_Window_default_button_down(Gosu_Window *window, unsigned btn)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->default_button_down(btn);
+}
+
+void Gosu_Window_set_button_up(Gosu_Window *window, void function(void *data, unsigned btn), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->button_up_callback = [=](unsigned btn) { function(data, btn); };
+}
+
+void Gosu_Window_set_drop(Gosu_Window *window, void function(void *data, const char *filename), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->drop_callback = [=](const char *filename) { function(data, filename); };
+}
+
+void Gosu_Window_set_needs_redraw(Gosu_Window *window, bool function(void *data), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->needs_redraw_callback = [=]() -> bool { return function(data); };
+}
+
+void Gosu_Window_set_needs_cursor(Gosu_Window *window, bool function(void *data), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->needs_cursor_callback = [=]() -> bool { return function(data); };
+}
+
+void Gosu_Window_set_close(Gosu_Window *window, void function(void *data), void *data)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->close_callback = [=]() { function(data); };
+}
+
+Gosu_TextInput *Gosu_Window_text_input(Gosu_Window *window)
+{
+    Gosu::Window *gosu_window = reinterpret_cast<Gosu::WindowForWrapper *>(window);
+    return reinterpret_cast<Gosu_TextInput *>(gosu_window->input().text_input());
+}
+
+void Gosu_Window_set_text_input(Gosu_Window *window, Gosu_TextInput *text_input)
+{
+    Gosu::Window *gosu_window = reinterpret_cast<Gosu::WindowForWrapper *>(window);
+    gosu_window->input().set_text_input(reinterpret_cast<Gosu::TextInput *>(text_input));
+}
+
+void Gosu_Window_show(Gosu_Window *window)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->show();
+}
+
+bool Gosu_Window_tick(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->tick();
+}
+
+void Gosu_Window_close_immediately(Gosu_Window *window)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->close_immediately();
+}
+
+bool Gosu_Window_is_fullscreen(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->fullscreen();
+}
+
+bool Gosu_Window_is_resizable(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->resizable();
+}
+
+const char *Gosu_Window_caption(Gosu_Window *window)
+{
+    static thread_local std::string caption;
+    caption = reinterpret_cast<Gosu::WindowForWrapper *>(window)->caption();
+
+    return caption.c_str();
+}
+
+void Gosu_Window_set_caption(Gosu_Window *window, const char *caption)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->set_caption(caption);
+}
+
+double Gosu_Window_update_interval(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->update_interval();
+}
+
+void Gosu_Window_set_update_interval(Gosu_Window *window, double update_interval)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->set_update_interval(update_interval);
+}
+
+void Gosu_Window_set_mouse_x(Gosu_Window *window, double x)
+{
+    Gosu::Window *gosu_window = reinterpret_cast<Gosu::WindowForWrapper *>(window);
+    gosu_window->input().set_mouse_position(x, gosu_window->input().mouse_x());
+}
+
+void Gosu_Window_set_mouse_y(Gosu_Window *window, double y)
+{
+    Gosu::Window *gosu_window = reinterpret_cast<Gosu::WindowForWrapper *>(window);
+    gosu_window->input().set_mouse_position(gosu_window->input().mouse_x(), y);
+}
+
+double Gosu_Window_mouse_x(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->input().mouse_x();
+}
+
+double Gosu_Window_mouse_y(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->input().mouse_y();
+}
+
+int Gosu_Window_width(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->width();
+}
+
+void Gosu_Window_set_width(Gosu_Window *window, int width)
+{
+    Gosu::Window *gosu_window = reinterpret_cast<Gosu::WindowForWrapper *>(window);
+    gosu_window->resize(width, gosu_window->height(), gosu_window->fullscreen());
+}
+
+int Gosu_Window_height(Gosu_Window *window)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->height();
+}
+
+void Gosu_Window_set_height(Gosu_Window *window, int height)
+{
+    Gosu::Window *gosu_window = reinterpret_cast<Gosu::WindowForWrapper *>(window);
+    gosu_window->resize(gosu_window->width(), height, gosu_window->fullscreen());
+}
+
+void Gosu_Window_resize(Gosu_Window *window, int width, int height, bool fullscreen)
+{
+    reinterpret_cast<Gosu::WindowForWrapper *>(window)->resize(width, height, fullscreen);
+}
+
+int Gosu_Window_is_button_down(Gosu_Window *window, unsigned btn)
+{
+    return reinterpret_cast<Gosu::WindowForWrapper *>(window)->input().down(Gosu::Button(btn));
+}
+
+// Destructor
+void Gosu_Window_destroy(Gosu_Window *window)
+{
+    delete (reinterpret_cast<Gosu::WindowForWrapper *>(window));
+}
+
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -25,30 +25,40 @@ extra_rdoc_files:
 - COPYING
 - rdoc/gosu.rb
 files:
+- ".yardopts"
 - COPYING
 - Gosu/Audio.hpp
 - Gosu/AutoLink.hpp
 - Gosu/Bitmap.hpp
 - Gosu/Buttons.hpp
+- Gosu/Channel.h
+- Gosu/Color.h
 - Gosu/Color.hpp
 - Gosu/Directories.hpp
+- Gosu/Font.h
 - Gosu/Font.hpp
 - Gosu/Fwd.hpp
+- Gosu/Gosu.h
 - Gosu/Gosu.hpp
 - Gosu/Graphics.hpp
 - Gosu/GraphicsBase.hpp
 - Gosu/IO.hpp
+- Gosu/Image.h
 - Gosu/Image.hpp
 - Gosu/ImageData.hpp
 - Gosu/Input.hpp
 - Gosu/Inspection.hpp
 - Gosu/Math.hpp
 - Gosu/Platform.hpp
+- Gosu/Sample.h
+- Gosu/Song.h
 - Gosu/Text.hpp
+- Gosu/TextInput.h
 - Gosu/TextInput.hpp
 - Gosu/Timing.hpp
 - Gosu/Utility.hpp
 - Gosu/Version.hpp
+- Gosu/Window.h
 - Gosu/Window.hpp
 - README.md
 - ext/gosu/extconf.rb
@@ -70,8 +80,11 @@ files:
 - src/BlockAllocator.cpp
 - src/BlockAllocator.hpp
 - src/Channel.cpp
+- src/ChannelWrapper.cpp
 - src/ClipRectStack.hpp
 - src/Color.cpp
+- src/ColorWrapper.cpp
+- src/Constants.cpp
 - src/DirectoriesApple.cpp
 - src/DirectoriesUnix.cpp
 - src/DirectoriesWin.cpp
@@ -81,15 +94,18 @@ files:
 - src/FileUnix.cpp
 - src/FileWin.cpp
 - src/Font.cpp
+- src/FontWrapper.cpp
 - src/GosuGLView.cpp
 - src/GosuGLView.hpp
 - src/GosuViewController.cpp
 - src/GosuViewController.hpp
+- src/GosuWrapper.cpp
 - src/Graphics.cpp
 - src/GraphicsImpl.hpp
 - src/IO.cpp
 - src/Iconv.hpp
 - src/Image.cpp
+- src/ImageWrapper.cpp
 - src/Input.cpp
 - src/InputUIKit.cpp
 - src/Inspection.cpp
@@ -109,13 +125,16 @@ files:
 - src/Resolution.cpp
 - src/RubyGosu.cxx
 - src/RubyGosu.h
+- src/SampleWrapper.cpp
 - src/SndFile.hpp
+- src/SongWrapper.cpp
 - src/TexChunk.cpp
 - src/TexChunk.hpp
 - src/Text.cpp
 - src/TextBuilder.cpp
 - src/TextBuilder.hpp
 - src/TextInput.cpp
+- src/TextInputWrapper.cpp
 - src/Texture.cpp
 - src/Texture.hpp
 - src/TimingApple.cpp
@@ -137,6 +156,7 @@ files:
 - src/WinUtility.hpp
 - src/Window.cpp
 - src/WindowUIKit.cpp
+- src/WindowWrapper.cpp
 - src/stb_image.h
 - src/stb_image_write.h
 - src/stb_truetype.h
@@ -167,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 2D game development library.