gosu 0.7.15 → 0.7.16

data/Gosu/Audio.hpp

@@ -1,9 +1,6 @@
 //! \file Audio.hpp
 //! Contains all the classes of Gosu's audio system.
 
-// REDESIGN: Rename all changeXXX() member functions to setXXX().
-// REDESIGN: Don't require window argument, is this possible?
-
 #ifndef GOSU_AUDIO_HPP
 #define GOSU_AUDIO_HPP
 
@@ -14,27 +11,12 @@
 #include <Gosu/IO.hpp>
 #include <Gosu/Platform.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
 #include <string>
 
 namespace Gosu
 {
-    //! Manages initialization and finalization of audio libraries. Must be
-    //! created before and destroyed after all samples and songs.
-    //! There can only be one instance of Gosu::Audio.
-    //! Usually created internally by Gosu::Window.
-    class Audio : boost::noncopyable
-    {
-    public:
-        #ifdef GOSU_IS_WIN
-        explicit Audio(HWND window);
-        #else
-        Audio();
-        #endif
-        ~Audio();
-        
-        void update();
-    };
+    // Deprecated.
+    class Audio;
 
     //! An instance of a Sample playing. Can be used to stop sounds dynamically,
     //! or to check if they are finished.
@@ -81,11 +63,11 @@ namespace Gosu
     public:
         //! Constructs a sample that can be played on the specified audio
         //! system and loads the sample from a file.
-        Sample(Audio& audio, const std::wstring& filename);
+        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.
-        Sample(Audio& audio, Reader reader);
+        explicit Sample(Reader reader);
         
         ~Sample();
 
@@ -109,6 +91,11 @@ namespace Gosu
         //! or low values. Use 1.0 for normal playback speed.
         SampleInstance playPan(double pan, double volume = 1, double speed = 1,
             bool looping = false) const;
+
+
+        // Deprecated.
+        Sample(Audio& audio, const std::wstring& filename);
+        Sample(Audio& audio, Reader reader);
     };
 
     //! Songs are less flexible than samples in that they can only be played
@@ -119,11 +106,6 @@ namespace Gosu
         class ModuleData;
         class StreamData;
         boost::scoped_ptr<BaseData> data;
-        
-        #ifdef GOSU_IS_MAC
-        void update();
-        friend class Audio;
-        #endif
     public:
         //! There are two types of songs that can be loaded as a Song: Streamed
         //! songs (like OGG) and modules (like MOD or XM).
@@ -136,11 +118,11 @@ namespace Gosu
         //! 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.
-        Song(Audio&, const std::wstring& 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.
-        Song(Audio&, Type type, Reader reader);
+        Song(Type type, Reader reader);
         
         ~Song();
         
@@ -167,6 +149,13 @@ namespace Gosu
         double volume() const;
         //! Changes the volume of the song.
         void changeVolume(double volume);
+        
+        //! Called every tick by Window for management purposes.
+        static void update();
+
+        // Deprecated.
+        Song(Audio&, const std::wstring& filename);
+        Song(Audio&, Type type, Reader reader);
     };
 }
 

data/Gosu/Bitmap.hpp

@@ -30,7 +30,7 @@ namespace Gosu
 
         void swap(Bitmap& other);
 
-        void resize(unsigned width, unsigned height, Color c = Colors::none);
+        void resize(unsigned width, unsigned height, Color c = Color::NONE);
 
         void fill(Color c);
         void replace(Color oldColor, Color newColor);

data/Gosu/Color.hpp

@@ -126,6 +126,19 @@ namespace Gosu
         {
             return alpha() << 24 | bgr();
         }
+        
+        static const Color NONE;
+        static const Color BLACK;
+        static const Color GRAY;
+        static const Color WHITE;
+        
+        static const Color AQUA;
+        static const Color RED;
+        static const Color GREEN;
+        static const Color BLUE;
+        static const Color YELLOW;
+        static const Color FUCHSIA;
+        static const Color CYAN;
     };
     
     // Causes weird errors when included in the SWIG wrapping process.
@@ -153,13 +166,15 @@ namespace Gosu
     //! and then multiplied with each other.
     Color multiply(Color a, Color b);
 
