gosu 0.7.48 → 0.7.49

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 12757ae26d02d3cad60c1062c94d9a66d5ad2ecbfebea61eee6a3e92ec35127f4a60a89e536be7cc212962e0feb2d721a744f5a7f604db4682ce2fa532487e03
-  data.tar.gz: 83b6d27a97e32233878676f797275e593efd5946fe5e41c093937e20bb6767f969e257693b5df4fd071883aa7ed14b8a545567cd57bf199058b4a54b92503174
-SHA1: 
-  metadata.gz: 4cc0bdd7ce334c6f0d65250719b6f44a3965eaf2
-  data.tar.gz: 1b6a3594dd5ab71455bec96cf0d345bcd0e4cc42
+---
+SHA1:
+  metadata.gz: 98fdd3c3dcad165605ab512fee4b11d77b9f9741
+  data.tar.gz: fe97e808302d1523a11ae40f9e0ec6d8be646573
+SHA512:
+  metadata.gz: b0280a8ed1bc01d4384e8cc70ed1686b62f5ac4b81a6197039a563b37c00f9a583416226bb2c96ee61dee042f02c58c594069207d95d9c53be5d304956ade982
+  data.tar.gz: 1c9030d88de771441d8f7ea87297e22c55f600bf9b7c06e379a6a5e64f18902405e0bd8186e9fddbccf92351396af1fa0c9c0c91a9e5ad13d3f15ee5bb923c21

data/.yardopts

