gosu 0.15.0 → 1.0.0

data/src/RubyGosu.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.1.0
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -28,7 +28,7 @@ public:
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:
-    SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen = false, double update_interval = 16.666666, bool resizable = false);
+    SwigDirector_Window(VALUE self,unsigned int width,unsigned int height,bool fullscreen=false,double update_interval=16.666666,bool resizable=false);
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();
@@ -41,6 +41,8 @@ public:
     virtual void release_memory();
     virtual void button_down(Gosu::Button arg0);
     virtual void button_up(Gosu::Button arg0);
+    virtual void gamepad_connected(int index);
+    virtual void gamepad_disconnected(int index);
     virtual void drop(std::string const &filename);
 };
 

data/src/SampleWrapper.cpp

@@ -0,0 +1,30 @@
+#include <Gosu/Audio.hpp>
+#include <Gosu/Sample.h>
+
+extern "C" {
+
+Gosu_Sample *Gosu_Sample_create(const char *filename)
+{
+  return reinterpret_cast<Gosu_Sample *>( new Gosu::Sample(filename) );
+}
+
+void Gosu_Sample_destroy(Gosu_Sample *sample)
+{
+  delete( reinterpret_cast<Gosu::Sample *>( sample ) );
+}
+
+Gosu_Channel *Gosu_Sample_play(Gosu_Sample *sample, double volume, double speed, bool looping)
+{
+  Gosu::Channel channel = reinterpret_cast<Gosu::Sample *>( sample )->play(volume, speed, looping);
+
+  return reinterpret_cast<Gosu_Channel *>( new Gosu::Channel(channel) );
+}
+
+Gosu_Channel *Gosu_Sample_play_pan(Gosu_Sample *sample, double pan, double volume, double speed, bool looping)
+{
+  Gosu::Channel channel = reinterpret_cast<Gosu::Sample *>( sample )->play_pan(pan, volume, speed, looping);
+
+  return reinterpret_cast<Gosu_Channel *>( new Gosu::Channel(channel) );
+}
+
+}

data/src/SongWrapper.cpp

@@ -0,0 +1,52 @@
+#include <Gosu/Audio.hpp>
+#include <Gosu/Song.h>
+
+extern "C" {
+  Gosu_Song* Gosu_Song_create(const char* filename)
+  {
+    return reinterpret_cast<Gosu_Song*>( new Gosu::Song(filename) );
+  }
+
+  void Gosu_Song_destroy(Gosu_Song* song)
+  {
+    delete( reinterpret_cast<Gosu::Song*>( song ));
+  }
+
+  void Gosu_Song_play(Gosu_Song* song, bool looping)
+  {
+    reinterpret_cast<Gosu::Song*>( song )->play(looping);
+  }
+
+  bool Gosu_Song_playing(Gosu_Song* song)
+  {
+    return reinterpret_cast<Gosu::Song*>( song )->playing();
+  }
+
+  void Gosu_Song_pause(Gosu_Song* song)
+  {
+    reinterpret_cast<Gosu::Song*>( song )->pause();
+  }
+
+  bool Gosu_Song_paused(Gosu_Song* song)
+  {
+    return reinterpret_cast<Gosu::Song*>( song )->paused();
+  }
+
+  void Gosu_Song_stop(Gosu_Song* song)
+  {
+    reinterpret_cast<Gosu::Song*>( song )->stop();
+  }
+
+  double Gosu_Song_volume(Gosu_Song* song){
+    return reinterpret_cast<Gosu::Song*>( song )->volume();
+  }
+
+  void Gosu_Song_set_volume(Gosu_Song* song, double volume){
+    return reinterpret_cast<Gosu::Song*>( song )->set_volume(volume);
+  }
+
+  Gosu_Song* Gosu_Song_current_song()
+  {
+    return reinterpret_cast<Gosu_Song*>(Gosu::Song::current_song());
+  }
+}

data/src/TexChunk.cpp

@@ -120,7 +120,7 @@ void Gosu::TexChunk::insert(const Bitmap& original_bitmap, int x, int y)
         if (clipped_width <= 0 || clipped_height <= 0) return;
         
         clipped_bitmap.resize(clipped_width, clipped_height);
