gosu 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0fd86f4301c36a1537d5adaa45e6bc7fd918e47191909bb1bc238624d01f48
-  data.tar.gz: 0d79c98a88fc7c433a8eaf3b5a432da6a9c24c86d6388d6e853c6d6c4a44f4a4
+  metadata.gz: ee520b114c06651017a9aac042728e418654c2721bd483fe3de6c44be2acc1de
+  data.tar.gz: 2da43a5b2e1a19d45e1be85acceb48210c70a9fb866e03ca392c6232c8e89186
 SHA512:
-  metadata.gz: d3393dda33deff7db00d4fda1f40faac895243f6dc8c0d6c776eaf905bc44e64235ac0e3e2ff9067bac7a971d6794c02e526755e7602b98f4fc58b2053c1441a
-  data.tar.gz: 1fce5bf10d01a9e2ab6df0d30d62a3105bb98050c8efe94701eb09d8cbc64fa19a9a7fac02bc1d7a2ab62d74bb591b5bce1fdc1ae5a49ccdc57d8d6911ec9757
+  metadata.gz: af2d2f9ac8121b4edae0ab5fd2bdd9aa69c0209741ae2af4dabc99419ab0ba9520c0dafa51640132db79c1496f2993f40ab000c475e562d079b59fdecd3227e7
+  data.tar.gz: 0ee8ff41e302362370ed40d2d640444a89a232ddd35a072d4c038941b6412ea7662d06ea5acdabe8ffc1739ca73aade3d88ec0b4090bb7db8023b5ec777f97d2

data/ext/gosu/extconf.rb

@@ -5,11 +5,9 @@ when /^mingw/
   windows = true
 when /^darwin/
   macos = true
-when /linux/
-  linux = true
 end
 
-if macos or linux
+if not windows
   puts 'The Gosu gem requires some libraries to be installed system-wide.'
   puts 'See the following site for a list:'
   if macos
@@ -54,12 +52,11 @@ if windows
     $LDFLAGS << "  -L../../dependencies/al_soft/x86 -L../../dependencies/SDL/lib/x86"
   end
   $LDFLAGS << " -lgdi32 -lwinmm -lOpenGL32 -lOpenAL32 -lSDL2"
+  # Link libstdc++ statically to avoid having another DLL dependency when using Ocra.
+  $LDFLAGS << " -static-libstdc++"
 elsif macos
   # Compile all C++ files as Objective C++ on macOS since mkmf does not support .mm files.
   $CXXFLAGS << " -x objective-c++ -fobjc-arc -DNDEBUG"
-  # Prevents issues with Apple's pre-installed Ruby 2.3 on macOS 10.13.
-  # https://github.com/gosu/gosu/issues/424
-  $CXXFLAGS << " -Wno-reserved-user-defined-literal"
 
   # Explicitly specify libc++ as the standard library.
   # rvm will sometimes try to override this:
@@ -82,7 +79,7 @@ elsif macos
   $LDFLAGS.gsub! "-arch i386", ""
   $ARCH_FLAG.gsub! "-arch i386", ""
   CONFIG['LDSHARED'].gsub! "-arch i386", ""
-elsif linux
+else
   if /BCM2708/ =~ `cat /proc/cpuinfo`
     $INCFLAGS << " -I/opt/vc/include/GLES"
     $INCFLAGS << " -I/opt/vc/include"
@@ -113,21 +110,4 @@ Dir.glob('../../dependencies/**/*.c').each do |dep|
   end
 end
 
-# Gem::Version#initialize is apparently broken in some versions of Ruby, so use a local helper.
-def ruby_newer_than?(want_version)
-  have_parts = RUBY_VERSION.split('.').map { |part| part.to_i }
-  want_parts = want_version.split('.').map { |part| part.to_i }
-  have_parts << 0 while have_parts.size < want_parts.size
-  want_parts << 0 while want_parts.size < have_parts.size
-  (have_parts <=> want_parts) == 1
-end
-
-# In some versions of Ruby/mkmf, the $CXXFLAGS variable does not work.
-# We can modify CONFIG instead, and our changes will end up in the Makefile.
-# See: http://bugs.ruby-lang.org/issues/8315
-# The lower bound was reduced to 1.9.3 here: https://github.com/gosu/gosu/issues/321
-if ruby_newer_than?("1.9.2") and not ruby_newer_than?("2.2.0")
-  CONFIG['CXXFLAGS'] = "#$CFLAGS #$CXXFLAGS"
-end
-
 create_makefile "gosu", "../../src"

data/include/Gosu/Buttons.hpp

@@ -1,15 +1,12 @@
 #pragma once
 
