gosu 0.7.29 → 0.7.30

data/Gosu/Audio.hpp

@@ -20,7 +20,9 @@
 namespace Gosu
 {
     // Deprecated.
-    class Audio;
+    #ifndef SWIG
+    GOSU_DEPRECATED class Audio;
+    #endif
 
     //! An instance of a Sample playing. Can be used to stop sounds dynamically,
     //! or to check if they are finished.
@@ -94,8 +96,6 @@ namespace Gosu
         SampleInstance playPan(double pan, double volume = 1, double speed = 1,
             bool looping = false) const;
 
-
-        // Deprecated.
         #ifndef SWIG
         GOSU_DEPRECATED Sample(Audio& audio, const std::wstring& filename);
         GOSU_DEPRECATED Sample(Audio& audio, Reader reader);
@@ -150,16 +150,8 @@ namespace Gosu
         //! Called every tick by Window for management purposes.
         static void update();
 
-        // Deprecated.
         #ifndef SWIG
-        //! There are two types of songs that can be loaded as a Song: Streamed
-        //! songs (like OGG) and modules (like MOD or XM).
-        enum Type
-        {
-            stStream,
-            stModule
-        };
-
+        enum Type { stStream, stModule };
         GOSU_DEPRECATED Song(Audio&, const std::wstring& filename);
         GOSU_DEPRECATED Song(Audio&, Type type, Reader reader);
         #endif

data/Gosu/Bitmap.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/Color.hpp>
 #include <Gosu/Fwd.hpp>
 #include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Platform.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <string>
 #include <vector>
@@ -23,18 +24,16 @@ namespace Gosu
         std::vector<Color> pixels;
 
     public:
-        Bitmap();
+        Bitmap() : w(0), h(0) {}
+        Bitmap(unsigned w, unsigned h, Color c = Color::NONE) : w(w), h(h), pixels(w * h, c) {}
 
-        unsigned width() const { return w; }
+        unsigned width()  const { return w; }
         unsigned height() const { return h; }
 
         void swap(Bitmap& other);
 
         void resize(unsigned width, unsigned height, Color c = Color::NONE);
-
-        void fill(Color c);
-        void replace(Color oldColor, Color newColor);
-
+        
         //! Returns the color at the specified position. x and y must be on the
         //! bitmap.
         Color getPixel(unsigned x, unsigned y) const { return pixels[y * w + x]; }
@@ -56,32 +55,43 @@ namespace Gosu
 		
 		//! Direct access to the array of color values. May be useful for optimized
         //! OpenGL operations.
-        const unsigned* data() const { return reinterpret_cast<const unsigned*>(&pixels[0]); }
-        unsigned* data() { return reinterpret_cast<unsigned*>(&pixels[0]); }
-    };
+        const Color* data() const { return &pixels[0]; }
+        Color* data()             { return &pixels[0]; }
 
-    //! Loads a Windows or OS/2 BMP file into the given bitmap.
-    Reader loadFromBMP(Bitmap& bmp, Reader reader);
-    //! Saves the contents of the given bitmap into windows BMP file data.
-    Writer saveToBMP(const Bitmap& bmp, Writer writer);
-    //! Loads a PNG file into the given bitmap.
-    Reader loadFromPNG(Bitmap& bmp, Reader reader);
-    //! Saves the contents of the given bitmap into PNG file data, 24 bits.
-    Writer saveToPNG(const Bitmap& bmp, Writer writer);
+        // Work with data() instead if you need fast operations.
+        GOSU_DEPRECATED void fill(Color c);
+        GOSU_DEPRECATED void replace(Color oldColor, Color newColor);
+    };
+    
+	//! Loads any supported image into a Bitmap.
+	Bitmap loadImageFile(const std::wstring& filename);
+	//! Loads any supported image into a Bitmap.
+	Bitmap loadImageFile(Reader input);
     
