gosu 0.7.11 → 0.7.12

data/Gosu/Audio.hpp

@@ -40,12 +40,16 @@ namespace Gosu
 	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;
+        void pause();
+        void resume();
 		void stop();
 
         //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
@@ -54,14 +58,14 @@ namespace Gosu
         //! \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
-        //! capatibilities and can accept very high or low values. Use 1.0 for
+        //! 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. In short, use samples for everything that's not music.
+    //! parameters. Use samples for everything that's not music.
     class Sample
     {
         struct SampleData;
@@ -82,20 +86,22 @@ namespace Gosu
         //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
         //! volume).
         //! \param speed Playback speed is only limited by FMOD's
-        //! capatibilities and can accept very high or low values. Use 1.0 for
+        //! capabilities and can accept very high or low values. Use 1.0 for
         //! normal playback speed.
-        SampleInstance play(double volume = 1, double speed = 1) const;
+        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 FMOD's panning works.
+        //! 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 FMOD's
-        //! capatibilities 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) const;
+        //! \param speed Playback speed is only limited by FMOD's (or
+        //! SDL_mixer's, respectively) capabilities 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;
     };
 
     //! Songs are less flexible than samples in that they can only be played
@@ -126,12 +132,23 @@ namespace Gosu
         Song(Audio&, Type type, Reader reader);
         
         ~Song();
-
-        //! Starts playback of the song. This will stop all other songs and
-        //! cause the currently played song to restart if called on the
-        //! current song.
-        void play();
-        //! Stops playback of this song if it is currently played.
+        
+        //! 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 if the song is currently playing.
         bool playing() const;

data/Gosu/GraphicsBase.hpp

@@ -4,7 +4,7 @@
 #ifndef GOSU_GRAPHICSBASE_HPP
 #define GOSU_GRAPHICSBASE_HPP
 