-#include <Gosu/Platform.hpp>
-
 namespace Gosu
 {
-    //! List of button ids that can be used with Gosu::Input.
-    //! This enumeration contains ids for keyboard keys (KB_*),
-    //! mouse buttons and mouse wheel (MS_*) and gamepad buttons (GP_*).
-    enum ButtonName
+    /// List of button IDs that can be used with Gosu::Input.
+    /// This enumeration contains IDs for keyboard keys (KB_*),
+    /// mouse buttons and mouse wheel (MS_*), as well as gamepad buttons (GP_*).
+    enum Button
     {
-        KB_RANGE_BEGIN,
         KB_ESCAPE          = 41,
         KB_F1              = 58,
         KB_F2              = 59,
@@ -51,8 +48,8 @@ namespace Gosu
         KB_DOWN            = 81,
         KB_HOME            = 74,
         KB_END             = 77,
-        KB_PRINTSCREEN     = 70,
-        KB_SCROLLLOCK      = 71,
+        KB_PRINT_SCREEN    = 70,
+        KB_SCROLL_LOCK     = 71,
         KB_PAUSE           = 72,
         KB_INSERT          = 73,
         KB_DELETE          = 76,
@@ -70,7 +67,7 @@ namespace Gosu
         KB_COMMA           = 54,
         KB_PERIOD          = 55,
         KB_SLASH           = 56,
-        KB_CAPSLOCK        = 57,
+        KB_CAPS_LOCK       = 57,
         KB_A               = 4,
         KB_B               = 5,
         KB_C               = 6,
@@ -97,7 +94,8 @@ namespace Gosu
         KB_X               = 27,
         KB_Y               = 28,
         KB_Z               = 29,
-        KB_ISO             = 100, // ` on US/UK macOS, < on EU macOS, \ on US/UK Windows
+        /// ` on US/UK macOS, < on EU macOS, \ on US/UK Windows
+        KB_ISO             = 100,
         KB_NUMPAD_0        = 98,
         KB_NUMPAD_1        = 89,
         KB_NUMPAD_2        = 90,
@@ -129,7 +127,6 @@ namespace Gosu
         MS_OTHER_5,
         MS_OTHER_6,
         MS_OTHER_7,
-        MS_RANGE_END = 0x110,
 
         GP_RANGE_BEGIN,
         GP_DPAD_LEFT = GP_RANGE_BEGIN,
@@ -263,8 +260,14 @@ namespace Gosu
         GP_3_DOWN,
         GP_RANGE_END = GP_3_DOWN,
 
-        GP_AXES_RANGE_BEGIN,
-        GP_LEFT_STICK_X_AXIS = GP_AXES_RANGE_BEGIN,
+        NUM_GAMEPADS = 4,
+        NO_BUTTON = 0xffffffff,
+    };
+
+    /// List of axis IDs that can be used with Gosu::Input.
+    enum Axis
+    {
+        GP_LEFT_STICK_X_AXIS,
         GP_LEFT_STICK_Y_AXIS,
         GP_RIGHT_STICK_X_AXIS,
         GP_RIGHT_STICK_Y_AXIS,
@@ -298,9 +301,7 @@ namespace Gosu
         GP_3_RIGHT_STICK_Y_AXIS,
         GP_3_LEFT_TRIGGER_AXIS,
         GP_3_RIGHT_TRIGGER_AXIS,
-        GP_AXES_RANGE_END = GP_3_RIGHT_TRIGGER_AXIS,
 
-        NUM_GAMEPADS = 4,
-        NO_BUTTON = 0xffffffff,
+        NUM_AXES
     };
 }

data/include/Gosu/Fwd.hpp

@@ -1,14 +1,9 @@
-//! \file Fwd.hpp
-//! Contains forward declarations of all of Gosu's available classes.
-
 #pragma once
 
