gosu 0.10.9.pre1 → 0.11.0

data/Gosu/Color.hpp

@@ -1,23 +1,20 @@
 //! \file Color.hpp
 //! Interface of the Color class.
 
-#ifndef GOSU_COLOR_HPP
-#define GOSU_COLOR_HPP
+#pragma once
 
 #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.
+    //! 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 will look
+    //! like 0xrrggbbaa, on Little-Endian machines it is 0xaabbggrr.
     class Color
     {
-        std::tr1::uint32_t rep;
+        std::uint32_t rep;
         #ifdef GOSU_IS_LITTLE_ENDIAN
         enum { RED_OFFSET = 0, GREEN_OFFSET = 8, BLUE_OFFSET = 16, ALPHA_OFFSET = 24 };
         #else
@@ -25,7 +22,7 @@ namespace Gosu
         #endif
         
     public:
-        typedef std::tr1::uint8_t Channel;
+        typedef std::uint8_t Channel;
         static const unsigned GL_FORMAT = 0x1908; // GL_RGBA
         
         //! The default constructor does not initialize the color to any value.
@@ -35,14 +32,13 @@ namespace Gosu
         
         //! Conversion constructor for literals of the form 0xaarrggbb.
         Color(unsigned argb)
+        : Color((argb >> 24) & 0xff, (argb >> 16) & 0xff, (argb >> 8) & 0xff, (argb >> 0) & 0xff)
         {
-            *this = Color((argb >> 24) & 0xff, (argb >> 16) & 0xff,
-                          (argb >>  8) & 0xff, (argb >>  0) & 0xff);
         }
         
         Color(Channel red, Channel green, Channel blue)
+        : Color(0xff, red, green, blue)
         {
-            *this = Color(0xff, red, green, blue);
         }
         
         Color(Channel alpha, Channel red, Channel green, Channel blue)
@@ -52,11 +48,12 @@ namespace Gosu
         }
         
         //! 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);
+        //! Ranges of these values are given as 0..360, 0..1, and 0..1, respectively.
+        static Color from_hsv(double h, double s, double v);
+        
+        //! 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.
+        static Color from_ahsv(Channel alpha, double h, double s, double v);
 
         Channel red() const
         {
@@ -78,25 +75,25 @@ namespace Gosu
             return static_cast<Channel>(rep >> ALPHA_OFFSET);
         }
 
-        void setRed(Channel value)
+        void set_red(Channel value)
         {
             rep &= ~(0xff << RED_OFFSET);
             rep |= value << RED_OFFSET;
         }
 
-        void setGreen(Channel value)
+        void set_green(Channel value)
         {
             rep &= ~(0xff << GREEN_OFFSET);
             rep |= value << GREEN_OFFSET;
         }
 
-        void setBlue(Channel value)
+        void set_blue(Channel value)
         {
             rep &= ~(0xff << BLUE_OFFSET);
             rep |= value << BLUE_OFFSET;
         }
 
-        void setAlpha(Channel value)
+        void set_alpha(Channel value)
         {
             rep &= ~(0xff << ALPHA_OFFSET);
             rep |= value << ALPHA_OFFSET;
@@ -106,43 +103,31 @@ namespace Gosu
         double hue() const;
         
         //! Changes the current color so hue() will return h.
-        void setHue(double h);
+        void set_hue(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);
+        void set_saturation(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);
+        void set_value(double v);
 
         //! Returns the color in 0xaarrggbb representation.
-        std::tr1::uint32_t argb() const
-        {
-            return alpha() << 24 | red() << 16 | green() << 8 | blue();
-        }
+        std::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();
-        }
+        std::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();
-        }
+        std::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;
-        }
+        std::uint32_t gl() const { return rep; }
         
         static const Color NONE;
         static const Color BLACK;
@@ -158,21 +143,10 @@ namespace Gosu
         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();
-    }
+#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.
@@ -182,23 +156,5 @@ namespace Gosu
     //! 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,39 +1,36 @@
 //! \file Directories.hpp
 //! Access to a small set of system paths.
 
-#ifndef GOSU_DIRECTORIES_HPP
-#define GOSU_DIRECTORIES_HPP
+#pragma once
 
 #include <string>
 
 namespace Gosu
 {
-    //! Changes the current directory to the result of resourcePrefix().
-    void useResourceDirectory();
+    //! Changes the current directory to the result of resource_prefix().
+    void use_resource_directory();
     
     //! Prefix for a program's own resources.
-    //! On Windows, the executable's containing directory.
-    //! On OS X, the application's Resources subdirectory.
+    //! On Windows, the parent directory of the executable.
+    //! On macOS, the 'Resources' directory inside the .app bundle.
     //! On Linux, the current directory (empty string).
-    std::wstring resourcePrefix();
+    std::string resource_prefix();
     
-    //! Prefix for resources of a group of programs.
-    //! On Windows, the executable's containing directory.
-    //! On OS X, the application's containing subdirectory.
+    //! Prefix for shared resources of a group of programs.
+    //! On Windows, the parent directory of the executable.
+    //! On macOS, the parent directory of the .app bundle.
     //! On Linux, the current directory (empty string).
-    std::wstring sharedResourcePrefix();
+    std::string shared_resource_prefix();
     
     //! Prefix for user settings.
     //! On Windows, the same as %APPDATA%.
-    //! On OS X, the user's Library/Preferences folder.
+    //! On macOS, the user's Library/Preferences folder.
     //! On Linux, the home directory plus a trailing dot for hidden files.
-    std::wstring userSettingsPrefix();
+    std::string user_settings_prefix();
     
     //! Prefix for user documents, e.g. saved games.
     //! On Windows, the My Documents folder.
-    //! On OS X, the user's Documents folder.
+    //! On macOS, the user's Documents folder.
     //! On Linux, the home directory.
-    std::wstring userDocsPrefix();
+    std::string user_documents_prefix();
 }
