gosu 0.7.45-x86-mingw32 → 0.7.46-x86-mingw32

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2004-2012 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2004-2013 Julian Raschke, Jan Lücker and all contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -18,17 +18,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-                  Julian Raschke  julian@raschke.de
-                  Jan Lücker     jan.luecker@gmx.de
+            Julian Raschke <julian@raschke.de> & contributors
                         http://www.libgosu.org/
 
                                   ***
 
-This does NOT apply to audiere.dll shipped with the Windows versions of
-Gosu. Audiere is a separate library licensed under the Lesser General
-Public License. Please consult http://audiere.sf.net/ for more details.
-
-This does also NOT apply to libogg and libvorbis, which are included in
-all source and binary distributions of Gosu, sometimes via audiere. These
-projects are licensed under a BSD-like license, and their copyright terms
-need to be supplied even with binary redistributions (e.g. Gosu games).
+This does NOT apply to libogg and libvorbis, which are included in all source
+and binary distributions of Gosu. These projects are licensed under a BSD-like
+license, and their copyright terms need to be supplied even with binary
+redistributions (e.g. Gosu games).

data/Gosu/{ButtonsWin.hpp → Buttons.hpp}

@@ -126,14 +126,101 @@ namespace Gosu
         gpButton13,
         gpButton14,
         gpButton15,
-        gpRangeEnd = 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,
-        
-        numButtons = gpRangeEnd,
-		noButton = 0xffffffff
+        gpNumPerGamepad = gpNum / (numGamepads + 1),
 	};
 }
 

data/Gosu/ButtonsMac.hpp

@@ -126,14 +126,101 @@ namespace Gosu
         gpButton13,
         gpButton14,
         gpButton15,
-        gpRangeEnd = 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,
-        
-        numButtons = gpRangeEnd + 1,
-		noButton = 0xffffffff
+        gpNumPerGamepad = gpNum / (numGamepads + 1),
     };
 }
     

data/Gosu/Graphics.hpp

@@ -23,7 +23,17 @@ namespace Gosu
     //! Useful when extending Gosu using OpenGL.
     unsigned const MAX_TEXTURE_SIZE = 1024;
     
+    #ifdef GOSU_IS_MAC
+    struct Transform
+    {
+        double value[16];
+        bool operator==(const Transform &other) { for (int i = 0; i < 16; ++i) if ((*this)[i] != other[i]) return false; return true; }
+        const double &operator[](std::size_t idx) const { return value[idx]; }
+        double &operator[](std::size_t idx) { return value[idx]; }
+    };
+    #else
     typedef std::tr1::array<double, 16> Transform;
+    #endif
     Transform translate(double x, double y);
     Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
     Transform scale(double factor);

data/Gosu/ImageData.hpp