-//! The library's main namespace.
 namespace Gosu
 {
     class Bitmap;
     class Buffer;
-    class Button;
     class Channel;
     class Color;
     class File;

data/include/Gosu/Input.hpp

@@ -1,11 +1,9 @@
-//! \file Input.hpp
-//! Interface of the Input class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Buttons.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Utility.hpp>
 #include <functional>
 #include <memory>
 #include <string>
@@ -13,56 +11,30 @@
 
 namespace Gosu
 {
-    //! Very lightweight class that identifies a button (keyboard, mouse or other device).
-    class Button
-    {
-        unsigned id_;
-
-    public:
-        //! For internal use.
-        explicit Button(unsigned id) : id_(id) {}
-        //! For internal use.
-        unsigned id() const { return id_; }
-
-        //! Default constructor; == no_button.
-        Button() : id_(NO_BUTTON) {}
-
-        //! Conversion from ButtonName constants.
-        Button(ButtonName name) : id_(name) {}
-    };
-
-    //! Tests whether two Buttons identify the same physical button.
-    inline bool operator==(Button lhs, Button rhs) { return lhs.id() == rhs.id(); }
-    inline bool operator!=(Button lhs, Button rhs) { return !(lhs == rhs); }
-    inline bool operator<(Button lhs, Button rhs) { return lhs.id() < rhs.id(); }
-
-    //! Struct that saves information about a touch on the surface of a multi-
-    //! touch device.
-    //! Available even on non-iPhone platforms to make it easier to compile the
-    //! same source for multiple platforms.
+    /// Struct that saves information about a touch on the surface of a multi-touch device.
+    /// (Right now this is only supported on iOS.)
     struct Touch
     {
-        //! Allows for identification of a touch across calls.
+        /// Allows for identification of a touch across calls.
         void* id;
-        //! Position of a touch on the touch screen.
-        float x, y;
+        /// Position of a touch on the touch screen.
+        double x, y;
     };
     typedef std::vector<Touch> Touches;
 
-    //! Manages initialization and shutdown of the input system. Only one Input
-    //! instance can exist per application.
-    class Input
+    /// Manages initialization and shutdown of the input system.
+    /// Only one Input instance can exist per application.
+    class Input : Noncopyable
     {
         struct Impl;
-        // Non-movable (const) to avoid dangling internal references.
-        const std::unique_ptr<Impl> pimpl;
+        std::unique_ptr<Impl> pimpl;
 
     public:
     #ifdef GOSU_IS_IPHONE
         Input(void* view, float update_interval);
         void feed_touch_event(std::function<void (Touch)>& callback, void* touches);
     #else
-        Input(void* window);
+        explicit Input(void* window);
         bool feed_sdl_event(void* event);
     #endif
 
@@ -87,7 +59,8 @@ namespace Gosu
         //! Updated every tick.
         static bool down(Button btn);
 
-        //! Returns the value of a Gamepad joystick in the range -1.0 thru +1.0 and trigger in the range 0.0 thru +1.0.
+        //! Returns the value of a gamepad stick in the range -1.0 through +1.0, or a trigger in the
+        //! range 0.0 through +1.0.
         //! Updated every tick.
         static double axis(Button btn);
 

data/include/Gosu/Utility.hpp

@@ -1,6 +1,3 @@
-//! \file Utility.hpp
-//! General purpose utility functions.
-
 #pragma once
 
 #include <string>
@@ -17,4 +14,18 @@ namespace Gosu
     //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'.
     //! The first two letters will always be a language code.
     std::string language();
+
+    class Noncopyable
+    {
+    protected:
+        Noncopyable() = default;
+        ~Noncopyable() = default;
+
+    public:
+        Noncopyable(const Noncopyable& other) = delete;
+        Noncopyable& operator=(const Noncopyable& other) = delete;
+
+        Noncopyable(Noncopyable&& other) = delete;
+        Noncopyable& operator=(Noncopyable&& other) = delete;
+    };
 }

data/include/Gosu/Version.hpp

@@ -2,9 +2,9 @@
 
 #include <string>
 
-#define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 15
-#define GOSU_POINT_VERSION 2
+#define GOSU_MAJOR_VERSION 1
+#define GOSU_MINOR_VERSION 0
+#define GOSU_POINT_VERSION 0
 
 namespace Gosu
 {

data/include/Gosu/Window.hpp

@@ -1,6 +1,3 @@
-//! \file Window.hpp
-//! Interface of the Window class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
@@ -9,13 +6,6 @@
 #include <memory>
 #include <string>
 
-#ifdef GOSU_IS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
 namespace Gosu
 {
     //! Convenient all-in-one class that serves as the foundation of a standard Gosu application.
@@ -82,8 +72,8 @@ namespace Gosu
         //! By default, the window is redrawn all the time.
         virtual bool needs_redraw() const { return true; }
 
-        //! If this function returns true, the system arrow cursor is drawn while over the window.
-        virtual bool needs_cursor() const { return false; }
+        //! If this function returns true, the system cursor will be visible while over the window.
+        virtual bool needs_cursor() const { return true; }
 
         //! This function is called when the window loses focus on some platforms.
         //! Most importantly, it is called on the iPhone or iPad when the user locks the screen.

data/rdoc/gosu.rb

@@ -32,8 +32,8 @@ module Gosu
   KB_DOWN = :an_integer
   KB_END = :an_integer
 
-  KB_PRINTSCREEN = :an_integer
-  KB_SCROLLLOCK = :an_integer
+  KB_PRINT_SCREEN = :an_integer
+  KB_SCROLL_LOCK = :an_integer
   KB_PAUSE = :an_integer
 
   ##
@@ -75,7 +75,7 @@ module Gosu
   KB_RIGHT_SHIFT = :an_integer
   KB_SEMICOLON = :an_integer
   KB_SLASH = :an_integer
-  KB_CAPSLOCK = :an_integer
+  KB_CAPS_LOCK = :an_integer
   KB_SPACE = :an_integer
   KB_TAB = :an_integer
   KB_UP = :an_integer
@@ -875,7 +875,7 @@ module Gosu
     def draw; end
 
     ##
-    # This method can be overriden to give the game a chance to opt out of a call to {#draw}; however, the operating system can still force a redraw for any reason.
+    # This method can be overridden to give the game a chance to opt out of a call to {#draw}; however, the operating system can still force a redraw for any reason.
     #
     # @return [true, false] whether the window needs to be redrawn.
     #
@@ -883,7 +883,8 @@ module Gosu
     def needs_redraw?; end
 
     ##
-    # This method can be overriden to control the visibility of the system cursor over your window, e.g., for level editors or other situations where introducing a custom cursor or hiding the default one is not desired.
+    # This method can be overridden to control the visibility of the system cursor over your window.
+    # The base class implementation returns true.
     #
     # @return [true, false] whether the system cursor should be shown.
     def needs_cursor?; end

data/src/AudioFile.hpp

@@ -3,6 +3,9 @@
 #include <Gosu/IO.hpp>
 
 #ifdef GOSU_IS_MAC
+// Ignore OpenAL deprecation warnings. If macOS stops shipping OpenAL, it's more likely that we bundle our own version
+// of it than that we switch to another audio API.
+#define OPENAL_DEPRECATED
 #include <OpenAL/al.h>
 #else
 #include <AL/al.h>

data/src/Constants.cpp

@@ -88,6 +88,9 @@ unsigned Gosu_KB_UP = Gosu::KB_UP;
 unsigned Gosu_KB_DOWN = Gosu::KB_DOWN;
 unsigned Gosu_KB_HOME = Gosu::KB_HOME;
 unsigned Gosu_KB_END = Gosu::KB_END;
+unsigned Gosu_KB_PRINT_SCREEN = Gosu::KB_PRINT_SCREEN;
+unsigned Gosu_KB_SCROLL_LOCK = Gosu::KB_SCROLL_LOCK;
+unsigned Gosu_KB_PAUSE = Gosu::KB_PAUSE;
 unsigned Gosu_KB_INSERT = Gosu::KB_INSERT;
 unsigned Gosu_KB_DELETE = Gosu::KB_DELETE;
 unsigned Gosu_KB_PAGE_UP = Gosu::KB_PAGE_UP;
@@ -104,6 +107,7 @@ unsigned Gosu_KB_APOSTROPHE = Gosu::KB_APOSTROPHE;
 unsigned Gosu_KB_COMMA = Gosu::KB_COMMA;
 unsigned Gosu_KB_PERIOD = Gosu::KB_PERIOD;
 unsigned Gosu_KB_SLASH = Gosu::KB_SLASH;
+unsigned Gosu_KB_CAPS_LOCK = Gosu::KB_CAPS_LOCK;
 unsigned Gosu_KB_A = Gosu::KB_A;
 unsigned Gosu_KB_B = Gosu::KB_B;
 unsigned Gosu_KB_C = Gosu::KB_C;
@@ -291,35 +295,35 @@ unsigned Gosu_GP_3_RIGHT = Gosu::GP_3_RIGHT;
 unsigned Gosu_GP_3_UP = Gosu::GP_3_UP;
 unsigned Gosu_GP_3_DOWN = Gosu::GP_3_DOWN;
 
-unsigned Gosu_GP_LEFT_STICK_X_AXIS = Gosu::GP_LEFT_STICK_Y_AXIS;
+unsigned Gosu_GP_LEFT_STICK_X_AXIS = Gosu::GP_LEFT_STICK_X_AXIS;
 unsigned Gosu_GP_LEFT_STICK_Y_AXIS = Gosu::GP_LEFT_STICK_Y_AXIS;
 unsigned Gosu_GP_RIGHT_STICK_X_AXIS = Gosu::GP_RIGHT_STICK_X_AXIS;
 unsigned Gosu_GP_RIGHT_STICK_Y_AXIS = Gosu::GP_RIGHT_STICK_Y_AXIS;
 unsigned Gosu_GP_LEFT_TRIGGER_AXIS = Gosu::GP_LEFT_TRIGGER_AXIS;
 unsigned Gosu_GP_RIGHT_TRIGGER_AXIS = Gosu::GP_RIGHT_TRIGGER_AXIS;
 
-unsigned Gosu_GP_0_LEFT_STICK_X_AXIS = Gosu::GP_0_LEFT_STICK_Y_AXIS;
+unsigned Gosu_GP_0_LEFT_STICK_X_AXIS = Gosu::GP_0_LEFT_STICK_X_AXIS;
 unsigned Gosu_GP_0_LEFT_STICK_Y_AXIS = Gosu::GP_0_LEFT_STICK_Y_AXIS;
 unsigned Gosu_GP_0_RIGHT_STICK_X_AXIS = Gosu::GP_0_RIGHT_STICK_X_AXIS;
 unsigned Gosu_GP_0_RIGHT_STICK_Y_AXIS = Gosu::GP_0_RIGHT_STICK_Y_AXIS;
 unsigned Gosu_GP_0_LEFT_TRIGGER_AXIS = Gosu::GP_0_LEFT_TRIGGER_AXIS;
 unsigned Gosu_GP_0_RIGHT_TRIGGER_AXIS = Gosu::GP_0_RIGHT_TRIGGER_AXIS;
 
-unsigned Gosu_GP_1_LEFT_STICK_X_AXIS = Gosu::GP_1_LEFT_STICK_Y_AXIS;
+unsigned Gosu_GP_1_LEFT_STICK_X_AXIS = Gosu::GP_1_LEFT_STICK_X_AXIS;
 unsigned Gosu_GP_1_LEFT_STICK_Y_AXIS = Gosu::GP_1_LEFT_STICK_Y_AXIS;
 unsigned Gosu_GP_1_RIGHT_STICK_X_AXIS = Gosu::GP_1_RIGHT_STICK_X_AXIS;
 unsigned Gosu_GP_1_RIGHT_STICK_Y_AXIS = Gosu::GP_1_RIGHT_STICK_Y_AXIS;
 unsigned Gosu_GP_1_LEFT_TRIGGER_AXIS = Gosu::GP_1_LEFT_TRIGGER_AXIS;
 unsigned Gosu_GP_1_RIGHT_TRIGGER_AXIS = Gosu::GP_1_RIGHT_TRIGGER_AXIS;
 
-unsigned Gosu_GP_2_LEFT_STICK_X_AXIS = Gosu::GP_2_LEFT_STICK_Y_AXIS;
+unsigned Gosu_GP_2_LEFT_STICK_X_AXIS = Gosu::GP_2_LEFT_STICK_X_AXIS;
 unsigned Gosu_GP_2_LEFT_STICK_Y_AXIS = Gosu::GP_2_LEFT_STICK_Y_AXIS;
 unsigned Gosu_GP_2_RIGHT_STICK_X_AXIS = Gosu::GP_2_RIGHT_STICK_X_AXIS;
 unsigned Gosu_GP_2_RIGHT_STICK_Y_AXIS = Gosu::GP_2_RIGHT_STICK_Y_AXIS;
 unsigned Gosu_GP_2_LEFT_TRIGGER_AXIS = Gosu::GP_2_LEFT_TRIGGER_AXIS;
 unsigned Gosu_GP_2_RIGHT_TRIGGER_AXIS = Gosu::GP_2_RIGHT_TRIGGER_AXIS;
 
-unsigned Gosu_GP_3_LEFT_STICK_X_AXIS = Gosu::GP_3_LEFT_STICK_Y_AXIS;
+unsigned Gosu_GP_3_LEFT_STICK_X_AXIS = Gosu::GP_3_LEFT_STICK_X_AXIS;
 unsigned Gosu_GP_3_LEFT_STICK_Y_AXIS = Gosu::GP_3_LEFT_STICK_Y_AXIS;
 unsigned Gosu_GP_3_RIGHT_STICK_X_AXIS = Gosu::GP_3_RIGHT_STICK_X_AXIS;
 unsigned Gosu_GP_3_RIGHT_STICK_Y_AXIS = Gosu::GP_3_RIGHT_STICK_Y_AXIS;

data/src/GosuWrapper.cpp

@@ -187,7 +187,7 @@ unsigned Gosu_screen_height(Gosu_Window *window)
 
 int Gosu_button_down(int btn)
 {
-    return Gosu::Input::down((Gosu::ButtonName)btn);
+    return Gosu::Input::down((Gosu::Button)btn);
 }
 
 const char *Gosu_button_id_to_char(int id)
@@ -200,13 +200,13 @@ const char *Gosu_button_id_to_char(int id)
 
 unsigned Gosu_button_char_to_id(const char *btn)
 {
-    return Gosu::Input::char_to_id(btn).id();
+    return Gosu::Input::char_to_id(btn);
 }
 
 const char *Gosu_button_name(int btn)
 {
     static thread_local std::string name;
-    name = Gosu::Input::button_name((Gosu::ButtonName)btn);
+    name = Gosu::Input::button_name((Gosu::Button)btn);
     return name.empty() ? nullptr : name.c_str();
 }
 
@@ -219,7 +219,7 @@ const char *Gosu_gamepad_name(int id)
 
 double Gosu_axis(int btn)
 {
-    return Gosu::Input::axis((Gosu::ButtonName)btn);
+    return Gosu::Input::axis((Gosu::Button)btn);
 }
 
 int Gosu_fps()

data/src/Input.cpp

@@ -26,8 +26,7 @@ static void require_sdl_video()
 
 static const unsigned NUM_BUTTONS_PER_GAMEPAD =
     (Gosu::GP_RANGE_END - Gosu::GP_RANGE_BEGIN + 1 - 4) / (Gosu::NUM_GAMEPADS + 1) - 3;
-static const unsigned NUM_AXES_PER_GAMEPAD =
-    (Gosu::GP_AXES_RANGE_END - Gosu::GP_AXES_RANGE_BEGIN + 1) / (Gosu::NUM_GAMEPADS + 1);
+static const unsigned NUM_AXES_PER_GAMEPAD = Gosu::NUM_AXES / (Gosu::NUM_GAMEPADS + 1);
 static const unsigned NUM_BUTTONS = Gosu::GP_RANGE_END + 1;
 
 static array<bool, NUM_BUTTONS> button_states = {false};
@@ -416,17 +415,17 @@ private:
         GamepadBuffer gamepad;
 
         // Poll axes first.
-        gamepad.axes[GP_LEFT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] =
+        gamepad.axes[GP_LEFT_STICK_X_AXIS] =
             scale_axis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX));
-        gamepad.axes[GP_LEFT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] =
+        gamepad.axes[GP_LEFT_STICK_Y_AXIS] =
             scale_axis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY));
