gosu 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed0ac66341075737207ca2339bf55a0fb6d32706
-  data.tar.gz: 1dfdefbffd3829dfe825abdd1c83e8eae9a6037e
+  metadata.gz: a99fd67ed15c43d6baa549fcf60a0ad00b08bd7b
+  data.tar.gz: 9691a5d023c9f8e3f92862eed8fddf613916c53f
 SHA512:
-  metadata.gz: 197fba0e97d66a57276e219fcf314dd57786b008b8779e9fc4b7ec89619e8b3874157581e5e1ba14272c5fe95e51706a606dac0152ebf56fbfcb43dd097026cc
-  data.tar.gz: 3025dd68ae612cb1450aabbc728f63d60532ec46f85bc8fe65af53a6302474d26647901666c1dbe3c9c1a50e2204c9e1ba5d960eab5d9c53511600006ca3a523
+  metadata.gz: 6c0952e4ebd1c1120f02f9d3f41bf173bc659784b2a08549326f41d63b860b2b6102e754c54b50dfa94268825066b2bf5da5780a0b4b037598cdd6bdf604c27c
+  data.tar.gz: 1aaa547b027028f1db2ee54e10bfc5e6e6ddb8ec95df921778d753e07bcbd0cf4f213b83aaee5397ce893a6b943a92c71c202fd2c3258e09d3ec57b85deae14e

data/Gosu/Audio.hpp

@@ -21,7 +21,7 @@ namespace Gosu
 {
     // Deprecated.
     #ifndef SWIG
-    class GOSU_DEPRECATED Audio;
+    class Audio;
     #endif
 
     //! An instance of a Sample playing. Can be used to stop sounds dynamically,

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 8
-#define GOSU_POINT_VERSION 6
-#define GOSU_VERSION "0.8.6"
+#define GOSU_POINT_VERSION 7
+#define GOSU_VERSION "0.8.7"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/Gosu/Window.hpp

@@ -131,8 +131,8 @@ namespace Gosu
         virtual void touchEnded(Touch touch) {}
         #endif        
         
-        const Audio& audio() const;
-        Audio& audio();
+        GOSU_DEPRECATED const Audio& audio() const;
+        GOSU_DEPRECATED Audio& audio();
 
         #endif
     };

data/ext/gosu/extconf.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-WINDOWS_HINTS = %w(-win32 win32- mswin mingw32)
-
-if RUBY_PLATFORM =~ /mswin|mingw32|mingw64|win32\-|\-win32/ then
-  puts 'This gem is not meant to be installed on Windows. Instead, please use:'
-  puts 'gem install gosu --platform=i386-mingw32'
+if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/ then
+  platform = (RUBY_PLATFORM =~ /^x64-/ ? 'x64-mingw32' : 'i386-mingw32')
+  
+  puts "This gem is not meant to be installed on Windows. Instead, please use:"
+  puts "gem install gosu --platform=#{platform}"
   exit 1
 end
 

data/ext/gosu/gosu_wrap.cxx

@@ -10876,8 +10876,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   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 >(8)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(6)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.8.6"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(7)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.8.7"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nFreeImage, http://freeimage.sourceforge.net, FreeImage Public License\nlibogg & libvorbis, http://www.xiph.org, BSD License, 3-Clause Version, http://www.xiph.org/licenses/bsd\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);

data/lib/gosu.rb

@@ -1,16 +1,19 @@
 require 'rbconfig'
 
-if RUBY_PLATFORM =~ /mswin|mingw32|mingw64|win32\-|\-win32/ then
-  # Add this gem to the PATH on Windows so that DLLs can be found
-  ENV['PATH'] = "#{File.dirname(__FILE__)};#{ENV['PATH']}"
-end
-
-begin
+if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/ then
+  binary_path = File.dirname(__FILE__)
+  # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
+  binary_path += '64' if RUBY_PLATFORM =~ /^x64-/
+  
+  # Add this gem to the PATH on Windows so that bundled DLLs can be found.
+  ENV['PATH'] = "#{binary_path};#{ENV['PATH']}"
+  
+  # Add the correct directory 
   RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/gosu.#{RbConfig::CONFIG['DLEXT']}"
-rescue LoadError
-  require "gosu.#{RbConfig::CONFIG['DLEXT']}"
+  $LOAD_PATH.unshift "#{binary_path}/#{$1}"
 end
 
+require "gosu.#{RbConfig::CONFIG['DLEXT']}"
+
 require "gosu/swig_patches"
 require "gosu/patches"

data/lib/gosu/preview.rb

@@ -1,25 +1,25 @@
 require 'gosu'
 
