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

data/Gosu/GraphicsBase.hpp

@@ -1,110 +1,110 @@
-//! \file GraphicsBase.hpp
-//! Contains general typedefs and enums related to graphics.
-
-#ifndef GOSU_GRAPHICSBASE_HPP
-#define GOSU_GRAPHICSBASE_HPP
-
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-#include <limits>
-
-namespace Gosu
-{
-    //! Represents the Z position of something drawn with Gosu's graphics
-    //! system. Draw calls with higher ZPos values will cover those with a
-    //! lower ZPos value, that is, they are performed last.
-    typedef double ZPos;
-    
-    //! Determines the way colors are combined when one is drawn onto
-    //! another.
-#if defined(GOSU_CPP11_ENABLED)
-    enum class AlphaMode
-    {
-        //! The color's channels will be interpolated. The alpha channel
-        //! specifies the opacity of the new color, 255 is full opacity.
-        DEFAULT,
-        INTERPOLATE = DEFAULT,
-        //! The colors' channels will be added. The alpha channel specifies
-        //! the percentage of the new color's channels that will be added
-        //! to the old color's channels.
-        ADD,
-        //! The color's channels will be multiplied with each other.
-        MULTIPLY
-    };
-    GOSU_DEPRECATED constexpr AlphaMode amDefault = AlphaMode::DEFAULT;
-    GOSU_DEPRECATED constexpr AlphaMode amInterpolate = AlphaMode::INTERPOLATE;
-    GOSU_DEPRECATED constexpr AlphaMode amAdd = AlphaMode::ADD;
-    GOSU_DEPRECATED constexpr AlphaMode amAdditive = AlphaMode::ADD;
-    GOSU_DEPRECATED constexpr AlphaMode amMultiply = AlphaMode::MULTIPLY;
-#else
-    enum AlphaMode
-    {
-        //! The color's channels will be interpolated. The alpha channel
-        //! specifies the opacity of the new color, 255 is full opacity.
-        amDefault,
-        //! The colors' channels will be added. The alpha channel specifies
-        //! the percentage of the new color's channels that will be added
-        //! to the old color's channels.
-        amAdd,
-        amAdditive = amAdd,
-        //! The color's channels will be multiplied with each other.
-        amMultiply
-    };
-#endif
-    
-    enum FontFlags
-    {
-        ffBold         = 1,
-        ffItalic       = 2,
-        ffUnderline    = 4,
-        ffCombinations = 8
-    };
-    
-    enum TextAlign
-    {
-        taLeft,
-        taRight,
-        taCenter,
-        taJustify
-    };
-    
-    //! Flags that affect the tileability of an image.
-    enum BorderFlags
-    {
-        bfSmooth = 0,
-        bfTileableLeft = 1,
-        bfTileableTop = 2,
-        bfTileableRight = 4,
-        bfTileableBottom = 8,
-        bfTileable = bfTileableLeft | bfTileableTop | bfTileableRight | bfTileableBottom
-    };
-    
-#ifdef GOSU_IS_MAC
-    // TODO: Without this gigantic hack, Gosu crashes in the "scale" function,
-    // but _only_ when used from Ruby 1.9. It is unclear what might cause this -
-    // maybe a compiler bug that tries to use SSE functions with the wrong
-    // alignment. Adding __attribute__((aligned(16))) does not help, though.
-    struct Transform
-    {
-        double value[16];
-        bool operator==(const Transform &other) { for (int i = 0; i < 16; ++i) if ((*this)[i] != other[i]) return false; return true; }
-        const double &operator[](std::size_t idx) const { return value[idx]; }
-        double &operator[](std::size_t idx) { return value[idx]; }
-    };
-#else
-    typedef std::tr1::array<double, 16> Transform;
-#endif
-    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, double fromX = 0, double fromY = 0);
-    Transform concat(const Transform& lhs, const Transform& rhs);
-    
-#ifndef SWIG
-    // A not so useful optimization - this was supposed to bypass the Z queue for immediate rendering.
-    // In retrospect, the only useful optimization would be to work down the Z queue on a second thread.
-    GOSU_DEPRECATED const double zImmediate = -std::numeric_limits<double>::infinity();
-#endif
-}
-
-#endif
+//! \file GraphicsBase.hpp
+//! Contains general typedefs and enums related to graphics.
+
+#ifndef GOSU_GRAPHICSBASE_HPP
+#define GOSU_GRAPHICSBASE_HPP
+
+#include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
+#include <limits>
+
+namespace Gosu
+{
+    //! Represents the Z position of something drawn with Gosu's graphics
+    //! system. Draw calls with higher ZPos values will cover those with a
+    //! lower ZPos value, that is, they are performed last.
+    typedef double ZPos;
+    
+    //! Determines the way colors are combined when one is drawn onto
+    //! another.
+#if defined(GOSU_CPP11_ENABLED)
+    enum class AlphaMode
+    {
+        //! The color's channels will be interpolated. The alpha channel
+        //! specifies the opacity of the new color, 255 is full opacity.
+        DEFAULT,
+        INTERPOLATE = DEFAULT,
+        //! The colors' channels will be added. The alpha channel specifies
+        //! the percentage of the new color's channels that will be added
+        //! to the old color's channels.
+        ADD,
+        //! The color's channels will be multiplied with each other.
+        MULTIPLY
+    };
+    GOSU_DEPRECATED constexpr AlphaMode amDefault = AlphaMode::DEFAULT;
+    GOSU_DEPRECATED constexpr AlphaMode amInterpolate = AlphaMode::INTERPOLATE;
+    GOSU_DEPRECATED constexpr AlphaMode amAdd = AlphaMode::ADD;
+    GOSU_DEPRECATED constexpr AlphaMode amAdditive = AlphaMode::ADD;
+    GOSU_DEPRECATED constexpr AlphaMode amMultiply = AlphaMode::MULTIPLY;
+#else
+    enum AlphaMode
+    {
+        //! The color's channels will be interpolated. The alpha channel
+        //! specifies the opacity of the new color, 255 is full opacity.
+        amDefault,
+        //! The colors' channels will be added. The alpha channel specifies
+        //! the percentage of the new color's channels that will be added
+        //! to the old color's channels.
+        amAdd,
+        amAdditive = amAdd,
+        //! The color's channels will be multiplied with each other.
+        amMultiply
+    };
+#endif
+    
+    enum FontFlags
+    {
+        ffBold         = 1,
+        ffItalic       = 2,
+        ffUnderline    = 4,
+        ffCombinations = 8
+    };
+    
+    enum TextAlign
+    {
+        taLeft,
+        taRight,
+        taCenter,
+        taJustify
+    };
+    
+    //! Flags that affect the tileability of an image.
+    enum BorderFlags
+    {
+        bfSmooth = 0,
+        bfTileableLeft = 1,
+        bfTileableTop = 2,
+        bfTileableRight = 4,
+        bfTileableBottom = 8,
+        bfTileable = bfTileableLeft | bfTileableTop | bfTileableRight | bfTileableBottom
+    };
+    
+#ifdef GOSU_IS_MAC
+    // TODO: Without this gigantic hack, Gosu crashes in the "scale" function,
+    // but _only_ when used from Ruby 1.9. It is unclear what might cause this -
+    // maybe a compiler bug that tries to use SSE functions with the wrong
+    // alignment. Adding __attribute__((aligned(16))) does not help, though.
+    struct Transform
+    {
+        double value[16];
+        bool operator==(const Transform &other) { for (int i = 0; i < 16; ++i) if ((*this)[i] != other[i]) return false; return true; }
+        const double &operator[](std::size_t idx) const { return value[idx]; }
+        double &operator[](std::size_t idx) { return value[idx]; }
+    };
+#else
+    typedef std::tr1::array<double, 16> Transform;
+#endif
+    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, double fromX = 0, double fromY = 0);
+    Transform concat(const Transform& lhs, const Transform& rhs);
+    
+#ifndef SWIG
+    // A not so useful optimization - this was supposed to bypass the Z queue for immediate rendering.
+    // In retrospect, the only useful optimization would be to work down the Z queue on a second thread.
+    GOSU_DEPRECATED const double zImmediate = -std::numeric_limits<double>::infinity();
+#endif
+}
+
+#endif

