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

data/Gosu/Color.hpp

@@ -1,204 +1,204 @@
-//! \file Color.hpp
-//! Interface of the Color class.
-
-#ifndef GOSU_COLOR_HPP
-#define GOSU_COLOR_HPP
-
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-
-namespace Gosu
-{
-    //! Represents an RGBA color value with 8 bits for each channel. Can be
-    //! implicitly constructed from literals of the form 0xaarrggbb. Has fast
-    //! value semantics.
-    //! The four-byte layout in memory is RGBA. On Big-Endian machines the
-    //! unsigned int interpretation is 0xrrggbbaa, on Little-Endian machines
-    //! it is 0xaabbggrr.
-    class Color
-    {
-        std::tr1::uint32_t rep;
-        #ifdef GOSU_IS_LITTLE_ENDIAN
-        enum { RED_OFFSET = 0, GREEN_OFFSET = 8, BLUE_OFFSET = 16, ALPHA_OFFSET = 24 };
-        #else
-        enum { RED_OFFSET = 24, GREEN_OFFSET = 16, BLUE_OFFSET = 8, ALPHA_OFFSET = 0 };
-        #endif
-        
-    public:
-        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.
-        Color()
-        {
-        }
-        
-        //! Conversion constructor for literals of the form 0xaarrggbb.
-        Color(unsigned argb)
-        {
-            *this = Color((argb >> 24) & 0xff, (argb >> 16) & 0xff,
-                          (argb >>  8) & 0xff, (argb >>  0) & 0xff);
-        }
-        
-        Color(Channel red, Channel green, Channel blue)
-        {
-            *this = Color(0xff, red, green, blue);
-        }
-        
-        Color(Channel alpha, Channel red, Channel green, Channel blue)
-        {
-            rep = (alpha << ALPHA_OFFSET) | (red << RED_OFFSET) |
-                  (green << GREEN_OFFSET) | (blue << BLUE_OFFSET);
-        }
-        
-        //! Constructs a color from the given hue/saturation/value triple.
-        //! Ranges of these values are given as 0..360, 0..1 and 0..1,
-        //! respectively.
-        //! The alpha value is set to 1 from this method.
-        static Color fromHSV(double h, double s, double v);
-        static Color fromAHSV(Channel alpha, double h, double s, double v);
-
-        Channel red() const
-        {
-            return static_cast<Channel>(rep >> RED_OFFSET);
-        }
-
-        Channel green() const
-        {
-            return static_cast<Channel>(rep >> GREEN_OFFSET);
-        }
-
-        Channel blue() const
-        {
-            return static_cast<Channel>(rep >> BLUE_OFFSET);
-        }
-
-        Channel alpha() const
-        {
-            return static_cast<Channel>(rep >> ALPHA_OFFSET);
-        }
-
-        void setRed(Channel value)
-        {
-            rep &= ~(0xff << RED_OFFSET);
-            rep |= value << RED_OFFSET;
-        }
-
-        void setGreen(Channel value)
-        {
-            rep &= ~(0xff << GREEN_OFFSET);
-            rep |= value << GREEN_OFFSET;
-        }
-
-        void setBlue(Channel value)
-        {
-            rep &= ~(0xff << BLUE_OFFSET);
-            rep |= value << BLUE_OFFSET;
-        }
-
-        void setAlpha(Channel value)
-        {
-            rep &= ~(0xff << ALPHA_OFFSET);
-            rep |= value << ALPHA_OFFSET;
-        }
-
-        //! Returns the hue of the color, in the usual range of 0..360.
-        double hue() const;
-        
-        //! Changes the current color so hue() will return h.
-        void setHue(double h);
-        
-        //! Returns the saturation of the color, in the range of 0..1.
-        double saturation() const;
-        
-        //! Changes the current color so saturation() will return s.
-        void setSaturation(double s);
-        
-        //! Returns the value (brightness) of the color, in the range of 0..1.
-        double value() const;
-        
-        //! Changes the current color so value() will return v.
-        void setValue(double v);
-
-        //! Returns the color in 0xaarrggbb representation.
-        std::tr1::uint32_t argb() const
-        {
-            return alpha() << 24 | red() << 16 | green() << 8 | blue();
-        }
-
-        //! Returns the color in 0x00bbggrr representation. Useful for Win32 programming.
-        std::tr1::uint32_t bgr() const
-        {
-            return blue() << 16 | green() << 8 | red();
-        }
-
-        //! Returns the color in 0xaabbggrr representation.
-        std::tr1::uint32_t abgr() const
-        {
-            return alpha() << 24 | blue() << 16 | green() << 8 | red();
-        }
-        
-        //! Returns the internal representation of the color (RGBA in memory).
-        std::tr1::uint32_t gl() const
-        {
-            return rep;
-        }
-        
-        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;
-    };
-    
-    #ifndef SWIG
-    inline bool operator<(Color a, Color b)
-    {
-        return a.gl() < b.gl();
-    }
-    
-    inline bool operator==(Color a, Color b)
-    {
-        return a.gl() == b.gl();
-    }
-
-    inline bool operator!=(Color a, Color b)
-    {
-        return a.gl() != b.gl();
-    }
-
-    //! Interpolates linearly between two colors, with a given weight towards
-    //! the second color.
-    //! Specialization of the general function in Gosu/Math.hpp.
-    Color interpolate(Color a, Color b, double weight = 0.5);
-    
-    //! Combines two colors as if their channels were mapped to the 0..1 range
-    //! and then multiplied with each other.
-    Color multiply(Color a, Color b);
-
-    namespace Colors
-    {
-        GOSU_DEPRECATED const Color none     (0x00000000);
-        GOSU_DEPRECATED const Color black    (0xff000000);
-        GOSU_DEPRECATED const Color gray     (0xff808080);
-        GOSU_DEPRECATED const Color white    (0xffffffff);
-        
-        GOSU_DEPRECATED const Color aqua     (0xff00ffff);
-        GOSU_DEPRECATED const Color red      (0xffff0000);
-        GOSU_DEPRECATED const Color green    (0xff00ff00);
-        GOSU_DEPRECATED const Color blue     (0xff0000ff);
-        GOSU_DEPRECATED const Color yellow   (0xffffff00);
-        GOSU_DEPRECATED const Color fuchsia  (0xffff00ff);
-        GOSU_DEPRECATED const Color cyan     (0xff00ffff);
-    }
-    #endif
-}
-
-#endif
+//! \file Color.hpp
+//! Interface of the Color class.
+
+#ifndef GOSU_COLOR_HPP
+#define GOSU_COLOR_HPP
+
+#include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
+
+namespace Gosu
+{
+    //! Represents an RGBA color value with 8 bits for each channel. Can be
+    //! implicitly constructed from literals of the form 0xaarrggbb. Has fast
+    //! value semantics.
+    //! The four-byte layout in memory is RGBA. On Big-Endian machines the
+    //! unsigned int interpretation is 0xrrggbbaa, on Little-Endian machines
+    //! it is 0xaabbggrr.
+    class Color
+    {
+        std::tr1::uint32_t rep;
+        #ifdef GOSU_IS_LITTLE_ENDIAN
+        enum { RED_OFFSET = 0, GREEN_OFFSET = 8, BLUE_OFFSET = 16, ALPHA_OFFSET = 24 };
+        #else
+        enum { RED_OFFSET = 24, GREEN_OFFSET = 16, BLUE_OFFSET = 8, ALPHA_OFFSET = 0 };
+        #endif
+        
+    public:
+        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.
+        Color()
+        {
+        }
+        
+        //! Conversion constructor for literals of the form 0xaarrggbb.
+        Color(unsigned argb)
+        {
+            *this = Color((argb >> 24) & 0xff, (argb >> 16) & 0xff,
+                          (argb >>  8) & 0xff, (argb >>  0) & 0xff);
+        }
+        
+        Color(Channel red, Channel green, Channel blue)
+        {
+            *this = Color(0xff, red, green, blue);
+        }
+        
+        Color(Channel alpha, Channel red, Channel green, Channel blue)
+        {
+            rep = (alpha << ALPHA_OFFSET) | (red << RED_OFFSET) |
+                  (green << GREEN_OFFSET) | (blue << BLUE_OFFSET);
+        }
+        
+        //! Constructs a color from the given hue/saturation/value triple.
+        //! Ranges of these values are given as 0..360, 0..1 and 0..1,
+        //! respectively.
+        //! The alpha value is set to 1 from this method.
+        static Color fromHSV(double h, double s, double v);
+        static Color fromAHSV(Channel alpha, double h, double s, double v);
+
+        Channel red() const
+        {
+            return static_cast<Channel>(rep >> RED_OFFSET);
+        }
+
+        Channel green() const
+        {
+            return static_cast<Channel>(rep >> GREEN_OFFSET);
+        }
+
+        Channel blue() const
+        {
+            return static_cast<Channel>(rep >> BLUE_OFFSET);
+        }
+
+        Channel alpha() const
+        {
+            return static_cast<Channel>(rep >> ALPHA_OFFSET);
+        }
+
+        void setRed(Channel value)
+        {
+            rep &= ~(0xff << RED_OFFSET);
+            rep |= value << RED_OFFSET;
+        }
+
+        void setGreen(Channel value)
+        {
+            rep &= ~(0xff << GREEN_OFFSET);
+            rep |= value << GREEN_OFFSET;
+        }
+
+        void setBlue(Channel value)
+        {
+            rep &= ~(0xff << BLUE_OFFSET);
+            rep |= value << BLUE_OFFSET;
+        }
+
+        void setAlpha(Channel value)
+        {
+            rep &= ~(0xff << ALPHA_OFFSET);
+            rep |= value << ALPHA_OFFSET;
+        }
+
+        //! Returns the hue of the color, in the usual range of 0..360.
+        double hue() const;
+        
+        //! Changes the current color so hue() will return h.
+        void setHue(double h);
+        
+        //! Returns the saturation of the color, in the range of 0..1.
+        double saturation() const;
+        
+        //! Changes the current color so saturation() will return s.
+        void setSaturation(double s);
+        
+        //! Returns the value (brightness) of the color, in the range of 0..1.
+        double value() const;
+        
+        //! Changes the current color so value() will return v.
+        void setValue(double v);
+
+        //! Returns the color in 0xaarrggbb representation.
+        std::tr1::uint32_t argb() const
+        {
+            return alpha() << 24 | red() << 16 | green() << 8 | blue();
+        }
+
+        //! Returns the color in 0x00bbggrr representation. Useful for Win32 programming.
+        std::tr1::uint32_t bgr() const
+        {
+            return blue() << 16 | green() << 8 | red();
+        }
+
+        //! Returns the color in 0xaabbggrr representation.
+        std::tr1::uint32_t abgr() const
+        {
+            return alpha() << 24 | blue() << 16 | green() << 8 | red();
+        }
+        
+        //! Returns the internal representation of the color (RGBA in memory).
+        std::tr1::uint32_t gl() const
+        {
+            return rep;
+        }
+        
+        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;
+    };
+    
+    #ifndef SWIG
+    inline bool operator<(Color a, Color b)
+    {
+        return a.gl() < b.gl();
+    }
+    
+    inline bool operator==(Color a, Color b)
+    {
+        return a.gl() == b.gl();
+    }
+
+    inline bool operator!=(Color a, Color b)
+    {
+        return a.gl() != b.gl();
+    }
+
+    //! Interpolates linearly between two colors, with a given weight towards
+    //! the second color.
+    //! Specialization of the general function in Gosu/Math.hpp.
+    Color interpolate(Color a, Color b, double weight = 0.5);
+    
+    //! Combines two colors as if their channels were mapped to the 0..1 range
+    //! and then multiplied with each other.
+    Color multiply(Color a, Color b);
+
+    namespace Colors
+    {
+        GOSU_DEPRECATED const Color none     (0x00000000);
+        GOSU_DEPRECATED const Color black    (0xff000000);
+        GOSU_DEPRECATED const Color gray     (0xff808080);
+        GOSU_DEPRECATED const Color white    (0xffffffff);
+        
+        GOSU_DEPRECATED const Color aqua     (0xff00ffff);
+        GOSU_DEPRECATED const Color red      (0xffff0000);
+        GOSU_DEPRECATED const Color green    (0xff00ff00);
+        GOSU_DEPRECATED const Color blue     (0xff0000ff);
+        GOSU_DEPRECATED const Color yellow   (0xffffff00);
+        GOSU_DEPRECATED const Color fuchsia  (0xffff00ff);
+        GOSU_DEPRECATED const Color cyan     (0xff00ffff);
+    }
+    #endif
+}
+
+#endif