-        clipped_bitmap.insert(original_bitmap, -clip_left, -clip_top);
+        clipped_bitmap.insert(-clip_left, -clip_top, original_bitmap);
         bitmap = &clipped_bitmap;
     }
     

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/TextBuilder.cpp

@@ -1,8 +1,10 @@
 #include "TextBuilder.hpp"
 #include <Gosu/Text.hpp>
+
+#include <utf8proc.h>
+
 #include <cassert>
 #include <cmath>
-#include "utf8proc.h"
 using namespace std;
 
 Gosu::WordInfo::WordInfo(const string& font_name, double font_height, vector<FormattedString> parts)

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/Texture.cpp

@@ -124,7 +124,7 @@ Gosu::Bitmap Gosu::Texture::to_bitmap(unsigned x, unsigned y, unsigned width, un
     // TODO: There are ways to retrieve only part of a texture, which we should use sooner or later.
     glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, full_texture.data());
     Bitmap bitmap(width, height);
-    bitmap.insert(full_texture, -int(x), -int(y));
+    bitmap.insert(-int(x), -int(y), full_texture);
     
     return bitmap;
 #endif

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__
@@ -9,7 +10,7 @@
 #endif
 
 #define STB_TRUETYPE_IMPLEMENTATION
-#include "stb_truetype.h"
+#include <stb_truetype.h>
 
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

data/src/Utility.cpp

@@ -1,7 +1,7 @@
 #include <Gosu/Utility.hpp>
 #include <Gosu/Platform.hpp>
 
-#include "utf8proc.h"
+#include <utf8proc.h>
 
 #include <cstring>
 #include <stdexcept>
@@ -45,17 +45,20 @@ u32string Gosu::utf8_to_composed_utc4(const string& utf8)
     return utc4;
 }
 
-bool Gosu::has_extension(const string& filename, const char* extension)
+bool Gosu::has_extension(string_view filename, string_view extension)
 {
-    size_t ext_len = strlen(extension);
+    size_t ext_len = extension.length();
     if (ext_len > filename.length()) {
         return false;
     }
 
-    const char* str = filename.c_str() + filename.length();
-    const char* ext = extension + ext_len;
+    string_view::iterator filename_iter = filename.end();
+    string_view::iterator ext_iter = extension.end();
     while (ext_len--) {
-        if (tolower((int) *--str) != *--ext) {
+        --filename_iter;
+        --ext_iter;
+
+        if (tolower((int) *filename_iter) != tolower((int) *ext_iter)) {
             return false;
         }
     }
@@ -66,6 +69,7 @@ bool Gosu::has_extension(const string& filename, const char* extension)
 #if defined(GOSU_IS_UNIX) && !defined(GOSU_IS_MAC)
 string Gosu::language()
 {
-    return getenv("LANG");
+    const char* env = getenv("LANG");
+    return env ? env : "en_US";
 }
 #endif

data/src/Window.cpp

@@ -22,8 +22,6 @@ namespace Gosu
         throw runtime_error(operation + ": " + (error ? error : "(unknown error)"));
     }
 
-    static void cleanup();
-
     SDL_Window* shared_window()
     {
         static SDL_Window* window = nullptr;
@@ -32,14 +30,12 @@ namespace Gosu
                 throw_sdl_error("Could not initialize SDL Video");
             }
 
-            atexit(cleanup);
-
             Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN;
-            
+
         #if SDL_VERSION_ATLEAST(2, 0, 1)
             flags |= SDL_WINDOW_ALLOW_HIGHDPI;
         #endif
-            
+
             window =
                 SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 64, 64, flags);
             if (window == nullptr) {
@@ -58,27 +54,20 @@ namespace Gosu
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
         #endif
-            
+
             context = SDL_GL_CreateContext(shared_window());
-            
+
             if (context == nullptr) {
                 throw_sdl_error("Could not create OpenGL context");
             }
         }
         return context;
     }
-    
+
     void ensure_current_context()
     {
         SDL_GL_MakeCurrent(shared_window(), shared_gl_context());
     }
-
-    static void cleanup()
-    {
-        SDL_GL_DeleteContext(shared_gl_context());
-        SDL_DestroyWindow(shared_window());
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    }
 }
 
 struct Gosu::Window::Impl
@@ -123,6 +112,8 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
 
     input().on_button_down = [this](Button button) { button_down(button); };
     input().on_button_up   = [this](Button button) { button_up(button); };
