gosu 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c9b393a63015707256dca78e9079b01dbc004d85b89c6bf68d021085f65a905
-  data.tar.gz: 60396892082e2fa81a7ab03f8662fe00630745f84b1e0a47e9abcd7bed5c7692
+  metadata.gz: b9f867c68587f182be0ba872daf669724376a55b6f7e0c3853eca5f350dc413f
+  data.tar.gz: f24639563ba937303f9a81dd22a78ad5a22fa9243d980c629d163605656be0b2
 SHA512:
-  metadata.gz: fb477140be8f524abfeb3694277bd815690c4c0ae432ac011956a43640f49309aca3c0a9b3619c17cc83461ae5c9c9b6fb1bfa155e72f1be19b4f166e23b3022
-  data.tar.gz: 24707e94f193a4fe949a447a01b732057860eb271a8a0d61ba6c45a0b1b5da8c2894ffc65d3ff3fe2b97fe7e8b9c5b38b9995d4d443d014fe6059f520f900393
+  metadata.gz: 6bb10eafcfa8742066e246e607ada383af5d2f3a461910e386064b27788d5620ab289b2081e0e4652240df9faf7cb1bb8d669fb95b7bcfbfb040e767c4354edd
+  data.tar.gz: dc56b6a28a0f8980027c3f3bc5fd110e806617a4b22b3d6e918fa24f99d59cea98cd03d85af875968bcc7b98bc283ac810aca7a37e199ff1f4aaaaea1de7fc80

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2020 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2001-2021 Julian Raschke, Jan Lücker and all contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/ext/gosu/extconf.rb

@@ -51,7 +51,7 @@ if windows
   else
     $LDFLAGS << "  -L../../dependencies/al_soft/x86 -L../../dependencies/SDL/lib/x86"
   end
-  $LDFLAGS << " -lgdi32 -lwinmm -lOpenGL32 -lOpenAL32 -lSDL2"
+  $LDFLAGS << " -lgdi32 -lwinmm -ldwmapi -lOpenGL32 -lOpenAL32 -lSDL2"
   # Link libstdc++ statically to avoid having another DLL dependency when using Ocra.
   $LDFLAGS << " -static-libstdc++"
 elsif macos
@@ -62,6 +62,10 @@ elsif macos
   # rvm will sometimes try to override this:
   # https://github.com/shawn42/gamebox/issues/96
   $CXXFLAGS << " -stdlib=libc++"
+
+  # Disable an error that is disabled by default and prevents Gosu from building with universal Ruby:
+  # https://trac.macports.org/ticket/58255 / https://github.com/gosu/gosu/issues/424
+  $CXXFLAGS << " -Wno-reserved-user-defined-literal"
   
   # Dependencies.
   $CFLAGS << " #{`sdl2-config --cflags`.chomp}"

data/include/Gosu/Font.hpp

@@ -22,11 +22,9 @@ namespace Gosu
 
     public:
         //! Constructs a font that can be drawn onto the graphics object.
-        //! \param font_name Name of a system font, or a filename to a TTF
-        //!        file (must contain '/', does not work on Linux).
-        //! \param font_height Height of the font, in pixels.
-        //! \param font_flags Flags used to render individual characters of
-        //!        the font.
+        //! \param name   Name of a system font, or a filename to a TTF file.
+        //! \param height Height of the font, in pixels.
+        //! \param flags  Flags used to render individual characters of the font.
         Font(int height, const std::string& name = default_font_name(), unsigned flags = 0);
         
         //! Returns the name of the font that was used to create it.
@@ -46,11 +44,11 @@ namespace Gosu
         //! Draws text so the top left corner of the text is at (x; y).
         void draw_text(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;
+                       BlendMode mode = BM_DEFAULT) const;
         //! Draws markup so the top left corner of the text is at (x; y).
         void draw_markup(const std::string& markup, double x, double y, ZPos z,
                          double scale_x = 1, double scale_y = 1, Color c = Color::WHITE,
-                         AlphaMode mode = AM_DEFAULT) const;
+                         BlendMode mode = BM_DEFAULT) const;
         
         //! Draws text at a position relative to (x; y).
         //! \param rel_x Determines where the text is drawn horizontally. If
@@ -60,7 +58,7 @@ namespace Gosu
         //! \param rel_y See rel_x.
         void draw_text_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;
+                           Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         //! Draws text at a position relative to (x; y).
         //! \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,
