gosu 0.7.22 → 0.7.23

data/Gosu/Audio.hpp

@@ -5,7 +5,9 @@
 #define GOSU_AUDIO_HPP
 
 #ifdef WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif
 #include <Gosu/Fwd.hpp>

data/Gosu/Fwd.hpp

@@ -19,7 +19,6 @@ namespace Gosu
     class Input;
     class Reader;
     class Resource;
-    class RotFlip;
     class Sample;
     class Song;
     class TextInput;

data/Gosu/Gosu.hpp

@@ -22,12 +22,12 @@
 #include <Gosu/IO.hpp>
 #include <Gosu/Math.hpp>
 #include <Gosu/Platform.hpp>
-#include <Gosu/RotFlip.hpp>
 #include <Gosu/Sockets.hpp>
 #include <Gosu/Text.hpp>
 #include <Gosu/TextInput.hpp>
 #include <Gosu/Timing.hpp>
 #include <Gosu/Utility.hpp>
+#include <Gosu/Version.hpp>
 #include <Gosu/Window.hpp>
 
 #endif

data/Gosu/Graphics.hpp

@@ -19,21 +19,20 @@ namespace Gosu
     //! Returns the height, in pixels, of the user's primary screen.
     unsigned screenHeight();
     
-    // Returns the maximum size of an image that can fit on a single
-    // texture.
-    // Only useful when extending Gosu using OpenGL.
-    // (Held back until it will not cause a stock Ubuntu to crash. Don't ask me!)
-    //extern unsigned const MAX_TEXTURE_SIZE;
+    //! Returns the maximum size of an texture that will be allocated
+    //! internally by Gosu.
+    //! Useful when extending Gosu using OpenGL.
+    extern unsigned const MAX_TEXTURE_SIZE;
     
     typedef boost::array<double, 16> Transform;
-    Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
     Transform translate(double x, double y);
+    Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
     Transform scale(double factor);
-    Transform scale(double factorX, double factorY);
+    Transform scale(double factorX, double factorY, double fromX = 0, double fromY = 0);
     
-    //! Serves as the target of all drawing and provides basic drawing
+    //! Serves as the target of all drawing and provides primitive drawing
     //! functionality.
-    //! Usually created by Gosu::Window.
+    //! Usually created internally by Gosu::Window.
     class Graphics
     {
         struct Impl;
@@ -44,8 +43,6 @@ namespace Gosu
         ~Graphics();
 
         // Undocumented until I have thought about this...
-        double factorX() const;
-        double factorY() const;
         void setResolution(unsigned virtualWidth, unsigned virtualHeight);
         // End of Undocumented
         
@@ -58,6 +55,10 @@ namespace Gosu
         bool begin(Color clearWithColor = Color::BLACK);
         //! Every call to begin must have a matching call to end.
         void end();
+        //! Flushes the Z queue to the screen and starts a new one.
+        //! Useful for games that are *very* composite in nature (splitscreen).
+        void flush();
+        
         //! Finishes all pending Gosu drawing operations and executes
         //! the following OpenGL code in a clean environment.
         void beginGL();

data/Gosu/GraphicsBase.hpp

@@ -4,6 +4,7 @@
 #ifndef GOSU_GRAPHICSBASE_HPP
 #define GOSU_GRAPHICSBASE_HPP
 
+#include <Gosu/Platform.hpp>
 #include <limits>
 
 namespace Gosu
@@ -16,6 +17,10 @@ namespace Gosu
     //! 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

data/Gosu/Image.hpp

@@ -6,7 +6,6 @@
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Bitmap.hpp>
-#include <Gosu/RotFlip.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <memory>
 
@@ -79,21 +78,8 @@ namespace Gosu
             Color c = Color::WHITE,
             AlphaMode mode = amDefault) const;
 
-        #ifndef SWIG
-        void drawRotFlip(double x, double y, ZPos z,
-            RotFlip rf,
-            double factorX = 1, double factorY = 1,
-            Color c = Color::WHITE,
-            AlphaMode mode = amDefault) const;
-        void drawRotFlipMod(double x, double y, ZPos z,
-            RotFlip rf,
-            double factorX, double factorY,
-            Color c1, Color c2, Color c3, Color c4,
-            AlphaMode mode = amDefault) const;
-
         //! Provides access to the underlying image data object.
         const ImageData& getData() const;
-        #endif
     };
 
 	//! Convenience function that splits a BMP or PNG file into an array

data/Gosu/Input.hpp

@@ -9,7 +9,9 @@
 
 #ifdef GOSU_IS_WIN
 #include <Gosu/ButtonsWin.hpp>
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif
 
@@ -50,20 +52,6 @@ namespace Gosu
 		Button(ButtonName name) : id_(name) {}
 	};
     
