gosu 0.15.2 → 1.0.0.pre1

data/{Gosu → include/Gosu}/Gosu.h

@@ -67,6 +67,9 @@ unsigned Gosu_screen_height(Gosu_Window* window);
 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();

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

@@ -8,6 +8,7 @@
 #include <Gosu/Platform.hpp>
 #include <functional>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace Gosu
@@ -16,7 +17,7 @@ namespace Gosu
     class Button
     {
         unsigned id_;
-        
+
     public:
         //! For internal use.
         explicit Button(unsigned id) : id_(id) {}
@@ -29,12 +30,12 @@ namespace Gosu
         //! 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
@@ -47,7 +48,7 @@ namespace Gosu
         float 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
@@ -64,26 +65,38 @@ namespace Gosu
         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 joystick in the range -1.0 thru +1.0 and trigger in the range 0.0 thru +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 +105,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

@@ -11,7 +11,7 @@ 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'.

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

@@ -16,6 +16,8 @@ void Gosu_Window_set_update(Gosu_Window *window, void function(void *data), void
 void Gosu_Window_set_draw(Gosu_Window *window, void function(void *data), void* data);
 void Gosu_Window_set_button_down(Gosu_Window *window, void function(void *data, unsigned btn), void* data);
 void Gosu_Window_set_button_up(Gosu_Window *window, void function(void *data, unsigned btn), void* data);
+void Gosu_Window_set_gamepad_connected(Gosu_Window *window, void function(void *data, int id), void* data);
+void Gosu_Window_set_gamepad_disconnected(Gosu_Window *window, void function(void *data, int id), void* data);
 void Gosu_Window_set_drop(Gosu_Window *window, void function(void *data, const char *filename), void* data);
 void Gosu_Window_set_needs_redraw(Gosu_Window *window, bool function(void *data), void* data);
 void Gosu_Window_set_needs_cursor(Gosu_Window *window, bool function(void *data), void* data);

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

@@ -52,7 +52,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 +62,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,11 +71,11 @@ 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.
@@ -84,11 +84,11 @@ namespace Gosu
 
         //! If this function returns true, the system arrow cursor is drawn while over the window.
         virtual bool needs_cursor() const { return false; }
-        
+
         //! 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 +99,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 +123,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
@@ -132,18 +140,18 @@ namespace Gosu
     //! \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);
-    
+
     //! 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);
-    
+
     //! 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);
-    
+
     //! 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

data/lib/gosu.rb

@@ -17,9 +17,6 @@ if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
     path_encoding = ENV["PATH"].encoding
     ENV["PATH"] = "#{binary_path.encode(path_encoding)};#{ENV["PATH"]}"
   end
-  
-  # Add the correct lib directory for the current version of Ruby (major.minor).
-  $LOAD_PATH.unshift File.join(binary_path, RUBY_VERSION[/^\d+.\d+/])
 end
 
 require "gosu.#{RbConfig::CONFIG["DLEXT"]}"

data/lib/gosu/patches.rb

@@ -78,12 +78,3 @@ class Gosu::Window
     _tick
   end
 end
-
-# Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit do
-  begin
-    Gosu::Song.current_song.stop if Gosu::Song.current_song
-    Gosu._release_all_openal_resources
-  rescue
-  end
-end

data/lib/gosu/swig_patches.rb

@@ -19,7 +19,8 @@ class Gosu::Window
   end
 
   %w(update draw needs_redraw? needs_cursor?
-     lose_focus button_down button_up).each do |callback|
+     lose_focus button_down button_up
+     gamepad_connected gamepad_disconnected drop).each do |callback|
     define_method "protected_#{callback}" do |*args|
       begin
         # If there has been an exception, don't do anything as to not make matters worse.
@@ -47,7 +48,7 @@ class Gosu::Window
     # doing here.
     if defined? @_exception
       if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen?
-        @_exception.backtrace.reject! { |line| line.include? 'lib/gosu/swig_patches.rb' }
+        @_exception.backtrace.reject! { |line| line.include? "lib/gosu/swig_patches.rb" }
       end
       raise @_exception
     end

data/rdoc/gosu.rb

@@ -32,6 +32,10 @@ module Gosu
   KB_DOWN = :an_integer
   KB_END = :an_integer
 
+  KB_PRINTSCREEN = :an_integer
+  KB_SCROLLLOCK = :an_integer
+  KB_PAUSE = :an_integer
+
   ##
   # This is the key on the numpad.
   KB_ENTER = :an_integer
@@ -71,6 +75,7 @@ module Gosu
   KB_RIGHT_SHIFT = :an_integer
   KB_SEMICOLON = :an_integer
   KB_SLASH = :an_integer
+  KB_CAPSLOCK = :an_integer
   KB_SPACE = :an_integer
   KB_TAB = :an_integer
   KB_UP = :an_integer
@@ -83,12 +88,32 @@ module Gosu
   MS_OTHER_0…MS_OTHER_7 = :an_integer
 
   GP_BUTTON_0…GP_BUTTON_15 = :an_integer
+  GP_LEFT_STICK_X_AXIS = :an_integer
+  GP_RIGHT_STICK_X_AXIS = :an_integer
+  GP_LEFT_STICK_Y_AXIS = :an_integer
+  GP_RIGHT_STICK_Y_AXIS = :an_integer
+  GP_LEFT_TRIGGER_AXIS = :an_integer
+  GP_RIGHT_TRIGGER_AXIS = :an_integer
+  GP_DPAD_DOWN = :an_integer
+  GP_DPAD_LEFT = :an_integer
+  GP_DPAD_RIGHT = :an_integer
+  GP_DPAD_UP = :an_integer
   GP_DOWN = :an_integer
   GP_LEFT = :an_integer
   GP_RIGHT = :an_integer
   GP_UP = :an_integer
 
   GP_0_BUTTON_0…GP_3_BUTTON_15 = :an_integer
+  GP_0_LEFT_STICK_X_AXIS…GP_3_LEFT_STICK_X_AXIS = :an_integer
+  GP_0_RIGHT_STICK_X_AXIS…GP_3_RIGHT_STICK_X_AXIS = :an_integer
+  GP_0_LEFT_STICK_Y_AXIS…GP_3_LEFT_STICK_Y_AXIS = :an_integer
+  GP_0_RIGHT_STICK_Y_AXIS…GP_3_RIGHT_STICK_Y_AXIS = :an_integer
+  GP_0_LEFT_TRIGGER_AXIS…GP_3_LEFT_TRIGGER_AXIS = :an_integer
+  GP_0_RIGHT_TRIGGER_AXIS…GP_3_RIGHT_TRIGGER_AXIS = :an_integer
+  GP_0_DPAD_DOWN…GP_3_DPAD_DOWN = :an_integer
+  GP_0_DPAD_LEFT…GP_3_DPAD_LEFT = :an_integer
+  GP_0_DPAD_RIGHT…GP_3_DPAD_RIGHT = :an_integer
+  GP_0_DPAD_UP…GP_3_DPAD_UP = :an_integer
   GP_0_DOWN…GP_3_DOWN = :an_integer
   GP_0_LEFT…GP_3_LEFT = :an_integer
   GP_0_RIGHT…GP_3_RIGHT = :an_integer
@@ -193,14 +218,14 @@ module Gosu
     ##
     # @return [Integer] a 32-bit representation of the color in 0xAARRGGBB format.
     def argb; end
-    
+
     alias_method :to_i, :argb
 
     # Returns a 32-bit representation of the color suitable for use with OpenGL calls. This color is stored in a fixed format in memory and its integer value may vary depending on your system's byte order.
     #
     # @return [Integer] a 32-bit OpenGL color.
     def gl; end
-    
+
     # Returns an OpenGL integer constant that identifies the RGBA color format that Gosu uses.
     GL_FORMAT = :some_integer
 
@@ -316,7 +341,7 @@ module Gosu
     # @return [Integer] the width of the text, in pixels.
     # @param text [String]
     def text_width(text, scale_x=1); end
-    
+
     ##
     # Like {#text_width}, but supports the following markup tags: `<b>bold</b>`, `<i>italic</i>`, `<c=rrggbb>colors</c>`.
     def markup_width(markup, scale_x=1); end
@@ -420,13 +445,13 @@ module Gosu
 
     ##
     # Returns an image that is a smaller, rectangular view of this {Image}.
-    # 
+    #
     # This is a very fast operation, and no new textures will be allocated.
     # If you update this {Image} or the {#subimage} using {#insert}, the other {Image} will be affected as well.
-    # 
+    #
     # Caveats:
     # * If you stretch or rotate a {#subimage}, the pixels adjacent to it might bleed into it, as Gosu does not manage the 'tileability' of subimages.
-    # 
+    #
     # @return [Image?] an image that represents a portion of the containing image
     def subimage(left, top, width, height); end
 
@@ -450,7 +475,7 @@ module Gosu
     # @see #draw_as_quad
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#drawing-with-colours Drawing with colors, explained in the Gosu Wiki
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
-    def draw(x, y, z, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
+    def draw(x, y, z=0, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
     ##
     # Draws the image rotated, with its rotational center at (x, y).
@@ -464,7 +489,7 @@ module Gosu
     # @see #draw
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#drawing-with-colours Drawing with colors, explained in the Gosu Wiki
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
-    def draw_rot(x, y, z, angle, center_x=0.5, center_y=0.5, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
+    def draw_rot(x, y, z=0, angle=0, center_x=0.5, center_y=0.5, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
     ##
     # Draws the image as an arbitrary quad. This method can be used for advanced non-rectangular drawing techniques, e.g., faking perspective or isometric projection.
@@ -576,16 +601,16 @@ module Gosu
     # @param [Float]
     # @return [Float]
     attr_writer :volume
-    
+
     ##
     # Sets the playback speed. A value of 2.0 will play the sample at 200% speed and one octave higher. A value of 0.5 will play the sample at 50% speed and one octave lower. The valid range of this property depends on the operating system, but values up to 8.0 should work.
-    # @param [Float]    
+    # @param [Float]
     # @return [Float]
     attr_writer :speed
-    
+
     ##
     # Set the amount of panning, i.e. the position of the sound when using stereo speakers. 0.0 is the centre, negative values are to the left, positive values are to the right. If something happens on the edge of the screen, a good value for pan would be ±0.1.
-    # @param [Float] 
+    # @param [Float]
     # @return [Float]
     attr_writer :pan
 
@@ -781,7 +806,7 @@ module Gosu
     ##
     # Toggles between windowed mode and fullscreen.
     attr_writer :fullscreen
-    
+
     ##
     # @return [true, false] whether this window is resizable.
     def resizable?; end
@@ -795,7 +820,7 @@ module Gosu
     #
     # Resizable fullscreen windows always use the full desktop resolution.
     # Windows that are larger than the desktop resolution will be shrunk.
-    # 
+    #
     # @overload initialize(width, height, options = {})
     # @overload initialize(width, height, fullscreen, update_interval = 16.666666)
     #
@@ -812,18 +837,18 @@ module Gosu
     #
     # @return [void]
     def show; end
-    
+
     ##
     # EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING.
-    # 
+    #
     # Performs a single step in the main loop.
     # This can be useful for integrating Gosu with other libraries that have their own main loop, e.g. Ruby/Tk.
-    # 
+    #
     # See: https://www.libgosu.org/cgi-bin/mwf/topic_show.pl?tid=1218
-    # 
+    #
     # If you find a good way to use {#tick}, please let us know on the forum and we can make this a part of Gosu's stable interface.
     # Thank you!
-    # 
+    #
     # @return [true, false] whether the {Window} should still be shown after this tick
     def tick; end
 
@@ -871,7 +896,7 @@ module Gosu
     #
     # @return [bool]
     def close; end
-    
+
     ##
     # This method is called before {#update} if a button is pressed while the window has focus.
     #
@@ -903,6 +928,24 @@ module Gosu
     # @param filename [String] the filename of the dropped file. When multiple files are dropped, this method will be called several times.
     def drop(filename); end
 
+    ##
+    # Called when a gamepad is connected.
+    # If a gamepad is momentarily disconnected and then reconnected, before another gamepad, it will have the same index.
+    #
+    # @param index [integer] index for looking up gamepad.
+    #
+    # @see Gosu.gamepad_name
+    def gamepad_connected(index); end
+
+    ##
+    # Called when a gamepad is disconnected.
+    #
+    # @param index [integer] index for looking up gamepad.
+    #
+    # @see #gamepad_connected
+    # @see Gosu.gamepad_name
+    def gamepad_disconnected(index); end
+
     # @!endgroup
   end
 
@@ -945,6 +988,38 @@ module Gosu
     # @see Window#button_up
     def button_down?(id); end
 
+    ##
+    # Returns the name of a Gosu::KB_{*} constant. Returns nil if no name is found.
+    #
+    # @example
+    #   Gosu.button_name(Gosu::KB_SPACE) #=> "Space"
+    #
+    # @return [String, nil]
+    # @param id [Integer]
+    #
+    def button_name(id); end
+
+    ##
+    # Returns the name for gamepad at `index` or nil if there is no connected at the specified index.
+    #
+    # @example
+    #   Gosu.gamepad_name(0) #=> "PS4 Controller"
+    #
+    # @return [String, nil]
+    # @param index [Integer]
+    def gamepad_name(index); end
+
+    ##
+    # Returns the value for the specified gamepad axis in the range -1.0..1.0 for joysticks and 0.0..1.0 for triggers.
+    #
+    # @example
+    #   Gosu.axis(Gosu::GP_0_LEFT_STICK_Y_AXIS) #=> 0.75
+    #
+    # @return [Float]
+    # @param id [Integer]
+    #
+    def axis(id); end
+
     # @!group Drawing primitives
 
     ##