gosu 0.7.33 → 0.7.35

data/Gosu/Async.hpp

@@ -1,12 +1,13 @@
 // Undocumented for the first few iterations. Interface may change rapidly.
 // This is mainly a proof of concept. Stability will be the highest on OS X.
 
+#if 0
 #ifndef GOSU_ASYNC_HPP
 #define GOSU_ASYNC_HPP
 
 #include <Gosu/Fwd.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
+#include <Gosu/TR1.hpp>
+#include <thread>
 #include <memory>
 #include <string>
 
@@ -15,25 +16,25 @@ namespace Gosu
     template<typename Result>
     class AsyncResult
     {
-        boost::shared_ptr<boost::try_mutex> mutex;
-        boost::shared_ptr<std::auto_ptr<Result> > result;
+        std::tr1::shared_ptr<std::tr1::try_mutex> mutex;
+        std::tr1::shared_ptr<std::auto_ptr<Result> > result;
         
     public:
-        AsyncResult(const boost::shared_ptr<boost::try_mutex>& mutex,
-                    const boost::shared_ptr<std::auto_ptr<Result> >& result)
+        AsyncResult(const std::tr1::shared_ptr<std::tr1::try_mutex>& mutex,
+                    const std::tr1::shared_ptr<std::auto_ptr<Result> >& result)
         : mutex(mutex), result(result)
         {
         }
         
         bool hasValue() const
         {
-            boost::try_mutex::scoped_try_lock lock(*mutex);
+            std::tr1::try_mutex::scoped_try_lock lock(*mutex);
             return lock && result->get();
         }
         
         std::auto_ptr<Result> takeValue()
         {
-            boost::try_mutex::scoped_lock lock(*mutex);
+            std::tr1::try_mutex::scoped_lock lock(*mutex);
             return *result;
         }
     };
@@ -46,3 +47,4 @@ namespace Gosu
 }
 
 #endif
+#endif

data/Gosu/Audio.hpp

@@ -13,8 +13,8 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/IO.hpp>
 #include <Gosu/Platform.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <Gosu/TR1.hpp>
+#include <memory>
 #include <string>
 
 namespace Gosu
@@ -64,7 +64,7 @@ namespace Gosu
     class Sample
     {
         struct SampleData;
-        boost::shared_ptr<SampleData> data;
+        std::tr1::shared_ptr<SampleData> data;
     
     public:
         //! Constructs a sample that can be played on the specified audio
@@ -109,7 +109,9 @@ namespace Gosu
         class BaseData;
         class ModuleData;
         class StreamData;
-        boost::scoped_ptr<BaseData> data;
+        Song(const Song&);
+        Song& operator=(const Song&);
+        std::auto_ptr<BaseData> data;
     
     public:
         //! Constructs a song that can be played on the provided audio system

data/Gosu/Bitmap.hpp

@@ -8,7 +8,6 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Platform.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <string>
 #include <vector>
 
@@ -63,10 +62,10 @@ namespace Gosu
         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);
+    //! 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);

data/Gosu/ButtonsX.hpp

@@ -133,7 +133,7 @@ namespace Gosu
         gpNum = gpRangeEnd - gpRangeBegin + 1,
         
         numButtons = gpRangeEnd,
-		noButton = 0xffffffff
+        noButton = 0xffffffff
     };
 }
 

data/Gosu/Color.hpp

@@ -4,8 +4,8 @@
 #ifndef GOSU_COLOR_HPP
 #define GOSU_COLOR_HPP
 