-# Wrapper around Gosu 0.7 that provides the work-in-progress 0.8 interface
+# Wrapper around Gosu 0.4-0.8 that provides the work-in-progress 0.9 interface
 
 module Gosu
   class Font
-    alias :initialize07 :initialize
+    alias :initialize_old :initialize
     
     def initialize *args
       if args.first.is_a? Gosu::Window then
-        initialize07 *args
+        initialize_old *args
       else
         height  = args[0]
         options = args[1] || {}
         name = options[:name] || Gosu::default_font_name
-        initialize07 $window, name, height
+        initialize_old $window, name, height
       end
     end
   end
   
   class Window
-    alias :initialize07 :initialize
+    alias :initialize_old :initialize
     
     def initialize width, height, *args
       if args.empty? or args.first.is_a? Hash then
@@ -29,40 +29,40 @@ module Gosu
       else
        fullscreen, update_interval = *args
       end
-      $window = initialize07 width, height, fullscreen, update_interval
+      $window = initialize_old width, height, fullscreen, update_interval
     end
   end
   
   class Image
-    alias :initialize07 :initialize
+    alias :initialize_old :initialize
     
     def initialize *args
       if args.first.is_a? Gosu::Window then
-        initialize07 *args
+        initialize_old *args
       else
         source = args[0]
         tileable = !args[1] || args[1][:tileable]
         rect = args[1] && args[1][:rect]
         if rect then
-          initialize07 $window, source, !!tileable, *rect
+          initialize_old $window, source, !!tileable, *rect
         else
-          initialize07 $window, source, !!tileable
+          initialize_old $window, source, !!tileable
         end
       end
     end
     
     class <<self
-      alias load_tiles07 load_tiles
+      alias load_tiles_old load_tiles
     end
     
     def self.load_tiles *args
       if args.first.is_a? Gosu::Window then
-        load_tiles07 *args
+        load_tiles_old *args
       else
         source = args[0]
         x, y = args[1..2]
         tileable = !args[3] || args[3][:tileable]
-        load_tiles07 $window, source, x, y, !!tileable
+        load_tiles_old $window, source, x, y, !!tileable
       end
     end
     
@@ -109,6 +109,10 @@ module Gosu
     $window.draw_quad *args
   end
   
+  def self.draw_rect x, y, width, height, color = 0xffffffff, z, mode = :default
+    $window.draw_quad x, y, color, x + width, y, color, x, y + height, color, x + width, y + height, color, z, mode
+  end
+  
   def self.clip_to *args, &draw
     $window.clip_to *args, &draw
   end

data/src/Audio/AudioOpenAL.cpp

@@ -55,9 +55,9 @@ namespace
     bool curSongLooping;
 }
 
-// TODO: What is the NSAutoreleasePool good for?
+// TODO: What is this NSAutoreleasePool good for?
 #ifdef GOSU_IS_MAC
-#include "MacUtility.hpp"
+#include "../MacUtility.hpp"
     #define CONSTRUCTOR_COMMON \
         ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]); \
         if (!alChannelManagement.get()) \

data/src/Audio/AudioToolboxFile.hpp

@@ -7,9 +7,9 @@
 #include <AudioToolbox/ExtendedAudioFile.h>
 #include <OpenAL/al.h>
 #include <Gosu/IO.hpp>
-#include "MacUtility.hpp"
 #include <Gosu/Utility.hpp>
 #include <Gosu/Platform.hpp>
+#include "../MacUtility.hpp"
 #include <algorithm>
 #include <vector>
 #include <arpa/inet.h>

data/src/Audio/SndFile.hpp

@@ -15,7 +15,7 @@ namespace Gosu
         Reader reader;
         Buffer buffer;
         
-        // Cannot use /DELAYLOAD with libsndfile-1.dll because it was compiled
+        // Cannot use /DELAYLOAD with libsndfile.dll because it was compiled
         // using arcane GNU tools of dark magic (or maybe it's the filename).
         #ifdef GOSU_IS_WIN
         static HMODULE dll()
@@ -23,6 +23,7 @@ namespace Gosu
             static HMODULE dll = LoadLibrary(L"libsndfile.dll");
             if (!dll)
                 throw std::runtime_error("Cannot find libsndfile.dll");
+
             return dll;
         }
         

data/src/Bitmap/BitmapApple.mm

@@ -4,7 +4,7 @@
 #include <Gosu/Platform.hpp>
 #include <Gosu/Utility.hpp>
 
-#include "MacUtility.hpp"
+#include "../MacUtility.hpp"
 #include <stdexcept>
 
 #ifdef GOSU_IS_IPHONE

data/src/Input/Input.cpp