@@ -69,7 +67,7 @@ namespace Gosu
         //! \param rel_y See rel_x.
         void draw_markup_rel(const std::string& markup, 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;
+                             Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         
         //! Maps a letter to a specific image, instead of generating one using
         //! Gosu's built-in text rendering.

data/include/Gosu/Graphics.hpp

@@ -78,21 +78,23 @@ namespace Gosu
         //! image to simulate lines, or contribute a better draw_line to Gosu.
         static void draw_line(double x1, double y1, Color c1,
                               double x2, double y2, Color c2,
-                              ZPos z, AlphaMode mode = AM_DEFAULT);
+                              ZPos z, BlendMode mode = BM_DEFAULT);
 
         static void draw_triangle(double x1, double y1, Color c1,
                                   double x2, double y2, Color c2,
                                   double x3, double y3, Color c3,
-                                  ZPos z, AlphaMode mode = AM_DEFAULT);
+                                  ZPos z,
+                                  BlendMode mode = BM_DEFAULT);
 
         static void draw_quad(double x1, double y1, Color c1,
                               double x2, double y2, Color c2,
                               double x3, double y3, Color c3,
                               double x4, double y4, Color c4,
-                              ZPos z, AlphaMode mode = AM_DEFAULT);
+                              ZPos z, BlendMode mode = BM_DEFAULT);
         
         static void draw_rect(double x, double y, double width, double height,
-                              Color c, ZPos z, AlphaMode mode = AM_DEFAULT);
+                              Color c, ZPos z,
+                              BlendMode mode = BM_DEFAULT);
 
         //! For internal use only.
         void set_physical_resolution(unsigned physical_width, unsigned physical_height);

data/include/Gosu/GraphicsBase.hpp

@@ -15,18 +15,18 @@ namespace Gosu
     
     //! Determines the way colors are combined when one is drawn onto
     //! another.
-    enum AlphaMode
+    enum BlendMode
     {
-        AM_DEFAULT,
+        BM_DEFAULT,
         //! The color's channels will be interpolated. The alpha channel
         //! specifies the opacity of the new color, 255 is full opacity.
-        AM_INTERPOLATE = AM_DEFAULT,
+        BM_INTERPOLATE = BM_DEFAULT,
         //! The colors' channels will be added. The alpha channel specifies
         //! the percentage of the new color's channels that will be added
         //! to the old color's channels.
-        AM_ADD,
+        BM_ADD,
         //! The color's channels will be multiplied with each other.
-        AM_MULTIPLY
+        BM_MULTIPLY
     };
     
     enum FontFlags
@@ -50,7 +50,7 @@ namespace Gosu
     {
         IF_SMOOTH = 0,
         
-        // Note: No constant for '1', but Gosu treats '1' as if_tileable for
+        // Note: No constant for '1', but Gosu treats '1' as IF_TILEABLE for
         // backward compatibility reasons (this parameter used to be a bool).
         
         IF_TILEABLE_LEFT   = 1 << 1,

data/include/Gosu/Image.hpp

@@ -49,10 +49,10 @@ namespace Gosu
 
         //! Draws the image so its upper left corner is at (x; y).
         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;
+            Color c = Color::WHITE, BlendMode mode = BM_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,
-            Color c1, Color c2, Color c3, Color c4, AlphaMode mode = AM_DEFAULT) const;
+            Color c1, Color c2, Color c3, Color c4, BlendMode mode = BM_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
@@ -65,7 +65,7 @@ namespace Gosu
         //! \param center_y See center_x.
         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;
+            Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         
         #ifndef SWIG
         //! Provides access to the underlying image data object.

data/include/Gosu/ImageData.hpp

@@ -44,7 +44,7 @@ namespace Gosu
             double x2, double y2, Color c2,
             double x3, double y3, Color c3,
             double x4, double y4, Color c4,
-            ZPos z, AlphaMode mode) const = 0;
+            ZPos z, BlendMode mode) const = 0;
 
         virtual const GLTexInfo* gl_tex_info() const = 0;
         

data/include/Gosu/Text.hpp

@@ -20,7 +20,7 @@ namespace Gosu
     double text_width(const std::u32string& text, const std::string& font_name, double font_height,
                       unsigned font_flags = 0);
 
-    //! Draws a line of unformatted text on a bitmap. This is a low-level function that does not
+    //! Draws a line of plain text on a bitmap. This is a low-level function that does not
     //! understand any of Gosu's HTML-like markup.
     //! \param text A UCS-4 string, normalization: NFC.
     //! \param font_name Name of a system font, or filename of a TTF file (must contain '/' or '.').