-        gamepad.axes[GP_RIGHT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] =
+        gamepad.axes[GP_RIGHT_STICK_X_AXIS] =
             scale_axis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTX));
-        gamepad.axes[GP_RIGHT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] =
+        gamepad.axes[GP_RIGHT_STICK_Y_AXIS] =
             scale_axis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY));
-        gamepad.axes[GP_LEFT_TRIGGER_AXIS - GP_AXES_RANGE_BEGIN] =
+        gamepad.axes[GP_LEFT_TRIGGER_AXIS] =
             scale_axis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_TRIGGERLEFT));
-        gamepad.axes[GP_RIGHT_TRIGGER_AXIS - GP_AXES_RANGE_BEGIN] =
+        gamepad.axes[GP_RIGHT_TRIGGER_AXIS] =
             scale_axis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_TRIGGERRIGHT));
 
         gamepad.buttons[GP_DPAD_LEFT - GP_RANGE_BEGIN] =
@@ -460,19 +459,19 @@ private:
         // Just guess that the first four axes are equivalent to two analog sticks.
         int axes = SDL_JoystickNumAxes(joystick);
         if (axes > 0) {
-            gamepad.axes[GP_LEFT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] =
+            gamepad.axes[GP_LEFT_STICK_X_AXIS] =
                 scale_axis(SDL_JoystickGetAxis(joystick, 0));
         }
         if (axes > 1) {
-            gamepad.axes[GP_LEFT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] =
+            gamepad.axes[GP_LEFT_STICK_Y_AXIS] =
                 scale_axis(SDL_JoystickGetAxis(joystick, 1));
         }
         if (axes > 2) {
-            gamepad.axes[GP_RIGHT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] =
+            gamepad.axes[GP_RIGHT_STICK_X_AXIS] =
                 scale_axis(SDL_JoystickGetAxis(joystick, 2));
         }
         if (axes > 3) {
-            gamepad.axes[GP_RIGHT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] =
+            gamepad.axes[GP_RIGHT_STICK_Y_AXIS] =
                 scale_axis(SDL_JoystickGetAxis(joystick, 3));
         }
 