+    input().on_gamepad_connected    = [this](int index) { gamepad_connected(index); };
+    input().on_gamepad_disconnected = [this](int index) { gamepad_disconnected(index); };
 }
 
 Gosu::Window::~Window()
@@ -153,17 +144,17 @@ bool Gosu::Window::resizable() const
 void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
 {
     pimpl->fullscreen = fullscreen;
-    
+
     int actual_width = width;
     int actual_height = height;
     double scale_factor = 1.0;
     double black_bar_width = 0;
     double black_bar_height = 0;
-    
+
     if (fullscreen) {
         actual_width  = Gosu::screen_width(this);
         actual_height = Gosu::screen_height(this);
-        
+
         if (resizable()) {
             // Resizable fullscreen windows stubbornly follow the desktop resolution.
             width  = actual_width;
@@ -186,7 +177,7 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
     else {
         unsigned max_width  = Gosu::available_width(this);
         unsigned max_height = Gosu::available_height(this);
-        
+
         if (resizable()) {
             // If the window is resizable, limit its size, without preserving the aspect ratio.
             width  = actual_width  = min(width,  max_width);
@@ -199,18 +190,18 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
             actual_height = height * scale_factor;
         }
     }
-    
+
     SDL_SetWindowFullscreen(shared_window(), fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
     if (!pimpl->resizing) {
         SDL_SetWindowSize(shared_window(), actual_width, actual_height);
     }
-    
+
 #if SDL_VERSION_ATLEAST(2, 0, 1)
     SDL_GL_GetDrawableSize(shared_window(), &actual_width, &actual_height);
 #endif
-    
+
     ensure_current_context();
-    
+
     if (!pimpl->graphics) {
         pimpl->graphics.reset(new Graphics(actual_width, actual_height));
     }
@@ -218,7 +209,7 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         pimpl->graphics->set_physical_resolution(actual_width, actual_height);
     }
     pimpl->graphics->set_resolution(width, height, black_bar_width, black_bar_height);
-    
+
     if (!pimpl->input) {
         pimpl->input.reset(new Input(shared_window()));
     }
@@ -250,17 +241,17 @@ void Gosu::Window::set_caption(const string& caption)
 void Gosu::Window::show()
 {
     unsigned long time_before_tick = milliseconds();
-    
+
     while (tick()) {
         // Sleep to keep this loop from eating 100% CPU.
         unsigned long tick_time = milliseconds() - time_before_tick;
         if (tick_time < update_interval()) {
             sleep(update_interval() - tick_time);
         }
-        
+
         time_before_tick = milliseconds();
     }
-    
+
     pimpl->state = Impl::CLOSED;
 }
 
@@ -270,7 +261,7 @@ bool Gosu::Window::tick()
         pimpl->state = Impl::CLOSED;
         return false;
     }
-    
+
     if (pimpl->state == Impl::CLOSED) {
         SDL_ShowWindow(shared_window());
         pimpl->state = Impl::OPEN;
@@ -282,7 +273,7 @@ bool Gosu::Window::tick()
         SDL_GL_GetDrawableSize(shared_window(), &width, &height);
         graphics().set_physical_resolution(width, height);
     }
-    
+
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
 
@@ -320,29 +311,29 @@ bool Gosu::Window::tick()
             }
         }
     }
-    
+
     Song::update();
-    
+
     input().update();
-    
+
     update();
-    
+
     SDL_ShowCursor(needs_cursor());
-    
+
     if (needs_redraw()) {
         ensure_current_context();
         graphics().frame([&] {
             draw();
             FPS::register_frame();
         });
-        
+
         SDL_GL_SwapWindow(shared_window());
     }
-    
+
     if (pimpl->state == Impl::CLOSING) {
         pimpl->state = Impl::CLOSED;
     }
-    
+
     return pimpl->state == Impl::OPEN;
 }
 
@@ -357,7 +348,7 @@ void Gosu::Window::button_down(Button button)
     bool toggle_fullscreen;
 
     // Default shortcuts for toggling fullscreen mode, see: https://github.com/gosu/gosu/issues/361
-    
+
 #ifdef GOSU_IS_MAC
     // cmd+F and cmd+ctrl+F are both common shortcuts for toggling fullscreen mode on macOS.
     toggle_fullscreen = button == KB_F &&