data/Gosu/IO.hpp

@@ -1,269 +1,269 @@
-//! \file IO.hpp
-//! Contains everything related to input and output.
-
-#ifndef GOSU_IO_HPP
-#define GOSU_IO_HPP
-
-#include <cstddef>
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-#include <Gosu/Platform.hpp>
-
-namespace Gosu
-{
-    class Resource;
-    
-    enum ByteOrder { boLittle, boBig, boDontCare };
-#ifdef __BIG_ENDIAN__
-    const ByteOrder nativeByteOrder = boBig, otherByteOrder = boLittle;
-#else
-    const ByteOrder nativeByteOrder = boLittle, otherByteOrder = boBig;
-#endif
-
-    //! Utility class that points to a specific position in a resource
-    //! and offers an interface for sequential reading.
-    class Reader
-    {
-        const Resource* res;
-        std::size_t pos;
-
-    public:
-        Reader(const Resource& resource, std::size_t position)
-        : res(&resource), pos(position)
-        {
-        }
-
-        const Resource& resource() const
-        {
-            return *res;
-        }
-
-        std::size_t position() const
-        {
-            return pos;
-        }
-
-        void setPosition(std::size_t value)
-        {
-            // TODO: Check?
-            pos = value;
-        }
-
-        void seek(std::ptrdiff_t offset)
-        {
-            // TODO: Check?
-            pos += offset;
-        }
-
-        void read(void* destBuffer, std::size_t length);
-        
-        //! Convenience function; equivalent to read(&t, sizeof t).
-        template<typename T>
-        void readPod(T& t, ByteOrder bo = boDontCare)
-        {
-            read(&t, sizeof t);
-            if (bo == otherByteOrder)
-            {
-                char* begin = reinterpret_cast<char*>(&t);
-                std::reverse(begin, begin + sizeof t);
-            }
-        }
-
-        //! Similar to readPod(T&), but returns the read value instead.
-        template<typename T>
-        T getPod(ByteOrder bo = boDontCare)
-        {
-            T t;
-            readPod<T>(t, bo);
-            return t;
-        }
-    };
-    
-    //! Utility class that points to a specific position in a resource
-    //! and offers an interface for sequential writing.
-    class Writer
-    {
-        Resource* res;
-        std::size_t pos;
-
-    public:
-        Writer(Resource& resource, std::size_t position)
-        : res(&resource), pos(position)
-        {
-        }
-
-        Resource& resource() const
-        {
-            return *res;
-        }
-
-        std::size_t position() const
-        {
-            return pos;
-        }
-
-        void setPosition(std::size_t value)
-        {
-            // TODO: Check?
-            pos = value;
-        }
-
-        void seek(std::ptrdiff_t offset)
-        {
-            // TODO: Check?
-            pos += offset;
-        }
-
-        void write(const void* sourceBuffer, std::size_t length);
-
-        //! Convenience function; equivalent to write(&t, sizeof t).
-        template<typename T>
-        void writePod(const T& t, ByteOrder bo = boDontCare)
-        {
-            if (bo == otherByteOrder)
-            {
-                char buf[sizeof t];
-                const char* begin = reinterpret_cast<const char*>(&t);
-                std::reverse_copy(begin, begin + sizeof t, buf);
-                write(buf, sizeof buf);
-            }
-            else
-                write(&t, sizeof t);
-        }
-    };
-
-    //! Base class for resources. A resource in Gosu is nothing more but a
-    //! piece of binary data that can be read or written, for example files
-    //! 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
-    {
-        // Non-copyable
-#if defined(GOSU_CPP11_ENABLED)
-        Resource(const Resource&) = delete;
-        Resource& operator=(const Resource&) = delete;
-        // and non-movable
-        Resource(Resource&&) = delete;
-        Resource& operator=(Resource&&) = delete;
-#else
-        Resource(const Resource&);
-        Resource& operator=(const Resource&);
-#endif
-
-    public:
-        Resource()
-        {
-        }
-        
-        virtual ~Resource()
-        {
-        }
-
-        //! Convenience: Creates a new Reader that reads from the start of
-        //! the resource.
-        Reader frontReader() const
-        {
-            return Reader(*this, 0);
-        }
-
-        //! Convenience: Creates a new Writer that appends data at the
-        //! end of the resource.
-        Writer backWriter()
-        {
-            return Writer(*this, size());
-        }
-
-        virtual std::size_t size() const = 0;
-
-        virtual void resize(std::size_t newSize) = 0;
-
-        virtual void read(std::size_t offset, std::size_t length,
-            void* destBuffer) const = 0;
-
-        virtual void write(std::size_t offset, std::size_t length,
-            const void* sourceBuffer) = 0;
-    };
-
-    //! Piece of memory with the Resource interface.
-    class Buffer : public Resource
-    {
-        std::vector<char> buf;
-
-    public:
-        Buffer()
-        {
-        }
-
-        Buffer(const Buffer& other)
-        : Resource()
-        , buf(other.buf)
-        {
-        }
-
-        Buffer& operator=(const Buffer& other)
-        {
-            buf = other.buf;
-            return *this;
-        }
-
-        std::size_t size() const;
-        void resize(std::size_t newSize);
-
-        void read(std::size_t offset, std::size_t length,
-            void* destBuffer) const;
-
-        void write(std::size_t offset, std::size_t length,
-            const void* sourceBuffer);
-
-        const void* data() const
-        {
-            return &buf[0];
-        }
-
-        void* data()
-        {
-            return &buf[0];
-        }
-    };
-
-    enum FileMode
-    {
-        //! Opens an existing file for reading; throws an exception if the file
-        //! cannot be found.
-        fmRead,
-        //! Writes data to a file. If the file already exists, is emptied on
-        //! opening. If the file does not exist, it is created.
-        fmReplace,
-        //! Opens or creates a file with writing access, but does not clear
-        //! existing contents.
-        fmAlter
-    };
-
-    //! File with the Resource interface.
-    class File : public Resource
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-
-    public:
-        explicit File(const std::wstring& filename, FileMode mode = fmRead);
-        ~File();
-
-        std::size_t size() const;
-        void resize(std::size_t newSize);
-        void read(std::size_t offset, std::size_t length,
-            void* destBuffer) const;
-        void write(std::size_t offset, std::size_t length,
-            const void* sourceBuffer);
-    };
-
-    //! Loads a whole file into a buffer.
-    void loadFile(Buffer& buffer, const std::wstring& filename);
-    //! Creates or overwrites a file with the contents of a buffer.
-    void saveFile(const Buffer& buffer, const std::wstring& filename);
-}
-
-#endif
+//! \file IO.hpp
+//! Contains everything related to input and output.
+
+#ifndef GOSU_IO_HPP
+#define GOSU_IO_HPP
+
+#include <cstddef>
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+#include <Gosu/Platform.hpp>
+
+namespace Gosu
+{
+    class Resource;
+    
+    enum ByteOrder { boLittle, boBig, boDontCare };
+#ifdef __BIG_ENDIAN__
+    const ByteOrder nativeByteOrder = boBig, otherByteOrder = boLittle;
+#else
+    const ByteOrder nativeByteOrder = boLittle, otherByteOrder = boBig;
+#endif
+
+    //! Utility class that points to a specific position in a resource
+    //! and offers an interface for sequential reading.
+    class Reader
+    {
+        const Resource* res;
+        std::size_t pos;
+
+    public:
+        Reader(const Resource& resource, std::size_t position)
+        : res(&resource), pos(position)
+        {
+        }
+
+        const Resource& resource() const
+        {
+            return *res;
+        }
+
+        std::size_t position() const
+        {
+            return pos;
+        }
+
+        void setPosition(std::size_t value)
+        {
+            // TODO: Check?
+            pos = value;
+        }
+
+        void seek(std::ptrdiff_t offset)
+        {
+            // TODO: Check?
+            pos += offset;
+        }
+
+        void read(void* destBuffer, std::size_t length);
+        
+        //! Convenience function; equivalent to read(&t, sizeof t).
+        template<typename T>
+        void readPod(T& t, ByteOrder bo = boDontCare)
+        {
+            read(&t, sizeof t);
+            if (bo == otherByteOrder)
+            {
+                char* begin = reinterpret_cast<char*>(&t);
+                std::reverse(begin, begin + sizeof t);
+            }
+        }
+
+        //! Similar to readPod(T&), but returns the read value instead.
+        template<typename T>
+        T getPod(ByteOrder bo = boDontCare)
+        {
+            T t;
+            readPod<T>(t, bo);
+            return t;
+        }
+    };
+    
+    //! Utility class that points to a specific position in a resource
+    //! and offers an interface for sequential writing.
+    class Writer
+    {
+        Resource* res;
+        std::size_t pos;
+
+    public:
+        Writer(Resource& resource, std::size_t position)
+        : res(&resource), pos(position)
+        {
+        }
+
+        Resource& resource() const
+        {
+            return *res;
+        }
+
+        std::size_t position() const
+        {
+            return pos;
+        }
+
+        void setPosition(std::size_t value)
+        {
+            // TODO: Check?
+            pos = value;
+        }
+
+        void seek(std::ptrdiff_t offset)
+        {
+            // TODO: Check?
+            pos += offset;
+        }
+
+        void write(const void* sourceBuffer, std::size_t length);
+
+        //! Convenience function; equivalent to write(&t, sizeof t).
+        template<typename T>
+        void writePod(const T& t, ByteOrder bo = boDontCare)
+        {
+            if (bo == otherByteOrder)
+            {
+                char buf[sizeof t];
+                const char* begin = reinterpret_cast<const char*>(&t);
+                std::reverse_copy(begin, begin + sizeof t, buf);
+                write(buf, sizeof buf);
+            }
+            else
+                write(&t, sizeof t);
+        }
+    };
+
+    //! Base class for resources. A resource in Gosu is nothing more but a
+    //! piece of binary data that can be read or written, for example files
+    //! 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
+    {
+        // Non-copyable
+#if defined(GOSU_CPP11_ENABLED)
+        Resource(const Resource&) = delete;
+        Resource& operator=(const Resource&) = delete;
+        // and non-movable
+        Resource(Resource&&) = delete;
+        Resource& operator=(Resource&&) = delete;
+#else
+        Resource(const Resource&);
+        Resource& operator=(const Resource&);
+#endif
+
+    public:
+        Resource()
+        {
+        }
+        
+        virtual ~Resource()
+        {
+        }
+
+        //! Convenience: Creates a new Reader that reads from the start of
+        //! the resource.
+        Reader frontReader() const
+        {
+            return Reader(*this, 0);
+        }
+
+        //! Convenience: Creates a new Writer that appends data at the
+        //! end of the resource.
+        Writer backWriter()
+        {
+            return Writer(*this, size());
+        }
+
+        virtual std::size_t size() const = 0;
+
+        virtual void resize(std::size_t newSize) = 0;
+
+        virtual void read(std::size_t offset, std::size_t length,
+            void* destBuffer) const = 0;
+
+        virtual void write(std::size_t offset, std::size_t length,
+            const void* sourceBuffer) = 0;
+    };
+
+    //! Piece of memory with the Resource interface.
+    class Buffer : public Resource
+    {
+        std::vector<char> buf;
+
+    public:
+        Buffer()
+        {
+        }
+
+        Buffer(const Buffer& other)
+        : Resource()
+        , buf(other.buf)
+        {
+        }
+
+        Buffer& operator=(const Buffer& other)
+        {
+            buf = other.buf;
+            return *this;
+        }
+
+        std::size_t size() const;
+        void resize(std::size_t newSize);
+
+        void read(std::size_t offset, std::size_t length,
+            void* destBuffer) const;
+
+        void write(std::size_t offset, std::size_t length,
+            const void* sourceBuffer);
+
+        const void* data() const
+        {
+            return &buf[0];
+        }
+
+        void* data()
+        {
+            return &buf[0];
+        }
+    };
+
+    enum FileMode
+    {
+        //! Opens an existing file for reading; throws an exception if the file
+        //! cannot be found.
+        fmRead,
+        //! Writes data to a file. If the file already exists, is emptied on
+        //! opening. If the file does not exist, it is created.
+        fmReplace,
+        //! Opens or creates a file with writing access, but does not clear
+        //! existing contents.
+        fmAlter
+    };
+
+    //! File with the Resource interface.
+    class File : public Resource
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+
+    public:
+        explicit File(const std::wstring& filename, FileMode mode = fmRead);
+        ~File();
+
+        std::size_t size() const;
+        void resize(std::size_t newSize);
+        void read(std::size_t offset, std::size_t length,
+            void* destBuffer) const;
+        void write(std::size_t offset, std::size_t length,
+            const void* sourceBuffer);
+    };
+
+    //! Loads a whole file into a buffer.
+    void loadFile(Buffer& buffer, const std::wstring& filename);
+    //! Creates or overwrites a file with the contents of a buffer.
+    void saveFile(const Buffer& buffer, const std::wstring& filename);
+}
+
+#endif