-    //! Namespace which contains some predefined colors.
+    // Deprecated
     namespace Colors
     {
         const Color none    = 0x00000000;
         const Color black   = 0xff000000;
         const Color gray    = 0xff808080;
         const Color white   = 0xffffffff;
+        
+        const Color aqua    = 0xff00ffff;
         const Color red     = 0xffff0000;
         const Color green   = 0xff00ff00;
         const Color blue    = 0xff0000ff;

data/Gosu/Font.hpp

@@ -47,7 +47,7 @@ namespace Gosu
         //! Draws text so the top left corner of the text is at (x; y).
         void draw(const std::wstring& text, double x, double y, ZPos z,
             double factorX = 1, double factorY = 1,
-            Color c = Colors::white, AlphaMode mode = amDefault) const;
+            Color c = Color::WHITE, AlphaMode mode = amDefault) const;
         
         //! Draws text at a position relative to (x; y).
         //! \param relX Determines where the text is drawn horizontally. If
@@ -57,12 +57,12 @@ namespace Gosu
         //! \param relY See relX.
         void drawRel(const std::wstring& text, double x, double y, ZPos z,
             double relX, double relY, double factorX = 1, double factorY = 1,
-            Color c = Colors::white, AlphaMode mode = amDefault) const;
+            Color c = Color::WHITE, AlphaMode mode = amDefault) const;
         
         //! Analogous to draw, but rotates the text by a given angle.
         void drawRot(const std::wstring& text, double x, double y, ZPos z, double angle,
             double factorX = 1, double factorY = 1,
-            Color c = Colors::white, AlphaMode mode = amDefault) const;
+            Color c = Color::WHITE, AlphaMode mode = amDefault) const;
     };
 }
 

data/Gosu/Graphics.hpp

@@ -18,6 +18,12 @@ 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;
+    
     //! Serves as the target of all drawing and provides basic drawing
     //! functionality.
     //! Usually created by Gosu::Window.
@@ -42,7 +48,7 @@ namespace Gosu
 
         //! Prepares the graphics object for drawing. Nothing must be drawn
         //! without calling begin.
-        bool begin(Color clearWithColor = Colors::black);
+        bool begin(Color clearWithColor = Color::BLACK);
         //! Every call to begin must have a matching call to end.
         void end();
         //! Finishes all pending Gosu drawing operations and executes

data/Gosu/Image.hpp

@@ -48,14 +48,14 @@ namespace Gosu
         explicit Image(std::auto_ptr<ImageData> data);
 
         ~Image();
-
+        
         unsigned width() const;
         unsigned height() const;
 
         //! Draws the image so its upper left corner is at (x; y).
         void draw(double x, double y, ZPos z,
             double factorX = 1, double factorY = 1,
-            Color c = Colors::white,
+            Color c = Color::WHITE,
             AlphaMode mode = amDefault) const;
         //! Like draw(), but allows to give modulation colors for all four
         //! corners.
@@ -76,14 +76,14 @@ namespace Gosu
         void drawRot(double x, double y, ZPos z,
             double angle, double centerX = 0.5, double centerY = 0.5,
             double factorX = 1, double factorY = 1,
-            Color c = Colors::white,
+            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 = Colors::white,
+            Color c = Color::WHITE,
             AlphaMode mode = amDefault) const;
         void drawRotFlipMod(double x, double y, ZPos z,
             RotFlip rf,

data/Gosu/TextInput.hpp

@@ -27,7 +27,7 @@ namespace Gosu
         
     public:
         TextInput();
-        ~TextInput();
+        virtual ~TextInput();
 
         std::wstring text() const;
 
@@ -42,7 +42,7 @@ namespace Gosu
         //! using the same indexing scheme as caretPos. If there is no selection,
         //! selectionStart() is equal to caretPos().
         unsigned selectionStart() const;
-
+        
         // Platform-specific communication with Gosu::Input.
         #if defined(GOSU_IS_MAC)
         bool feedNSEvent(void* event);
@@ -51,6 +51,14 @@ namespace Gosu
         #elif defined(GOSU_IS_X)
         bool feedXEvent(void* display, void* event);
         #endif
+
+        //! Overridable filter that is applied to all new text that is entered.
+        //! Allows for context-sensitive filtering/extending/... of the text.
+        //! The text will be inserted at caretPos afterwards.
+        virtual std::wstring filter(const std::wstring& textIn) const
+        {
+            return textIn;
+        }
     };
 }
 

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 15
-#define GOSU_VERSION "0.7.15"
+#define GOSU_POINT_VERSION 16
+#define GOSU_VERSION "0.7.16"
 
 #endif

data/Gosu/Window.hpp

@@ -71,9 +71,6 @@ namespace Gosu
         const Graphics& graphics() const;
         Graphics& graphics();
         
-        const Audio& audio() const;
-        Audio& audio();
-        
         const Input& input() const;
         Input& input();
         