@@ -29,9 +29,9 @@ namespace Gosu
     double draw_text(Bitmap& bitmap, double x, double y, Color c, const std::u32string& text,
                      const std::string& font_name, double font_height, unsigned font_flags = 0);
 
-    //! Creates a bitmap that is filled with the formatted text given to the function.
+    //! Creates a bitmap that is filled with the plain text given to the function.
     //! The line can contain line breaks and HTML-like markup.
-    //! \param text Formatted text.
+    //! \param text Plain text.
     //! \param font_name Name of a system font, or filename of a TTF file (must contain '/' or '.').
     //! \param font_height Height of the font in pixels.
     //! \param line_spacing Spacing between two lines of text in pixels. Can be negative to make
@@ -48,7 +48,7 @@ namespace Gosu
     
     //! Creates a bitmap that is filled with the formatted text given to the function.
     //! The line can contain line breaks and HTML-like markup.
-    //! \param text Formatted text.
+    //! \param markup Formatted text.
     //! \param font_name Name of a system font, or filename of a TTF file (must contain '/' or '.').
     //! \param font_height Height of the font in pixels.
     //! \param line_spacing Spacing between two lines of text in pixels. Can be negative to make

data/include/Gosu/Utility.hpp

@@ -1,19 +1,21 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 namespace Gosu
 {
     std::u32string utf8_to_composed_utc4(const std::string& utf8);
-    
-    //! Returns true if the filename has the given extension.
-    //! The comparison is case-insensitive, but you must pass the extension in lower case.
+
+    /// 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(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();
+
+    /// Returns the user's preferred user_languages/locales, e.g. {"en_US", "de_DE", "ja"}.
+    /// The first two letters of each element will always be a language code.
+    /// This value is not cached. Please memorize the specific value that you are interested in,
+    /// typically the first language in the returned array that your game supports.
+    std::vector<std::string> user_languages();
 
     class Noncopyable
     {

data/include/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 #include <string>
 
 #define GOSU_MAJOR_VERSION 1
-#define GOSU_MINOR_VERSION 0
+#define GOSU_MINOR_VERSION 2
 #define GOSU_POINT_VERSION 0
 
 namespace Gosu

data/include/Gosu/Window.hpp

@@ -8,6 +8,14 @@
 
 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.
@@ -21,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);
@@ -129,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);
 }

data/lib/gosu/compat.rb

@@ -202,4 +202,8 @@ module Gosu
     # Also import old-style constants into Gosu::Button.
     Gosu::Button.const_set old_name, Gosu.const_get(new_name)
   end
+
+  def self.language
+    @language_cache ||= (user_languages.first || "en_US")
+  end
 end

data/lib/gosu/swig_patches.rb

@@ -3,19 +3,20 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  alias_method :initialize_without_hash, :initialize
+  alias_method :initialize_with_bitmask, :initialize
 
-  def initialize width, height, *args
-    if args.empty? or args.first.is_a? Hash
-      options = args.first || {}
-      fullscreen = options[:fullscreen]
-      update_interval = options[:update_interval]
-      resizable = options[:resizable]
+  def initialize(width, height, *args)
+    $gosu_gl_blocks = nil
+
+    if args.first.is_a? Hash
+      flags = 0
+      flags |= 1 if args.first[:fullscreen]
+      flags |= 2 if args.first[:resizable]
+      flags |= 4 if args.first[:borderless]
+      initialize_with_bitmask(width, height, flags, args.first[:update_interval] || 16.666666)
     else
-      fullscreen, update_interval = *args
+      initialize_with_bitmask(width, height, args[0] ? 1 : 0, args[1] || 16.666666)
     end
-    $gosu_gl_blocks = nil
-    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666, !!resizable
   end
 
   %w(update draw needs_redraw? needs_cursor?

data/rdoc/gosu.rb

@@ -811,6 +811,18 @@ module Gosu
     # @return [true, false] whether this window is resizable.
     def resizable?; end
 
+    ##
+    # Toggles between resizable and fixed modes.
+    attr_writer :resizable
+
+    ##
+    # @return [true, false] whether this window is borderless.
+    def borderless?; end
+
+    ##
+    # Toggles between borderless mode and having window chrome.
+    attr_writer :borderless
+
     ##
     # @return [Float] the interval between calls to {#update}, in milliseconds.
     attr_accessor :update_interval
@@ -828,7 +840,8 @@ module Gosu
     # @param height [Integer] the desired window height.
     # @param [Hash] options
     # @option options [true, false] :fullscreen (false) whether to present the window in fullscreen mode.
-    # @option options [true, false] :resizable (false) whether the window can be resized by the user.
+    # @option options [true, false] :resizable (false) whether the window can be resized by the user. Not useful if the window is either fullscreen or borderless.
+    # @option options [true, false] :borderless (false) whether the window should hide all its window chrome. Does not affect fullscreen windows.
     # @option options [Float] :update_interval (16.666666) the interval between frames, in milliseconds.
     def initialize(width, height, options); end
 

data/src/EmptyImageData.hpp

@@ -22,7 +22,7 @@ namespace Gosu
                   double, double, Color,
                   double, double, Color,
                   double, double, Color,
-                  ZPos, AlphaMode) const override
+                  ZPos, BlendMode) const override
         {
         }
         

