gosu 0.7.50 → 0.8.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfaaac88bd71ec3192882427d272cab04134386
-  data.tar.gz: 734cf005cff5cadb1f8c446079d87c406b5235d7
+  metadata.gz: 44a9c34018bb68377bbebea3d2b032802164035f
+  data.tar.gz: c54379a8fc21c22f1134e25fcab64eb86b03affb
 SHA512:
-  metadata.gz: 9c936efca2c7b7924a151c35d6b2eafd3d4d02bec49cef0e0f63d1fb30fc650aaddc248ef0ed45938baa58f9fbcbe06bdd923aaf09668c85b98fe447dfa35999
-  data.tar.gz: 2fe577e9f04ad56536e10b7c58781f8e95417af937baa4bd96400f06b59611b6fc4d0f0278db12b1fc7d57496b13139646ec629c274f8493ef758ab44f6cf2ca
+  metadata.gz: 1097c5da7679685396bbd3dafa24ad914813a025277ad110b039a9ae8d8b70cae79b5188d3def18e08b5a668c0c32102d303957f3163c7ee3730069bf9ce795c
+  data.tar.gz: 47e91556e91d55cead8de660b37c621ab40a5f712f6047147f4424fce9b55f069a94b5c2b3eb6d378b1aee95139d7b82df5724789b7fc4cfd68129ffd4f67cd9

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2004-2013 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2001-2014 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"),

data/Gosu/Buttons.hpp

@@ -23,103 +23,103 @@ namespace Gosu
     enum ButtonName
 	{
         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),
+        kbEscape = 41,
+        kbF1 = 58,
+        kbF2 = 59,
+        kbF3 = 60,
+        kbF4 = 61,
+        kbF5 = 62,
+        kbF6 = 63,
+        kbF7 = 64,
+        kbF8 = 65,
+        kbF9 = 66,
+        kbF10 = 67,
+        kbF11 = 68,
+        kbF12 = 69,
+        kb0 = 30,
+        kb1 = 31,
+        kb2 = 32,
+        kb3 = 33,
+        kb4 = 34,
+        kb5 = 35,
+        kb6 = 36,
+        kb7 = 37,
+        kb8 = 38,
+        kb9 = 39,
+        kbTab = 43,
+        kbReturn = 40,
+        kbSpace = 44,
+        kbLeftShift = 225,
+        kbRightShift = 229,
+        kbLeftControl = 224,
+        kbRightControl = 228,
+        kbLeftAlt = 226,
+        kbRightAlt = 230,
+        kbLeftMeta = 227,
+        kbRightMeta = 231,
+        kbBackspace = 42,
+        kbLeft = 80,
+        kbRight = 79,
+        kbUp = 82,
+        kbDown = 81,
+        kbHome = 74,
+        kbEnd = 77,
+        kbInsert = 73,
+        kbDelete = 76,
+        kbPageUp = 75,
+        kbPageDown = 78,
+        kbEnter = 88,
+        kbBacktick = 53,
+        kbMinus = 45,
+        kbEqual = 46,        // TODO: Rename ->kbEquals
+        kbBracketLeft = 47,  // TODO: Rename ->kbLeftBracket
+        kbBracketRight = 48, // TODO: Rename ->kbRightBracket
+        kbBackslash = 49,
+        kbSemicolon = 51,
+        kbApostrophe = 52,
+        kbComma = 54,
+        kbPeriod = 55,
+        kbSlash = 49,
+        kbA = 4,
+        kbB = 5,
+        kbC = 6,
+        kbD = 7,
+        kbE = 8,
+        kbF = 9,
+        kbG = 10,
+        kbH = 11,
+        kbI = 12, 
+        kbJ = 13,
+        kbK = 14,
+        kbL = 15,
+        kbM = 16,
+        kbN = 17,
+        kbO = 18,
+        kbP = 19,
+        kbQ = 20,
+        kbR = 21,
+        kbS = 22,
+        kbT = 23,
+        kbU = 24,
+        kbV = 25,
+        kbW = 26,
+        kbX = 27,
+        kbY = 28,
+        kbZ = 29,
+        kbNumpad0 = 98,
+        kbNumpad1 = 89,
+        kbNumpad2 = 90,
+        kbNumpad3 = 91,
+        kbNumpad4 = 92,
+        kbNumpad5 = 93,
+        kbNumpad6 = 94,
+        kbNumpad7 = 95,
+        kbNumpad8 = 96,
+        kbNumpad9 = 97,
+        kbNumpadAdd = 87,      // TODO: Rename ->kbNumpadPlus
+        kbNumpadSubtract = 86, // TODO: Rename ->kbNumpadMinus
+        kbNumpadMultiply = 85,
+        kbNumpadDivide = 84,
 		kbRangeEnd = 0xff,
 
         msRangeBegin,