+    //! Saves a Bitmap to a file.
+    void saveImageFile(const Bitmap& bitmap, const std::wstring& filename);
+    //! Saves a Bitmap to an arbitrary resource.
+    void saveImageFile(const Bitmap& bitmap, Gosu::Writer writer,
+        const std::wstring& formatHint = L"png");
+
     //! Set the alpha value of all pixels which are equal to the color key
     //! to zero. Color values are adjusted so that no borders show up when
     //! the image is stretched or rotated.
     void applyColorKey(Bitmap& bitmap, Color key);
     
+    //! The reverse of applyColorKey. Resets all fully transparent pixels by
+    //! a background color, makes all other pixels fully opaque.
+    void unapplyColorKey(Bitmap& bitmap, Color background);
+    
     void applyBorderFlags(Bitmap& dest, const Bitmap& source,
         unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
         unsigned borderFlags);	
-    
-	//! Loads any supported image into a Bitmap object.
-	Bitmap loadImageFile(const std::wstring& filename);
-	//! Loads any supported image into a Bitmap object.
-	Bitmap loadImageFile(Gosu::Reader input);
+
+    // Use loadImageFile/saveImageFile instead.
+    GOSU_DEPRECATED Reader loadFromBMP(Bitmap& bmp, Reader reader);
+    GOSU_DEPRECATED Writer saveToBMP(const Bitmap& bmp, Writer writer);
+    GOSU_DEPRECATED Reader loadFromPNG(Bitmap& bmp, Reader reader);
+    GOSU_DEPRECATED Writer saveToPNG(const Bitmap& bmp, Writer writer);
 }
 
 #endif

data/Gosu/Color.hpp

@@ -9,7 +9,7 @@
 
 namespace Gosu
 {
-    //! Represents an ARGB color value with 8 bits for each channel. Can be
+    //! Represents an RGBA color value with 8 bits for each channel. Can be
     //! implicitly constructed from literals of the form 0xaarrggbb. Has fast
     //! value semantics.
     //! The four-byte layout in memory is RGBA. On Big-Endian machines the
@@ -138,6 +138,12 @@ namespace Gosu
             return alpha() << 24 | blue() << 16 | green() << 8 | red();
         }
         
+        //! Returns the internal representation of the color (RGBA in memory).
+        boost::uint32_t gl() const
+        {
+            return rep;
+        }
+        
         static const Color NONE;
         static const Color BLACK;
         static const Color GRAY;
@@ -152,24 +158,20 @@ namespace Gosu
         static const Color CYAN;
     };
     
-    // Causes weird errors when included in the SWIG wrapping process.
-    // If, with a future version of SWIG, this can be included and
-    // require 'gosu'; include Gosu
-    // works from within Ruby, the #ifndef guard can be removed.
     #ifndef SWIG
     inline bool operator<(Color a, Color b)
     {
-        return a.argb() < b.argb();
+        return a.gl() < b.gl();
     }
     
     inline bool operator==(Color a, Color b)
     {
-        return a.argb() == b.argb();
+        return a.gl() == b.gl();
     }
 
     inline bool operator!=(Color a, Color b)
     {
-        return a.argb() != b.argb();
+        return a.gl() != b.gl();
     }
     #endif
 

data/Gosu/GraphicsBase.hpp

@@ -14,15 +14,6 @@ namespace Gosu
     //! lower ZPos value, that is, they are performed last.
     typedef double ZPos;
     
-    //! The lowest possible Z position. By using this, you tell Gosu that
-    //! your drawing operation does not need Z ordering and can be performed
-    //! immediately.
-    //! Deprecated because this turned out not be very useful in optimizing.
-    #ifndef SWIG
-    GOSU_DEPRECATED
-    #endif
-    const double zImmediate = -std::numeric_limits<double>::infinity();
-    
     //! Determines the way colors are combined when one is drawn onto
     //! another.
     enum AlphaMode
@@ -64,6 +55,11 @@ namespace Gosu
         bfTileableBottom = 8,
         bfTileable = bfTileableLeft | bfTileableTop | bfTileableRight | bfTileableBottom
     };        
