gosu 0.10.9.pre1 → 0.11.0

data/Gosu/Image.hpp

@@ -1,13 +1,11 @@
 //! \file Image.hpp
 //! Interface of the Image class and helper functions.
 
-#ifndef GOSU_IMAGE_HPP
-#define GOSU_IMAGE_HPP
+#pragma once
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
-#include <Gosu/TR1.hpp>
 #include <memory>
 #include <vector>
 
@@ -16,116 +14,74 @@ namespace Gosu
     //! Provides functionality for drawing rectangular images.
     class Image
     {
-        std::tr1::shared_ptr<ImageData> data;
+        std::shared_ptr<ImageData> data_;
 
     public:
         //! Loads an image from a given filename.
         //!
         //! A color key of #ff00ff is automatically applied to BMP image files.
         //! For more flexibility, use the corresponding constructor that uses a Bitmap object.
-        explicit Image(const std::wstring& filename,
-            unsigned imageFlags = ifSmooth);
+        explicit Image(const std::string& filename, unsigned image_flags = IF_SMOOTH);
         
         //! Loads a portion of the the image at the given filename..
         //!
         //! A color key of #ff00ff is automatically applied to BMP image files.
         //! For more flexibility, use the corresponding constructor that uses a Bitmap object.
-        Image(const std::wstring& filename, unsigned srcX,
-              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-              unsigned imageFlags = ifSmooth);
+        Image(const std::string& filename, unsigned src_x, unsigned src_y,
+            unsigned src_width, unsigned src_height, unsigned image_flags = IF_SMOOTH);
         
         //! Converts the given bitmap into an image.
-        explicit Image(const Bitmap& source,
-            unsigned imageFlags = ifSmooth);
+        explicit Image(const Bitmap& source, unsigned image_flags = IF_SMOOTH);
         
         //! Converts a portion of the given bitmap into an image.
-        Image(const Bitmap& source, unsigned srcX,
-            unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-            unsigned imageFlags = ifSmooth);
+        Image(const Bitmap& source, unsigned src_x, unsigned src_y, unsigned src_width,
+            unsigned src_height, unsigned image_flags = IF_SMOOTH);
         
         //! Creates an Image from a user-supplied instance of the ImageData interface.
-        explicit Image(GOSU_UNIQUE_PTR<ImageData> data);
+        explicit Image(std::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;
+        void draw(double x, double y, ZPos z, double scale_x = 1, double scale_y = 1,
+            Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) const;
         //! Like draw(), but with modulation colors for all four corners.
-        //! TODO: This can be an overload of draw() - in any case the name is terrible.
-        void drawMod(double x, double y, ZPos z,
-            double factorX, double factorY,
-            Color c1, Color c2, Color c3, Color c4,
-            AlphaMode mode = amDefault) const;
+        void draw_mod(double x, double y, ZPos z, double scale_x, double scale_y,
+            Color c1, Color c2, Color c3, Color c4, AlphaMode mode = AM_DEFAULT) 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
+        //! \param center_x 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;
+        //! \param center_y See center_x.
+        void draw_rot(double x, double y, ZPos z, double angle,
+            double center_x = 0.5, double center_y = 0.5, double scale_x = 1, double scale_y = 1,
+            Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) const;
         
         #ifndef SWIG
         //! Provides access to the underlying image data object.
-        ImageData& getData() const;
-        
-        GOSU_DEPRECATED Image(Graphics& graphics, const std::wstring& filename,
-              bool tileable = false);
-        GOSU_DEPRECATED Image(Graphics& graphics, const std::wstring& filename, unsigned srcX,
-              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-              bool tileable = false);
-        GOSU_DEPRECATED Image(Graphics& graphics, const Bitmap& source,
-              bool tileable = false);
-        GOSU_DEPRECATED Image(Graphics& graphics, const Bitmap& source, unsigned srcX,
-              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-              bool tileable = false);
+        ImageData& data() const;
         #endif
     };
     
     #ifndef SWIG
     //! Convenience function that slices an image file into a grid 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.
-    std::vector<Gosu::Image> loadTiles(const Bitmap& bmp,
-        int tileWidth, int tileHeight, unsigned imageFlags = ifSmooth);
+    //! \param tile_width If positive, specifies the width of one tile in pixels.
+    //! If negative, the bitmap is divided into -tile_width rows.
+    //! \param tile_height See tile_width.
+    std::vector<Gosu::Image> load_tiles(const Bitmap& bmp,
+        int tile_width, int tile_height, unsigned image_flags = IF_SMOOTH);
     
     //! Convenience function that slices a bitmap into a grid 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.
-    std::vector<Gosu::Image> loadTiles(const std::wstring& filename,
-        int tileWidth, int tileHeight, unsigned imageFlags = ifSmooth);
-    
-    GOSU_DEPRECATED std::vector<Gosu::Image> loadTiles(Graphics& graphics, const Bitmap& bmp, int tileWidth, int tileHeight, bool tileable);
-    GOSU_DEPRECATED std::vector<Gosu::Image> loadTiles(Graphics& graphics, const std::wstring& bmp, int tileWidth, int tileHeight, bool tileable);
-    template<typename Container>
-    GOSU_DEPRECATED 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])));
-    }
-    template<typename Container>
-    GOSU_DEPRECATED 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])));
-    }
+    //! \param tile_width If positive, specifies the width of one tile in pixels.
+    //! If negative, the bitmap is divided into -tile_width rows.
+    //! \param tile_height See tile_width.
+    std::vector<Gosu::Image> load_tiles(const std::string& filename,
+        int tile_width, int tile_height, unsigned image_flags = IF_SMOOTH);
     #endif
 }