-
-#endif

data/Gosu/Font.hpp

@@ -1,40 +1,39 @@
 //! \file Font.hpp
 //! Interface of the Font class.
 
-#ifndef GOSU_FONT_HPP
-#define GOSU_FONT_HPP
+#pragma once
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Platform.hpp>
 #include <Gosu/Text.hpp>
-#include <Gosu/TR1.hpp>
+#include <memory>
 #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
+    //! static texts you should use create_bitmap and turn the result into
     //! an image.
     class Font
     {
         struct Impl;
-        std::tr1::shared_ptr<Impl> pimpl;
+        std::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
+        //! \param font_name 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
+        //! \param font_height Height of the font, in pixels.
+        //! \param font_flags Flags used to render individual characters of
         //!        the font.
-        Font(unsigned fontHeight, const std::wstring& fontName = defaultFontName(),
-            unsigned fontFlags = ffBold);
+        Font(unsigned font_height, const std::string& font_name = default_font_name(),
+            unsigned font_flags = FF_BOLD);
         
         //! Returns the name of the font that was used to create it.
-        std::wstring name() const;
+        std::string name() const;
         
         //! Returns the height of the font, in pixels.
         unsigned height() const;
@@ -43,45 +42,40 @@ namespace Gosu
         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;
+        double text_width(const std::string& text, double scale_x = 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;
+        void draw(const std::string& text, double x, double y, ZPos z,
+            double scale_x = 1, double scale_y = 1, Color c = Color::WHITE,
+            AlphaMode mode = AM_DEFAULT) 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,
+        //! \param rel_x Determines where the text is drawn horizontally. If
+        //! rel_x 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;
+        //! \param rel_y See rel_x.
+        void draw_rel(const std::string& text, double x, double y, ZPos z,
+            double rel_x, double rel_y, double scale_x = 1, double scale_y = 1,
+            Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) 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.
+        //! This ensures that Fonts are still (sort of) immutable.
+        void set_image(wchar_t wc, unsigned font_flags, const Gosu::Image& image);
+        //! A shortcut for mapping a character to an image regardless of font_flags.
         //! Later versions might apply faux italics or faux bold to it (to be decided!).
-        void setImage(wchar_t wc, const Gosu::Image& image);
+        void set_image(wchar_t wc, const Gosu::Image& image);
         
         #ifndef SWIG
-        GOSU_DEPRECATED Font(Graphics& graphics, const std::wstring& fontName,
-            unsigned fontHeight, unsigned fontFlags = ffBold);
-        
         GOSU_DEPRECATED
         #endif
         //! DEPRECATED: Analogous to draw, but rotates the text by a given angle.
-        //! Use Graphics::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;
+        //! Use Graphics::push_transform to achieve the same effect.
+        void draw_rot(const std::string& text, double x, double y, ZPos z, double angle,
+            double scale_x = 1, double scale_y = 1, Color c = Color::WHITE,
+            AlphaMode mode = AM_DEFAULT) const;
     };
 }
-
-#endif

data/Gosu/Fwd.hpp

@@ -1,31 +1,27 @@
-//! \file Fwd.hpp
-//! Contains declarations of all of Gosu's available classes.
-
-#ifndef GOSU_FWD_HPP
-#define GOSU_FWD_HPP
-
-//! The library's main namespace.
-namespace Gosu
-{
-    class Audio;
-    class Bitmap;
-    class Buffer;
-    class Button;
-    class Color;
-    class File;
-    class Font;
-    class Graphics;
-    class Image;
-    class ImageData;
-    class Input;
-    class Reader;
-    class Resource;
-    class Sample;
-    class Song;
-    class TextInput;
-    class Timer;
-    class Window;
-    class Writer;
-}
-
-#endif
+//! \file Fwd.hpp
+//! Contains forward declarations of all of Gosu's available classes.
+
+#pragma once
+
+//! The library's main namespace.
+namespace Gosu
+{
+    class Bitmap;
+    class Buffer;
+    class Button;
+    class Color;
+    class File;
+    class Font;
+    class Graphics;
+    class Image;
+    class ImageData;
+    class Input;
+    class Reader;
+    class Resource;
+    class Sample;
+    class Song;
+    class TextInput;
+    class Timer;
+    class Window;
+    class Writer;
+}

data/Gosu/Gosu.hpp

@@ -1,5 +1,5 @@
 //! \file Gosu.hpp
-//! Umbrella header for lazy people with fast compilers, or pre-compiled headers.
+//! Umbrella header for all of Gosu.
 
 //! \mainpage Gosu C++ Documentation
 //!
@@ -7,8 +7,7 @@
 //! discussion of concepts and ideas behind the library, see the Wiki entries linked
 //! from the official website, https://www.libgosu.org/.
 
-#ifndef GOSU_GOSU_HPP
-#define GOSU_GOSU_HPP
+#pragma once
 
 #include <Gosu/Audio.hpp>
 #include <Gosu/Bitmap.hpp>
@@ -29,5 +28,3 @@
 #include <Gosu/Utility.hpp>
 #include <Gosu/Version.hpp>
 #include <Gosu/Window.hpp>
-
-#endif