@@ -501,20 +500,20 @@ private:
     {
         gamepad.directions[0] =
             gamepad.buttons[GP_DPAD_LEFT - GP_RANGE_BEGIN] ||
-            gamepad.axes[GP_LEFT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] <= -0.5 ||
-            gamepad.axes[GP_RIGHT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] <= -0.5;
+            gamepad.axes[GP_LEFT_STICK_X_AXIS] <= -0.5 ||
+            gamepad.axes[GP_RIGHT_STICK_X_AXIS] <= -0.5;
         gamepad.directions[1] =
             gamepad.buttons[GP_DPAD_RIGHT - GP_RANGE_BEGIN] ||
-            gamepad.axes[GP_LEFT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] >= +0.5 ||
-            gamepad.axes[GP_RIGHT_STICK_X_AXIS - GP_AXES_RANGE_BEGIN] >= +0.5;
+            gamepad.axes[GP_LEFT_STICK_X_AXIS] >= +0.5 ||
+            gamepad.axes[GP_RIGHT_STICK_X_AXIS] >= +0.5;
         gamepad.directions[2] =
             gamepad.buttons[GP_DPAD_UP - GP_RANGE_BEGIN] ||
-            gamepad.axes[GP_LEFT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] <= -0.5 ||
-            gamepad.axes[GP_RIGHT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] <= -0.5;
+            gamepad.axes[GP_LEFT_STICK_Y_AXIS] <= -0.5 ||
+            gamepad.axes[GP_RIGHT_STICK_Y_AXIS] <= -0.5;
         gamepad.directions[3] =
             gamepad.buttons[GP_DPAD_DOWN - GP_RANGE_BEGIN] ||
-            gamepad.axes[GP_LEFT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] >= +0.5 ||
-            gamepad.axes[GP_RIGHT_STICK_Y_AXIS - GP_AXES_RANGE_BEGIN] >= +0.5;
+            gamepad.axes[GP_LEFT_STICK_Y_AXIS] >= +0.5 ||
+            gamepad.axes[GP_RIGHT_STICK_Y_AXIS] >= +0.5;
     }
 };
 