@@ -6,6 +6,7 @@
 
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Fwd.hpp>
 
 namespace Gosu
 {

data/Gosu/Input.hpp

@@ -8,7 +8,7 @@
 #include <Gosu/Platform.hpp>
 
 #ifdef GOSU_IS_WIN
-#include <Gosu/ButtonsWin.hpp>
+#include <Gosu/Buttons.hpp>
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
@@ -20,10 +20,9 @@
 #endif
 
 #ifdef GOSU_IS_X
+#include <Gosu/Buttons.hpp>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
-#include <Gosu/ButtonsX.hpp>
 #endif
 
 #include <Gosu/Platform.hpp>

data/Gosu/Version.hpp

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

data/Gosu/Window.hpp

@@ -74,7 +74,7 @@ namespace Gosu
         //! This function is called when the operating system's memory is low.
         //! So far, it is only called in iOS applications.
         virtual void releaseMemory() {}
-        
+
         //! Called before update when the user pressed a button while the
         //! window had the focus.
         virtual void buttonDown(Gosu::Button) {}

data/lib/gosu/swig_patches.rb

@@ -27,8 +27,8 @@ class Gosu::Window
   end
   
   def gl(*args, &block)
-    $gosu_blocks ||= []
-    $gosu_blocks << block
+    $gosu_gl_blocks ||= []
+    $gosu_gl_blocks << block
     unsafe_gl(*args, &block)
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 95
   prerelease: 
   segments: 
   - 0
   - 7
-  - 45
-  version: 0.7.45
+  - 46
+  version: 0.7.46
 platform: x86-mingw32
 authors: 
 - Julian Raschke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2013-03-31 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"
@@ -34,9 +34,8 @@ files:
 - Gosu/Audio.hpp
 - Gosu/AutoLink.hpp
 - Gosu/Bitmap.hpp
+- Gosu/Buttons.hpp
 - Gosu/ButtonsMac.hpp
-- Gosu/ButtonsWin.hpp
-- Gosu/ButtonsX.hpp
 - Gosu/Color.hpp
 - Gosu/Directories.hpp
 - Gosu/Font.hpp
@@ -44,28 +43,28 @@ files:
 - Gosu/Gosu.hpp
 - Gosu/Graphics.hpp
 - Gosu/GraphicsBase.hpp
+- Gosu/IO.hpp
 - Gosu/Image.hpp
 - Gosu/ImageData.hpp
 - Gosu/Input.hpp
 - Gosu/Inspection.hpp
-- Gosu/IO.hpp
 - Gosu/Math.hpp
 - Gosu/Platform.hpp
 - Gosu/Sockets.hpp
+- Gosu/TR1.hpp
 - Gosu/Text.hpp
 - Gosu/TextInput.hpp
 - Gosu/Timing.hpp
-- Gosu/TR1.hpp
 - Gosu/Utility.hpp
 - Gosu/Version.hpp
-- Gosu/Window.hpp
 - Gosu/WinUtility.hpp
+- Gosu/Window.hpp
+- lib/gosu.rb
 - lib/gosu/patches.rb
 - lib/gosu/preview.rb
 - lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
 - lib/gosu/zen.rb
-- lib/gosu.rb
 - examples/ChipmunkIntegration.rb
 - examples/CptnRuby.rb
 - examples/GosuZen.rb
@@ -97,8 +96,8 @@ files:
 - lib/gosu.for_1_8.so
 - lib/gosu.for_1_9.so
 - lib/FreeImage.dll
-- lib/libsndfile.dll
 - lib/OpenAL32.dll
+- lib/libsndfile.dll
 homepage: http://www.libgosu.org/
 licenses: []
 

data/Gosu/ButtonsX.hpp

@@ -1,141 +0,0 @@
-#ifndef GOSU_BUTTONSX_HPP
-#define GOSU_BUTTONSX_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,
-        kbA = 'a',
-        kbB = 'b',
-        kbC = 'c',
-        kbD = 'd',
-        kbE = 'e',
-        kbF = 'f',
-        kbG = 'g',
-        kbH = 'h',
-        kbI = 'i',
-        kbJ = 'j',
-        kbK = 'k',
-        kbL = 'l',
-        kbM = 'm',
-        kbN = 'n',
-        kbO = 'o',
-        kbP = 'p',
-        kbQ = 'q',
-        kbR = 'r',
-        kbS = 's',
-        kbT = 't',
-        kbU = 'u',
-        kbV = 'v',
-        kbW = 'w',
-        kbX = 'x',
-        kbY = 'y',
-        kbZ = 'z',
-        kbEscape = XK_Escape,
-        kbF1 = XK_F1,
-        kbF2 = XK_F2,
-        kbF3 = XK_F3,
-        kbF4 = XK_F4,
-        kbF5 = XK_F5,
-        kbF6 = XK_F6,
-        kbF7 = XK_F7,
-        kbF8 = XK_F8,
-        kbF9 = XK_F9,
-        kbF10 = XK_F10,
-        kbF11 = XK_F11,
-        kbF12 = XK_F12,
-        kb1 = XK_1,
-        kb2 = XK_2,
-        kb3 = XK_3,
-        kb4 = XK_4,
-        kb5 = XK_5,
-        kb6 = XK_6,
-        kb7 = XK_7,
-        kb8 = XK_8,
-        kb9 = XK_9,
-        kb0 = XK_0,
-        kbTab = XK_Tab,
-        kbReturn = XK_Return,
-        kbSpace = XK_space,
-        kbLeftShift = XK_Shift_L,
-        kbRightShift = XK_Shift_R,
-        kbLeftControl = XK_Control_L,
-        kbRightControl = XK_Control_R,
-        kbLeftAlt = XK_Alt_L,
-        kbRightAlt = XK_Alt_R,
-        kbLeftMeta = XK_Meta_L,
-        kbRightMeta = XK_Meta_R,
-        kbBackspace = XK_BackSpace,
-        kbLeft = XK_Left,
-        kbRight = XK_Right,
-        kbUp = XK_Up,
-        kbDown = XK_Down,
-        kbHome = XK_Home,
-        kbEnd = XK_End,
-        kbInsert = XK_Insert,
-        kbDelete = XK_Delete,
-        kbPageUp = XK_Prior,
-        kbPageDown = XK_Next,
-        kbEnter = XK_KP_Enter,
-        kbNumpad1 = XK_KP_1,
-        kbNumpad2 = XK_KP_2,
-        kbNumpad3 = XK_KP_3,
-        kbNumpad4 = XK_KP_4,
-        kbNumpad5 = XK_KP_5,
-        kbNumpad6 = XK_KP_6,
-        kbNumpad7 = XK_KP_7,
-        kbNumpad8 = XK_KP_8,
-        kbNumpad9 = XK_KP_9,
-        kbNumpad0 = XK_KP_0,
-        kbNumpadAdd = XK_KP_Add,
-        kbNumpadSubtract = XK_KP_Subtract,
-        kbNumpadMultiply = XK_KP_Multiply,
-        kbNumpadDivide = XK_KP_Divide,
-        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,
-        gpRangeEnd = gpButton15,
-        
-        kbNum = kbRangeEnd - kbRangeBegin + 1,
-        msNum = msRangeEnd - msRangeBegin + 1,
-        gpNum = gpRangeEnd - gpRangeBegin + 1,
-        
-        numButtons = gpRangeEnd,
-        noButton = 0xffffffff
-    };
-}
-
-#endif
-