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

data/Gosu/Font.hpp

@@ -1,83 +1,83 @@
-//! \file Font.hpp
-//! Interface of the Font class.
-
-#ifndef GOSU_FONT_HPP
-#define GOSU_FONT_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Color.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-#include <string>
-
-namespace Gosu
-{
-    //! A font can be used to draw text on a Graphics object very flexibly.
-    //! Fonts are ideal for small texts that change regularly. For large,
-    //! static texts you should use createBitmap and turn the result into
-    //! an image.
-    class Font
-    {
-        struct Impl;
-        std::tr1::shared_ptr<Impl> pimpl;
-
-    public:
-        //! Constructs a font that can be drawn onto the graphics object.
-        //! \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 fontFlags Flags used to render individual characters of
-        //!        the font.
-        Font(Graphics& graphics, const std::wstring& fontName,
-            unsigned fontHeight, unsigned fontFlags = ffBold);
-        
-        //! Returns the name of the font that was used to create it.
-        std::wstring name() const;
-        
-        //! Returns the height of the font, in pixels.
-        unsigned height() const;
-        
-        //! Returns the flags used to create the font characters.
-        unsigned flags() const;
-        
-        //! Returns the width, in pixels, the given text would occupy if drawn.
-        double textWidth(const std::wstring& text, double factorX = 1) const;
-        
-        //! Draws text so the top left corner of the text is at (x; y).
-        //! \param text Formatted text without line-breaks.
-        void draw(const std::wstring& text, double x, double y, ZPos z,
-            double factorX = 1, double factorY = 1,
-            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
-        //! relX is 0.0, the text will be to the right of x, if it is 1.0,
-        //! the text will be to the left of x, if it is 0.5, it will be
-        //! centered on x. Of course, all real numbers are possible values.
-        //! \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 = Color::WHITE, AlphaMode mode = amDefault) const;
-        
-        //! Maps a letter to a specific image instead of generating one using
-        //! Gosu's built-in text rendering. This can only be called once per
-        //! character, and the character must not have been drawn before.
-        //! This ensures that Fonts are still sort of immutable.
-        void setImage(wchar_t wc, unsigned fontFlags, const Gosu::Image& image);
-        //! A shortcut for mapping a character to an image regardless of fontFlags.
-        //! Later versions might apply faux italics or faux bold to it (to be decided!).
-        void setImage(wchar_t wc, const Gosu::Image& image);
-        
-        #ifndef SWIG
-        GOSU_DEPRECATED
-        #endif
-        //! DEPRECATED: Analogous to draw, but rotates the text by a given angle. Use 
-        //! a simple pushTransform to achieve the same effect.
-        void drawRot(const std::wstring& text, double x, double y, ZPos z, double angle,
-            double factorX = 1, double factorY = 1,
-            Color c = Color::WHITE, AlphaMode mode = amDefault) const;
-    };
-}
-
-#endif
+//! \file Font.hpp
+//! Interface of the Font class.
+
+#ifndef GOSU_FONT_HPP
+#define GOSU_FONT_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Color.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
+#include <string>
+
+namespace Gosu
+{
+    //! A font can be used to draw text on a Graphics object very flexibly.
+    //! Fonts are ideal for small texts that change regularly. For large,
+    //! static texts you should use createBitmap and turn the result into
+    //! an image.
+    class Font
+    {
+        struct Impl;
+        std::tr1::shared_ptr<Impl> pimpl;
+
+    public:
+        //! Constructs a font that can be drawn onto the graphics object.
+        //! \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 fontFlags Flags used to render individual characters of
+        //!        the font.
+        Font(Graphics& graphics, const std::wstring& fontName,
+            unsigned fontHeight, unsigned fontFlags = ffBold);
+        
+        //! Returns the name of the font that was used to create it.
+        std::wstring name() const;
+        
+        //! Returns the height of the font, in pixels.
+        unsigned height() const;
+        
+        //! Returns the flags used to create the font characters.
+        unsigned flags() const;
+        
+        //! Returns the width, in pixels, the given text would occupy if drawn.
+        double textWidth(const std::wstring& text, double factorX = 1) const;
+        
+        //! Draws text so the top left corner of the text is at (x; y).
+        //! \param text Formatted text without line-breaks.
+        void draw(const std::wstring& text, double x, double y, ZPos z,
+            double factorX = 1, double factorY = 1,
+            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
+        //! relX is 0.0, the text will be to the right of x, if it is 1.0,
+        //! the text will be to the left of x, if it is 0.5, it will be
+        //! centered on x. Of course, all real numbers are possible values.
+        //! \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 = Color::WHITE, AlphaMode mode = amDefault) const;
+        
+        //! Maps a letter to a specific image instead of generating one using
+        //! Gosu's built-in text rendering. This can only be called once per
+        //! character, and the character must not have been drawn before.
+        //! This ensures that Fonts are still sort of immutable.
+        void setImage(wchar_t wc, unsigned fontFlags, const Gosu::Image& image);
+        //! A shortcut for mapping a character to an image regardless of fontFlags.
+        //! Later versions might apply faux italics or faux bold to it (to be decided!).
+        void setImage(wchar_t wc, const Gosu::Image& image);
+        
+        #ifndef SWIG
+        GOSU_DEPRECATED
+        #endif
+        //! DEPRECATED: Analogous to draw, but rotates the text by a given angle. Use 
+        //! a simple pushTransform to achieve the same effect.
+        void drawRot(const std::wstring& text, double x, double y, ZPos z, double angle,
+            double factorX = 1, double factorY = 1,
+            Color c = Color::WHITE, AlphaMode mode = amDefault) const;
+    };
+}
+
+#endif

data/Gosu/Gosu.hpp

@@ -1,34 +1,34 @@
-//! \file Gosu.hpp
-//! Umbrella header for lazy people with fast compilers, or pre-compiled headers.
-
-//! \mainpage Gosu C++ Documentation
-//!
-//! These pages serve as a reference on the C++ interface of Gosu. For a higher-level
-//! discussion of concepts and ideas behind the library, see the Wiki entries linked
-//! from the official website, http://www.libgosu.org/.
-
-#ifndef GOSU_GOSU_HPP
-#define GOSU_GOSU_HPP
-
-#include <Gosu/Audio.hpp>
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Color.hpp>
-#include <Gosu/Directories.hpp>
-#include <Gosu/Font.hpp>
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Image.hpp>
-#include <Gosu/ImageData.hpp>
-#include <Gosu/Input.hpp>
-#include <Gosu/Inspection.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Math.hpp>
-#include <Gosu/Platform.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
+//! \file Gosu.hpp
+//! Umbrella header for lazy people with fast compilers, or pre-compiled headers.
+
+//! \mainpage Gosu C++ Documentation
+//!
+//! These pages serve as a reference on the C++ interface of Gosu. For a higher-level
+//! discussion of concepts and ideas behind the library, see the Wiki entries linked
+//! from the official website, http://www.libgosu.org/.
+
+#ifndef GOSU_GOSU_HPP
+#define GOSU_GOSU_HPP
+
+#include <Gosu/Audio.hpp>
+#include <Gosu/Bitmap.hpp>
+#include <Gosu/Color.hpp>
+#include <Gosu/Directories.hpp>
+#include <Gosu/Font.hpp>
+#include <Gosu/Graphics.hpp>
+#include <Gosu/Image.hpp>
+#include <Gosu/ImageData.hpp>
+#include <Gosu/Input.hpp>
+#include <Gosu/Inspection.hpp>
+#include <Gosu/IO.hpp>
+#include <Gosu/Math.hpp>
+#include <Gosu/Platform.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

@@ -1,115 +1,115 @@
-//! \file Graphics.hpp
-//! Interface of the Graphics class.
-
-#ifndef GOSU_GRAPHICS_HPP
-#define GOSU_GRAPHICS_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Color.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <Gosu/TR1.hpp>
-#include <memory>
-
-namespace Gosu
-{
-    //! Returns the maximum size of an texture that will be allocated
-    //! internally by Gosu.
-    //! Useful when extending Gosu using OpenGL.
-    unsigned const MAX_TEXTURE_SIZE = 1024;
-    
-    //! Serves as the target of all drawing and provides primitive drawing
-    //! functionality.
-    //! Usually created internally by Gosu::Window.
-    class Graphics
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-        
-    #if defined(GOSU_CPP11_ENABLED)
-        // explicitly forbid copying and moving
-        Graphics(Graphics&&) = delete;
-        Graphics& operator=(Graphics&&) = delete;
-        Graphics(const Graphics&) = delete;
-        Graphics& operator=(const Graphics&) = delete;
-    #endif
-
-    public:
-        Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
-        ~Graphics();
-
-        // TODO: Replace by setBaseTransform()
-        void setResolution(unsigned virtualWidth, unsigned virtualHeight,
-            double horizontalBlackBarWidth = 0, double verticalBlackBarHeight = 0);
-        
-        unsigned width() const;
-        unsigned height() const;
-        bool fullscreen() const;
-
-        //! Prepares the graphics object for drawing. Nothing must be drawn
-        //! without calling begin.
-        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();
-        //! Resets Gosu into its default rendering state.
-        void endGL();
-        //! Schedules a custom GL functor to be executed at a certain Z level.
-        //! The functor is called in a clean GL context (as given by beginGL/endGL).
-        //! Gosu's rendering up to the Z level may not yet have been glFlush()ed.
-        //! 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 std::tr1::function<void()>& functor, ZPos z);
-        
-        //! Enables clipping to a specified rectangle.
-        void beginClipping(double x, double y, double width, double height);
-        //! Disables clipping.
-        void endClipping();
-        
-        //! Starts recording a macro. Cannot be nested.
-        void beginRecording();
-        //! Finishes building the macro and returns it as a drawable object.
-        //! The width and height affect nothing about the recording process,
-        //! the resulting macro will simply return these values when you ask
-        //! it.
-        //! Most usually, the return value is passed to Image::Image().
-        GOSU_UNIQUE_PTR<Gosu::ImageData> endRecording(int width, int height);
-        
-        //! Pushes one transformation onto the transformation stack.
-        void pushTransform(const Transform& transform);
-        //! Pops one transformation from the transformation stack.
-        void popTransform();
-
-        //! Draws a line from one point to another (last pixel exclusive).
-        //! Note: OpenGL lines are not reliable at all and may have a missing pixel at the start
-        //! or end point. Please only use this for debugging purposes. Otherwise, use a quad or
-        //! image to simulate lines, or contribute a better drawLine to Gosu.
-        void drawLine(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            ZPos z, AlphaMode mode = amDefault);
-
-        void drawTriangle(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            double x3, double y3, Color c3,
-            ZPos z, AlphaMode mode = amDefault);
-
-        void drawQuad(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 = amDefault);
-
-        //! Turns a portion of a bitmap into something that can be drawn on
-        //! this graphics object.
-        GOSU_UNIQUE_PTR<ImageData> createImage(const Bitmap& src,
-            unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-            unsigned borderFlags);
-    };
-}
-
-#endif
+//! \file Graphics.hpp
+//! Interface of the Graphics class.
+
+#ifndef GOSU_GRAPHICS_HPP
+#define GOSU_GRAPHICS_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Color.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <Gosu/TR1.hpp>
+#include <memory>
+
+namespace Gosu
+{
+    //! Returns the maximum size of an texture that will be allocated
+    //! internally by Gosu.
+    //! Useful when extending Gosu using OpenGL.
+    unsigned const MAX_TEXTURE_SIZE = 1024;
+    
+    //! Serves as the target of all drawing and provides primitive drawing
+    //! functionality.
+    //! Usually created internally by Gosu::Window.
+    class Graphics
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+        
+    #if defined(GOSU_CPP11_ENABLED)
+        // explicitly forbid copying and moving
+        Graphics(Graphics&&) = delete;
+        Graphics& operator=(Graphics&&) = delete;
+        Graphics(const Graphics&) = delete;
+        Graphics& operator=(const Graphics&) = delete;
+    #endif
+
+    public:
+        Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
+        ~Graphics();
+
+        // TODO: Replace by setBaseTransform()
+        void setResolution(unsigned virtualWidth, unsigned virtualHeight,
+            double horizontalBlackBarWidth = 0, double verticalBlackBarHeight = 0);
+        
+        unsigned width() const;
+        unsigned height() const;
+        bool fullscreen() const;
+
+        //! Prepares the graphics object for drawing. Nothing must be drawn
+        //! without calling begin.
+        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();
+        //! Resets Gosu into its default rendering state.
+        void endGL();
+        //! Schedules a custom GL functor to be executed at a certain Z level.
+        //! The functor is called in a clean GL context (as given by beginGL/endGL).
+        //! Gosu's rendering up to the Z level may not yet have been glFlush()ed.
+        //! 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 std::tr1::function<void()>& functor, ZPos z);
+        
+        //! Enables clipping to a specified rectangle.
+        void beginClipping(double x, double y, double width, double height);
+        //! Disables clipping.
+        void endClipping();
+        
+        //! Starts recording a macro. Cannot be nested.
+        void beginRecording();
+        //! Finishes building the macro and returns it as a drawable object.
+        //! The width and height affect nothing about the recording process,
+        //! the resulting macro will simply return these values when you ask
+        //! it.
+        //! Most usually, the return value is passed to Image::Image().
+        GOSU_UNIQUE_PTR<Gosu::ImageData> endRecording(int width, int height);
+        
+        //! Pushes one transformation onto the transformation stack.
+        void pushTransform(const Transform& transform);
+        //! Pops one transformation from the transformation stack.
+        void popTransform();
+
+        //! Draws a line from one point to another (last pixel exclusive).
+        //! Note: OpenGL lines are not reliable at all and may have a missing pixel at the start
+        //! or end point. Please only use this for debugging purposes. Otherwise, use a quad or
+        //! image to simulate lines, or contribute a better drawLine to Gosu.
+        void drawLine(double x1, double y1, Color c1,
+            double x2, double y2, Color c2,
+            ZPos z, AlphaMode mode = amDefault);
+
+        void drawTriangle(double x1, double y1, Color c1,
+            double x2, double y2, Color c2,
+            double x3, double y3, Color c3,
+            ZPos z, AlphaMode mode = amDefault);
+
+        void drawQuad(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 = amDefault);
+
+        //! Turns a portion of a bitmap into something that can be drawn on
+        //! this graphics object.
+        GOSU_UNIQUE_PTR<ImageData> createImage(const Bitmap& src,
+            unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
+            unsigned borderFlags);
+    };
+}
+
+#endif