-#include <boost/cstdint.hpp>
+#include <limits>
 
 namespace Gosu
 {
@@ -12,6 +12,11 @@ namespace Gosu
     //! system. Draw calls with higher ZPos values will cover those with a
     //! 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.
+    const double zImmediate = -std::numeric_limits<double>::infinity();
 
     //! Determines the way colors are combined when one is drawn onto
     //! another.

data/Gosu/Input.hpp

@@ -76,8 +76,8 @@ namespace Gosu
         #endif
         
         #ifdef GOSU_IS_X
-        Input(::Display* dpy);
-        bool feedXEvent(::XEvent& event, Window* window);
+        Input(::Display* display, ::Window window);
+        bool feedXEvent(::XEvent& event);
         #endif
         
         ~Input();
@@ -96,6 +96,12 @@ namespace Gosu
         double mouseX() const;
         //! See mouseX.
         double mouseY() const;
+
+        //! Immediately moves the mouse as far towards the desired position
+        //! as possible. x and y are relativ to the window just as in the mouse
+        //! position accessors.
+        void setMousePosition(double x, double y);
+
         // Undocumented for the moment.
         void setMouseFactors(double factorX, double factorY);
         

data/Gosu/Platform.hpp

@@ -1,61 +1,63 @@
-//! \file Platform.hpp
-//! Macros and utility functions to facilitate programming on all of Gosu's supported platforms.
-
-#ifndef GOSU_PLATFORM_HPP
-#define GOSU_PLATFORM_HPP
-
-#ifdef __BIG_ENDIAN__
-#define IDENTITY_FUN bigToNative
-#define IDENTITY_FUN2 nativeToBig
-#define CONV_FUN littleToNative
-#define CONV_FUN2 nativeToLittle
-#else
-#define IDENTITY_FUN littleToNative
-#define IDENTITY_FUN2 nativeToLittle
-#define CONV_FUN bigToNative
-#define CONV_FUN2 nativeToBig
-#endif
-
-#include <algorithm>
-
-namespace Gosu
-{
-    template<typename T> T IDENTITY_FUN(T t) { return t; }
-    template<typename T> T IDENTITY_FUN2(T t) { return t; }
-    
-    template<typename T>
-    T CONV_FUN(T t)
-    {
-        char* begin = reinterpret_cast<char*>(&t);
-        std::reverse(begin, begin + sizeof t);
-        return t;
-    }
-
-    template<typename T> T CONV_FUN2(T t) { return CONV_FUN(t); }
-}
-
-#undef IDENTITY_FUN
-#undef IDENTITY_FUN2
-#undef CONV_FUN
-#undef CONV_FUN2
-
-#ifdef _MSC_VER
-#define GOSU_NORETURN __declspec(noreturn)
-#endif
-
-#ifdef __GNUC__
-#define GOSU_NORETURN __attribute__ ((noreturn))
-#endif
-
-#ifdef WIN32
-# define GOSU_IS_WIN
-#else
-# define GOSU_IS_UNIX
-# if defined(__linux) || defined(__FreeBSD__)
-#  define GOSU_IS_X
-# else
-#  define GOSU_IS_MAC
-# endif
-#endif
-
-#endif
+//! \file Platform.hpp
+//! Macros and utility functions to facilitate programming on all of Gosu's supported platforms.
+
+#ifndef GOSU_PLATFORM_HPP
+#define GOSU_PLATFORM_HPP
+
+#ifdef __BIG_ENDIAN__
+#define IDENTITY_FUN bigToNative
+#define IDENTITY_FUN2 nativeToBig
+#define CONV_FUN littleToNative
+#define CONV_FUN2 nativeToLittle
+#else
+#define IDENTITY_FUN littleToNative
+#define IDENTITY_FUN2 nativeToLittle
+#define CONV_FUN bigToNative
+#define CONV_FUN2 nativeToBig
+#endif
+
+#include <algorithm>
+
+namespace Gosu
+{
+    template<typename T> T IDENTITY_FUN(T t) { return t; }
+    template<typename T> T IDENTITY_FUN2(T t) { return t; }
+    
+    template<typename T>
+    T CONV_FUN(T t)
+    {
+        char* begin = reinterpret_cast<char*>(&t);
+        std::reverse(begin, begin + sizeof t);
+        return t;
+    }
+
+    template<typename T> T CONV_FUN2(T t) { return CONV_FUN(t); }
+}
+
+#undef IDENTITY_FUN
+#undef IDENTITY_FUN2
+#undef CONV_FUN
+#undef CONV_FUN2
+
+#if defined(_MSC_VER)
+#define GOSU_NORETURN __declspec(noreturn)
+#elif defined(__GNUC__)
+#define GOSU_NORETURN __attribute__ ((noreturn))
+#endif
+
+#if defined(WIN32)
+# define GOSU_IS_WIN
+#else
+# define GOSU_IS_UNIX
+# if defined(__linux) || defined(__FreeBSD__)
+#  define GOSU_IS_X
+# else
+#  define GOSU_IS_MAC
+#  include <TargetConditionals.h>
+#  if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+#   define GOSU_IS_IPHONE
+#  endif
+# endif
+#endif
+
+#endif

data/Gosu/Window.hpp

@@ -11,6 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <string>
+#include <vector>
 
 #ifdef GOSU_IS_WIN
 #include <windows.h>
@@ -18,6 +19,11 @@
 
 namespace Gosu
 {
+    #ifdef GOSU_IS_IPHONE
+    struct Touch { double x, y; };
+    typedef std::vector<Touch> Touches;
+    #endif
+
     //! Convenient all-in-one class that serves as the foundation of a standard
 	//! Gosu application. Manages initialization of all of Gosu's core components
     //! and provides timing functionality.
@@ -76,6 +82,11 @@ namespace Gosu
         typedef boost::shared_ptr<boost::function<void()> > SharedContext;
         SharedContext createSharedContext();
         #endif
+        #ifdef GOSU_IS_IPHONE
+        virtual void touchesBegan(const Touches& touches) {}
+        virtual void touchesMoved(const Touches& touches) {}
+        virtual void touchesEnded(const Touches& touches) {}
+        #endif        
 
         #endif
     };

data/GosuImpl/AudioFmod.cpp

@@ -96,6 +96,21 @@ bool Gosu::SampleInstance::playing() const
     return FSOUND_IsPlaying(handle);
 }
 