-	// Available even on non-iPhone platforms to make it easier to compile the
-	// same source for multiple platforms.
-    
-    //! Struct that saves information about a touch on the surface of a multi-
-    //! touch device.
-    struct Touch
-    {
-        //! Allows for identification of a touch across calls.
-        void* id;
-        //! Position of a touch on the touch screen.
-        double x, y;
-    };
-    typedef std::vector<Touch> Touches;
-    
 	//! Tests whether two Buttons identify the same physical button.
 	inline bool operator==(Button lhs, Button rhs)
 	{
@@ -78,6 +66,19 @@ namespace Gosu
         return lhs.id() < rhs.id();
     }
 	
+    //! Struct that saves information about a touch on the surface of a multi-
+    //! touch device.
+	//! Available even on non-iPhone platforms to make it easier to compile the
+	//! same source for multiple platforms.
+    struct Touch
+    {
+        //! Allows for identification of a touch across calls.
+        void* id;
+        //! Position of a touch on the touch screen.
+        float x, y;
+    };
+    typedef std::vector<Touch> Touches;
+    
     //! Manages initialization and shutdown of the input system. Only one Input
 	//! instance can exist per application.
     class Input
@@ -92,9 +93,10 @@ namespace Gosu
         
         #ifdef GOSU_IS_MAC
         #ifdef GOSU_IS_IPHONE
-        Input();
+        Input(void* view, float updateInterval);
+        void feedTouchEvent(int type, void* touches);
         #else
-        Input(void* nswindow);
+        Input(void* window);
         bool feedNSEvent(void* event);
         #endif
         #endif
@@ -121,15 +123,23 @@ 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.
+        // Undocumented for the moment. Also applies to currentTouches().
         void setMouseFactors(double factorX, double factorY);
         
+        //! Currently known touches.
+        const Touches& currentTouches() const;
+        
+        //! Accelerometer positions in all three dimensions (smoothened).
+        double accelerometerX() const;
+        double accelerometerY() const;
+        double accelerometerZ() const;
+        
         //! Collects new information about which buttons are pressed, where the
         //! mouse is and calls onButtonUp/onButtonDown, if assigned.
         void update();
@@ -138,6 +148,10 @@ namespace Gosu
 		//! If you use the Window class, it will assign forward these to its own methods.
         boost::function<void (Button)> onButtonDown, onButtonUp;
         
+		//! Assignable events that are called by update. You can bind these to your own functions.
+		//! If you use the Window class, it will assign forward these to its own methods.
+        boost::function<void (Touch)> onTouchBegan, onTouchMoved, onTouchEnded;
+        
         //! Returns the currently active TextInput instance, or 0.
         TextInput* textInput() const;
         //! Sets the currently active TextInput, or clears it (input = 0).

data/Gosu/Text.hpp

@@ -51,7 +51,8 @@ namespace Gosu
     //! \param text Formatted text.
     //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/', does not work on Linux).
     //! \param fontHeight Height of the font in pixels.
-    //! \param lineSpacing Spacing between two lines of text in pixels.
+    //! \param lineSpacing Spacing between two lines of text in pixels. Can be negative to make
+    //! text stick together more closely.
     //! \param maxWidth Width of the bitmap that will be returned. Text
     //! will be split into multiple lines to avoid drawing over the right
     //! border. When a single word is too long, it will be truncated.
@@ -59,7 +60,7 @@ namespace Gosu
     //! enum.
     Bitmap createText(const std::wstring& text,
         const std::wstring& fontName, unsigned fontHeight, 
-        unsigned lineSpacing, unsigned maxWidth, TextAlign align,
+        int lineSpacing, unsigned maxWidth, TextAlign align,
         unsigned fontFlags = 0);
     
     //! Registers a new HTML-style entity that can subsequently be used

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 22
-#define GOSU_VERSION "0.7.22"
+#define GOSU_POINT_VERSION 23
+#define GOSU_VERSION "0.7.23"
 
 #endif

data/Gosu/Window.hpp

@@ -13,7 +13,9 @@
 #include <string>
 
 #ifdef GOSU_IS_WIN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif
 
