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

data/Gosu/Image.hpp

@@ -1,122 +1,122 @@
-//! \file Image.hpp
-//! Interface of the Image class and helper functions.
-
-#ifndef GOSU_IMAGE_HPP
-#define GOSU_IMAGE_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Color.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <Gosu/TR1.hpp>
-#include <memory>
-#include <vector>
-
-namespace Gosu
-{
-    //! Provides functionality for drawing rectangular images.
-    class Image
-    {
-        std::tr1::shared_ptr<ImageData> data;
-
-    public:
-        //! Loads an image from a given filename that can be drawn onto
-        //! graphics.
-        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
-        //! automatically applied to BMP type images. For more flexibility, use the
-        //! corresponding constructor that uses a Bitmap object.
-        Image(Graphics& graphics, const std::wstring& filename,
-              bool tileable = false);
-        //! Loads a portion of the the image at the given filename that can be
-        //! drawn onto graphics.
-        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
-        //! automatically applied to BMP type images. For more flexibility, use the
-        //! corresponding constructor that uses a Bitmap object.
-        Image(Graphics& graphics, const std::wstring& filename, unsigned srcX,
-              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-              bool tileable = false);
-        
-        //! Converts the given bitmap into an image that can be drawn onto
-        //! graphics.
-        Image(Graphics& graphics, const Bitmap& source,
-            bool tileable = false);
-        //! Converts a portion of the given bitmap into an image that can be
-        //! drawn onto graphics.
-        Image(Graphics& graphics, const Bitmap& source, unsigned srcX,
-            unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-            bool tileable = false);
-        
-        //! Creates an Image from a user-supplied instance of the ImageData interface.
-        explicit Image(GOSU_UNIQUE_PTR<ImageData> data);
-
-        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 = Color::WHITE,
-            AlphaMode mode = amDefault) const;
-        //! Like draw(), but allows to give modulation colors for all four
-        //! corners.
-        void drawMod(double x, double y, ZPos z,
-            double factorX, double factorY,
-            Color c1, Color c2, Color c3, Color c4,
-            AlphaMode mode = amDefault) const;
-
-        //! Draws the image rotated by the given angle so that its rotation
-        //! center is at (x; y). Note that this is different from how all the
-        //! other drawing functions work!
-        //! \param angle See Math.hpp for an explanation of how Gosu interprets
-        //! angles.
-        //! \param centerX Relative horizontal position of the rotation center
-        //! on the image. 0 is the left border, 1 is the right border, 0.5 is
-        //! the center (and default).
-        //! \param centerY See centerX.
-        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 = Color::WHITE,
-            AlphaMode mode = amDefault) const;
-
-        //! Provides access to the underlying image data object.
-        ImageData& getData() const;
-    };
-    
-    std::vector<Gosu::Image> loadTiles(Graphics& graphics, const Bitmap& bmp, int tileWidth, int tileHeight, bool tileable);
-    std::vector<Gosu::Image> loadTiles(Graphics& graphics, const std::wstring& bmp, int tileWidth, int tileHeight, bool tileable);
-    
-    //! Convenience function that splits a BMP or PNG file into an array
-    //! of small rectangles and creates images from them.
-    //! \param tileWidth If positive, specifies the width of one tile in
-    //! 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; vector<tr1::shared_ptr<Image>>
-    //! or boost::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)
-    {
-        std::vector<Gosu::Image> tiles = loadTiles(graphics, filename, tileWidth, tileHeight, tileable);
-        for (int i = 0, num = tiles.size(); i < num; ++i)
-            appendTo.push_back(typename Container::value_type(new Gosu::Image(tiles[i])));
-    }
-    
-    //! Convenience function that splits a bitmap into an area of array 
-    //! rectangles and creates images from them.
-    //! \param tileWidth If positive, specifies the width of one tile in
-    //! 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<std::tr1::shared_ptr<Image>>
-    //! or boost::ptr_vector<Image> are good choices.
-    template<typename Container>
-    void imagesFromTiledBitmap(Graphics& graphics, const Bitmap& bmp,
-        int tileWidth, int tileHeight, bool tileable, Container& appendTo)
-    {
-        std::vector<Gosu::Image> tiles = loadTiles(graphics, bmp, tileWidth, tileHeight, tileable);
-        for (int i = 0, num = tiles.size(); i < num; ++i)
-            appendTo.push_back(typename Container::value_type(new Gosu::Image(tiles[i])));
-    }
-}
-
-#endif
+//! \file Image.hpp
+//! Interface of the Image class and helper functions.
+
+#ifndef GOSU_IMAGE_HPP
+#define GOSU_IMAGE_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Color.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <Gosu/TR1.hpp>
+#include <memory>
+#include <vector>
+
+namespace Gosu
+{
+    //! Provides functionality for drawing rectangular images.
+    class Image
+    {
+        std::tr1::shared_ptr<ImageData> data;
+
+    public:
+        //! Loads an image from a given filename that can be drawn onto
+        //! graphics.
+        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
+        //! automatically applied to BMP type images. For more flexibility, use the
+        //! corresponding constructor that uses a Bitmap object.
+        Image(Graphics& graphics, const std::wstring& filename,
+              bool tileable = false);
+        //! Loads a portion of the the image at the given filename that can be
+        //! drawn onto graphics.
+        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
+        //! automatically applied to BMP type images. For more flexibility, use the
+        //! corresponding constructor that uses a Bitmap object.
+        Image(Graphics& graphics, const std::wstring& filename, unsigned srcX,
+              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
+              bool tileable = false);
+        
+        //! Converts the given bitmap into an image that can be drawn onto
+        //! graphics.
+        Image(Graphics& graphics, const Bitmap& source,
+            bool tileable = false);
+        //! Converts a portion of the given bitmap into an image that can be
+        //! drawn onto graphics.
+        Image(Graphics& graphics, const Bitmap& source, unsigned srcX,
+            unsigned srcY, unsigned srcWidth, unsigned srcHeight,
+            bool tileable = false);
+        
+        //! Creates an Image from a user-supplied instance of the ImageData interface.
+        explicit Image(GOSU_UNIQUE_PTR<ImageData> data);
+
+        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 = Color::WHITE,
+            AlphaMode mode = amDefault) const;
+        //! Like draw(), but allows to give modulation colors for all four
+        //! corners.
+        void drawMod(double x, double y, ZPos z,
+            double factorX, double factorY,
+            Color c1, Color c2, Color c3, Color c4,
+            AlphaMode mode = amDefault) const;
+
+        //! Draws the image rotated by the given angle so that its rotation
+        //! center is at (x; y). Note that this is different from how all the
+        //! other drawing functions work!
+        //! \param angle See Math.hpp for an explanation of how Gosu interprets
+        //! angles.
+        //! \param centerX Relative horizontal position of the rotation center
+        //! on the image. 0 is the left border, 1 is the right border, 0.5 is
+        //! the center (and default).
+        //! \param centerY See centerX.
+        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 = Color::WHITE,
+            AlphaMode mode = amDefault) const;
+
+        //! Provides access to the underlying image data object.
+        ImageData& getData() const;
+    };
+    
+    std::vector<Gosu::Image> loadTiles(Graphics& graphics, const Bitmap& bmp, int tileWidth, int tileHeight, bool tileable);
+    std::vector<Gosu::Image> loadTiles(Graphics& graphics, const std::wstring& bmp, int tileWidth, int tileHeight, bool tileable);
+    
+    //! Convenience function that splits a BMP or PNG file into an array
+    //! of small rectangles and creates images from them.
+    //! \param tileWidth If positive, specifies the width of one tile in
+    //! 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; vector<tr1::shared_ptr<Image>>
+    //! or boost::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)
+    {
+        std::vector<Gosu::Image> tiles = loadTiles(graphics, filename, tileWidth, tileHeight, tileable);
+        for (int i = 0, num = tiles.size(); i < num; ++i)
+            appendTo.push_back(typename Container::value_type(new Gosu::Image(tiles[i])));
+    }
+    
+    //! Convenience function that splits a bitmap into an area of array 
+    //! rectangles and creates images from them.
+    //! \param tileWidth If positive, specifies the width of one tile in
+    //! 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<std::tr1::shared_ptr<Image>>
+    //! or boost::ptr_vector<Image> are good choices.
+    template<typename Container>
+    void imagesFromTiledBitmap(Graphics& graphics, const Bitmap& bmp,
+        int tileWidth, int tileHeight, bool tileable, Container& appendTo)
+    {
+        std::vector<Gosu::Image> tiles = loadTiles(graphics, bmp, tileWidth, tileHeight, tileable);
+        for (int i = 0, num = tiles.size(); i < num; ++i)
+            appendTo.push_back(typename Container::value_type(new Gosu::Image(tiles[i])));
+    }
+}
+
+#endif