+bool Gosu::SampleInstance::paused() const
+{
+    return FSOUND_GetPaused(handle);
+}
+
+void Gosu::SampleInstance::pause()
+{
+    FSOUND_SetPaused(handle, 1);
+}
+
+void Gosu::SampleInstance::resume()
+{
+    FSOUND_SetPaused(handle, 0);
+}
+
 void Gosu::SampleInstance::stop()
 {
     FSOUND_StopSound(handle);
@@ -164,12 +179,15 @@ Gosu::Sample::~Sample()
 {
 }
 
-Gosu::SampleInstance Gosu::Sample::play(double volume, double speed) const
+Gosu::SampleInstance Gosu::Sample::play(double volume, double speed,
+    bool looping) const
 {
     int handle = FSOUND_PlaySound(FSOUND_FREE, data->rep);
     int freq;
     if (handle > 0)
     {
+        if (looping)
+            FSOUND_SetLoopMode(handle, FSOUND_LOOP_NORMAL);
         freq = FSOUND_GetFrequency(handle);
         FSOUND_SetPan(handle, FSOUND_STEREOPAN);
     }
@@ -180,12 +198,15 @@ Gosu::SampleInstance Gosu::Sample::play(double volume, double speed) const
     return result;
 }
 
-Gosu::SampleInstance Gosu::Sample::playPan(double pan, double volume, double speed) const
+Gosu::SampleInstance Gosu::Sample::playPan(double pan, double volume,
+    double speed, bool looping) const
 {
     int handle = FSOUND_PlaySound(FSOUND_FREE, data->rep);
     int freq;
     if (handle > 0)
     {
+        if (looping)
+            FSOUND_SetLoopMode(handle, FSOUND_LOOP_NORMAL);
         freq = FSOUND_GetFrequency(handle);
     }
     
@@ -207,7 +228,9 @@ protected:
 public:
     virtual ~BaseData() {}
 
-    virtual void play() = 0;
+    virtual void play(bool looping) = 0;
+    virtual void pause() = 0;
+    virtual bool paused() const = 0;
     virtual void stop() = 0;
     
     double volume() const
@@ -254,8 +277,8 @@ public:
         }
 #endif
 
-        stream = FSOUND_Stream_Open(&buffer[0], FSOUND_LOADMEMORY, 0,
-            buffer.size());
+        stream = FSOUND_Stream_Open(&buffer[0], FSOUND_LOADMEMORY | FSOUND_LOOP_NORMAL,
+            0, buffer.size());
         if (stream == 0)
             throwLastFMODError();
         
@@ -274,15 +297,33 @@ public:
             FSOUND_Stream_Close(stream);
     }
     
-    void play()
+    void play(bool looping)
     {
-        handle = FSOUND_Stream_Play(FSOUND_FREE, stream);
+        if (handle == -1)
+        {
+            handle = FSOUND_Stream_Play(FSOUND_FREE, stream);
+                FSOUND_Stream_SetLoopCount(stream, looping ? -1 : 0);
+        }
+        else if (paused())
+            FSOUND_SetPaused(handle, 0);
         applyVolume();
     }
     
+    void pause()
+    {
+        if (handle != -1)
+            FSOUND_SetPaused(handle, 1);
+    }
+    
+    bool paused() const
+    {
+        return handle != -1 && FSOUND_GetPaused(handle);
+    }
+    
     void stop()
     {
         fmodCheck(FSOUND_Stream_Stop(stream));
+        handle = -1; // The end callback is NOT being called!
     }
     
     void applyVolume()
@@ -321,15 +362,30 @@ public:
             FMUSIC_FreeSong(module_);
     }
 
-    void play()
+    void play(bool looping)
     {
-        FMUSIC_PlaySong(module_);
+        if (paused())
+            FMUSIC_SetPaused(module_, 0);
+        else
+            FMUSIC_PlaySong(module_);
+        FMUSIC_SetLooping(module_, looping);
         applyVolume();
     }
+    
+    void pause()
+    {
+        FMUSIC_SetPaused(module_, 1);
+    }
+    
+    bool paused() const
+    {
+        return FMUSIC_GetPaused(module_);
+    }
 
     void stop()
     {
         fmodCheck(FMUSIC_StopSong(module_));
+        FMUSIC_SetPaused(module_, false);
     }
     
     void applyVolume()
@@ -381,20 +437,37 @@ Gosu::Song::~Song()
         stop();
 }
 
-void Gosu::Song::play()
+Gosu::Song* Gosu::Song::currentSong()
 {
-    if (curSong)
+    return curSong;
+}
+
+void Gosu::Song::play(bool looping)
+{
+    if (curSong && curSong != this)
+    {
         curSong->stop();
+        assert(curSong == 0);
+    }
+
+    data->play(looping);
+    curSong = this; // may be redundant
+}
 
-    assert(curSong == 0);
+void Gosu::Song::pause()
+{
+    if (curSong == this)
+        data->pause(); // may be redundant
+}
 
-    data->play();
-    curSong = this;
+bool Gosu::Song::paused() const
+{
+    return curSong == this && data->paused();
 }
 
 void Gosu::Song::stop()
 {
-    if (playing())
+    if (curSong == this)
     {
         data->stop();
         curSong = 0;
@@ -403,7 +476,7 @@ void Gosu::Song::stop()
 
 bool Gosu::Song::playing() const
 {
-    return curSong == this;
+    return curSong == this && !data->paused();
 }
 
 double Gosu::Song::volume() const