+    
+    #ifndef SWIG
+    // A not so useful optimization.
+    GOSU_DEPRECATED const double zImmediate = -std::numeric_limits<double>::infinity();
+    #endif
 }
 
 #endif

data/Gosu/Platform.hpp

@@ -5,17 +5,17 @@
 #define GOSU_PLATFORM_HPP
 
 #ifdef __BIG_ENDIAN__
-#define GOSU_IS_BIG_ENDIAN
-#define IDENTITY_FUN bigToNative
-#define IDENTITY_FUN2 nativeToBig
-#define CONV_FUN littleToNative
-#define CONV_FUN2 nativeToLittle
+# define GOSU_IS_BIG_ENDIAN
+# define IDENTITY_FUN bigToNative
+# define IDENTITY_FUN2 nativeToBig
+# define CONV_FUN littleToNative
+# define CONV_FUN2 nativeToLittle
 #else
-#define GOSU_IS_LITTLE_ENDIAN
-#define IDENTITY_FUN littleToNative
-#define IDENTITY_FUN2 nativeToLittle
-#define CONV_FUN bigToNative
-#define CONV_FUN2 nativeToBig
+# define GOSU_IS_LITTLE_ENDIAN
+# define IDENTITY_FUN littleToNative
+# define IDENTITY_FUN2 nativeToLittle
+# define CONV_FUN bigToNative
+# define CONV_FUN2 nativeToBig
 #endif
 
 #include <algorithm>
@@ -42,9 +42,9 @@ namespace Gosu
 #undef CONV_FUN2
 
 #if defined(_MSC_VER)
-#define GOSU_NORETURN __declspec(noreturn)
+# define GOSU_NORETURN __declspec(noreturn)
 #elif defined(__GNUC__)
-#define GOSU_NORETURN __attribute__ ((noreturn))
+# define GOSU_NORETURN __attribute__ ((noreturn))
 #endif
 
 #if defined(WIN32)
@@ -62,10 +62,10 @@ namespace Gosu
 # endif
 #endif
 
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-# define GOSU_DEPRECATED  __attribute__((__deprecated__))
-#elif defined(GOSU_IS_WIN)
+#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

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 29
-#define GOSU_VERSION "0.7.29"
+#define GOSU_POINT_VERSION 30
+#define GOSU_VERSION "0.7.30"
 
 #endif

data/GosuImpl/Audio/AudioAudiere.cpp

@@ -1,6 +1,7 @@
 #include <Gosu/Audio.hpp>
 #include <Gosu/Math.hpp>
 #include <Gosu/IO.hpp>
+#include <Gosu/Utility.hpp>
 #include <boost/foreach.hpp>
 #include <algorithm>
 #include <stdexcept>
@@ -55,8 +56,12 @@ namespace Gosu
             ADR_METHOD(void) streamStopped(StopEvent* event)
             {
                 if (event->getReason() == StopEvent::STREAM_ENDED)
-                    if (!clear(event->getOutputStream()) && curSong)
-                        curSong = 0;
+                    BOOST_FOREACH (NumberedStream& stream, streams)
+                        if (stream.stream == event->getOutputStream())
+                        {
+                            stream.stream = 0;
+                            break;
+                        }
             }
 
         public:
@@ -91,17 +96,6 @@ namespace Gosu
             {
                 streams.at(handle).stream = 0;
             }
-
-            bool clear(OutputStreamPtr stream)
-            {
-                BOOST_FOREACH (NumberedStream& numberedStream, streams)
-                    if (numberedStream.stream == stream)
-                    {
-                        numberedStream.stream = 0;
-                        return true;
-                    }
-                return false;
-            }
         };
         
         // Intentionally leak. Let Windows clean up on program exit.
@@ -148,7 +142,6 @@ namespace Gosu
             }
             return device;
         }
-        
     }
 }
 
@@ -217,6 +210,8 @@ Gosu::Sample::Sample(const std::wstring& filename)
     
     SampleSourcePtr source = OpenSampleSource(MemoryBuffer(filename), FF_AUTODETECT);
     data->buffer = CreateSampleBuffer(source);
