gosu 0.15.0 → 1.0.0

data/include/Gosu/Channel.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_Channel Gosu_Channel;
+
+Gosu_Channel* Gosu_Channel_create(Gosu_Channel* channel);
+void Gosu_Channel_destroy(Gosu_Channel* channel);
+
+void Gosu_Channel_play(Gosu_Channel *channel);
+bool Gosu_Channel_playing(Gosu_Channel *channel);
+void Gosu_Channel_pause(Gosu_Channel *channel);
+bool Gosu_Channel_paused(Gosu_Channel *channel);
+void Gosu_Channel_resume(Gosu_Channel *channel);
+void Gosu_Channel_stop(Gosu_Channel *channel);
+
+void Gosu_Channel_set_volume(Gosu_Channel *channel, double volume);
+void Gosu_Channel_set_speed(Gosu_Channel *channel, double speed);
+void Gosu_Channel_set_pan(Gosu_Channel *channel, double pan);
+
+#ifdef __cplusplus
+}
+#endif

data/include/Gosu/Color.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef unsigned char Gosu_Color_Channel;
+
+unsigned Gosu_Color_create(unsigned argb);
+unsigned Gosu_Color_create_argb(Gosu_Color_Channel a, Gosu_Color_Channel r, Gosu_Color_Channel g, Gosu_Color_Channel b);
+unsigned Gosu_Color_create_from_hsv(double h, double s, double v);
+unsigned Gosu_Color_create_from_ahsv(Gosu_Color_Channel alpha, double h, double s, double v);
+
+Gosu_Color_Channel Gosu_Color_alpha(unsigned color);
+Gosu_Color_Channel Gosu_Color_red(unsigned color);
+Gosu_Color_Channel Gosu_Color_green(unsigned color);
+Gosu_Color_Channel Gosu_Color_blue(unsigned color);
+unsigned Gosu_Color_set_alpha(unsigned color, Gosu_Color_Channel value);
+unsigned Gosu_Color_set_red(unsigned color, Gosu_Color_Channel value);
+unsigned Gosu_Color_set_green(unsigned color, Gosu_Color_Channel value);
+unsigned Gosu_Color_set_blue(unsigned color, Gosu_Color_Channel value);
+
+double Gosu_Color_hue(unsigned color);
+double Gosu_Color_saturation(unsigned color);
+double Gosu_Color_value(unsigned color);
+unsigned Gosu_Color_set_hue(unsigned color, double value);
+unsigned Gosu_Color_set_saturation(unsigned color, double value);
+unsigned Gosu_Color_set_value(unsigned color, double value);
+
+unsigned Gosu_Color_argb(unsigned color);
+unsigned Gosu_Color_bgr(unsigned color);
+unsigned Gosu_Color_abgr(unsigned color);
+
+unsigned Gosu_Color_gl(unsigned color);
+
+#ifdef __cplusplus
+}
+#endif

data/include/Gosu/Font.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_Font Gosu_Font;
+
+Gosu_Font* Gosu_Font_create(int height, const char* name, unsigned flags);
+
+const char *Gosu_Font_name(Gosu_Font* font);
+int Gosu_Font_height(Gosu_Font* font);
+unsigned Gosu_Font_flags(Gosu_Font* font);
+
+double Gosu_Font_text_width(Gosu_Font* font, const char* text);
+double Gosu_Font_markup_width(Gosu_Font* font, const char* text);
+
+void Gosu_Font_draw_text(Gosu_Font* font, const char* text, double x, double y, double z,
+                          double scale_x, double scale_y, unsigned c, unsigned mode);
+void Gosu_Font_draw_markup(Gosu_Font* font, const char* text, double x, double y, double z,
+                            double scale_x, double scale_y, unsigned c, unsigned mode);
+
+void Gosu_Font_draw_text_rel(Gosu_Font* font, const char* text, double x, double y, double z,
+                              double rel_x, double rel_y, double scale_x, double scale_y,
+                              unsigned c, unsigned mode);
+void Gosu_Font_draw_markup_rel(Gosu_Font* font, const char* text, double x, double y, double z,
+                                double rel_x, double rel_y, double scale_x, double scale_y,
+                                unsigned c, unsigned mode);
+
+void Gosu_Font_set_image(Gosu_Font* font, const char* codepoint, unsigned font_flags, Gosu_Image* image);
+
+void Gosu_Font_destroy(Gosu_Font* font);
+
+#ifdef __cplusplus
+}
+#endif

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/include/Gosu/Gosu.h

