gosu 0.8.6-x86-mingw32 → 0.8.7-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6bc79695d6862d14f8be778cba7117b694a3ad
-  data.tar.gz: be7c1b5573c52f4e2dc26f5a602d86edca4cc556
+  metadata.gz: df73ca132662b34b18796107171a789df123ca86
+  data.tar.gz: a7277391d6f01631d4168a4d7dc4883abe947a7d
 SHA512:
-  metadata.gz: c7fb039378d8c298f2247f85d09133aac116e85db0c4339c7aef7188b5f64c462804a5dd0e01614984747a0dea6e7c6013be58174e4a178a0523df49c6f8ecd3
-  data.tar.gz: 42fe209a4411e54e1b9535deb49cfbd70aee62896a448e77563c472a68321f7735e3067c97c6f4a656299a6d4dda6baa7f714f14e92b0b4a1c5123b7510ce302
+  metadata.gz: 6c18107d4fff35f8be824076b6932379e018f77f4a0bc7fec5b62f8313b96e899e43c5427ce84fe708c16279bdf37b09f469a07d1d3f49f02dd63fc34a766e55
+  data.tar.gz: 110f9914d6fa2643d52297adfbad4af77b6b643b46345974b0736ae084abf6dde0979bf3e56148f0dcf02bcd1ab6c4d0ab9b4e1fe82bc966c0fcc949d52cc8f7

data/Gosu/Audio.hpp