@@ -59,6 +59,15 @@ struct Gosu::Input::Impl
         int numGamepads = std::min<int>(Gosu::numGamepads, SDL_NumJoysticks());
         
         for (int i = 0; i < numGamepads; ++i) {
+            // Prefer the SDL_GameController API...
+            if (SDL_IsGameController(i)) {
+                SDL_GameController *gameController = SDL_GameControllerOpen(i);
+                if (gameController) {
+                    gameControllers.push_back(gameController);
+                    continue;
+                }
+            }
+            // ...but fall back on the good, old SDL_Joystick API :)
             SDL_Joystick *joystick = SDL_JoystickOpen(i);
             if (joystick) {
                 joysticks.push_back(joystick);
@@ -66,55 +75,41 @@ struct Gosu::Input::Impl
         }
     }
     
+    void releaseGamepads()
+    {
+        std::for_each(joysticks.begin(), joysticks.end(), &SDL_JoystickClose);
+        joysticks.clear();
+        std::for_each(gameControllers.begin(), gameControllers.end(), &SDL_GameControllerClose);
+        gameControllers.clear();
+    }
+    
+    typedef std::tr1::array<bool, gpNumPerGamepad> GamepadBuffer;
+    
     void pollGamepads()
     {
-        std::tr1::array<bool, gpNumPerGamepad> anyGamepad = { false };
+        // This gamepad is an OR-ed version of all the other gamepads. If button
+        // 3 is pressed on any attached gamepad, down(gpButton3) will return
+        // true. This is handy for singleplayer games.
+        GamepadBuffer anyGamepad = { false };
         
-        for (int i = 0; i < joysticks.size(); ++i) {
-            std::tr1::array<bool, gpNumPerGamepad> currentGamepad = { false };
-            
-            int axes = SDL_JoystickNumAxes(joysticks[i]),
-                hats = SDL_JoystickNumHats(joysticks[i]),
-                buttons = std::min<int>(gpNumPerGamepad - 4, SDL_JoystickNumButtons(joysticks[i]));
-            
-            for (int axis = 0; axis < axes; ++axis) {
-                Sint16 value = SDL_JoystickGetAxis(joysticks[i], axis);
-
-                if (value < -(1 << 14)) {
-                    if (axis % 2 == 0)
-                        currentGamepad[gpLeft - gpRangeBegin] = true;
-                    else
-                        currentGamepad[gpUp - gpRangeBegin] = true;
-                }
-                else if (value > +(1 << 14)) {
-                    if (axis % 2 == 0)
-                        currentGamepad[gpRight - gpRangeBegin] = true;
-                    else
-                        currentGamepad[gpDown - gpRangeBegin] = true;
-                }
-            }
+        std::size_t availableGamepads = gameControllers.size() + joysticks.size();
+        
+        for (int i = 0; i < availableGamepads; ++i) {
+            GamepadBuffer currentGamepad = { false };
             
-            for (int hat = 0; hat < hats; ++hat) {
-                Uint8 value = SDL_JoystickGetHat(joysticks[i], hat);
-                
-                if (value == SDL_HAT_LEFT || value == SDL_HAT_LEFTUP || value == SDL_HAT_LEFTDOWN)
-                    currentGamepad[gpLeft - gpRangeBegin] = true;
-                if (value == SDL_HAT_RIGHT || value == SDL_HAT_RIGHTUP || value == SDL_HAT_RIGHTDOWN)
-                    currentGamepad[gpRight - gpRangeBegin] = true;
-                if (value == SDL_HAT_UP || value == SDL_HAT_LEFTUP || value == SDL_HAT_RIGHTUP)
-                    currentGamepad[gpUp - gpRangeBegin] = true;
-                if (value == SDL_HAT_DOWN || value == SDL_HAT_LEFTDOWN || value == SDL_HAT_RIGHTDOWN)
-                    currentGamepad[gpDown - gpRangeBegin] = true;
+            // Poll data from SDL, using either of two API interfaces.
+            if (i < gameControllers.size()) {
+                SDL_GameController *gameController = gameControllers[i];
+                pollGameController(gameController, currentGamepad);
             }
-            
-            for (int button = 0; button < buttons; ++button) {
-                if (SDL_JoystickGetButton(joysticks[i], button)) {
-                    currentGamepad[gpButton0 + button - gpRangeBegin] = true;
-                }
+            else {
+                SDL_Joystick *joystick = joysticks[i];
+                pollJoystick(joystick, currentGamepad);
             }
             
+            // Now at the same time, enqueue all events for this particular
+            // gamepad, and OR the keyboard state into anyGamepad.
             int offset = gpRangeBegin + gpNumPerGamepad * (i + 1);
-            
             for (int j = 0; j < currentGamepad.size(); ++j) {
                 anyGamepad[j] = anyGamepad[j] || currentGamepad[j];
                 
@@ -129,6 +124,7 @@ struct Gosu::Input::Impl
             }
         }
         
+        // And lastly, enqueue events for the virtual "any" gamepad.
         for (int j = 0; j < anyGamepad.size(); ++j) {
             if (anyGamepad[j] && !buttonStates[j + gpRangeBegin]) {
                 buttonStates[j + gpRangeBegin] = true;
@@ -147,19 +143,98 @@ private:
     std::vector<int> eventQueue;
     
     std::vector<SDL_Joystick*> joysticks;
+    std::vector<SDL_GameController*> gameControllers;
+    
+    // SDL returns axis values in the range -2^15 through 2^15-1, so we consider
+    // -2^14 through 2^14 the dead zone.
+    
+    enum { DEAD_ZONE = (1 << 14) };
+    
+    void pollGameController(SDL_GameController *gameController, GamepadBuffer& gamepad)
+    {
+        gamepad[gpLeft - gpRangeBegin] =
+            SDL_GameControllerGetButton(gameController, SDL_CONTROLLER_BUTTON_DPAD_LEFT) ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTX) < -DEAD_ZONE ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX) < -DEAD_ZONE;
+        
+        gamepad[gpRight - gpRangeBegin] =
+            SDL_GameControllerGetButton(gameController, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTX) > +DEAD_ZONE ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX) > +DEAD_ZONE;
+        
+        gamepad[gpUp - gpRangeBegin] =
+            SDL_GameControllerGetButton(gameController, SDL_CONTROLLER_BUTTON_DPAD_UP) ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTY) < -DEAD_ZONE ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY) < -DEAD_ZONE;
+        
+        gamepad[gpDown - gpRangeBegin] =
+            SDL_GameControllerGetButton(gameController, SDL_CONTROLLER_BUTTON_DPAD_DOWN) ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTY) > +DEAD_ZONE ||
+            SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY) > +DEAD_ZONE;
+        
+        for (int button = SDL_CONTROLLER_BUTTON_A; button < SDL_CONTROLLER_BUTTON_DPAD_UP; ++button) {
+            gamepad[gpButton0 - gpRangeBegin + button - SDL_CONTROLLER_BUTTON_A] =
+                SDL_GameControllerGetButton(gameController, (SDL_GameControllerButton)button);
+        }
+    }
+    
+    void pollJoystick(SDL_Joystick *joystick, GamepadBuffer& gamepad)
+    {
+        int axes = SDL_JoystickNumAxes(joystick),
+            hats = SDL_JoystickNumHats(joystick),
+            buttons = std::min<int>(gpNumPerGamepad - 4, SDL_JoystickNumButtons(joystick));
+        
+        for (int axis = 0; axis < axes; ++axis) {
+            Sint16 value = SDL_JoystickGetAxis(joystick, axis);
+            
+            if (value < -DEAD_ZONE) {
+                if (axis % 2 == 0)
+                    gamepad[gpLeft - gpRangeBegin] = true;
+                else
+                    gamepad[gpUp - gpRangeBegin] = true;
+            }
+            else if (value > +DEAD_ZONE) {
+                if (axis % 2 == 0)
+                    gamepad[gpRight - gpRangeBegin] = true;
+                else
+                    gamepad[gpDown - gpRangeBegin] = true;
+            }
+        }
+        
+        for (int hat = 0; hat < hats; ++hat) {
+            Uint8 value = SDL_JoystickGetHat(joystick, hat);
+            
+            if (value & SDL_HAT_LEFT)
+                gamepad[gpLeft - gpRangeBegin] = true;
+            if (value & SDL_HAT_RIGHT)
+                gamepad[gpRight - gpRangeBegin] = true;
+            if (value & SDL_HAT_UP)
+                gamepad[gpUp - gpRangeBegin] = true;
+            if (value & SDL_HAT_DOWN)
+                gamepad[gpDown - gpRangeBegin] = true;
+        }
+        
+        for (int button = 0; button < buttons; ++button) {
+            if (SDL_JoystickGetButton(joystick, button)) {
+                gamepad[gpButton0 + button - gpRangeBegin] = true;
+            }
+        }
+    }
 };
 
 Gosu::Input::Input()
 : pimpl(new Impl(*this))
 {
-    SDL_InitSubSystem(SDL_INIT_JOYSTICK);
+    SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
     
     pimpl->initializeGamepads();
 }
 
 Gosu::Input::~Input()
 {
-    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+    pimpl->releaseGamepads();
+    
+    SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
 }
 
 bool Gosu::Input::feedSDLEvent(void* event)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.