@@ -1 +1 @@
-reference/gosu.rb - README.txt COPYING reference/*.rdoc --output reference/rdoc
+reference/*.rb - README.txt COPYING reference/*.md --markup markdown -M rdiscount --output reference/rdoc

data/Gosu/Audio.hpp

@@ -21,7 +21,7 @@ namespace Gosu
 {
     // Deprecated.
     #ifndef SWIG
-    GOSU_DEPRECATED class Audio;
+    class GOSU_DEPRECATED Audio;
     #endif
 
     //! An instance of a Sample playing. Can be used to stop sounds dynamically,
@@ -109,10 +109,18 @@ namespace Gosu
         class BaseData;
         class ModuleData;
         class StreamData;
+        GOSU_UNIQUE_PTR<BaseData> data;
+
+#if defined(GOSU_CPP11_ENABLED)
+        Song(Song&&) = delete;
+        Song& operator=(Song&&) = delete;
+        Song(const Song&) = delete;
+        Song& operator=(const Song&) = delete;
+#else
         Song(const Song&);
         Song& operator=(const Song&);
-        std::auto_ptr<BaseData> data;
-    
+#endif
+
     public:
         //! Constructs a song that can be played on the provided audio system
         //! and loads the song from a file. The type is determined from the

data/Gosu/Buttons.hpp

@@ -253,7 +253,7 @@ namespace Gosu
         kbNum = kbRangeEnd - kbRangeBegin + 1,
         msNum = msRangeEnd - msRangeBegin + 1,
         gpNum = gpRangeEnd - gpRangeBegin + 1,
-        gpNumPerGamepad = gpNum / (numGamepads + 1),
+        gpNumPerGamepad = gpNum / (numGamepads + 1)
 	};
 }
 

data/Gosu/Color.hpp

@@ -186,18 +186,18 @@ namespace Gosu
 
     namespace Colors
     {
-        const Color none    = 0x00000000;
-        const Color black   = 0xff000000;
-        const Color gray    = 0xff808080;
-        const Color white   = 0xffffffff;
+        GOSU_DEPRECATED const Color none     (0x00000000);
+        GOSU_DEPRECATED const Color black    (0xff000000);
+        GOSU_DEPRECATED const Color gray     (0xff808080);
+        GOSU_DEPRECATED const Color white    (0xffffffff);
         
-        const Color aqua    = 0xff00ffff;
-        const Color red     = 0xffff0000;
-        const Color green   = 0xff00ff00;
-        const Color blue    = 0xff0000ff;
-        const Color yellow  = 0xffffff00;
-        const Color fuchsia = 0xffff00ff;
-        const Color cyan    = 0xff00ffff;
+        GOSU_DEPRECATED const Color aqua     (0xff00ffff);
+        GOSU_DEPRECATED const Color red      (0xffff0000);
+        GOSU_DEPRECATED const Color green    (0xff00ff00);
+        GOSU_DEPRECATED const Color blue     (0xff0000ff);
+        GOSU_DEPRECATED const Color yellow   (0xffffff00);
+        GOSU_DEPRECATED const Color fuchsia  (0xffff00ff);
+        GOSU_DEPRECATED const Color cyan     (0xff00ffff);
     }
 }
 

data/Gosu/Graphics.hpp

@@ -49,7 +49,15 @@ namespace Gosu
     class Graphics
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+        
+#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
 
     public:
         Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
@@ -97,7 +105,7 @@ namespace Gosu
         //! the resulting macro will simply return these values when you ask
         //! it.
         //! Most usually, the return value is passed to Image::Image().
-        std::auto_ptr<Gosu::ImageData> endRecording(int width, int height);
+        GOSU_UNIQUE_PTR<Gosu::ImageData> endRecording(int width, int height);
         
         //! Pushes one transformation onto the transformation stack.
         void pushTransform(const Transform& transform);
@@ -125,7 +133,7 @@ namespace Gosu
 
         //! Turns a portion of a bitmap into something that can be drawn on
         //! this graphics object.
-        std::auto_ptr<ImageData> createImage(const Bitmap& src,
+        GOSU_UNIQUE_PTR<ImageData> createImage(const Bitmap& src,
             unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
             unsigned borderFlags);
     };

data/Gosu/GraphicsBase.hpp

@@ -16,6 +16,26 @@ namespace Gosu
     
     //! Determines the way colors are combined when one is drawn onto
     //! another.
+#if defined(GOSU_CPP11_ENABLED)
+    enum class AlphaMode
+    {
+        //! The color's channels will be interpolated. The alpha channel
+        //! specifies the opacity of the new color, 255 is full opacity.
+        DEFAULT,
+        INTERPOLATE = DEFAULT,
+        //! The colors' channels will be added. The alpha channel specifies
+        //! the percentage of the new color's channels that will be added
+        //! to the old color's channels.
+        ADD,
+        //! The color's channels will be multiplied with each other.
+        MULTIPLY
+    };
+    GOSU_DEPRECATED constexpr AlphaMode amDefault = AlphaMode::DEFAULT;
+    GOSU_DEPRECATED constexpr AlphaMode amInterpolate = AlphaMode::INTERPOLATE;
+    GOSU_DEPRECATED constexpr AlphaMode amAdd = AlphaMode::ADD;
+    GOSU_DEPRECATED constexpr AlphaMode amAdditive = AlphaMode::ADD;
+    GOSU_DEPRECATED constexpr AlphaMode amMultiply = AlphaMode::MULTIPLY;
+#else
     enum AlphaMode
     {
         //! The color's channels will be interpolated. The alpha channel
@@ -29,6 +49,7 @@ namespace Gosu
         //! The color's channels will be multiplied with each other.
         amMultiply
     };
+#endif
     
     enum FontFlags
     {

data/Gosu/IO.hpp

@@ -9,6 +9,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <Gosu/Platform.hpp>
 
 namespace Gosu
 {
@@ -141,8 +142,16 @@ namespace Gosu
     class Resource
     {
         // Non-copyable
+#if defined(GOSU_CPP11_ENABLED)
+        Resource(const Resource&) = delete;
+        Resource& operator=(const Resource&) = delete;
+        // and non-movable
+        Resource(Resource&&) = delete;
+        Resource& operator=(Resource&&) = delete;
+#else
         Resource(const Resource&);
         Resource& operator=(const Resource&);
+#endif
 
     public:
         Resource()
@@ -189,7 +198,8 @@ namespace Gosu
         }
 
         Buffer(const Buffer& other)
-        : buf(other.buf)
+        : Resource()
+        , buf(other.buf)
         {
         }
 
@@ -236,7 +246,7 @@ namespace Gosu
     class File : public Resource
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
 
     public:
         explicit File(const std::wstring& filename, FileMode mode = fmRead);

data/Gosu/Image.hpp

@@ -46,7 +46,7 @@ namespace Gosu
             bool tileable = false);
         
         //! Creates an Image from a user-supplied instance of the ImageData interface.
-        explicit Image(std::auto_ptr<ImageData> data);
+        explicit Image(GOSU_UNIQUE_PTR<ImageData> data);
 
         unsigned width() const;
         unsigned height() const;

data/Gosu/ImageData.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Fwd.hpp>
+#include <Gosu/Platform.hpp>
 
 namespace Gosu
 {
@@ -51,7 +52,7 @@ namespace Gosu
         virtual const GLTexInfo* glTexInfo() const = 0;
         virtual Bitmap toBitmap() const = 0;
         
-        virtual std::auto_ptr<ImageData> subimage(int x, int y, int width, int height) const = 0;
+        virtual GOSU_UNIQUE_PTR<ImageData> subimage(int x, int y, int width, int height) const = 0;
         
         virtual void insert(const Bitmap& bitmap, int x, int y) = 0;
     };

data/Gosu/Input.hpp

@@ -75,7 +75,14 @@ namespace Gosu
     class Input
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#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
 
     public:
         #ifdef GOSU_IS_WIN

data/Gosu/Platform.hpp

@@ -62,12 +62,28 @@ namespace Gosu
 # endif
 #endif
 
-#if defined(GOSU_IS_WIN)
-# define GOSU_DEPRECATED __declspec(deprecated)
-#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-# define GOSU_DEPRECATED  __attribute__((__deprecated__))
+#ifndef SWIG
+# if (defined(_MSC_VER) && _MSC_VER >= 1700) || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
+#  define GOSU_CPP11_ENABLED
+# endif
+#endif
+
+#ifdef GOSU_CPP11_ENABLED
+# define GOSU_UNIQUE_PTR std::unique_ptr
+# define GOSU_MOVE_UNIQUE_PTR(ptr) std::move(ptr)
 #else
-# define GOSU_DEPRECATED 
+# define GOSU_UNIQUE_PTR std::auto_ptr
+# define GOSU_MOVE_UNIQUE_PTR(ptr) (ptr)
+#endif
+
+#ifndef GOSU_DEPRECATED
+# if defined(GOSU_IS_WIN)
+#  define GOSU_DEPRECATED __declspec(deprecated)
+# elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#  define GOSU_DEPRECATED  __attribute__((__deprecated__))
+# else
+#  define GOSU_DEPRECATED
+# endif
 #endif
 
 #endif

data/Gosu/Sockets.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/TR1.hpp>
 #include <cstddef>
 #include <string>
+#include <Gosu/Platform.hpp>
 
 namespace Gosu
 {
@@ -35,7 +36,13 @@ namespace Gosu
     class MessageSocket
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        MessageSocket(const MessageSocket&) = delete;
+        MessageSocket& operator=(const MessageSocket&) = delete;
+        MessageSocket(MessageSocket&&) = delete;
+        MessageSocket& operator=(MessageSocket&&) = delete;
+#endif
 
     public:
         //! Opens a message socket for listening at the specified port.
@@ -84,7 +91,13 @@ namespace Gosu
     class CommSocket
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        CommSocket(const CommSocket&) = delete;
+        CommSocket& operator=(const CommSocket&) = delete;
+        CommSocket(CommSocket&&) = delete;
+        CommSocket& operator=(CommSocket&&) = delete;
+#endif
 
     public:
         CommSocket(CommMode mode, SocketAddress targetAddress,
@@ -117,7 +130,13 @@ namespace Gosu
     class ListenerSocket
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        ListenerSocket(const ListenerSocket&) = delete;
+        ListenerSocket& operator=(const ListenerSocket&) = delete;
+        ListenerSocket(ListenerSocket&&) = delete;
+        ListenerSocket& operator=(ListenerSocket&&) = delete;
+#endif
 
     public:
         ListenerSocket(SocketPort port);

data/Gosu/TR1.hpp

@@ -23,6 +23,10 @@
             typedef signed long long int64_t;
             
             #ifdef _LIBCPP_MEMORY
+            namespace placeholders
+            {
+                using namespace std::placeholders;
+            }
             using std::array;
             using std::bind;
             using std::function;

data/Gosu/TextInput.hpp

@@ -23,7 +23,13 @@ namespace Gosu
     class TextInput
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        TextInput(TextInput&&) = delete;
+        TextInput& operator=(TextInput&&) = delete;
+        TextInput(const TextInput&) = delete;
+        TextInput& operator=(const TextInput&) = delete;
+#endif
         
     public:
         TextInput();

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 48
-#define GOSU_VERSION "0.7.48"
+#define GOSU_POINT_VERSION 49
+#define GOSU_VERSION "0.7.49"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/Gosu/Window.hpp

@@ -28,7 +28,13 @@ namespace Gosu
     class Window
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        Window(Window&&) = delete;
+        Window& operator=(Window&&) = delete;
+        Window(const Window&) = delete;
+        Window& operator=(const Window&) = delete;
+#endif
 	
     public:
         //! Constructs a Window.

data/GosuImpl/Audio/ALChannelManagement.hpp

@@ -39,6 +39,11 @@ namespace Gosu
             return alDevice;
         }
         
+        static ALCcontext* context()
+        {
+            return alContext;
+        }
+        
         ALChannelManagement()
         {
             // Open preferred device
@@ -95,10 +100,15 @@ namespace Gosu
     ALuint ALChannelManagement::currentToken = 0;
     ALuint ALChannelManagement::currentTokens[NUM_SOURCES];
 
-    std::auto_ptr<ALChannelManagement> alChannelManagement;
+    GOSU_UNIQUE_PTR<ALChannelManagement> alChannelManagement;
     
     void releaseAllOpenALResources()
     {
         alChannelManagement.reset();
     }
+    
+    ALCcontext *sharedContext()
+    {
+        return ALChannelManagement::context();
+    }
 }

data/GosuImpl/Audio/AudioOpenAL.cpp

@@ -327,7 +327,7 @@ public:
 // AudioFile impl
 class Gosu::Song::StreamData : public BaseData
 {
-    std::auto_ptr<AudioFile> file;
+    GOSU_UNIQUE_PTR<AudioFile> file;
     ALuint buffers[2];
     
     void applyVolume()

data/GosuImpl/Graphics/BitmapApple.mm

@@ -97,9 +97,23 @@ namespace Gosu { bool isExtension(const wchar_t* str, const wchar_t* ext); }
 void Gosu::loadImageFile(Bitmap& bitmap, const std::wstring& filename)
 {
     ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
+    ObjRef<APPLE_IMAGE> image;
     ObjRef<NSString> filenameRef([[NSString alloc] initWithUTF8String: wstringToUTF8(filename).c_str()]);
-    ObjRef<APPLE_IMAGE> image([[APPLE_IMAGE alloc] initWithContentsOfFile: filenameRef.obj()]);
-    if (!image.get())
+    
+#ifdef GOSU_IS_IPHONE
+    if ([UIScreen mainScreen].scale > 1) {
+#endif
+        // Prevent app from automatically appending @2x to full filenames by loading into an NSData object first
+        NSData *data = [NSData dataWithContentsOfFile:filenameRef.obj()];
+        image.reset([[APPLE_IMAGE alloc] initWithData:data]);
+#ifdef GOSU_IS_IPHONE
+    }
+    else {
+        image.reset([[APPLE_IMAGE alloc] initWithContentsOfFile:filenameRef.obj()]);
+    }
+#endif
+    
+    if (! image.get())
         throw std::runtime_error("Cannot load image file " + wstringToUTF8(filename));
     
     appleImageToBitmap(image.obj(), bitmap);