gosu 0.15.2 → 1.1.0.pre2

data/{Gosu → include/Gosu}/Font.hpp

@@ -40,7 +40,7 @@ namespace Gosu
         
         //! Returns the width, in pixels, the given text would occupy if drawn.
         double text_width(const std::string& text) const;
-        //! Returns the width, in pixels, the given text would occupy if drawn.
+        //! Returns the width, in pixels, the given markup would occupy if drawn.
         double markup_width(const std::string& markup) const;
         
         //! Draws text so the top left corner of the text is at (x; y).

data/{Gosu → include/Gosu}/Fwd.hpp

@@ -1,14 +1,9 @@
-//! \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 Channel;
     class Color;
     class File;

data/{Gosu → include/Gosu}/Image.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace Gosu
@@ -30,15 +31,15 @@ namespace Gosu
         //!
         //! 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::string& filename, unsigned src_x, unsigned src_y,
-            unsigned src_width, unsigned src_height, unsigned image_flags = IF_SMOOTH);
+        Image(const std::string& filename, int src_x, int src_y,
+            int src_width, int src_height, unsigned image_flags = IF_SMOOTH);
         
         //! Converts the given bitmap into an image.
         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 src_x, unsigned src_y, unsigned src_width,
-            unsigned src_height, unsigned image_flags = IF_SMOOTH);
+        Image(const Bitmap& source, int src_x, int src_y, int src_width,
+              int src_height, unsigned image_flags = IF_SMOOTH);
         
         //! Creates an Image from a user-supplied instance of the ImageData interface.
         explicit Image(std::unique_ptr<ImageData>&& data);
@@ -47,7 +48,7 @@ namespace Gosu
         unsigned height() const;
 
         //! Draws the image so its upper left corner is at (x; y).
