gosu 0.7.46-x86-mingw32 → 0.7.47.1-x86-mingw32

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  data.tar.gz: 9a68c14a687fefa882fbaec9a73d761b6e90fde7c01c2cfd2248aa73df913bf99b1adc5b97b98c908412426c71cf5058331dc82d12a32778fb6418c219c71093
+  metadata.gz: 1a37cd19776555e63ca83cadf16ec5d5bfcac2687d1ff6a75b11a1adedf91e6bfb499345b6414b4bc19edca6dc8175c39041d11ea27a7ca8b86ada4b9336be6a
+SHA1: 
+  data.tar.gz: d10f7b72a9e19fdab4154ac068bb42cf9a6cbb07
+  metadata.gz: 8cfcf0988dc79dc4f2de3703baddc650b01b09fb

data/Gosu/Buttons.hpp

@@ -1,5 +1,19 @@
-#ifndef GOSU_BUTTONSWIN_HPP
-#define GOSU_BUTTONSWIN_HPP
+#ifndef GOSU_BUTTONS_HPP
+#define GOSU_BUTTONS_HPP
+
+#include <Gosu/Platform.hpp>
+
+#ifdef GOSU_IS_MAC
+    #define GOSU_SCANCODE(mac, windows_or_linux) mac
+    #define GOSU_SPECIAL_SCANCODE(mac, windows, linux) mac
+#else
+    #define GOSU_SCANCODE(mac, linux_or_windows) linux_or_windows
+    #ifdef GOSU_IS_WIN
+        #define GOSU_SPECIAL_SCANCODE(mac, windows, linux) windows
+    #else
+        #define GOSU_SPECIAL_SCANCODE(mac, windows, linux) linux
+    #endif
+#endif
 
 namespace Gosu
 {
@@ -8,93 +22,104 @@ namespace Gosu
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
 	{
-        kbRangeBegin = 0x00,
-		kbEscape = 0x01,
-		kbF1 = 0x3b,
-		kbF2 = 0x3c,
-		kbF3 = 0x3d,
-		kbF4 = 0x3e,
-		kbF5 = 0x3f,
-		kbF6 = 0x40,
-		kbF7 = 0x41,
-		kbF8 = 0x42,
-		kbF9 = 0x43,
-		kbF10 = 0x44,
-		kbF11 = 0x57,
-		kbF12 = 0x58,
-		kb0 = 0x0b,
-		kb1 = 0x02,
-		kb2 = 0x03,
-		kb3 = 0x04,
-		kb4 = 0x05,
-		kb5 = 0x06,
-		kb6 = 0x07,
-		kb7 = 0x08,
-		kb8 = 0x09,
-		kb9 = 0x0a,
-		kbTab = 0x0f,
-		kbReturn = 0x1c,
-		kbSpace = 0x39,
-		kbLeftShift = 0x2a,
-		kbRightShift = 0x36,
-		kbLeftControl = 0x1d,
-		kbRightControl = 0x9d,
-		kbLeftAlt = 0x38,
-		kbRightAlt = 0xb8,
-		kbLeftMeta = 0xdb,
-		kbRightMeta = 0xdc,
-		kbBackspace = 0x0e,
-		kbLeft = 0xcb,
-		kbRight = 0xcd,
-		kbUp = 0xc8,
-		kbDown = 0xd0,
-		kbHome = 0xc7,
-		kbEnd = 0xcf,
-		kbInsert = 0xd2,
-		kbDelete = 0xd3,
-		kbPageUp = 0xc9,
-		kbPageDown = 0xd1,
-		kbEnter = 0x9c,
-		kbA = 0x1e,
-		kbB = 0x30,
-		kbC = 0x2e,
-		kbD = 0x20,
-		kbE = 0x12,
-		kbF = 0x21,
-		kbG = 0x22,
-		kbH = 0x23,
-		kbI = 0x17,
-		kbJ = 0x24,
-		kbK = 0x25,
-		kbL = 0x26,
-		kbM = 0x32,
-		kbN = 0x31,
-		kbO = 0x18,
-		kbP = 0x19,
-		kbQ = 0x10,
-		kbR = 0x13,
-		kbS = 0x1f,
-		kbT = 0x14,
-		kbU = 0x16,
-		kbV = 0x2f,
-		kbW = 0x11,
-		kbX = 0x2d,
-		kbY = 0x15,
-		kbZ = 0x2c,
-		kbNumpad0 = 0x52,
-		kbNumpad1 = 0x4f,
-		kbNumpad2 = 0x50,
-		kbNumpad3 = 0x51,
-		kbNumpad4 = 0x4b,
-		kbNumpad5 = 0x4c,
-		kbNumpad6 = 0x4d,
-		kbNumpad7 = 0x47,
-		kbNumpad8 = 0x48,
-		kbNumpad9 = 0x49,
-		kbNumpadAdd = 0x4e,
-		kbNumpadSubtract = 0x4a,
-		kbNumpadMultiply = 0x37,
-		kbNumpadDivide = 0xb5,
+        kbRangeBegin,
+		kbEscape = GOSU_SCANCODE(0x35, 0x01),
+		kbF1 = GOSU_SCANCODE(0x7a, 0x3b),
+		kbF2 = GOSU_SCANCODE(0x78, 0x3c),
+		kbF3 = GOSU_SCANCODE(0x63, 0x3d),
+		kbF4 = GOSU_SCANCODE(0x76, 0x3e),
+		kbF5 = GOSU_SCANCODE(0x60, 0x3f),
+		kbF6 = GOSU_SCANCODE(0x61, 0x40),
+		kbF7 = GOSU_SCANCODE(0x62, 0x41),
+		kbF8 = GOSU_SCANCODE(0x64, 0x42),
+		kbF9 = GOSU_SCANCODE(0x65, 0x43),
+		kbF10 = GOSU_SCANCODE(0x6d, 0x44),
+		kbF11 = GOSU_SCANCODE(0x67, 0x57),
+		kbF12 = GOSU_SCANCODE(0x6f, 0x58),
+		kb0 = GOSU_SCANCODE(0x1d, 0x0b),
+		kb1 = GOSU_SCANCODE(0x12, 0x02),
+		kb2 = GOSU_SCANCODE(0x13, 0x03),
+		kb3 = GOSU_SCANCODE(0x14, 0x04),
+		kb4 = GOSU_SCANCODE(0x15, 0x05),
+		kb5 = GOSU_SCANCODE(0x17, 0x06),
+		kb6 = GOSU_SCANCODE(0x16, 0x07),
+		kb7 = GOSU_SCANCODE(0x1a, 0x08),
+		kb8 = GOSU_SCANCODE(0x1c, 0x09),
+		kb9 = GOSU_SCANCODE(0x19, 0x0a),
+		kbTab = GOSU_SCANCODE(0x30, 0x0f),
+		kbReturn = GOSU_SCANCODE(0x24, 0x1c),
+		kbSpace = GOSU_SCANCODE(0x31, 0x39),
+		kbLeftShift = GOSU_SCANCODE(0x38, 0x2a),
+		kbRightShift = GOSU_SCANCODE(0x3c, 0x36),
+		kbLeftControl = GOSU_SCANCODE(0x3b, 0x1d),
+		kbRightControl = GOSU_SPECIAL_SCANCODE(0x3e, 0x9d, 0x61),
+		kbLeftAlt = GOSU_SCANCODE(0x3a, 0x38),
+		kbRightAlt = GOSU_SPECIAL_SCANCODE(0x3d, 0xb8, 0x64),
+		kbLeftMeta = GOSU_SPECIAL_SCANCODE(0x37, 0xdb, 0x7d),
+		kbRightMeta = GOSU_SPECIAL_SCANCODE(0x36, 0xdc, 0x7e),
+		kbBackspace = GOSU_SCANCODE(0x33, 0x0e),
+		kbLeft = GOSU_SPECIAL_SCANCODE(0x7b, 0xcb, 0x69),
+		kbRight = GOSU_SPECIAL_SCANCODE(0x7c, 0xcd, 0x6a),
+		kbUp = GOSU_SPECIAL_SCANCODE(0x7e, 0xc8, 0x67),
+		kbDown = GOSU_SPECIAL_SCANCODE(0x7d, 0xd0, 0x6c),
+		kbHome = GOSU_SPECIAL_SCANCODE(0x73, 0xc7, 0x66),
+		kbEnd = GOSU_SPECIAL_SCANCODE(0x77, 0xcf, 0x6b),
+		kbInsert = GOSU_SPECIAL_SCANCODE(0x72, 0xd2, 0x6e),
+		kbDelete = GOSU_SPECIAL_SCANCODE(0x75, 0xd3, 0x6f),
+		kbPageUp = GOSU_SPECIAL_SCANCODE(0x74, 0xc9, 0x68),
+		kbPageDown = GOSU_SPECIAL_SCANCODE(0x79, 0xd1, 0x6d),
+		kbEnter = GOSU_SPECIAL_SCANCODE(0x4c, 0x9c, 0x60),
+		kbBacktick = GOSU_SCANCODE(0x32, 0x29),
+		kbMinus = GOSU_SCANCODE(0x1b, 0x0c),
+		kbEqual = GOSU_SCANCODE(0x18, 0x0d),
+		kbBracketLeft = GOSU_SCANCODE(0x21, 0x1a),
+		kbBracketRight = GOSU_SCANCODE(0x1e, 0x1b),
+		kbBackslash = GOSU_SCANCODE(0x2a, 0x2b),
+		kbSemicolon = GOSU_SCANCODE(0x29, 0x27),
+		kbApostrophe = GOSU_SCANCODE(0x27, 0x28),
+		kbComma = GOSU_SCANCODE(0x2b, 0x33),
+		kbPeriod = GOSU_SCANCODE(0x2f, 0x34),
+		kbSlash = GOSU_SCANCODE(0x2c, 0x35),
+		kbA = GOSU_SCANCODE(0x00, 0x1e),
+		kbB = GOSU_SCANCODE(0x0b, 0x30),
+		kbC = GOSU_SCANCODE(0x08, 0x2e),
+		kbD = GOSU_SCANCODE(0x02, 0x20),
+		kbE = GOSU_SCANCODE(0x0e, 0x12),
+		kbF = GOSU_SCANCODE(0x03, 0x21),
+		kbG = GOSU_SCANCODE(0x05, 0x22),
+		kbH = GOSU_SCANCODE(0x04, 0x23),
+		kbI = GOSU_SCANCODE(0x22, 0x17),
+		kbJ = GOSU_SCANCODE(0x26, 0x24),
+		kbK = GOSU_SCANCODE(0x28, 0x25),
+		kbL = GOSU_SCANCODE(0x25, 0x26),
+		kbM = GOSU_SCANCODE(0x2e, 0x32),
+		kbN = GOSU_SCANCODE(0x2d, 0x31),
+		kbO = GOSU_SCANCODE(0x1f, 0x18),
+		kbP = GOSU_SCANCODE(0x23, 0x19),
+		kbQ = GOSU_SCANCODE(0x0c, 0x10),
+		kbR = GOSU_SCANCODE(0x0f, 0x13),
+		kbS = GOSU_SCANCODE(0x01, 0x1f),
+		kbT = GOSU_SCANCODE(0x11, 0x14),
+		kbU = GOSU_SCANCODE(0x20, 0x16),
+		kbV = GOSU_SCANCODE(0x09, 0x2f),
+		kbW = GOSU_SCANCODE(0x0d, 0x11),
+		kbX = GOSU_SCANCODE(0x07, 0x2d),
+		kbY = GOSU_SCANCODE(0x10, 0x15),
+		kbZ = GOSU_SCANCODE(0x06, 0x2c),
+		kbNumpad0 = GOSU_SCANCODE(0x52, 0x52),
+		kbNumpad1 = GOSU_SCANCODE(0x53, 0x4f),
+		kbNumpad2 = GOSU_SCANCODE(0x54, 0x50),
+		kbNumpad3 = GOSU_SCANCODE(0x55, 0x51),
+		kbNumpad4 = GOSU_SCANCODE(0x56, 0x4b),
+		kbNumpad5 = GOSU_SCANCODE(0x57, 0x4c),
+		kbNumpad6 = GOSU_SCANCODE(0x58, 0x4d),
+		kbNumpad7 = GOSU_SCANCODE(0x59, 0x47),
+		kbNumpad8 = GOSU_SCANCODE(0x5b, 0x48),
+		kbNumpad9 = GOSU_SCANCODE(0x5c, 0x49),
+		kbNumpadAdd = GOSU_SCANCODE(0x45, 0x4e),
+		kbNumpadSubtract = GOSU_SCANCODE(0x4e, 0x4a),
+		kbNumpadMultiply = GOSU_SCANCODE(0x43, 0x37),
+		kbNumpadDivide = GOSU_SCANCODE(0x4b, 0xb5),
 		kbRangeEnd = 0xff,
 
         msRangeBegin,
@@ -103,7 +128,15 @@ namespace Gosu
         msMiddle,
         msWheelUp,
         msWheelDown,
-        msRangeEnd,
+        msOther0,
+        msOther1,
+        msOther2,
+        msOther3,
+        msOther4,
+        msOther5,
+        msOther6,
+        msOther7,
+        msRangeEnd = 0x110,
         
         gpRangeBegin,
         gpLeft = gpRangeBegin,
@@ -224,4 +257,7 @@ namespace Gosu
 	};
 }
 