@@ -1,171 +1,171 @@
-//! \file Audio.hpp
-//! Contains all the classes of Gosu's audio system.
-
-#ifndef GOSU_AUDIO_HPP
-#define GOSU_AUDIO_HPP
-
-#ifdef WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-#include <Gosu/Fwd.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-#include <memory>
-#include <string>
-
-namespace Gosu
-{
-    // Deprecated.
-    #ifndef SWIG
-    class GOSU_DEPRECATED Audio;
-    #endif
-
-    //! An instance of a Sample playing. Can be used to stop sounds dynamically,
-    //! or to check if they are finished.
-    //! It is recommended that you throw away sample instances if possible,
-    //! as they could accidentally refer to other sounds being played after
-    //! a very long time has passed.
-	class SampleInstance
-	{
-		int handle, extra;
-        bool alive() const;		
-
-	public:
-        //! Called by Sample, do not use.
-		SampleInstance(int handle, int extra);
-
-		bool playing() const;
-		bool paused() const;
-        //! Pauses this instance to be resumed afterwards. It will still keep a channel filled while paused.
-        void pause();
-        void resume();
-        //! Stops this instance of a sound being played.
-        //! Calling this twice, or too late, does not do any harm.
-		void stop();
-
-        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
-        //! volume).
-        void changeVolume(double volume);
-        //! \param pan Can be anything from -1.0 (left) to 1.0 (right).
-        void changePan(double pan);
-        //! \param speed Playback speed is only limited by FMOD's
-        //! capabilities and can accept very high or low values. Use 1.0 for
-        //! normal playback speed.
-        void changeSpeed(double speed);
-	};
-
-    //! A sample is a short sound that is completely loaded in memory, can be
-    //! played multiple times at once and offers very flexible playback
-    //! parameters. Use samples for everything that's not music.
-    class Sample
-    {
-        struct SampleData;
-        std::tr1::shared_ptr<SampleData> data;
-    
-    public:
-        //! Constructs a sample that can be played on the specified audio
-        //! system and loads the sample from a file.
-        explicit Sample(const std::wstring& filename);
-        
-        //! Constructs a sample that can be played on the specified audio
-        //! system and loads the sample data from a stream.
-        explicit Sample(Reader reader);
-        
-        //! Plays the sample without panning.
-        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
-        //! volume).
-        //! \param speed Playback speed is only limited by the underlying audio library,
-        //! and can accept very high or low values. Use 1.0 for
-        //! normal playback speed.
-        SampleInstance play(double volume = 1, double speed = 1,
-            bool looping = false) const;
-
-        //! Plays the sample with panning. Even if pan is 0.0, the sample will
-        //! not be as loud as if it were played by calling play() due to the
-        //! way the panning works.
-        //! \param pan Can be anything from -1.0 (left) to 1.0 (right).
-        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
-        //! volume).
-        //! \param speed Playback speed is only limited by by the underlying audio library,
-        //! and can accept very high
-        //! or low values. Use 1.0 for normal playback speed.
-        SampleInstance playPan(double pan, double volume = 1, double speed = 1,
-            bool looping = false) const;
-
-        #ifndef SWIG
-        GOSU_DEPRECATED Sample(Audio& audio, const std::wstring& filename);
-        GOSU_DEPRECATED Sample(Audio& audio, Reader reader);
-        #endif
-    };
-
-    //! Songs are less flexible than samples in that they can only be played
-    //! one at a time and without panning or speed parameters.
-    class Song
-    {
-        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&);
-#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
-        //! filename.
-        explicit Song(const std::wstring& filename);
-        
-        //! Constructs a song of the specified type that can be played on the
-        //! provided audio system and loads the song data from a stream.
-        explicit Song(Reader reader);
-        
-        ~Song();
-        
-        //! Returns the song currently being played or paused, or 0 if
-        //! no song has been played yet or the last song has finished
-        //! playing.
-        static Song* currentSong();
-        
-        //! Starts or resumes playback of the song. This will stop all other
-        //! songs and set the current song to this object.
-        void play(bool looping = false);
-        //! Pauses playback of the song. It is not considered being played.
-        //! currentSong will stay the same.
-        void pause();
-        //! Returns true if the song is the current song, but in paused
-        //! mode.
-        bool paused() const;
-        //! Stops playback of this song if it is currently played or paused.
-        //! Afterwards, currentSong will return 0.
-        void stop();
-        //! Returns true if the song is currently playing.
-        bool playing() const;
-        //! Returns the current volume of the song.
-        double volume() const;
-        //! Changes the volume of the song.
-        void changeVolume(double volume);
-        
-        //! Called every tick by Window for management purposes.
-        static void update();
-
-        #ifndef SWIG
-        enum Type { stStream, stModule };
-        GOSU_DEPRECATED Song(Audio&, const std::wstring& filename);
-        GOSU_DEPRECATED Song(Audio&, Type type, Reader reader);
-        #endif
-    };
-}
-
-#endif
+//! \file Audio.hpp
+//! Contains all the classes of Gosu's audio system.
+
+#ifndef GOSU_AUDIO_HPP
+#define GOSU_AUDIO_HPP
+
+#ifdef WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+#include <Gosu/Fwd.hpp>
+#include <Gosu/IO.hpp>
+#include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
+#include <memory>
+#include <string>
+
+namespace Gosu
+{
+    // Deprecated.
+    #ifndef SWIG
+    class Audio;
+    #endif
+
+    //! An instance of a Sample playing. Can be used to stop sounds dynamically,
+    //! or to check if they are finished.
+    //! It is recommended that you throw away sample instances if possible,
+    //! as they could accidentally refer to other sounds being played after
+    //! a very long time has passed.
+	class SampleInstance
+	{
+		int handle, extra;
+        bool alive() const;		
+
+	public:
+        //! Called by Sample, do not use.
+		SampleInstance(int handle, int extra);
+
+		bool playing() const;
+		bool paused() const;
+        //! Pauses this instance to be resumed afterwards. It will still keep a channel filled while paused.
+        void pause();
+        void resume();
+        //! Stops this instance of a sound being played.
+        //! Calling this twice, or too late, does not do any harm.
+		void stop();
+
+        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
+        //! volume).
+        void changeVolume(double volume);
+        //! \param pan Can be anything from -1.0 (left) to 1.0 (right).
+        void changePan(double pan);
+        //! \param speed Playback speed is only limited by FMOD's
+        //! capabilities and can accept very high or low values. Use 1.0 for
+        //! normal playback speed.
+        void changeSpeed(double speed);
+	};
+
+    //! A sample is a short sound that is completely loaded in memory, can be
+    //! played multiple times at once and offers very flexible playback
+    //! parameters. Use samples for everything that's not music.
+    class Sample
+    {
+        struct SampleData;
+        std::tr1::shared_ptr<SampleData> data;
+    
+    public:
+        //! Constructs a sample that can be played on the specified audio
+        //! system and loads the sample from a file.
+        explicit Sample(const std::wstring& filename);
+        
+        //! Constructs a sample that can be played on the specified audio
+        //! system and loads the sample data from a stream.
+        explicit Sample(Reader reader);
+        
+        //! Plays the sample without panning.
+        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
+        //! volume).
+        //! \param speed Playback speed is only limited by the underlying audio library,
+        //! and can accept very high or low values. Use 1.0 for
+        //! normal playback speed.
+        SampleInstance play(double volume = 1, double speed = 1,
+            bool looping = false) const;
+
+        //! Plays the sample with panning. Even if pan is 0.0, the sample will
+        //! not be as loud as if it were played by calling play() due to the
+        //! way the panning works.
+        //! \param pan Can be anything from -1.0 (left) to 1.0 (right).
+        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
+        //! volume).
+        //! \param speed Playback speed is only limited by by the underlying audio library,
+        //! and can accept very high
+        //! or low values. Use 1.0 for normal playback speed.
+        SampleInstance playPan(double pan, double volume = 1, double speed = 1,
+            bool looping = false) const;
+
+        #ifndef SWIG
+        GOSU_DEPRECATED Sample(Audio& audio, const std::wstring& filename);
+        GOSU_DEPRECATED Sample(Audio& audio, Reader reader);
+        #endif
+    };
+
+    //! Songs are less flexible than samples in that they can only be played
+    //! one at a time and without panning or speed parameters.
+    class Song
+    {
+        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&);
+#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
+        //! filename.
+        explicit Song(const std::wstring& filename);
+        
+        //! Constructs a song of the specified type that can be played on the
+        //! provided audio system and loads the song data from a stream.
+        explicit Song(Reader reader);
+        
+        ~Song();
+        
+        //! Returns the song currently being played or paused, or 0 if
+        //! no song has been played yet or the last song has finished
+        //! playing.
+        static Song* currentSong();
+        
+        //! Starts or resumes playback of the song. This will stop all other
+        //! songs and set the current song to this object.
+        void play(bool looping = false);
+        //! Pauses playback of the song. It is not considered being played.
+        //! currentSong will stay the same.
+        void pause();
+        //! Returns true if the song is the current song, but in paused
+        //! mode.
+        bool paused() const;
+        //! Stops playback of this song if it is currently played or paused.
+        //! Afterwards, currentSong will return 0.
+        void stop();
+        //! Returns true if the song is currently playing.
+        bool playing() const;
+        //! Returns the current volume of the song.
+        double volume() const;
+        //! Changes the volume of the song.
+        void changeVolume(double volume);
+        
+        //! Called every tick by Window for management purposes.
+        static void update();
+
+        #ifndef SWIG
+        enum Type { stStream, stModule };
+        GOSU_DEPRECATED Song(Audio&, const std::wstring& filename);
+        GOSU_DEPRECATED Song(Audio&, Type type, Reader reader);
+        #endif
+    };
+}
+
+#endif