@@ -104,6 +101,10 @@ namespace Gosu
         #endif        
         
         #endif
+        
+        // Deprecated.
+        const Audio& audio() const;
+        Audio& audio();
     };
 }
 

data/GosuImpl/Audio/AudioOpenAL.mm

@@ -61,23 +61,10 @@ namespace
     bool curSongLooping;
 }
 
-Gosu::Audio::Audio()
-{
-    if (alChannelManagement)
-        throw std::logic_error("Multiple Gosu::Audio instances not supported");
-    alChannelManagement.reset(new ALChannelManagement);
-}
-
-Gosu::Audio::~Audio()
-{
-    alChannelManagement.reset();
-}
-
-void Gosu::Audio::update()
-{
-    if (Song::currentSong())
-        Song::currentSong()->update();
-}
+#define CONSTRUCTOR_COMMON \
+    ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]); \
+    if (!alChannelManagement) \
+        alChannelManagement.reset(new ALChannelManagement)
 
 Gosu::SampleInstance::SampleInstance(int handle, int extra)
 : handle(handle), extra(extra)
@@ -182,8 +169,10 @@ struct Gosu::Sample::SampleData : boost::noncopyable
     }
 };
 
-Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
+Gosu::Sample::Sample(const std::wstring& filename)
 {
+    CONSTRUCTOR_COMMON;
+
     if (isOggFile(filename))
     {
         Gosu::Buffer buffer;
@@ -198,8 +187,10 @@ Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
     }
 }
 
-Gosu::Sample::Sample(Audio& audio, Reader reader)
+Gosu::Sample::Sample(Reader reader)
 {
+    CONSTRUCTOR_COMMON;
+
     if (isOggFile(reader))
     {
         OggFile oggFile(reader);
@@ -445,25 +436,23 @@ public:
     }
 };
 
-void Gosu::Song::update()
+Gosu::Song::Song(const std::wstring& filename)
 {
-    data->update();
-}
+    CONSTRUCTOR_COMMON;
 
-Gosu::Song::Song(Audio& audio, const std::wstring& filename)
-: data(new StreamData(filename))
-{
+    data.reset(new StreamData(filename));
 }
 
-Gosu::Song::Song(Audio& audio, Type type, Reader reader)
-: data(new StreamData(reader))
+Gosu::Song::Song(Type type, Reader reader)
 {
+    CONSTRUCTOR_COMMON;
+
+    data.reset(new StreamData(reader));
 }
 
 Gosu::Song::~Song()
 {
-    if (alChannelManagement)
-        stop();
+    stop();
 }
 
 Gosu::Song* Gosu::Song::currentSong()
@@ -523,3 +512,31 @@ void Gosu::Song::changeVolume(double volume)
 {
     data->changeVolume(volume);
 }
+
+void Gosu::Song::update()
+{
+    if (currentSong())
+        currentSong()->data->update();
+}
+
+// Deprecated constructors.
+
+Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
+{
+    Sample(filename).data.swap(data);
+}
+
+Gosu::Sample::Sample(Audio& audio, Reader reader)
+{
+    Sample(reader).data.swap(data);
+}
+
+Gosu::Song::Song(Audio& audio, const std::wstring& filename)
+{
+    Song(filename).data.swap(data);
+}
+
+Gosu::Song::Song(Audio& audio, Type type, Reader reader)
+{
+    Song(type, reader).data.swap(data);
+}

data/GosuImpl/AudioFmod.cpp

@@ -29,11 +29,8 @@ namespace Gosu
             return retVal;
         }
 
-        bool fmodInitialized = false;
-        Song* curSong = 0;
-
         #ifdef GOSU_IS_WIN
-        bool setWindow(HWND window)
+        bool setWindow()
         {
             // Copied and pasted from MSDN.
             #define FACILITY_VISUALCPP  ((LONG)0x6d)
@@ -45,7 +42,7 @@ namespace Gosu
             // if the library is not found, instead of crashing the game.
             __try
             {
-                FSOUND_SetHWND(reinterpret_cast<void*>(window));
+                FSOUND_SetHWND(GetDesktopWindow());
             }
             __except ((GetExceptionCode() == BAD_MOD) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
             {
@@ -58,38 +55,25 @@ namespace Gosu
             #undef FACILITY_VISUALCPP
         }
         #endif
+        
+        void requireFMOD()
+        {
+            static bool initialized = false;
+            if (initialized)
+                return;
+                
+            #ifdef GOSU_IS_WIN
+            if (!setWindow())
+                throw std::runtime_error("Could not load fmod.dll");
+            #endif
+            fmodCheck(FSOUND_Init(44100, 32, 0));
+            
+            initialized = true;
+        }
+        Song* curSong = 0;
     }
 }
 