+    if (!data->buffer)
+        throw std::runtime_error("Cannot open " + wstringToUTF8(filename));
 }
 
 Gosu::Sample::Sample(Reader reader)
@@ -225,6 +220,8 @@ Gosu::Sample::Sample(Reader reader)
     
     SampleSourcePtr source = audiere::OpenSampleSource(MemoryBuffer(reader), FF_AUTODETECT);
     data->buffer = CreateSampleBuffer(source);
+    if (!data->buffer)
+        throw std::runtime_error("Cannot open audio file");
 }
 
 Gosu::SampleInstance Gosu::Sample::play(double volume, double speed,
@@ -271,6 +268,7 @@ public:
 
     virtual void play(bool looping) = 0;
     virtual bool playing() const = 0;
+    virtual bool paused() const = 0;
     virtual void pause() = 0;
     virtual void stop() = 0;
     
@@ -297,6 +295,8 @@ class Gosu::Song::StreamData : public BaseData
     {
         int handle, extra;
         stream = OpenSound(device(), buffer, true);
+        if (!stream)
+            throw std::runtime_error("Cannot open audio file for streaming");
         streams.put(stream, handle, extra);
         instance = SampleInstance(handle, extra);
         loop = false;
@@ -327,6 +327,11 @@ public:
     {
         return instance.playing();
     }
+
+    bool paused() const
+    {
+        return instance.paused();
+    }
     
     void pause()
     {
@@ -335,7 +340,7 @@ public:
     
     void stop()
     {
-        instance.pause();
+        instance.stop();
         stream->reset();
     }
     
@@ -361,9 +366,9 @@ Gosu::Song::~Song()
 
 Gosu::Song* Gosu::Song::currentSong()
 {
-    if (curSong)
+    if (curSong && (curSong->playing() || curSong->paused()))
         return curSong;
-    return 0;
+    return curSong = 0;
 }
 
 void Gosu::Song::play(bool looping)
@@ -387,7 +392,7 @@ void Gosu::Song::pause()
 
 bool Gosu::Song::paused() const
 {
-    return curSong == this && !data->playing();
+    return curSong == this && data->paused();
 }
 
 void Gosu::Song::stop()

data/GosuImpl/Graphics/Bitmap.cpp

@@ -3,21 +3,6 @@
 #include <algorithm>
 #include <vector>
 
-Gosu::Bitmap::Bitmap()
-: w(0), h(0)
-{
-}
-
-/*unsigned Gosu::Bitmap::width() const
-{
-    return w;
-}
-
-unsigned Gosu::Bitmap::height() const
-{
-    return h;
-}*/
-
 void Gosu::Bitmap::swap(Bitmap& other)
 {
     std::swap(pixels, other.pixels);
@@ -27,10 +12,10 @@ void Gosu::Bitmap::swap(Bitmap& other)
 
 void Gosu::Bitmap::resize(unsigned width, unsigned height, Color c)
 {
-    Bitmap temp;
-    temp.pixels.resize(width * height, c);
-    temp.w = width;
-    temp.h = height;
+    if (width == w && height == h)
+        return;
+    
+    Bitmap temp(width, height, c);
     temp.insert(*this, 0, 0);
     swap(temp);
 }
@@ -45,22 +30,6 @@ void Gosu::Bitmap::replace(Color what, Color with)
     std::replace(pixels.begin(), pixels.end(), what, with);
 }
 
-/*Gosu::Color Gosu::Bitmap::getPixel(unsigned x, unsigned y) const
-{
-    assert(x <= w);
-    assert(y <= h);
-    assert(w*h > 0);
-    return pixels[y * w + x];
-}
-
-void Gosu::Bitmap::setPixel(unsigned x, unsigned y, Color c)
-{
-    assert(x <= w);
-    assert(y <= h);
-    assert(w*h > 0);
-    pixels[y * w + x] = c;
-}*/
-
 void Gosu::Bitmap::insert(const Bitmap& source, int x, int y)
 {
     insert(source, x, y, 0, 0, source.width(), source.height());