-#include <boost/cstdint.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
 
 namespace Gosu
 {
@@ -17,7 +17,7 @@ namespace Gosu
     //! it is 0xaabbggrr.
     class Color
     {
-        boost::uint32_t rep;
+        std::tr1::uint32_t rep;
         #ifdef GOSU_IS_LITTLE_ENDIAN
         enum { RED_OFFSET = 0, GREEN_OFFSET = 8, BLUE_OFFSET = 16, ALPHA_OFFSET = 24 };
         #else
@@ -25,7 +25,7 @@ namespace Gosu
         #endif
         
     public:
-        typedef boost::uint8_t Channel;
+        typedef std::tr1::uint8_t Channel;
         static const unsigned GL_FORMAT = 0x1908; // GL_RGBA
         
         //! The default constructor does not initialize the color to any value.
@@ -34,7 +34,7 @@ namespace Gosu
         }
         
         //! Conversion constructor for literals of the form 0xaarrggbb.
-        Color(boost::uint32_t argb)
+        Color(unsigned argb)
         {
             *this = Color((argb >> 24) & 0xff, (argb >> 16) & 0xff,
                           (argb >>  8) & 0xff, (argb >>  0) & 0xff);
@@ -121,25 +121,25 @@ namespace Gosu
         void setValue(double v);
 
         //! Returns the color in 0xaarrggbb representation.
-        boost::uint32_t argb() const
+        std::tr1::uint32_t argb() const
         {
             return alpha() << 24 | red() << 16 | green() << 8 | blue();
         }
 
         //! Returns the color in 0x00bbggrr representation.
-        boost::uint32_t bgr() const
+        std::tr1::uint32_t bgr() const
         {
             return blue() << 16 | green() << 8 | red();
         }
 
         //! Returns the color in 0xaabbggrr representation.
-        boost::uint32_t abgr() const
+        std::tr1::uint32_t abgr() const
         {
             return alpha() << 24 | blue() << 16 | green() << 8 | red();
         }
         
         //! Returns the internal representation of the color (RGBA in memory).
-        boost::uint32_t gl() const
+        std::tr1::uint32_t gl() const
         {
             return rep;
         }

data/Gosu/Font.hpp

@@ -8,7 +8,7 @@
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Platform.hpp>
-#include <boost/shared_ptr.hpp>
+#include <Gosu/TR1.hpp>
 #include <string>
 
 namespace Gosu
@@ -20,7 +20,7 @@ namespace Gosu
     class Font
     {
         struct Impl;
-        boost::shared_ptr<Impl> pimpl;
+        std::tr1::shared_ptr<Impl> pimpl;
 
     public:
         //! Constructs a font that can be drawn onto the graphics object.

data/Gosu/Graphics.hpp

@@ -7,9 +7,7 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
-#include <boost/array.hpp>
-#include <boost/function.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <Gosu/TR1.hpp>
 #include <memory>
 
 namespace Gosu
@@ -25,7 +23,7 @@ namespace Gosu
     //! Useful when extending Gosu using OpenGL.
     unsigned const MAX_TEXTURE_SIZE = 1024;
     
-    typedef boost::array<double, 16> Transform;
+    typedef std::tr1::array<double, 16> Transform;
     Transform translate(double x, double y);
     Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
     Transform scale(double factor);
@@ -37,7 +35,7 @@ namespace Gosu
     class Graphics
     {
         struct Impl;
-        boost::scoped_ptr<Impl> pimpl;
+        const std::auto_ptr<Impl> pimpl;
 
     public:
         Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
@@ -73,7 +71,7 @@ namespace Gosu
         //! of custom GL functors is NOT DEFINED.
         //! Note: You may not call any Gosu rendering functions from within the
         //! functor, and you must schedule it from within Window::draw's call tree.
-        void scheduleGL(const boost::function<void()>& functor, ZPos z);
+        void scheduleGL(const std::tr1::function<void()>& functor, ZPos z);
         
         //! Enables clipping to a specified rectangle.
         void beginClipping(double x, double y, double width, double height);

data/Gosu/IO.hpp

@@ -4,10 +4,9 @@
 #ifndef GOSU_IO_HPP
 #define GOSU_IO_HPP
 
-#include <boost/utility.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <cstddef>
 #include <algorithm>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -139,9 +138,17 @@ namespace Gosu
     //! or simply areas of allocated memory.
     //! A resource always knows its size and can resize itself, thereby either
     //! truncating its content or allocating room for more data.
-    class Resource : boost::noncopyable
+    class Resource
     {
+        // Non-copyable
+        Resource(const Resource&);
+        Resource& operator=(const Resource&);
+
     public:
+        Resource()
+        {
+        }
+        
         virtual ~Resource()
         {
         }
@@ -229,7 +236,7 @@ namespace Gosu
     class File : public Resource
     {
         struct Impl;
-        boost::scoped_ptr<Impl> pimpl;
+        const std::auto_ptr<Impl> pimpl;
 
     public:
         explicit File(const std::wstring& filename, FileMode mode = fmRead);

data/Gosu/Image.hpp

@@ -6,7 +6,7 @@
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Bitmap.hpp>
-#include <boost/shared_ptr.hpp>
+#include <Gosu/TR1.hpp>
 #include <memory>
 
 namespace Gosu
@@ -14,7 +14,7 @@ namespace Gosu
     //! Provides functionality for drawing rectangular images.
     class Image
     {
-        boost::shared_ptr<ImageData> data;
+        std::tr1::shared_ptr<ImageData> data;
 
     public:
         //! Loads an image from a given filename that can be drawn onto
@@ -86,13 +86,15 @@ namespace Gosu
     //! pixels. If negative, the bitmap is divided into -tileWidth rows.
     //! \param tileHeight See tileWidth.
     //! \param appendTo STL container to which the images will be appended.
-    //! Must provide a push_back member function; std::vector<boost::shared_ptr<Image>>
-    //! or boost::ptr_vector<Image> are good choices.
+    //! Must provide a push_back member function; vector<tr1::shared_ptr<Image>>
+    //! or std::tr1::ptr_vector<Image> are good choices.
     template<typename Container>
     void imagesFromTiledBitmap(Graphics& graphics, const std::wstring& filename,
         int tileWidth, int tileHeight, bool tileable, Container& appendTo)
     {
-		imagesFromTiledBitmap(graphics, loadImageFile(filename), tileWidth, tileHeight, tileable, appendTo);
+        Bitmap bmp;
+        loadImageFile(bmp, filename);
+        imagesFromTiledBitmap(graphics, bmp, tileWidth, tileHeight, tileable, appendTo);
     }
 
     //! Convenience function that splits a bitmap into an area of array 
@@ -101,8 +103,8 @@ namespace Gosu
     //! pixels. If negative, the bitmap is divided into -tileWidth rows.
     //! \param tileHeight See tileWidth.
     //! \param appendTo STL container to which the images will be appended.
-    //! Must provide a push_back member function; std::vector<boost::shared_ptr<Image>>
-    //! or boost::ptr_vector<Image> are good choices.
+    //! Must provide a push_back member function; std::vector<std::tr1::shared_ptr<Image>>
+    //! or std::tr1::ptr_vector<Image> are good choices.
     template<typename Container>
     void imagesFromTiledBitmap(Graphics& graphics, const Bitmap& bmp,
         int tileWidth, int tileHeight, bool tileable, Container& appendTo)

data/Gosu/ImageData.hpp

@@ -6,8 +6,6 @@
 
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
-#include <boost/optional.hpp>
-#include <boost/utility.hpp>
 
 namespace Gosu
 {
@@ -25,9 +23,17 @@ namespace Gosu
     //! Graphics::createImage and usually only used to implement drawing
     //! primitives like Image, which then provide a more specialized and
     //! intuitive drawing interface.
-    class ImageData : boost::noncopyable
+    class ImageData
     {
+        // Non-copyable
+        ImageData(const ImageData&);
+        ImageData& operator=(const ImageData&);
+        
     public:
+        ImageData()
+        {
+        }
+        
         virtual ~ImageData()
         {
         }
@@ -41,7 +47,7 @@ namespace Gosu
             double x4, double y4, Color c4,
             ZPos z, AlphaMode mode) const = 0;
             
-        virtual boost::optional<GLTexInfo> glTexInfo() const = 0;
+        virtual const GLTexInfo* glTexInfo() const = 0;
         virtual Bitmap toBitmap() const = 0;
         
         //! Experimental and undocumented for now.

data/Gosu/Input.hpp

@@ -28,8 +28,7 @@
 
 #include <Gosu/Platform.hpp>
 #include <Gosu/Fwd.hpp>
-#include <boost/function.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <Gosu/TR1.hpp>
 #include <vector>
 
 namespace Gosu
@@ -84,7 +83,7 @@ namespace Gosu
     class Input
     {
         struct Impl;
-        boost::scoped_ptr<Impl> pimpl;
+        const std::auto_ptr<Impl> pimpl;
 
 	public:
         #ifdef GOSU_IS_WIN
@@ -146,11 +145,11 @@ namespace Gosu
         
 		//! 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 (Button)> onButtonDown, onButtonUp;
+        std::tr1::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;
+        std::tr1::function<void (Touch)> onTouchBegan, onTouchMoved, onTouchEnded;
         
         //! Returns the currently active TextInput instance, or 0.
         TextInput* textInput() const;

data/Gosu/Sockets.hpp

@@ -4,19 +4,17 @@
 #ifndef GOSU_SOCKETS_HPP
 #define GOSU_SOCKETS_HPP
 
-#include <boost/cstdint.hpp>
-#include <boost/function.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <Gosu/TR1.hpp>
 #include <cstddef>
 #include <string>
 
 namespace Gosu
 {
     //! Addresses are returned from and given to Gosu functions in host byte order.
-    typedef boost::uint32_t SocketAddress;
+    typedef std::tr1::uint32_t SocketAddress;
 
     //! Ports are returned from and given to Gosu functions in host byte order.
-    typedef boost::uint16_t SocketPort;
+    typedef std::tr1::uint16_t SocketPort;
     
     //! Constant that can be used as a placeholder for an arbitrary port, e.g. when
     //! starting to listen.
@@ -37,7 +35,7 @@ namespace Gosu
     class MessageSocket
     {
         struct Impl;
-        boost::scoped_ptr<Impl> pimpl;
+        const std::auto_ptr<Impl> pimpl;
 
     public:
         //! Opens a message socket for listening at the specified port.
@@ -66,7 +64,7 @@ namespace Gosu
             std::size_t size);*/
 
         //! If assigned, will be called by update for every packet received.
-        boost::function<void (SocketAddress, SocketPort, const void*,
+        std::tr1::function<void (SocketAddress, SocketPort, const void*,
             std::size_t)> onReceive;
     };
     
@@ -86,7 +84,7 @@ namespace Gosu
     class CommSocket
     {
         struct Impl;
-        boost::scoped_ptr<Impl> pimpl;
+        const std::auto_ptr<Impl> pimpl;
 
     public:
         CommSocket(CommMode mode, SocketAddress targetAddress,
@@ -110,8 +108,8 @@ namespace Gosu
         void sendPendingData();
         std::size_t pendingBytes() const;
 
-        boost::function<void (const void*, std::size_t)> onReceive;
-        boost::function<void ()> onDisconnection;
+        std::tr1::function<void (const void*, std::size_t)> onReceive;
+        std::tr1::function<void ()> onDisconnection;
     };
     
     //! Wraps a TCP socket that waits on a specific port and can create
@@ -119,7 +117,7 @@ namespace Gosu
     class ListenerSocket
     {
         struct Impl;
-        boost::scoped_ptr<Impl> pimpl;
+        const std::auto_ptr<Impl> pimpl;
 
     public:
         ListenerSocket(SocketPort port);
@@ -132,7 +130,7 @@ namespace Gosu
 
         //! This signal is fired by update() whenever someone connects
         //! to the port which is currently listened on.
-        boost::function<void (Socket&)> onConnection;
+        std::tr1::function<void (Socket&)> onConnection;
     };
 }