data/Gosu/Graphics.hpp

@@ -23,26 +23,6 @@ namespace Gosu
     //! Useful when extending Gosu using OpenGL.
     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];
-        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);
-    Transform scale(double factorX, double factorY, double fromX = 0, double fromY = 0);
-    
     //! Serves as the target of all drawing and provides primitive drawing
     //! functionality.
     //! Usually created internally by Gosu::Window.
@@ -51,21 +31,21 @@ namespace Gosu
         struct Impl;
         const GOSU_UNIQUE_PTR<Impl> pimpl;
         
-#if defined(GOSU_CPP11_ENABLED)
+    #if defined(GOSU_CPP11_ENABLED)
         // explicitly forbid copying and moving
         Graphics(Graphics&&) = delete;
         Graphics& operator=(Graphics&&) = delete;
         Graphics(const Graphics&) = delete;
         Graphics& operator=(const Graphics&) = delete;
-#endif
+    #endif
 
     public:
         Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
         ~Graphics();
 
-        // Undocumented until I have thought about this...
-        void setResolution(unsigned virtualWidth, unsigned virtualHeight);
-        // End of Undocumented
+        // TODO: Replace by setBaseTransform()
+        void setResolution(unsigned virtualWidth, unsigned virtualHeight,
+            double horizontalBlackBarWidth = 0, double verticalBlackBarHeight = 0);
         
         unsigned width() const;
         unsigned height() const;
@@ -85,7 +65,6 @@ namespace Gosu
         void beginGL();
         //! Resets Gosu into its default rendering state.
         void endGL();
-        //! (Experimental)
         //! Schedules a custom GL functor to be executed at a certain Z level.
         //! The functor is called in a clean GL context (as given by beginGL/endGL).
         //! Gosu's rendering up to the Z level may not yet have been glFlush()ed.

data/Gosu/GraphicsBase.hpp

@@ -5,6 +5,7 @@
 #define GOSU_GRAPHICSBASE_HPP
 
 #include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
 #include <limits>
 
 namespace Gosu
@@ -76,12 +77,34 @@ namespace Gosu
         bfTileableRight = 4,
         bfTileableBottom = 8,
         bfTileable = bfTileableLeft | bfTileableTop | bfTileableRight | bfTileableBottom
-    };        
+    };
     
-    #ifndef SWIG
-    // A not so useful optimization.
+#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];
+        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);
+    Transform scale(double factorX, double factorY, double fromX = 0, double fromY = 0);
+    Transform concat(const Transform& lhs, const Transform& rhs);
+    
+#ifndef SWIG
+    // A not so useful optimization - this was supposed to bypass the Z queue for immediate rendering.
+    // In retrospect, the only useful optimization would be to work down the Z queue on a second thread.
     GOSU_DEPRECATED const double zImmediate = -std::numeric_limits<double>::infinity();
-    #endif
+#endif
 }
 
 #endif

data/Gosu/Input.hpp