-#ifdef GOSU_IS_WIN
-Gosu::Audio::Audio(HWND window)
-{
-    if (!setWindow(window))
-        throw std::runtime_error("Could not load fmod.dll");
-#else
-Gosu::Audio::Audio()
-{
-#endif
-
-    if (fmodInitialized)
-        throw std::logic_error("Multiple Gosu::Audio instances not supported");
-
-    fmodCheck(FSOUND_Init(44100, 32, 0));
-    fmodInitialized = true;
-}
-
-Gosu::Audio::~Audio()
-{
-    assert(fmodInitialized);
-
-    FSOUND_Close();
-    fmodInitialized = false;
-}
-
-void Gosu::Audio::update()
-{
-}
-
 Gosu::SampleInstance::SampleInstance(int handle, int extra)
 : handle(handle), extra(extra)
 {
@@ -146,29 +130,26 @@ struct Gosu::Sample::SampleData : boost::noncopyable
 
     ~SampleData()
     {
-        // Should be checked for earlier, as play would crash too.
-        // This is just because it's hard to free things in the right
-        // order in Ruby/Gosu.
-        
-        if (!fmodInitialized)
-            return;
-        
         if (rep != 0)
             FSOUND_Sample_Free(rep);
     }
 };
 
-Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
+Gosu::Sample::Sample(const std::wstring& filename)
 {
+    requireFMOD();
+    
 	Buffer buf;
 	loadFile(buf, filename);
 
 	// Forward.
-	Sample(audio, buf.frontReader()).data.swap(data);
+	Sample(buf.frontReader()).data.swap(data);
 }
 
-Gosu::Sample::Sample(Audio& audio, Reader reader)
+Gosu::Sample::Sample(Reader reader)
 {
+    requireFMOD();
+    
     std::vector<char> buffer(reader.resource().size() - reader.position());
     reader.read(&buffer.front(), buffer.size());
 
@@ -291,12 +272,6 @@ public:
     
     ~StreamData()
     {
-        // TODO: Should be checked for earlier, as play would crash too.
-        // This is just because Ruby's GC will free objects in a weird
-        // order.
-        if (!fmodInitialized)
-            return;
-
         if (stream != 0)
             FSOUND_Stream_Close(stream);
     }
@@ -356,12 +331,6 @@ public:
 
     ~ModuleData()
     {
-        // TODO: Should be checked for earlier, as play would crash too.
-        // This is just because Ruby's GC will free objects in a weird
-        // order.
-        if (!fmodInitialized)
-            return;
-
         if (module_ != 0)
             FMUSIC_FreeSong(module_);
     }
@@ -400,8 +369,10 @@ public:
     }
 };
 
-Gosu::Song::Song(Audio& audio, const std::wstring& filename)
+Gosu::Song::Song(const std::wstring& filename)
 {
+    requireFMOD();
+    
     Buffer buf;
 	loadFile(buf, filename);
 	Type type = stStream;
@@ -415,11 +386,13 @@ Gosu::Song::Song(Audio& audio, const std::wstring& filename)
 	}
 	
     // Forward.
-	Song(audio, type, buf.frontReader()).data.swap(data);
+	Song(type, buf.frontReader()).data.swap(data);
 }
 
-Gosu::Song::Song(Audio& audio, Type type, Reader reader)
+Gosu::Song::Song(Type type, Reader reader)
 {
+    requireFMOD();
+    
     switch (type)
     {
     case stStream:
@@ -437,8 +410,6 @@ Gosu::Song::Song(Audio& audio, Type type, Reader reader)
 
 Gosu::Song::~Song()
 {
-    if (fmodInitialized)
-        stop();
 }
 
 Gosu::Song* Gosu::Song::currentSong()
@@ -492,3 +463,29 @@ void Gosu::Song::changeVolume(double volume)
 {
     data->changeVolume(volume);
 }
+
+void Gosu::Song::update()
+{
+}
+
+// Deprecated constructors.
+
+Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
+{
+    Sample(filename).data.swap(data);
+}
+
+Gosu::Sample::Sample(Audio& audio, Reader reader)
+{
+    Sample(reader).data.swap(data);
+}
+
+Gosu::Song::Song(Audio& audio, const std::wstring& filename)
+{
+    Song(filename).data.swap(data);
+}
+
+Gosu::Song::Song(Audio& audio, Type type, Reader reader)
+{
+    Song(type, reader).data.swap(data);
+}