data/src/Font.cpp

@@ -112,13 +112,13 @@ double Gosu::Font::markup_width(const string& markup) const
 }
 
 void Gosu::Font::draw_text(const string& text, double x, double y, ZPos z,
-                           double scale_x, double scale_y, Color c, AlphaMode mode) const
+                           double scale_x, double scale_y, Color c, BlendMode mode) const
 {
     draw_markup(escape_markup(text), x, y, z, scale_x, scale_y, c, mode);
 }
 
 void Gosu::Font::draw_markup(const string& markup, double x, double y, ZPos z,
-                             double scale_x, double scale_y, Color c, AlphaMode mode) const
+                             double scale_x, double scale_y, Color c, BlendMode mode) const
 {
     double current_y = y;
     
@@ -142,7 +142,7 @@ void Gosu::Font::draw_markup(const string& markup, double x, double y, ZPos z,
 
 void Gosu::Font::draw_text_rel(const string& text, double x, double y, ZPos z,
                                double rel_x, double rel_y, double scale_x, double scale_y,
-                               Color c, AlphaMode mode) const
+                               Color c, BlendMode mode) const
 {
     if (rel_x) x -= text_width(text) * scale_x * rel_x;
     if (rel_y) y -= height() * scale_y * rel_y;
@@ -152,7 +152,7 @@ void Gosu::Font::draw_text_rel(const string& text, double x, double y, ZPos z,
 
 void Gosu::Font::draw_markup_rel(const string& markup, double x, double y, ZPos z,
                                  double rel_x, double rel_y, double scale_x, double scale_y,
-                                 Color c, AlphaMode mode) const
+                                 Color c, BlendMode mode) const
 {
     if (rel_x) x -= markup_width(markup) * scale_x * rel_x;
     if (rel_y) y -= height() * scale_y * rel_y;

data/src/Graphics.cpp

@@ -330,7 +330,7 @@ void Gosu::Graphics::transform(const Gosu::Transform& transform, const function<
 }
 
 void Gosu::Graphics::draw_line(double x1, double y1, Color c1,
-    double x2, double y2, Color c2, ZPos z, AlphaMode mode)
+    double x2, double y2, Color c2, ZPos z, BlendMode mode)
 {
     DrawOp op;
     op.render_state.mode = mode;
@@ -343,7 +343,7 @@ void Gosu::Graphics::draw_line(double x1, double y1, Color c1,
 }
 
 void Gosu::Graphics::draw_triangle(double x1, double y1, Color c1, double x2, double y2, Color c2,
-    double x3, double y3, Color c3, ZPos z, AlphaMode mode)
+    double x3, double y3, Color c3, ZPos z, BlendMode mode)
 {
     DrawOp op;
     op.render_state.mode = mode;
@@ -361,7 +361,7 @@ void Gosu::Graphics::draw_triangle(double x1, double y1, Color c1, double x2, do
 }
 
 void Gosu::Graphics::draw_quad(double x1, double y1, Color c1, double x2, double y2, Color c2,
-    double x3, double y3, Color c3, double x4, double y4, Color c4, ZPos z, AlphaMode mode)
+    double x3, double y3, Color c3, double x4, double y4, Color c4, ZPos z, BlendMode mode)
 {
     normalize_coordinates(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
 
@@ -384,7 +384,7 @@ void Gosu::Graphics::draw_quad(double x1, double y1, Color c1, double x2, double
 }
 
 void Gosu::Graphics::draw_rect(double x, double y, double width, double height, Color c,
-                               ZPos z, Gosu::AlphaMode mode)
+                               ZPos z, Gosu::BlendMode mode)
 {
     draw_quad(x, y, c, x + width, y, c, x, y + height, c, x + width, y + height, c, z, mode);
 }