@@ -0,0 +1,82 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <Gosu/Window.h>
+#include <Gosu/Image.h>
+#include <Gosu/Font.h>
+#include <Gosu/Color.h>
+#include <Gosu/TextInput.h>
+#include <Gosu/Sample.h>
+#include <Gosu/Song.h>
+#include <Gosu/Channel.h>
+
+// Graphics operations
+void Gosu_gl_z(double z, void function(void *data), void* data);
+void Gosu_gl(void function(void *data), void* data);
+void Gosu_flush();
+Gosu_Image* Gosu_render(int width, int height, void function(void *data), void* data, unsigned image_flags);
+Gosu_Image* Gosu_record(int width, int height, void function(void *data), void* data);
+void Gosu_clip_to(double x, double y, double width, double height, void function(void *data), void* data);
+
+// Transformations
+void Gosu_transform(double m0, double m1, double m2, double m3, double m4, double m5, double m6,
+                    double m7, double m8, double m9, double m10, double m11, double m12, double m13,
+                    double m14, double m15, void function(void *data), void* data);
+void Gosu_translate(double x, double y, void function(void *data), void* data);
+void Gosu_scale(double scale_x, double scale_y, double around_x, double around_y, void function(void *data), void* data);
+void Gosu_rotate(double angle, double around_x, double around_y, void function(void *data), void* data);
+
+void Gosu_clip_to(double x, double y, double width, double height, void function(void *data), void* data);
+
+// Rendering
+void Gosu_draw_line(double x1, double y1, unsigned c1,
+                    double x2, double y2, unsigned c2,
+                    double z, unsigned mode);
+void Gosu_draw_triangle(double x1, double y1, unsigned c1,
+                        double x2, double y2, unsigned c2,
+                        double x3, double y3, unsigned c3,
+                        double z, unsigned mode);
+void Gosu_draw_rect(double x, double y, double width, double height, unsigned c, double z, unsigned mode);
+void Gosu_draw_quad(double x1, double y1, unsigned c1,
+                    double x2, double y2, unsigned c2,
+                    double x3, double y3, unsigned c3,
+                    double x4, double y4, unsigned c4,
+                    double z, unsigned mode);
+
+// Math functions
+double Gosu_distance(double x1, double y1, double x2, double y2);
+
+double Gosu_angle(double from_x, double from_y, double to_x, double to_y);
+double Gosu_angle_diff(double from, double to);
+
+double Gosu_offset_x(double angle, double radius);
+double Gosu_offset_y(double angle, double radius);
+
+double Gosu_random(double min, double max);
+
+// Window/Screen information
+unsigned Gosu_available_width(Gosu_Window* window);
+unsigned Gosu_available_height(Gosu_Window* window);
+unsigned Gosu_screen_width(Gosu_Window* window);
+unsigned Gosu_screen_height(Gosu_Window* window);
+
+// Button querying
+int Gosu_button_down(int id);
+const char* Gosu_button_id_to_char(int id);
+unsigned Gosu_button_char_to_id(const char* character);
+const char *Gosu_button_name(int id);
+const char *Gosu_gamepad_name(int id);
+double Gosu_axis(int id);
+
+// Misc
+int Gosu_fps();
+const char* Gosu_language();
+long Gosu_milliseconds();
+const char* Gosu_default_font_name();
+
+#ifdef __cplusplus
+}
+#endif

data/include/Gosu/Image.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_Image Gosu_Image;
+
+typedef struct Gosu_GLTexInfo {
+    int tex_name;
+    double left, right, top, bottom;
+} Gosu_GLTexInfo;
+
+// Constructor
+Gosu_Image* Gosu_Image_create(const char *filename, unsigned image_flags);
+Gosu_Image *Gosu_Image_create_from_blob(unsigned char *blob, int byte_count, int width, int height, unsigned image_flags); // support for RMagick blob objects
+Gosu_Image *Gosu_Image_create_from_markup(const char *markup, const char *font, double font_height,
+                                        int width, double spacing, unsigned align, unsigned font_flags, unsigned image_flags);
+Gosu_Image* Gosu_Image_create_from_text(const char *text, const char *font, double font_height,
+                                        int width, double spacing, unsigned align, unsigned font_flags, unsigned image_flags);
+Gosu_Image* Gosu_Image_create_from_subimage(Gosu_Image *source, int left, int top, int width, int height);
+
+void Gosu_Image_create_from_tiles(const char *source, int tile_width, int tile_height, void function(void* data, Gosu_Image* image), void *data, unsigned image_flags);
+void Gosu_Image_create_tiles_from_image(Gosu_Image *image, int tile_width, int tile_height, void function(void *data, Gosu_Image *image), void *data, unsigned image_flags);
+
+// Destructor
+void Gosu_Image_destroy(Gosu_Image *image);
+
+// Image properties
+unsigned Gosu_Image_width(Gosu_Image *image);
+unsigned Gosu_Image_height(Gosu_Image *image);
+
+// Rendering
+void Gosu_Image_draw(Gosu_Image *image, double x, double y, double z,
+                     double scale_x, double scale_y, unsigned color, unsigned mode);
+void Gosu_Image_draw_rot(Gosu_Image *image, double x, double y, double z,
+                          double angle, double center_x, double center_y,
+                          double scale_x, double scale_y, unsigned color, unsigned mode);
+void Gosu_Image_draw_as_quad(Gosu_Image *image, double x1, double y1, unsigned color1,
+                               double x2, double y2, unsigned color2,
+                               double x3, double y3, unsigned color3,
+                               double x4, double y4, unsigned color4,
+                               double z, unsigned mode);
+
+// Operations
+void Gosu_Image_insert(Gosu_Image *image, Gosu_Image *source, int x, int y);
+void Gosu_Image_save(Gosu_Image *image, const char *filename);
+unsigned char* Gosu_Image_to_blob(Gosu_Image *image);
+Gosu_GLTexInfo* Gosu_Image_gl_tex_info_create(Gosu_Image *image);
+void Gosu_Image_gl_tex_info_destroy(Gosu_GLTexInfo *tex_info);
+
+#ifdef __cplusplus
+}
+#endif

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.