+#undef GOSU_SCANCODE
+#undef GOSU_SPECIAL_SCANCODE
+
 #endif

data/Gosu/Graphics.hpp

@@ -24,6 +24,10 @@ namespace Gosu
     unsigned const MAX_TEXTURE_SIZE = 1024;
     
     #ifdef GOSU_IS_MAC
+    // TODO: Without this gigantic hack, Gosu crashes in the "scale" function,
+    // but _only_ when used from Ruby 1.9. It is unclear what might cause this -
+    // maybe a compiler bug that tries to use SSE functions with the wrong
+    // alignment. Adding __attribute__((aligned(16))) does not help, though.
     struct Transform
     {
         double value[16];

data/Gosu/Input.hpp

@@ -6,28 +6,21 @@
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Buttons.hpp>
+#include <Gosu/TR1.hpp>
 
 #ifdef GOSU_IS_WIN
-#include <Gosu/Buttons.hpp>
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
 #include <windows.h>
 #endif
 
-#ifdef GOSU_IS_MAC
-#include <Gosu/ButtonsMac.hpp>
-#endif
-
 #ifdef GOSU_IS_X
-#include <Gosu/Buttons.hpp>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
 
-#include <Gosu/Platform.hpp>
-#include <Gosu/Fwd.hpp>
-#include <Gosu/TR1.hpp>
 #include <vector>
 
 namespace Gosu

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 46
-#define GOSU_VERSION "0.7.46"
+#define GOSU_POINT_VERSION 47
+#define GOSU_VERSION "0.7.47.1"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/lib/gosu/patches.rb

@@ -75,4 +75,7 @@ class Gosu::Window
 end
 
 # Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit { Gosu::_release_all_openal_resources }
+at_exit do
+  Gosu::Song.current_song.stop if Gosu::Song.current_song
+  Gosu::_release_all_openal_resources
+end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 95
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 46
-  version: 0.7.46
+  version: 0.7.47.1
 platform: x86-mingw32
 authors: 
 - Julian Raschke
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-31 00:00:00 Z
+date: 2013-04-01 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
@@ -35,7 +29,6 @@ files:
 - Gosu/AutoLink.hpp
 - Gosu/Bitmap.hpp
 - Gosu/Buttons.hpp
-- Gosu/ButtonsMac.hpp
 - Gosu/Color.hpp
 - Gosu/Directories.hpp
 - Gosu/Font.hpp
@@ -101,6 +94,8 @@ files:
 homepage: http://www.libgosu.org/
 licenses: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: 
 - README.txt
@@ -117,31 +112,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 51
-      segments: 
-      - 1
-      - 8
-      - 2
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: 2D game development library.
 test_files: []
 

data/Gosu/ButtonsMac.hpp

@@ -1,227 +0,0 @@
-#ifndef GOSU_BUTTONSMAC_HPP
-#define GOSU_BUTTONSMAC_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
-    {
-        kbRangeBegin = 0x00,
-        kbEscape = 0x35,
-        kbF1 = 0x7a,
-        kbF2 = 0x78,
-        kbF3 = 0x63,
-        kbF4 = 0x76,
-        kbF5 = 0x60,
-        kbF6 = 0x61,
-        kbF7 = 0x62,
-        kbF8 = 0x64,
-        kbF9 = 0x65,
-        kbF10 = 0x6d,
-        kbF11 = 0x67,
-        kbF12 = 0x6f,
-        kb1 = 0x12,
-        kb2 = 0x13,
-        kb3 = 0x14,
-        kb4 = 0x15,
-        kb5 = 0x17,
-        kb6 = 0x16,
-        kb7 = 0x1a,
-        kb8 = 0x1c,
-        kb9 = 0x19,
-        kb0 = 0x1d,
-        kbA	= 0x00,
-        kbB	= 0x0b,
-        kbC	= 0x08,
-        kbD	= 0x02,
-        kbE	= 0x0e,
-        kbF	= 0x03,
-        kbG	= 0x05,
-        kbH	= 0x04,
-        kbI	= 0x22,
-        kbJ	= 0x26,
-        kbK	= 0x28,
-        kbL	= 0x25,
-        kbM	= 0x2e,
-        kbN	= 0x2d,
-        kbO	= 0x1f,
-        kbP	= 0x23,
-        kbQ	= 0x0c,
-        kbR	= 0x0f,
-        kbS	= 0x01,
-        kbT	= 0x11,
-        kbU	= 0x20,
-        kbV	= 0x09,
-        kbW	= 0x0d,
-        kbX	= 0x07,
-        kbY	= 0x10,
-        kbZ	= 0x06,
-        kbTab = 0x30,
-        kbReturn = 0x24,
-        kbSpace = 0x31,
-        kbLeftShift = 0x38,
-        kbRightShift = 0x3c,
-        kbLeftControl = 0x3b,
-        kbRightControl = 0x3e,
-        kbLeftAlt = 0x3a,
-        kbRightAlt = 0x3d,
-        kbLeftMeta = 0x37,
-        kbRightMeta = 0x36,
-        kbBackspace = 0x33,
-        kbLeft = 0x7b,
-        kbRight = 0x7c,
-        kbUp = 0x7e,
-        kbDown = 0x7d,
-        kbHome = 0x73,
-        kbEnd = 0x77,
-        kbInsert = 0x72,
-        kbDelete = 0x75,
-        kbPageUp = 0x74,
-        kbPageDown = 0x79,
-        kbEnter = 0x4c,
-        kbNumpad1 = 0x53,
-        kbNumpad2 = 0x54,
-        kbNumpad3 = 0x55,
-        kbNumpad4 = 0x56,
-        kbNumpad5 = 0x57,
-        kbNumpad6 = 0x58,
-        kbNumpad7 = 0x59,
-        kbNumpad8 = 0x5b,
-        kbNumpad9 = 0x5c,
-        kbNumpad0 = 0x52,
-        kbNumpadAdd = 0x45,
-        kbNumpadSubtract = 0x4e,
-        kbNumpadMultiply = 0x43,
-        kbNumpadDivide = 0x4b,
-        kbRangeEnd = 0xffff,
-        
-        msRangeBegin,
-        msLeft = msRangeBegin,
-        msRight,
-        msMiddle,
-        msWheelUp,
-        msWheelDown,
-        msRangeEnd,
-        
-        gpRangeBegin,
-        gpLeft = gpRangeBegin,
-        gpRight,
-        gpUp,
-        gpDown,
-        gpButton0,
-        gpButton1,
-        gpButton2,
-        gpButton3,
-        gpButton4,
-        gpButton5,
-        gpButton6,
-        gpButton7,
-        gpButton8,
-        gpButton9,
-        gpButton10,
-        gpButton11,
-        gpButton12,
-        gpButton13,
-        gpButton14,
-        gpButton15,
-
-        gp0Left,
-        gp0Right,
-        gp0Up,
-        gp0Down,
-        gp0Button0,
-        gp0Button1,
-        gp0Button2,
-        gp0Button3,
-        gp0Button4,
-        gp0Button5,
-        gp0Button6,
-        gp0Button7,
-        gp0Button8,
-        gp0Button9,
-        gp0Button10,
-        gp0Button11,
-        gp0Button12,
-        gp0Button13,
-        gp0Button14,
-        gp0Button15,
-        
-        gp1Left,
-        gp1Right,
-        gp1Up,
-        gp1Down,
-        gp1Button0,
-        gp1Button1,
-        gp1Button2,
-        gp1Button3,
-        gp1Button4,
-        gp1Button5,
-        gp1Button6,
-        gp1Button7,
-        gp1Button8,
-        gp1Button9,
-        gp1Button10,
-        gp1Button11,
-        gp1Button12,
-        gp1Button13,
-        gp1Button14,
-        gp1Button15,
-        
-        gp2Left,
-        gp2Right,
-        gp2Up,
-        gp2Down,
-        gp2Button0,
-        gp2Button1,
-        gp2Button2,
-        gp2Button3,
-        gp2Button4,
-        gp2Button5,
-        gp2Button6,
-        gp2Button7,
-        gp2Button8,
-        gp2Button9,
-        gp2Button10,
-        gp2Button11,
-        gp2Button12,
-        gp2Button13,
-        gp2Button14,
-        gp2Button15,
-        
-        gp3Left,
-        gp3Right,
-        gp3Up,
-        gp3Down,
-        gp3Button0,
-        gp3Button1,
-        gp3Button2,
-        gp3Button3,
-        gp3Button4,
-        gp3Button5,
-        gp3Button6,
-        gp3Button7,
-        gp3Button8,
-        gp3Button9,
-        gp3Button10,
-        gp3Button11,
-        gp3Button12,
-        gp3Button13,
-        gp3Button14,
-        gp3Button15,
-        
-        gpRangeEnd = gp3Button15,
-        
-        numButtons = gpRangeEnd + 1,
-        numGamepads = 4,
-        noButton = 0xffffffff,
-        
-        kbNum = kbRangeEnd - kbRangeBegin + 1,
-        msNum = msRangeEnd - msRangeBegin + 1,
-        gpNum = gpRangeEnd - gpRangeBegin + 1,
-        gpNumPerGamepad = gpNum / (numGamepads + 1),
-    };
-}
-    
-#endif