-
-#endif

data/Gosu/ImageData.hpp

@@ -1,13 +1,13 @@
 //! \file ImageData.hpp
 //! Interface of the ImageData class.
 
-#ifndef GOSU_IMAGEDATA_HPP
-#define GOSU_IMAGEDATA_HPP
+#pragma once
 
+#include <Gosu/Fwd.hpp>
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
-#include <Gosu/Fwd.hpp>
 #include <Gosu/Platform.hpp>
+#include <memory>
 
 namespace Gosu
 {
@@ -16,13 +16,13 @@ namespace Gosu
     //! to use them in OpenGL operations.
     struct GLTexInfo
     {
-        int texName;
+        int tex_name;
         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
+    //! Graphics::create_image and usually only used to implement drawing
     //! primitives like Image, which then provide a more specialized and
     //! intuitive drawing interface.
     class ImageData
@@ -32,15 +32,12 @@ namespace Gosu
         ImageData& operator=(const ImageData&);
         
     public:
-        ImageData()
-        {
-        }
+        ImageData() {}
         
-        virtual ~ImageData()
-        {
-        }
+        virtual ~ImageData() {}
 
         virtual int width() const = 0;
+        
         virtual int height() const = 0;
 
         virtual void draw(double x1, double y1, Color c1,
@@ -48,14 +45,13 @@ namespace Gosu
             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 const GLTexInfo* gl_tex_info() const = 0;
+        
+        virtual Bitmap to_bitmap() const = 0;
         
-        virtual GOSU_UNIQUE_PTR<ImageData> subimage(int x, int y, int width, int height) const = 0;
+        virtual std::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,14 +1,13 @@
 //! \file Input.hpp
 //! Interface of the Input class.
 
-#ifndef GOSU_INPUT_HPP
-#define GOSU_INPUT_HPP
+#pragma once
 
 #include <Gosu/Fwd.hpp>
-#include <Gosu/Platform.hpp>
 #include <Gosu/Buttons.hpp>
-#include <Gosu/TR1.hpp>
-
+#include <Gosu/Platform.hpp>
+#include <functional>
+#include <memory>
 #include <vector>
 
 namespace Gosu
@@ -24,26 +23,17 @@ namespace Gosu
         //! For internal use.
         unsigned id() const { return id_; }
 
-        //! Default constructor; == noButton.
-        Button() : id_(noButton) {}
+        //! Default constructor; == no_button.
+        Button() : id_(NO_BUTTON) {}
 
         //! 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();
-    }
+    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.
@@ -63,31 +53,26 @@ namespace Gosu
     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
+        // Non-movable (const) to avoid dangling internal references.
+        const std::unique_ptr<Impl> pimpl;
 
     public:
     #ifdef GOSU_IS_IPHONE
-        Input(void* view, float updateInterval);
-        void feedTouchEvent(int type, void* touches);
+        Input(void* view, float update_interval);
+        void feed_touch_event(int type, void* touches);
     #else
         Input(void* window);
-        bool feedSDLEvent(void* event);
+        bool feed_sdl_event(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 the character (as a UTF-8 encoded string) that a button usually produces.
+        //! Returns the empty string if nothing can be found.
+        static std::string id_to_char(Button btn);
+        //! Returns the button that has to be pressed to produce the given character (as a UTF-8
+        //! encoded string), or NO_BUTTON.
+        static Button char_to_id(std::string ch);
         
         //! Returns true if a button is currently pressed.
         //! Updated every tick.
@@ -95,44 +80,44 @@ namespace Gosu
         
         //! 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;
+        double mouse_x() const;
+        //! See mouse_x.
+        double mouse_y() const;
         
         //! Immediately moves the mouse as far towards the desired position
-        //! as possible. x and y are relative to the window, just as in mouseX()
-        //! and mouseY(), so (0, 0) is the top left corner of the window..
-        void setMousePosition(double x, double y);
+        //! as possible. x and y are relative to the window, just as in mouse_x()
+        //! and mouse_y(), so (0, 0) is the top left corner of the window..
+        void set_mouse_position(double x, double y);
 
-        // Undocumented for the moment. Also applies to currentTouches().
-        void setMouseFactors(double factorX, double factorY, double offsetX = 0, double offsetY = 0);
+        // Undocumented for the moment. Also applies to current_touches().
+        void set_mouse_factors(double factor_x, double factor_y,
+            double offset_x = 0, double offset_y = 0);
         
         //! Currently known touches.
-        const Touches& currentTouches() const;
+        const Touches& current_touches() const;
         
         //! Accelerometer positions in all three dimensions (smoothened).
-        //! Note: Not really deprecated - but temporarily defunct.
-        GOSU_DEPRECATED double accelerometerX() const;
-        GOSU_DEPRECATED double accelerometerY() const;
-        GOSU_DEPRECATED double accelerometerZ() const;
+        //! Note: Not really deprecated, but temporarily defunct.
+        GOSU_DEPRECATED double accelerometer_x() const;
+        GOSU_DEPRECATED double accelerometer_y() const;
+        GOSU_DEPRECATED double accelerometer_z() const;
         
         //! Collects new information about which buttons are pressed, where the
-        //! mouse is and calls onButtonUp/onButtonDown, if assigned.
+        //! mouse is and calls on_button_up/on_button_down, 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 these to its own methods.
-        std::tr1::function<void (Button)> onButtonDown, onButtonUp;
+        std::function<void (Button)> on_button_down, on_button_up;
         
         //! Assignable events that are called by update. You can bind these to your own functions.
         //! If you use the Window class, it will assign these to its own methods.
-        std::tr1::function<void (Touch)> onTouchBegan, onTouchMoved, onTouchEnded, onTouchCancelled;
+        std::function<void (Touch)> on_touch_began, on_touch_moved, on_touch_ended,
+            on_touch_cancelled;
         
-        //! 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);
+        //! Returns the currently active TextInput instance, or nullptr.
+        TextInput* text_input() const;
+        //! Sets the currently active TextInput, or resets it to the nullptr.
+        void set_text_input(TextInput* input);
     };
 }
-
-#endif

data/Gosu/Inspection.hpp

@@ -1,14 +1,10 @@
 //! \file Inspection.hpp
 //! A special set of functions designed for tuning Gosu games.
 
-#ifndef GOSU_INSPECTION_HPP
-#define GOSU_INSPECTION_HPP
+#pragma once
 
 namespace Gosu
 {
-    //! Returns the current framerate, as determined by an unspecified and possibly
-    //! horrible algorithm.
+    //! Returns the current framerate.
     int fps();
 }
-
-#endif

data/Gosu/Math.hpp

@@ -1,14 +1,17 @@
 //! \file Math.hpp
 //! Contains simple math functionality.
 
-#ifndef GOSU_MATH_HPP
-#define GOSU_MATH_HPP
+#pragma once
+
+#include <cmath>
+
+// Portability: Define M_PI, which MSVC's <cmath> does not do by default.
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338327950288
+#endif
 
 namespace Gosu
 {
-    //! Pi.
-    const double pi = 3.1415926536;
-    
     //! Truncates the fractional part of a real value. Equivalent to
     //! static_cast<long>.
     inline long trunc(double value)
@@ -19,61 +22,62 @@ namespace Gosu
     //! Rounds a real value towards the next integer.
     inline long round(double value)
     {
-        if (value >= 0)
+        if (value >= 0) {
             return static_cast<long>(value + 0.5);
-        else
+        }
+        else {
             return static_cast<long>(value - 0.5);
+        }
     }
     
     //! Returns a real value between min (inclusive) and max (exclusive).
     //! Uses std::rand, so you should call std::srand before using it.
     double random(double min, double max);
     
-    //! Translates between Gosu's angle system (where 0� is at the top)
+    //! Translates between Gosu's angle system (where 0 is at the top)
     //! and radians (where 0 is at the right).
-    inline double gosuToRadians(double angle)
+    inline double gosu_to_radians(double angle)
     {
-        return (angle - 90) * pi / 180;
+        return (angle - 90) * M_PI / 180;
     }
-    //! Translates between Gosu's angle system (where 0� is at the top)
+    //! Translates between Gosu's angle system (where 0 is at the top)
     //! and radians (where 0 is at the right).
-    inline double radiansToGosu(double angle)
+    inline double radians_to_gosu(double angle)
     {
-        return angle * 180 / pi + 90;
+        return angle * 180 / M_PI + 90;
     }
 
     //! Translates between degrees (used by Gosu) and radians, i.e. it
     //! does not change the 'origin' of the angle system.
-    inline double degreesToRadians(double angle)
+    inline double degrees_to_radians(double angle)
     {
-        return angle * pi / 180;
+        return angle * M_PI / 180;
     }
     //! Translates between degrees (used by Gosu) and radians, i.e. it
     //! does not change the 'origin' of the angle system.
-    inline double radiansToDegrees(double angle)
+    inline double radians_to_degrees(double angle)
     {
-        return angle * 180 / pi;
+        return angle * 180 / M_PI;
     }
     
     //! Returns the horizontal distance between the origin and the point to
     //! which you would get if you moved radius pixels in the direction
     //! specified by angle.
     //! \param angle Angle in degrees where 0.0 means upwards.
-    double offsetX(double angle, double radius);
+    double offset_x(double angle, double radius);
     //! Returns the vertical distance between the origin and the point to
     //! which you would get if you moved radius pixels in the direction
     //! specified by angle.
     //! \param angle Angle in degrees where 0.0 means upwards.
-    double offsetY(double angle, double radius);
+    double offset_y(double angle, double radius);
     //! Returns the angle from point 1 to point 2 in degrees, where 0.0 means
     //! upwards. Returns def if both points are equal.
-    double angle(double fromX, double fromY, double toX, double toY,
-        double def = 0);
+    double angle(double from_x, double from_y, double to_x, double to_y, double def = 0);
     //! Returns the smallest angle that can be added to angle1 to get to
     //! angle2 (can be negative if counter-clockwise movement is shorter).
-    double angleDiff(double angle1, double angle2);
+    double angle_diff(double angle1, double angle2);
     //! Normalizes an angle to fit into the range [0; 360[.
-    double normalizeAngle(double angle);
+    double normalize_angle(double angle);
     
     //! Returns value * value.
     template<typename T>
@@ -87,20 +91,11 @@ namespace Gosu
     template<typename T>
     T clamp(T value, T min, T max)
     {
-        if (value < min)
-            return min;
-        if (value > max)
-            return max;
+        if (value < min) return min;
+        if (value > max) return max;
         return value;
     }
     
-    // Backward compatibility with 0.7.x
-    template<typename T>
-    T boundBy(T value, T min, T max)
-    {
-        return clamp(value, min, max);
-    }
-    
     //! Returns (value-min) % (max-min) + min, where % always has a positive
     //! result for max > min. The results are undefined for max <= min.
     //! Note: This means that max is exclusive.
@@ -115,7 +110,7 @@ namespace Gosu
     double wrap(double value, double min, double max);
     
     //! Returns the square of the distance between two points.
-    inline double distanceSqr(double x1, double y1, double x2, double y2)
+    inline double distance_sqr(double x1, double y1, double x2, double y2)
     {
         return square(x1 - x2) + square(y1 - y2);
     }
@@ -124,12 +119,11 @@ namespace Gosu
     double distance(double x1, double y1, double x2, double y2);
     
     //! Interpolates a value between a and b, weight being the bias towards the second value.
-    //! Examples: interpolate(0, 10, 0.5) == 5, interpolate(-10, 10, 0.25) == 5, interpolate(0, 10, -0.5) == -5.
+    //! Examples: interpolate(0, 10, 0.5) == 5, interpolate(-10, 10, 0.25) == 5,
+    //! interpolate(0, 10, -0.5) == -5.
     template<typename T>
     T interpolate(T a, T b, double weight = 0.5)
     {
         return a * (1.0 - weight) + b * weight;
     }
 }
-
-#endif