@@ -28,7 +30,7 @@ namespace Gosu
     {
         struct Impl;
         boost::scoped_ptr<Impl> pimpl;
-
+	
     public:
         //! Constructs a Window.
         //! \param updateInterval Interval in milliseconds between two calls
@@ -59,6 +61,19 @@ namespace Gosu
         //! redraws for one reason or another.
         //! By default, the window is redrawn all the time.
         virtual bool needsRedraw() const { return true; }
+
+		//! If this function returns true, the system arrow cursor is drawn while
+		//! over the window.
+		virtual bool needsCursor() const { return false; }
+        
+        //! This function is called when the window loses focus on some platforms.
+        //! Most importantly, it is called on the iPhone or iPad when the user
+        //! locks the screen.
+        virtual void loseFocus() {}
+        
+        //! 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.
@@ -94,15 +109,13 @@ namespace Gosu
         // Note that it does not hurt to override them even if you compile
         // for another platform; if you don't specify "virtual" the code
         // should even be stripped away cleanly.
-        virtual void touchesBegan(const Touches& touches) {}
-        virtual void touchesMoved(const Touches& touches) {}
-        virtual void touchesEnded(const Touches& touches) {}
-        // Currently known touches.
-        const Touches& currentTouches() const;
+        virtual void touchBegan(Touch touch) {}
+        virtual void touchMoved(Touch touch) {}
+        virtual void touchEnded(Touch touch) {}
         #endif        
         
-        GOSU_DEPRECATED const Audio& audio() const;
-        GOSU_DEPRECATED Audio& audio();
+        const Audio& audio() const;
+        Audio& audio();
 
         #endif
     };

data/GosuImpl/Audio/AudioOpenAL.mm

@@ -22,6 +22,10 @@
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
 
+#ifdef GOSU_IS_IPHONE
+#import <AVFoundation/AVFoundation.h>
+#endif
+
 using namespace std;
 
 namespace
@@ -245,7 +249,7 @@ protected:
 public:
     virtual ~BaseData() {}
     
-    virtual void play() = 0;
+    virtual void play(bool looping) = 0;
     virtual void pause() = 0;
     virtual void resume() = 0;
     virtual bool paused() const = 0;
@@ -265,6 +269,62 @@ public:
     }
 };
 
+#ifdef GOSU_IS_IPHONE
+// AVAudioPlayer impl
+class Gosu::Song::ModuleData : public BaseData
+{
+    ObjRef<AVAudioPlayer> player;
+    
+    void applyVolume()
+    {
+        player.obj().volume = volume();
+    }
+    
+public:
+    ModuleData(const std::wstring& filename)
+    {
+        std::string utf8Filename = Gosu::wstringToUTF8(filename);
+        ObjRef<NSString> nsFilename([[NSString alloc] initWithUTF8String: utf8Filename.c_str()]);
+        ObjRef<NSURL> url([[NSURL alloc] initFileURLWithPath: nsFilename.obj()]);
+        player.reset([[AVAudioPlayer alloc] initWithContentsOfURL: url.obj() error: NULL]);
+    }
+    
+    void play(bool looping)
+    {
+        if (paused())
+            stop();
+        player.obj().numberOfLoops = looping ? -1 : 0;
+        [player.obj() play];
+    }
+    
+    void pause()
+    {
+        [player.obj() pause];
+    }
+    
+    void resume()
+    {
+        [player.obj() play];
+    }
+    
+    bool paused() const
+    {
+        return !player.obj().playing;
+    };
+    
+    void stop()
+    {
+        [player.obj() stop];
+        player.obj().currentTime = 0;
+    }
+    
+    void update()
+    {
+    }
+};
+#endif
+
+// AudioToolbox impl
 class Gosu::Song::StreamData : public BaseData
 {
     boost::scoped_ptr<AudioFile> file;
@@ -327,7 +387,7 @@ public:
         }
     }
     
-    void play()
+    void play(bool looping)
     {
         int source = lookupSource();
         if (source != ALChannelManagement::NO_SOURCE)
@@ -401,7 +461,7 @@ public:
         int source = lookupSource();
 
         ALuint buffer;
-        int queued, processed;
+        int processed;
         bool active = true;
         
         alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
@@ -428,7 +488,7 @@ public:
 
             if (curSongLooping)
                 // Start anew.
-                play();
+                play(true);
             else
                 // Let the world know we're finished.
                 curSong = 0;
@@ -438,9 +498,15 @@ public:
 
 Gosu::Song::Song(const std::wstring& filename)
 {
-    CONSTRUCTOR_COMMON;
-
-    data.reset(new StreamData(filename));
+#ifdef GOSU_IS_IPHONE
+    if (boost::iends_with(filename, L".mp3") || boost::iends_with(filename, L".aac") || boost::iends_with(filename, L".m4a"))
+        data.reset(new ModuleData(filename));
+    else
+#endif
+    {
+        CONSTRUCTOR_COMMON;
+        data.reset(new StreamData(filename));
+    }
 }
 
 Gosu::Song::Song(Type type, Reader reader)
@@ -472,7 +538,7 @@ void Gosu::Song::play(bool looping)
     }
     
     if (curSong == 0)
-        data->play();
+        data->play(looping);
     
     curSong = this;
     curSongLooping = looping;