gosu 0.7.45 → 0.7.46

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/GosuImpl/Audio/AudioToolboxFile.hpp

@@ -109,15 +109,19 @@ namespace Gosu
             // Easy formats
             format_ = 0;
             if (desc.mChannelsPerFrame == 1)
+            {
                 /*if (desc.mBitsPerChannel == 8)
                     format_ = AL_FORMAT_MONO8;
                 else*/ if (desc.mBitsPerChannel == 16)
                     format_ = AL_FORMAT_MONO16;
+            }
             else if (desc.mChannelsPerFrame == 2)
+            {
                 /*if (desc.mBitsPerChannel == 8)
                     format_ = AL_FORMAT_STEREO8;
                 else */if (desc.mBitsPerChannel == 16)
                     format_ = AL_FORMAT_STEREO16;
+            }
             
             if (format_ == 0 ||
                 // If format not native for OpenAL, set client data format

data/GosuImpl/Graphics/BitmapApple.mm

@@ -128,13 +128,14 @@ void Gosu::loadImageFile(Bitmap& bitmap, Reader reader)
         applyColorKey(bitmap, Color::FUCHSIA);
 }
 
-#ifndef GOSU_IS_IPHONE
 void Gosu::saveImageFile(const Bitmap& bitmap, const std::wstring& filename)
 {
-    File file(filename, fmReplace);
-    saveImageFile(bitmap, file.backWriter(), filename);
+    Buffer buffer;
+    saveImageFile(bitmap, buffer.backWriter(), filename);
+    saveFile(buffer, filename);
 }
 
+#ifndef GOSU_IS_IPHONE
 void Gosu::saveImageFile(const Bitmap& originalBitmap, Writer writer, const std::wstring& formatHint)
 {
     NSBitmapImageFileType fileType;
@@ -164,20 +165,13 @@ void Gosu::saveImageFile(const Bitmap& originalBitmap, Writer writer, const std:
         initWithBitmapDataPlanes:&plane pixelsWide:bitmap.width() pixelsHigh:bitmap.height()
         bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO
         colorSpaceName:NSDeviceRGBColorSpace // Nobody really seems to know which one to use
-        bitmapFormat:NSAlphaNonpremultipliedBitmapFormat bytesPerRow:0 bitsPerPixel:0]);
+        bitmapFormat:NSAlphaNonpremultipliedBitmapFormat bytesPerRow:bitmap.width() * 4 bitsPerPixel:32]);
 
     ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
     NSData* data = [rep.obj() representationUsingType:fileType properties:nil];
     writer.write([data bytes], [data length]);
 }
 #else
-void Gosu::saveImageFile(const Bitmap& bmp, const std::wstring& filename)
-{
-    Buffer buffer;
-    saveImageFile(bmp, buffer.backWriter());
-    saveFile(buffer, filename);
-}
-
 void Gosu::saveImageFile(const Bitmap& bmp, Writer writer, const std::wstring& formatHint)
 {    
     if (isExtension(formatHint.c_str(), L"bmp"))

data/GosuImpl/Graphics/ClipRectStack.hpp

@@ -20,7 +20,7 @@ class Gosu::ClipRectStack
             return;
         }
         
-        ClipRect result = { 0, 0, 0x7fffffff, 0x7fffffff };
+        ClipRect result = { 0.0, 0.0, 1e10, 1e10 };
         for (int i = 0, end = stack.size(); i < end; ++i)
         {
             const ClipRect& rect = stack[i];
@@ -62,7 +62,7 @@ public:
         hasEffectiveRect = false;
     }
     