@@ -537,12 +536,12 @@ string Gosu::Input::id_to_char(Button btn)
 {
     require_sdl_video();
 
-    if (btn.id() > KB_RANGE_END) return "";
+    if (btn > KB_RANGE_END) return "";
 
     // SDL_GetKeyName returns "Space" for this value, but we want the character value.
-    if (btn.id() == KB_SPACE) return " ";
+    if (btn == KB_SPACE) return " ";
 
-    SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn.id()));
+    SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn));
     if (keycode == SDLK_UNKNOWN) return "";
 
     const char* name = SDL_GetKeyName(keycode);
@@ -573,7 +572,7 @@ std::string Gosu::Input::button_name(Button btn)
 {
     require_sdl_video();
 
-    SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn.id()));
+    SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn));
     return SDL_GetKeyName(keycode);
 }
 
@@ -601,17 +600,17 @@ std::string Gosu::Input::gamepad_name(int index)
 
 bool Gosu::Input::down(Gosu::Button btn)
 {
-    if (btn == NO_BUTTON || btn.id() >= NUM_BUTTONS) return false;
+    if (btn == NO_BUTTON || btn >= NUM_BUTTONS) return false;
 
-    return button_states[btn.id()];
+    return button_states[btn];
 }
 
 double Gosu::Input::axis(Gosu::Button btn)
 {
-    unsigned axis_id = btn.id() - GP_LEFT_STICK_X_AXIS;
+    unsigned axis_id = btn - GP_LEFT_STICK_X_AXIS;
 
     if (axis_id >= axis_states.size()) {
-        throw std::out_of_range("Invalid axis ID: " + std::to_string(btn.id()));
+        throw std::out_of_range("Invalid axis ID: " + std::to_string(btn));
     }
 
     return axis_states[axis_id];

data/src/RubyGosu.cxx

@@ -2174,22 +2174,21 @@ namespace Swig {
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define SWIGTYPE_p_Gosu__Button swig_types[0]
-#define SWIGTYPE_p_Gosu__Channel swig_types[1]
-#define SWIGTYPE_p_Gosu__Color swig_types[2]
-#define SWIGTYPE_p_Gosu__Font swig_types[3]
-#define SWIGTYPE_p_Gosu__GLTexInfo swig_types[4]
-#define SWIGTYPE_p_Gosu__Image swig_types[5]
-#define SWIGTYPE_p_Gosu__Sample swig_types[6]
-#define SWIGTYPE_p_Gosu__Song swig_types[7]
-#define SWIGTYPE_p_Gosu__TextInput swig_types[8]
-#define SWIGTYPE_p_Gosu__Window swig_types[9]
-#define SWIGTYPE_p_char swig_types[10]
-#define SWIGTYPE_p_double swig_types[11]
-#define SWIGTYPE_p_std__arrayT_double_16_t swig_types[12]
-#define SWIGTYPE_p_std__string swig_types[13]
-static swig_type_info *swig_types[15];
-static swig_module_info swig_module = {swig_types, 14, 0, 0, 0, 0};
+#define SWIGTYPE_p_Gosu__Channel swig_types[0]
+#define SWIGTYPE_p_Gosu__Color swig_types[1]
+#define SWIGTYPE_p_Gosu__Font swig_types[2]
+#define SWIGTYPE_p_Gosu__GLTexInfo swig_types[3]
+#define SWIGTYPE_p_Gosu__Image swig_types[4]
+#define SWIGTYPE_p_Gosu__Sample swig_types[5]
+#define SWIGTYPE_p_Gosu__Song swig_types[6]
+#define SWIGTYPE_p_Gosu__TextInput swig_types[7]
+#define SWIGTYPE_p_Gosu__Window swig_types[8]
+#define SWIGTYPE_p_char swig_types[9]
+#define SWIGTYPE_p_double swig_types[10]
+#define SWIGTYPE_p_std__arrayT_double_16_t swig_types[11]
+#define SWIGTYPE_p_std__string swig_types[12]
+static swig_type_info *swig_types[14];
+static swig_module_info swig_module = {swig_types, 13, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3320,7 +3319,7 @@ void SwigDirector_Window::button_down(Gosu::Button arg0) {
   VALUE SWIGUNUSED result;
   
   {
-    obj0 = arg0 == Gosu::NO_BUTTON ? Qnil : LONG2NUM((&arg0)->id());
+    obj0 = arg0 == Gosu::NO_BUTTON ? Qnil : LONG2NUM(arg0);
   }
   result = rb_funcall(swig_get_self(), rb_intern("protected_button_down"), 1,obj0);
 }
@@ -3331,7 +3330,7 @@ void SwigDirector_Window::button_up(Gosu::Button arg0) {
   VALUE SWIGUNUSED result;
   
   {
-    obj0 = arg0 == Gosu::NO_BUTTON ? Qnil : LONG2NUM((&arg0)->id());
+    obj0 = arg0 == Gosu::NO_BUTTON ? Qnil : LONG2NUM(arg0);
   }
   result = rb_funcall(swig_get_self(), rb_intern("protected_button_up"), 1,obj0);
 }
@@ -10272,14 +10271,14 @@ _wrap_char_to_button_id(int argc, VALUE *argv, VALUE self) {
   }
   {
     try {
-      result = Gosu::char_to_button_id(arg1);
+      result = (Gosu::Button)Gosu::char_to_button_id(arg1);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
   {
-    vresult = result == Gosu::NO_BUTTON ? Qnil : LONG2NUM((&result)->id());
+    vresult = result == Gosu::NO_BUTTON ? Qnil : LONG2NUM(result);
   }
   return vresult;
 fail:
@@ -11651,7 +11650,6 @@ fail:
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static swig_type_info _swigt__p_Gosu__Button = {"_p_Gosu__Button", "Gosu::Button *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Gosu__Channel = {"_p_Gosu__Channel", "Gosu::Channel *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Gosu__Color = {"_p_Gosu__Color", "Gosu::Color *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Gosu__Font = {"_p_Gosu__Font", "Gosu::Font *", 0, 0, (void*)0, 0};
@@ -11667,7 +11665,6 @@ static swig_type_info _swigt__p_std__arrayT_double_16_t = {"_p_std__arrayT_doubl
 static swig_type_info _swigt__p_std__string = {"_p_std__string", "std::string *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
-  &_swigt__p_Gosu__Button,
   &_swigt__p_Gosu__Channel,
   &_swigt__p_Gosu__Color,
   &_swigt__p_Gosu__Font,
@@ -11683,7 +11680,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_std__string,
 };
 
-static swig_cast_info _swigc__p_Gosu__Button[] = {  {&_swigt__p_Gosu__Button, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Gosu__Channel[] = {  {&_swigt__p_Gosu__Channel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Gosu__Color[] = {  {&_swigt__p_Gosu__Color, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Gosu__Font[] = {  {&_swigt__p_Gosu__Font, 0, 0, 0},{0, 0, 0, 0}};
@@ -11699,7 +11695,6 @@ static swig_cast_info _swigc__p_std__arrayT_double_16_t[] = {  {&_swigt__p_std__
 static swig_cast_info _swigc__p_std__string[] = {  {&_swigt__p_std__string, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
-  _swigc__p_Gosu__Button,
   _swigc__p_Gosu__Channel,
   _swigc__p_Gosu__Color,
   _swigc__p_Gosu__Font,
@@ -11969,9 +11964,9 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "VERSION", SWIG_From_std_string(static_cast< std::string >(Gosu::VERSION)));
   rb_define_const(mGosu, "LICENSES", SWIG_From_std_string(static_cast< std::string >(Gosu::LICENSES)));
-  rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
-  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(15)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
+  rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(1)));
+  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(0)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);
@@ -12163,8 +12158,8 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KB_DOWN", SWIG_From_int(static_cast< int >(Gosu::KB_DOWN)));
   rb_define_const(mGosu, "KB_HOME", SWIG_From_int(static_cast< int >(Gosu::KB_HOME)));
   rb_define_const(mGosu, "KB_END", SWIG_From_int(static_cast< int >(Gosu::KB_END)));
-  rb_define_const(mGosu, "KB_PRINTSCREEN", SWIG_From_int(static_cast< int >(Gosu::KB_PRINTSCREEN)));
-  rb_define_const(mGosu, "KB_SCROLLLOCK", SWIG_From_int(static_cast< int >(Gosu::KB_SCROLLLOCK)));
+  rb_define_const(mGosu, "KB_PRINT_SCREEN", SWIG_From_int(static_cast< int >(Gosu::KB_PRINT_SCREEN)));
+  rb_define_const(mGosu, "KB_SCROLL_LOCK", SWIG_From_int(static_cast< int >(Gosu::KB_SCROLL_LOCK)));
   rb_define_const(mGosu, "KB_PAUSE", SWIG_From_int(static_cast< int >(Gosu::KB_PAUSE)));
   rb_define_const(mGosu, "KB_INSERT", SWIG_From_int(static_cast< int >(Gosu::KB_INSERT)));
   rb_define_const(mGosu, "KB_DELETE", SWIG_From_int(static_cast< int >(Gosu::KB_DELETE)));
@@ -12182,7 +12177,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KB_COMMA", SWIG_From_int(static_cast< int >(Gosu::KB_COMMA)));
   rb_define_const(mGosu, "KB_PERIOD", SWIG_From_int(static_cast< int >(Gosu::KB_PERIOD)));
   rb_define_const(mGosu, "KB_SLASH", SWIG_From_int(static_cast< int >(Gosu::KB_SLASH)));
-  rb_define_const(mGosu, "KB_CAPSLOCK", SWIG_From_int(static_cast< int >(Gosu::KB_CAPSLOCK)));
+  rb_define_const(mGosu, "KB_CAPS_LOCK", SWIG_From_int(static_cast< int >(Gosu::KB_CAPS_LOCK)));
   rb_define_const(mGosu, "KB_A", SWIG_From_int(static_cast< int >(Gosu::KB_A)));
   rb_define_const(mGosu, "KB_B", SWIG_From_int(static_cast< int >(Gosu::KB_B)));
   rb_define_const(mGosu, "KB_C", SWIG_From_int(static_cast< int >(Gosu::KB_C)));

data/src/WindowWrapper.cpp

@@ -55,20 +55,20 @@ void Gosu::WindowForWrapper::draw()
 
 void Gosu::WindowForWrapper::default_button_down(unsigned btn)
 {
-    Gosu::Window::button_down(Gosu::ButtonName(btn));
+    Gosu::Window::button_down(Gosu::Button(btn));
 }
 
 void Gosu::WindowForWrapper::button_down(Gosu::Button btn)
 {
     if (button_down_callback != nullptr) {
-        button_down_callback(btn.id());
+        button_down_callback(btn);
     }
 }
 
 void Gosu::WindowForWrapper::button_up(Gosu::Button btn)
 {
     if (button_up_callback != nullptr) {
-        button_up_callback(btn.id());
+        button_up_callback(btn);
     }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -186,7 +186,6 @@ files:
 - dependencies/utf8proc/utf8proc_data.h
 - ext/gosu/extconf.rb
 - include/Gosu/Audio.hpp
-- include/Gosu/AutoLink.hpp
 - include/Gosu/Bitmap.hpp
 - include/Gosu/Buttons.hpp
 - include/Gosu/Channel.h
@@ -227,12 +226,8 @@ files:
 - lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
 - lib/gosu/zen.rb
-- lib/libmpg123.dll
-- lib/libsndfile.dll
 - lib64/OpenAL32.dll
 - lib64/SDL2.dll
-- lib64/libmpg123.dll
-- lib64/libsndfile.dll
 - rdoc/gosu.rb
 - src/Audio.cpp
 - src/AudioFile.hpp
@@ -335,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/include/Gosu/AutoLink.hpp

@@ -1,14 +0,0 @@
-//! \file AutoLink.hpp
-//! Contains pragmas that make MSVC link against all the necessary libraries
-//! automatically.
-
-#ifdef _MSC_VER
-#pragma once
-
-#ifdef NDEBUG
-#pragma comment(lib, "Gosu.lib")
-#else
-#pragma comment(lib, "GosuDebug.lib")
-#endif
-
-#endif