@@ -76,33 +76,22 @@ namespace Gosu
     {
         struct Impl;
         const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
+    #if defined(GOSU_CPP11_ENABLED)
         // explicitly forbid copying and moving
         Input(Input&&) = delete;
         Input& operator=(Input&&) = delete;
         Input(const Input&) = delete;
         Input& operator=(const Input&) = delete;
-#endif
+    #endif
 
     public:
-        #ifdef GOSU_IS_WIN
-        Input(HWND window);
-        #endif
-        
-        #ifdef GOSU_IS_MAC
-        #ifdef GOSU_IS_IPHONE
+    #ifdef GOSU_IS_IPHONE
         Input(void* view, float updateInterval);
         void feedTouchEvent(int type, void* touches);
-        #else
-        Input(void* window);
-        bool feedNSEvent(void* event);
-        #endif
-        #endif
-        
-        #ifdef GOSU_IS_X
-        Input(::Display* display, ::Window window);
-        bool feedXEvent(::XEvent& event);
-        #endif
+    #else
+        Input();
+        bool feedSDLEvent(void* event);
+    #endif
         
         ~Input();
         
@@ -128,7 +117,7 @@ namespace Gosu
         void setMousePosition(double x, double y);
 
         // Undocumented for the moment. Also applies to currentTouches().
-        void setMouseFactors(double factorX, double factorY);
+        void setMouseFactors(double factorX, double factorY, double offsetX = 0, double offsetY = 0);
         
         //! Currently known touches.
         const Touches& currentTouches() const;

data/Gosu/Platform.hpp

@@ -62,8 +62,12 @@ namespace Gosu
 # endif
 #endif
 
+#if defined (GOSU_IS_IPHONE) || defined(__arm__)
+# define GOSU_IS_OPENGLES
+#endif
+
 #ifndef SWIG
-# if (defined(_MSC_VER) && _MSC_VER >= 1700) || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
+# if _MSC_VER >= 1700 || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
 #  define GOSU_CPP11_ENABLED
 # endif
 #endif

data/Gosu/TextInput.hpp

@@ -24,12 +24,12 @@ namespace Gosu
     {
         struct Impl;
         const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
+    #if defined(GOSU_CPP11_ENABLED)
         TextInput(TextInput&&) = delete;
         TextInput& operator=(TextInput&&) = delete;
         TextInput(const TextInput&) = delete;
         TextInput& operator=(const TextInput&) = delete;
-#endif
+    #endif
         
     public:
         TextInput();
@@ -55,20 +55,14 @@ namespace Gosu
         void setSelectionStart(unsigned pos);
         
         // Platform-specific communication with Gosu::Input.
-        #if defined(GOSU_IS_MAC)
-        bool feedNSEvent(void* event);
-        #elif defined(GOSU_IS_WIN)
-        bool feedMessage(unsigned long message, unsigned long wparam, unsigned long lparam);
-        #elif defined(GOSU_IS_X)
-        bool feedXEvent(void* display, void* event);
-        #endif
+        bool feedSDLEvent(void* event);
 
         //! Overridable filter that is applied to all new text that is entered.
         //! Allows for context-sensitive filtering/extending/... of the text.
         //! The text will be inserted at caretPos afterwards.
-        virtual std::wstring filter(const std::wstring& textIn) const
+        virtual std::wstring filter(const std::wstring& text) const
         {
-            return textIn;
+            return text;
         }
     };
 }

data/Gosu/Version.hpp

@@ -2,9 +2,9 @@
 #define GOSU_VERSION_HPP
 
 #define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 50
-#define GOSU_VERSION "0.7.50"
+#define GOSU_MINOR_VERSION 8
+#define GOSU_POINT_VERSION 0
+#define GOSU_VERSION "0.8.0.pre1"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/GosuImpl/Graphics/Common.hpp

@@ -16,6 +16,8 @@
 #include <OpenGLES/ES1/glext.h>
 #elif defined(GOSU_IS_MAC)
 #include <OpenGL/gl.h>
+#elif defined GOSU_IS_OPENGLES
+#include <GLES/gl.h>
 #else
 #include <GL/gl.h>
 #endif
@@ -85,17 +87,6 @@ namespace Gosu
         }
     }
     
-    inline Transform multiply(const Transform& left, const Transform& right)
-    {
-        Gosu::Transform result;
-        for (int i = 0; i < 16; ++i) {
-            result[i] = 0;
-            for (int j = 0; j < 4; ++j)
-                result[i] += left[i / 4 * 4 + j] * right[i % 4 + j * 4];
-        }
-        return result;
-    }
-    
     template<typename Float>
     void applyTransform(const Transform& transform, Float& x, Float& y)
     {