data/Gosu/ImageData.hpp

@@ -1,61 +1,61 @@
-//! \file ImageData.hpp
-//! Interface of the ImageData class.
-
-#ifndef GOSU_IMAGEDATA_HPP
-#define GOSU_IMAGEDATA_HPP
-
-#include <Gosu/Color.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Platform.hpp>
-
-namespace Gosu
-{
-    //! Contains information about the underlying OpenGL texture and the
-    //! u/v space used for image data. Can be retrieved from some images
-    //! to use them in OpenGL operations.
-    struct GLTexInfo
-    {
-        int texName;
-        float left, right, top, bottom;
-    };
-
-    //! The ImageData class is an abstract base class for drawable images.
-    //! Instances of classes derived by ImageData are usually returned by
-    //! Graphics::createImage and usually only used to implement drawing
-    //! primitives like Image, which then provide a more specialized and
-    //! intuitive drawing interface.
-    class ImageData
-    {
-        // Non-copyable
-        ImageData(const ImageData&);
-        ImageData& operator=(const ImageData&);
-        
-    public:
-        ImageData()
-        {
-        }
-        
-        virtual ~ImageData()
-        {
-        }
-
-        virtual int width() const = 0;
-        virtual int height() const = 0;
-
-        virtual void draw(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            double x3, double y3, Color c3,
-            double x4, double y4, Color c4,
-            ZPos z, AlphaMode mode) const = 0;
-            
-        virtual const GLTexInfo* glTexInfo() const = 0;
-        virtual Bitmap toBitmap() const = 0;
-        
-        virtual GOSU_UNIQUE_PTR<ImageData> subimage(int x, int y, int width, int height) const = 0;
-        
-        virtual void insert(const Bitmap& bitmap, int x, int y) = 0;
-    };
-}
-
-#endif
+//! \file ImageData.hpp
+//! Interface of the ImageData class.
+
+#ifndef GOSU_IMAGEDATA_HPP
+#define GOSU_IMAGEDATA_HPP
+
+#include <Gosu/Color.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Platform.hpp>
+
+namespace Gosu
+{
+    //! Contains information about the underlying OpenGL texture and the
+    //! u/v space used for image data. Can be retrieved from some images
+    //! to use them in OpenGL operations.
+    struct GLTexInfo
+    {
+        int texName;
+        float left, right, top, bottom;
+    };
+
+    //! The ImageData class is an abstract base class for drawable images.
+    //! Instances of classes derived by ImageData are usually returned by
+    //! Graphics::createImage and usually only used to implement drawing
+    //! primitives like Image, which then provide a more specialized and
+    //! intuitive drawing interface.
+    class ImageData
+    {
+        // Non-copyable
+        ImageData(const ImageData&);
+        ImageData& operator=(const ImageData&);
+        
+    public:
+        ImageData()
+        {
+        }
+        
+        virtual ~ImageData()
+        {
+        }
+
+        virtual int width() const = 0;
+        virtual int height() const = 0;
+
+        virtual void draw(double x1, double y1, Color c1,
+            double x2, double y2, Color c2,
+            double x3, double y3, Color c3,
+            double x4, double y4, Color c4,
+            ZPos z, AlphaMode mode) const = 0;
+            
+        virtual const GLTexInfo* glTexInfo() const = 0;
+        virtual Bitmap toBitmap() const = 0;
+        
+        virtual GOSU_UNIQUE_PTR<ImageData> subimage(int x, int y, int width, int height) const = 0;
+        
+        virtual void insert(const Bitmap& bitmap, int x, int y) = 0;
+    };
+}
+
+#endif