-    void beginClipping(int x, int y, int width, int height)
+    void beginClipping(double x, double y, double width, double height)
     {
         ClipRect rect = { x, y, width, height };
         stack.push_back(rect);

data/GosuImpl/Graphics/Common.hpp

@@ -36,7 +36,7 @@ namespace Gosu
     // that no clipping should happen.
     struct ClipRect
     {
-        int x, y, width, height;
+        double x, y, width, height;
         
         bool operator==(const ClipRect& other) const
         {

data/GosuImpl/Graphics/DrawOpQueue.hpp

@@ -10,43 +10,44 @@
 #include <algorithm>
 #include <map>
 #include <vector>
+#include <cmath>
 
 class Gosu::DrawOpQueue
 {
     TransformStack transformStack;
     ClipRectStack clipRectStack;
-    
+
     typedef std::vector<DrawOp> DrawOps;
     DrawOps ops;
     typedef std::vector<std::tr1::function<void()> > GLBlocks;
     GLBlocks glBlocks;
-    
+
 public:
     void scheduleDrawOp(DrawOp op)
     {
         if (clipRectStack.clippedWorldAway())
             return;
-        
+
         #ifdef GOSU_IS_IPHONE
         // No triangles, no lines supported
         assert (op.verticesOrBlockIndex == 4);
         #endif
-        
+
         op.renderState.transform = &transformStack.current();
         if (const ClipRect* cr = clipRectStack.maybeEffectiveRect())
             op.renderState.clipRect = *cr;
         ops.push_back(op);
     }
-    
+
     void scheduleGL(std::tr1::function<void()> glBlock, ZPos z)
     {
         // TODO: Document this case: Clipped-away GL blocks are *not* being run.
         if (clipRectStack.clippedWorldAway())
             return;
-        
+
         int complementOfBlockIndex = ~(int)glBlocks.size();
         glBlocks.push_back(glBlock);
-        
+
         DrawOp op;
         op.verticesOrBlockIndex = complementOfBlockIndex;
         op.renderState.transform = &transformStack.current();
@@ -55,60 +56,60 @@ public:
         op.z = z;
         ops.push_back(op);
     }
-    
-    void beginClipping(int x, int y, int width, int height, int screenHeight)
+
+    void beginClipping(double x, double y, double width, double height, double screenHeight)
     {
         // Apply current transformation.
-        
+
         double left = x, right = x + width;
         double top = y, bottom = y + height;
-        
+
         applyTransform(transformStack.current(), left, top);
         applyTransform(transformStack.current(), right, bottom);
-        
-        int physX = std::min(left, right);
-        int physY = std::min(top, bottom);
-        int physWidth = std::abs(int(left - right));
-        int physHeight = std::abs(int(top - bottom));
-        
+
+        double physX = std::min(left, right);
+        double physY = std::min(top, bottom);
+        double physWidth = std::abs(left - right);
+        double physHeight = std::abs(top - bottom);
+
         // Adjust for OpenGL having the wrong idea of where y=0 is.
         // TODO: This should really happen *right before* setting up
         // the glScissor.
         physY = screenHeight - physY - physHeight;
-        
+
         clipRectStack.beginClipping(physX, physY, physWidth, physHeight);
     }
-    
+
     void endClipping()
     {
         clipRectStack.endClipping();
     }
-    
+
     void setBaseTransform(const Transform& baseTransform)
     {
         transformStack.setBaseTransform(baseTransform);
     }
-    
+
     void pushTransform(const Transform& transform)
     {
         transformStack.push(transform);
     }
-    
+
     void popTransform()
     {
         transformStack.pop();
     }
-    
+
     void performDrawOpsAndCode()
     {
         // Apply Z-Ordering.
         std::stable_sort(ops.begin(), ops.end());
-        
+
         RenderStateManager manager;
         #ifdef GOSU_IS_IPHONE
         if (ops.empty())
             return;
-        
+
         DrawOps::const_iterator current = ops.begin(), last = ops.end() - 1;
         for (; current != last; ++current)
         {
@@ -136,24 +137,24 @@ public:
         }
         #endif
     }
-    
+
     void compileTo(VertexArrays& vas)
     {
         if (!glBlocks.empty())
             throw std::logic_error("Custom code cannot be recorded into a macro");
-        
+
         std::stable_sort(ops.begin(), ops.end());
         for (DrawOps::const_iterator op = ops.begin(), end = ops.end(); op != end; ++op)
             op->compileTo(vas);
     }
-    
+
     // This retains the current stack of transforms and clippings.
     void clearQueue()
     {
         glBlocks.clear();
         ops.clear();
     }
-    
+
     // This clears the queue and starts with new stacks. This must not be called
     // when endClipping/popTransform calls might still be pending.
     void reset()