data/Gosu/Directories.hpp

@@ -1,36 +1,36 @@
-//! \file Directories.hpp
-//! Access to a small set of system paths.
-
-#ifndef GOSU_DIRECTORIES_HPP
-#define GOSU_DIRECTORIES_HPP
-
-#include <string>
-
-namespace Gosu
-{
-    //! Prefix for a program's own resources.
-    //! On Windows, the executable's containing directory.
-    //! On OS X, the application's Resources subdirectory.
-    //! On Linux, the current directory.
-    std::wstring resourcePrefix();
-    
-    //! Prefix for resources of a group of programs.
-    //! On Windows, the executable's containing directory.
-    //! On OS X, the application's containing subdirectory.
-    //! On Linux, the current directory.
-    std::wstring sharedResourcePrefix();
-    
-    //! Prefix for user settings.
-    //! On Windows, the same as %APPDATA%.
-    //! On OS X, the user's Library/Preferences folder.
-    //! On Linux, the home directory plus a trailing dot for hidden files.
-    std::wstring userSettingsPrefix();
-    
-    //! Prefix for user documents, e.g. save games.
-    //! On Windows, the My Documents folder.
-    //! On OS X, the user's Documents folder.
-    //! On Linux, the home directory.
-    std::wstring userDocsPrefix();
-}
-
-#endif
+//! \file Directories.hpp
+//! Access to a small set of system paths.
+
+#ifndef GOSU_DIRECTORIES_HPP
+#define GOSU_DIRECTORIES_HPP
+
+#include <string>
+
+namespace Gosu
+{
+    //! Prefix for a program's own resources.
+    //! On Windows, the executable's containing directory.
+    //! On OS X, the application's Resources subdirectory.
+    //! On Linux, the current directory.
+    std::wstring resourcePrefix();
+    
+    //! Prefix for resources of a group of programs.
+    //! On Windows, the executable's containing directory.
+    //! On OS X, the application's containing subdirectory.
+    //! On Linux, the current directory.
+    std::wstring sharedResourcePrefix();
+    
+    //! Prefix for user settings.
+    //! On Windows, the same as %APPDATA%.
+    //! On OS X, the user's Library/Preferences folder.
+    //! On Linux, the home directory plus a trailing dot for hidden files.
+    std::wstring userSettingsPrefix();
+    
+    //! Prefix for user documents, e.g. save games.
+    //! On Windows, the My Documents folder.
+    //! On OS X, the user's Documents folder.
+    //! On Linux, the home directory.
+    std::wstring userDocsPrefix();
+}
+
+#endif