-        void draw(double x, double y, ZPos z, double scale_x = 1, double scale_y = 1,
+        void draw(double x, double y, ZPos z = 0, 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.
         void draw_mod(double x, double y, ZPos z, double scale_x, double scale_y,
@@ -62,7 +63,7 @@ namespace Gosu
         //! on the image. 0 is the left border, 1 is the right border, 0.5 is
         //! the center (and default).
         //! \param center_y See center_x.
-        void draw_rot(double x, double y, ZPos z, double angle,
+        void draw_rot(double x, double y, ZPos z = 0, double angle = 0,
             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;
         

data/{Gosu → include/Gosu}/Input.hpp

@@ -1,89 +1,75 @@
-//! \file Input.hpp
-//! Interface of the Input class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Buttons.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Utility.hpp>
 #include <functional>
 #include <memory>
+#include <string>
 #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; == 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(); }
-    
-    //! 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 that saves information about a touch on the surface of a multi-touch device.
+    /// (Right now this is only supported on iOS.)
     struct Touch
     {
-        //! Allows for identification of a touch across calls.
+        /// Allows for identification of a touch across calls.
         void* id;
-        //! Position of a touch on the touch screen.
-        float x, y;
+        /// Position of a touch on the touch screen.
+        double 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
+
+    /// Manages initialization and shutdown of the input system.
+    /// Only one Input instance can exist per application.
+    class Input : Noncopyable
     {
         struct Impl;
-        // Non-movable (const) to avoid dangling internal references.
-        const std::unique_ptr<Impl> pimpl;
+        std::unique_ptr<Impl> pimpl;
 
     public:
     #ifdef GOSU_IS_IPHONE
         Input(void* view, float update_interval);
         void feed_touch_event(std::function<void (Touch)>& callback, void* touches);
     #else
-        Input(void* window);
+        explicit Input(void* window);
         bool feed_sdl_event(void* event);
     #endif
-        
+
         ~Input();
-        
+
         //! 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 the name for the given button, provided it is a Gosu::KB_{constant}
+        //! Returns the empty string if nothing can be found.
+        static std::string button_name(Button btn);
+
+        //! Returns the name for the given gamepad.
+        //! Returns an empty string if there is no gamepad in the slot index.
+        static std::string gamepad_name(int index);
+
         //! Returns true if a button is currently pressed.
         //! Updated every tick.
         static bool down(Button btn);
-        
+
+        //! Returns the value of a gamepad stick in the range -1.0 through +1.0, or a trigger in the
+        //! range 0.0 through +1.0.
+        //! Updated every tick.
+        static double axis(Button btn);
+
         //! Returns the horizontal position of the mouse relative to the top
         //! left corner of the window given to Input's constructor.
         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 mouse_x()
         //! and mouse_y(), so (0, 0) is the top left corner of the window..
@@ -92,29 +78,31 @@ namespace Gosu
         // 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& current_touches() const;
-        
+
         //! Accelerometer positions in all three dimensions (smoothened).
         //! 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 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::function<void (Button)> on_button_down, on_button_up;
-        
+
+        std::function<void (int)> on_gamepad_connected, on_gamepad_disconnected;
+
         //! 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::function<void (Touch)> on_touch_began, on_touch_moved, on_touch_ended,
             on_touch_cancelled;
-        
+
         //! Returns the currently active TextInput instance, or nullptr.
         TextInput* text_input() const;
         //! Sets the currently active TextInput, or resets it to the nullptr.

data/{Gosu → include/Gosu}/Utility.hpp

@@ -1,6 +1,3 @@
-//! \file Utility.hpp
-//! General purpose utility functions.
-
 #pragma once
 
 #include <string>
@@ -11,10 +8,24 @@ namespace Gosu
     
     //! Returns true if the filename has the given extension.
     //! The comparison is case-insensitive, but you must pass the extension in lower case.
-    bool has_extension(const std::string& filename, const char* extension);
+    bool has_extension(std::string_view filename, std::string_view extension);
     
     //! Returns the user's preferred language, at the moment of calling the function. Expect return
     //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'.
     //! The first two letters will always be a language code.
     std::string language();
+
+    class Noncopyable
+    {
+    protected:
+        Noncopyable() = default;
+        ~Noncopyable() = default;
+
+    public:
+        Noncopyable(const Noncopyable& other) = delete;
+        Noncopyable& operator=(const Noncopyable& other) = delete;
+
+        Noncopyable(Noncopyable&& other) = delete;
+        Noncopyable& operator=(Noncopyable&& other) = delete;
+    };
 }

data/{Gosu → include/Gosu}/Version.hpp

@@ -2,9 +2,9 @@
 
 #include <string>
 
-#define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 15
-#define GOSU_POINT_VERSION 2
+#define GOSU_MAJOR_VERSION 1
+#define GOSU_MINOR_VERSION 1
+#define GOSU_POINT_VERSION 0
 
 namespace Gosu
 {

data/{Gosu → include/Gosu}/Window.hpp

@@ -1,6 +1,3 @@
-//! \file Window.hpp
-//! Interface of the Window class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
@@ -9,15 +6,16 @@
 #include <memory>
 #include <string>
 
-#ifdef GOSU_IS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
 namespace Gosu
 {
+    enum WindowFlags
+    {
+        WF_WINDOWED,
+        WF_FULLSCREEN = 1,
+        WF_RESIZABLE  = 2,
+        WF_BORDERLESS = 4
+    };
+
     //! Convenient all-in-one class that serves as the foundation of a standard Gosu application.
     //! Manages initialization of all of Gosu's core components and provides timing functionality.
     //! Note that you should really only use one instance of this class at the same time.
@@ -31,17 +29,23 @@ namespace Gosu
         //! \param width Width of the window in points; that is, pixels on a normal display, and
         //! 'points' on a high-resolution display.
         //! \param height See width.
+        //! \param window_flags A bitmask of values from Gosu::WindowFlags.
         //! \param update_interval Interval in milliseconds between two calls to the update member
         //! function.
-        Window(unsigned width, unsigned height, bool fullscreen = false,
-            double update_interval = 16.666666, bool resizable = false);
+        Window(int width, int height, unsigned window_flags = WF_WINDOWED,
+               double update_interval = 16.666666);
         virtual ~Window();
 
-        unsigned width() const;
-        unsigned height() const;
+        int width() const;
+        int height() const;
         bool fullscreen() const;
+        void resize(int width, int height, bool fullscreen);
+
         bool resizable() const;
-        void resize(unsigned width, unsigned height, bool fullscreen);
+        void set_resizable(bool resizable);
+
+        bool borderless() const;
+        void set_borderless(bool borderless);
 
         double update_interval() const;
         void set_update_interval(double update_interval);
@@ -52,7 +56,7 @@ namespace Gosu
         //! Enters a modal loop where the Window is visible on screen and
         //! receives calls to draw, update etc.
         virtual void show();
-        
+
         //! EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING.
         //! Performs a single main loop step.
         //! This method is only useful if you want to integrate Gosu with another library that has
@@ -62,7 +66,7 @@ namespace Gosu
         //! If you discard the return value and keep calling tick(), the window will be shown again,
         //! or keep being shown.
         virtual bool tick();
-        
+
         //! Closes the window if it is currently shown.
         //! If you do not want the window to close immediately, you should override this method and
         //! only call the base implementation (Window::close) when needed.
@@ -71,24 +75,24 @@ namespace Gosu
         //! Called every update_interval milliseconds while the window is being shown.
         //! Your application's main game logic goes here.
         virtual void update() {}
-        
+
         //! Called after every update and when the OS wants the window to repaint itself.
         //! Your application's rendering code goes here.
         virtual void draw() {}
-        
+
         //! Gives the game a chance to say no to being redrawn.
         //! This is not a definitive answer. The operating system can still force the window to
         //! redraw itself.
         //! By default, the window is redrawn all the time.
         virtual bool needs_redraw() const { return true; }
 
-        //! If this function returns true, the system arrow cursor is drawn while over the window.
-        virtual bool needs_cursor() const { return false; }
-        
+        //! If this function returns true, the system cursor will be visible while over the window.
+        virtual bool needs_cursor() const { return true; }
+
         //! This function is called when the window loses focus on some platforms.
         //! Most importantly, it is called on the iPhone or iPad when the user locks the screen.
         virtual void lose_focus() {}
-        
+
         //! This function is called when the operating system's memory is low.
         //! So far, it is only called in iOS applications.
         virtual void release_memory() {}
@@ -99,10 +103,18 @@ namespace Gosu
         //! To support these shortcuts in your application, make sure to call Window::button_down
         //! in your implementation.
         virtual void button_down(Gosu::Button);
-        
+
         //! Same as button_down. Called when the user releases a button.
         virtual void button_up(Gosu::Button) {}
 
+        //! Called when a gamepad is connected.
+        //! \param index the index of the gamepad slot that the gamepad is in.
+        virtual void gamepad_connected(int index) {}
+
+        //! Called when a gamepad is disconnected.
+        //! \param index the index of the gamepad slot that the gamepad is in. The slot will be freed immediately after this callback.
+        virtual void gamepad_disconnected(int index) {}
+
         //! Called when a file is dropped onto the window.
         //! \param filename The filename of the dropped file. When multiple files are dropped, this
         //! method will be called several times.
@@ -115,14 +127,14 @@ namespace Gosu
         virtual void touch_moved(Touch touch) {}
         virtual void touch_ended(Touch touch) {}
         virtual void touch_cancelled(Touch touch) {}
-        
+
         const Graphics& graphics() const;
         Graphics& graphics();
-        
+
         const Input& input() const;
         Input& input();
         #endif
-        
+
         #ifdef GOSU_IS_IPHONE
         void* uikit_window() const;
         #endif
@@ -131,22 +143,22 @@ namespace Gosu
     //! Returns the width (in pixels) of a screen.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned screen_width(Window* window = nullptr);
-    
+    int screen_width(Window* window = nullptr);
+
     //! Returns the height (in pixels) of the user's primary screen.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned screen_height(Window* window = nullptr);
-    
+    int screen_height(Window* window = nullptr);
+
     //! Returns the maximum width (in 'points') that is available for a non-fullscreen Window.
     //! All windows larger than this size will automatically be shrunk to fit.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned available_width(Window* window = nullptr);
-    
+    int available_width(Window* window = nullptr);
+
     //! Returns the maximum height (in 'points') that is available for a non-fullscreen Window.
     //! All windows larger than this size will automatically be shrunk to fit.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned available_height(Window* window = nullptr);
+    int available_height(Window* window = nullptr);
 }