data/Gosu/Input.hpp

@@ -1,149 +1,149 @@
-//! \file Input.hpp
-//! Interface of the Input class.
-
-#ifndef GOSU_INPUT_HPP
-#define GOSU_INPUT_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/Buttons.hpp>
-#include <Gosu/TR1.hpp>
-
-#ifdef GOSU_IS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
-#ifdef GOSU_IS_X
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#endif
-
-#include <vector>
-
-namespace Gosu
-{
-    //! Very lightweight class that identifies a button (keyboard, mouse or other device).
-    class Button
-    {
-        unsigned id_;
-        
-    public:
-        //! For internal use.
-        explicit Button(unsigned id) : id_(id) {}
-        //! For internal use.
-        unsigned id() const { return id_; }
-
-        //! Default constructor; == noButton.
-        Button() : id_(noButton) {}
-
-        //! Conversion from ButtonName constants.
-        Button(ButtonName name) : id_(name) {}
-    };
-    
-    //! Tests whether two Buttons identify the same physical button.
-    inline bool operator==(Button lhs, Button rhs)
-    {
-        return lhs.id() == rhs.id();
-    }
-    inline bool operator!=(Button lhs, Button rhs)
-    {
-        return !(lhs == rhs);
-    }
-    inline bool operator<(Button lhs, Button rhs)
-    {
-        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
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-    #if defined(GOSU_CPP11_ENABLED)
-        // explicitly forbid copying and moving
-        Input(Input&&) = delete;
-        Input& operator=(Input&&) = delete;
-        Input(const Input&) = delete;
-        Input& operator=(const Input&) = delete;
-    #endif
-
-    public:
-    #ifdef GOSU_IS_IPHONE
-        Input(void* view, float updateInterval);
-        void feedTouchEvent(int type, void* touches);
-    #else
-        Input();
-        bool feedSDLEvent(void* event);
-    #endif
-        
-        ~Input();
-        
-        //! Returns the character a button usually produces, or 0.
-        static wchar_t idToChar(Button btn);
-        //! Returns the button that has to be pressed to produce the
-        //! given character, or noButton.
-        static Button charToId(wchar_t ch);
-        
-        //! Returns true if a button is currently pressed.
-        //! Updated every tick.
-        bool down(Button btn) const;
-        
-        //! Returns the horizontal position of the mouse relative to the top
-        //! left corner of the window given to Input's constructor.
-        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. Also applies to currentTouches().
-        void setMouseFactors(double factorX, double factorY, double offsetX = 0, double offsetY = 0);
-        
-        //! 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();
-        
-        //! 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.
-        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.
-        std::tr1::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).
-        void setTextInput(TextInput* input);
-    };
-}
-
-#endif
+//! \file Input.hpp
+//! Interface of the Input class.
+
+#ifndef GOSU_INPUT_HPP
+#define GOSU_INPUT_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Platform.hpp>
+#include <Gosu/Buttons.hpp>
+#include <Gosu/TR1.hpp>
+
+#ifdef GOSU_IS_WIN
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+
+#ifdef GOSU_IS_X
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#endif
+
+#include <vector>
+
+namespace Gosu
+{
+    //! Very lightweight class that identifies a button (keyboard, mouse or other device).
+    class Button
+    {
+        unsigned id_;
+        
+    public:
+        //! For internal use.
+        explicit Button(unsigned id) : id_(id) {}
+        //! For internal use.
+        unsigned id() const { return id_; }
+
+        //! Default constructor; == noButton.
+        Button() : id_(noButton) {}
+
+        //! Conversion from ButtonName constants.
+        Button(ButtonName name) : id_(name) {}
+    };
+    
+    //! Tests whether two Buttons identify the same physical button.
+    inline bool operator==(Button lhs, Button rhs)
+    {
+        return lhs.id() == rhs.id();
+    }
+    inline bool operator!=(Button lhs, Button rhs)
+    {
+        return !(lhs == rhs);
+    }
+    inline bool operator<(Button lhs, Button rhs)
+    {
+        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
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+    #if defined(GOSU_CPP11_ENABLED)
+        // explicitly forbid copying and moving
+        Input(Input&&) = delete;
+        Input& operator=(Input&&) = delete;
+        Input(const Input&) = delete;
+        Input& operator=(const Input&) = delete;
+    #endif
+
+    public:
+    #ifdef GOSU_IS_IPHONE
+        Input(void* view, float updateInterval);
+        void feedTouchEvent(int type, void* touches);
+    #else
+        Input();
+        bool feedSDLEvent(void* event);
+    #endif
+        
+        ~Input();
+        
+        //! Returns the character a button usually produces, or 0.
+        static wchar_t idToChar(Button btn);
+        //! Returns the button that has to be pressed to produce the
+        //! given character, or noButton.
+        static Button charToId(wchar_t ch);
+        
+        //! Returns true if a button is currently pressed.
+        //! Updated every tick.
+        bool down(Button btn) const;
+        
+        //! Returns the horizontal position of the mouse relative to the top
+        //! left corner of the window given to Input's constructor.
+        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. Also applies to currentTouches().
+        void setMouseFactors(double factorX, double factorY, double offsetX = 0, double offsetY = 0);
+        
+        //! 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();
+        
+        //! 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.
+        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.
+        std::tr1::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).
+        void setTextInput(TextInput* input);
+    };
+}
+
+#endif