data/Gosu/Bitmap.hpp

@@ -1,96 +1,96 @@
-//! \file Bitmap.hpp
-//! Interface of the Bitmap class.
-
-#ifndef GOSU_BITMAP_HPP
-#define GOSU_BITMAP_HPP
-
-#include <Gosu/Color.hpp>
-#include <Gosu/Fwd.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <Gosu/Platform.hpp>
-#include <string>
-#include <vector>
-
-namespace Gosu
-{
-    //! Rectangular area of pixels, each represented by a Color value. Provides
-    //! minimal drawing functionality and serves as a temporary holder for
-    //! graphical resources which are usually turned into Images later.
-    //! Has (expensive) value semantics.
-    class Bitmap
-    {
-        unsigned w, h;
-        std::vector<Color> pixels;
-
-    public:
-        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 height() const { return h; }
-
-        void swap(Bitmap& other);
-
-        void resize(unsigned width, unsigned height, Color c = Color::NONE);
-        
-        //! 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]; }
-
-        //! Sets the pixel at the specified position to a color. x and y must
-        //! be on the bitmap.
-        void setPixel(unsigned x, unsigned y, Color c) { pixels[y * w + x] = c; }
-
-        //! Inserts a bitmap at the given position. Parts of the inserted
-        //! bitmap that would be outside of the target bitmap will be
-        //! clipped away.
-        void insert(const Bitmap& source, int x, int y);
-
-        //! Inserts a portion of a bitmap at the given position. Parts of the
-        //! inserted bitmap that would be outside of the target bitmap will be
-        //! clipped away.
-        void insert(const Bitmap& source, int x, int y, unsigned srcX,
-            unsigned srcY, unsigned srcWidth, unsigned srcHeight);
-		
-        //! Direct access to the array of color values. May be useful for optimized
-        //! OpenGL operations.
-        const Color* data() const { return &pixels[0]; }
-        Color* data() { return &pixels[0]; }
-
-        // 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.
-    void loadImageFile(Bitmap& bitmap, const std::wstring& filename);
-    //! Loads any supported image into a Bitmap.
-    void loadImageFile(Bitmap& bitmap, 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);	
-
-    // 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
+//! \file Bitmap.hpp
+//! Interface of the Bitmap class.
+
+#ifndef GOSU_BITMAP_HPP
+#define GOSU_BITMAP_HPP
+
+#include <Gosu/Color.hpp>
+#include <Gosu/Fwd.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Platform.hpp>
+#include <string>
+#include <vector>
+
+namespace Gosu
+{
+    //! Rectangular area of pixels, each represented by a Color value. Provides
+    //! minimal drawing functionality and serves as a temporary holder for
+    //! graphical resources which are usually turned into Images later.
+    //! Has (expensive) value semantics.
+    class Bitmap
+    {
+        unsigned w, h;
+        std::vector<Color> pixels;
+
+    public:
+        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 height() const { return h; }
+
+        void swap(Bitmap& other);
+
+        void resize(unsigned width, unsigned height, Color c = Color::NONE);
+        
+        //! 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]; }
+
+        //! Sets the pixel at the specified position to a color. x and y must
+        //! be on the bitmap.
+        void setPixel(unsigned x, unsigned y, Color c) { pixels[y * w + x] = c; }
+
+        //! Inserts a bitmap at the given position. Parts of the inserted
+        //! bitmap that would be outside of the target bitmap will be
+        //! clipped away.
+        void insert(const Bitmap& source, int x, int y);
+
+        //! Inserts a portion of a bitmap at the given position. Parts of the
+        //! inserted bitmap that would be outside of the target bitmap will be
+        //! clipped away.
+        void insert(const Bitmap& source, int x, int y, unsigned srcX,
+            unsigned srcY, unsigned srcWidth, unsigned srcHeight);
+		
+        //! Direct access to the array of color values. May be useful for optimized
+        //! OpenGL operations.
+        const Color* data() const { return &pixels[0]; }
+        Color* data() { return &pixels[0]; }
+
+        // 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.
+    void loadImageFile(Bitmap& bitmap, const std::wstring& filename);
+    //! Loads any supported image into a Bitmap.
+    void loadImageFile(Bitmap& bitmap, 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);	
+
+    // 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