gosu 1.1.0.pre2 → 1.3.0

data/include/Gosu/Window.hpp

@@ -89,6 +89,8 @@ namespace Gosu
         //! If this function returns true, the system cursor will be visible while over the window.
         virtual bool needs_cursor() const { return true; }
 
+        virtual void gain_focus() {}
+
         //! 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() {}

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

@@ -20,7 +20,7 @@ class Gosu::Window
   end
 
   %w(update draw needs_redraw? needs_cursor?
-     lose_focus button_down button_up
+     gain_focus lose_focus button_down button_up
      gamepad_connected gamepad_disconnected drop).each do |callback|
     define_method "protected_#{callback}" do |*args|
       begin
@@ -35,13 +35,13 @@ class Gosu::Window
       end
     end
   end
-  
+
   def protected_draw_2
     protected_draw
     $gosu_gl_blocks_2 = $gosu_gl_blocks
     $gosu_gl_blocks = nil
   end
-  
+
   alias_method :show_internal, :show
   def show
     show_internal
@@ -54,6 +54,21 @@ class Gosu::Window
       raise @_exception
     end
   end
+
+  alias_method :tick_internal, :tick
+  def tick
+    value = tick_internal
+    # Try to format the message nicely, without any useless patching that we are
+    # 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" }
+      end
+      raise @_exception
+    end
+
+    value
+  end
 end
 
 module Gosu
@@ -73,6 +88,19 @@ end
 # SWIG somehow maps the instance method "argb" as an overload of the class
 # method of the same name.
 class Gosu::Color
+  alias_method :initialize_without_argb, :initialize
+
+  # The (a,r,g,b) constructor overload was dropped in C++ to reduce ambiguity,
+  # adding it via %extend in gosu.i does not work, so patch it here.
+  def initialize(*args)
+    if args.size == 4
+      initialize_without_argb(args[1], args[2], args[3])
+      self.alpha = args[0]
+    else
+      initialize_without_argb(*args)
+    end
+  end
+
   alias_method :argb, :to_i
 end
 

data/rdoc/gosu.rb

@@ -481,7 +481,7 @@ module Gosu
     # Draws the image rotated, with its rotational center at (x, y).
     #
     # @return [void]
-    # @param angle [Float]
+    # @param angle [Float] the angle to rotate, in degrees.
     # @param center_x [Float] the relative horizontal rotation origin.
     # @param center_y [Float] the relative vertical rotation origin.
     # @param (see #draw)
@@ -960,6 +960,14 @@ module Gosu
     # @see Gosu.gamepad_name
     def gamepad_disconnected(index); end
 
+    ##
+    # Called when the window gains focus
+    def gain_focus; end
+
+    ##
+    # Called when the windows loses focus
+    def lose_focus; end
+
     # @!endgroup
   end
 

data/src/Bitmap.cpp

@@ -31,20 +31,20 @@ void Gosu::Bitmap::resize(int width, int height, Color c)
 
 void Gosu::Bitmap::blend_pixel(int x, int y, Color c)
 {
-    if (c.alpha() == 0) return;
+    if (c.alpha == 0) return;
 
     Color out = get_pixel(x, y);
-    if (out.alpha() == 0) {
+    if (out.alpha == 0) {
         set_pixel(x, y, c);
         return;
     }
 
-    int inv_alpha = out.alpha() * (255 - c.alpha()) / 255;
+    int inv_alpha = out.alpha * (255 - c.alpha) / 255;
 
-    out.set_alpha(c.alpha() + inv_alpha);
-    out.set_red  ((c.red()   * c.alpha() + out.red()   * inv_alpha) / out.alpha());
-    out.set_green((c.green() * c.alpha() + out.green() * inv_alpha) / out.alpha());
-    out.set_blue ((c.blue()  * c.alpha() + out.blue()  * inv_alpha) / out.alpha());
+    out.alpha = (c.alpha + inv_alpha);
+    out.red =   ((c.red   * c.alpha + out.red   * inv_alpha) / out.alpha);
+    out.green = ((c.green * c.alpha + out.green * inv_alpha) / out.alpha);
+    out.blue =  ((c.blue  * c.alpha + out.blue  * inv_alpha) / out.alpha);
 
     set_pixel(x, y, out);
 }
@@ -108,9 +108,9 @@ void Gosu::apply_color_key(Bitmap& bitmap, Color key)
                 auto visit = [&](Color c) {
                   if (c != key) {
                       neighbors += 1;
-                      red += c.red();
-                      green += c.green();
-                      blue += c.blue();
+                      red += c.red;
+                      green += c.green;
+                      blue += c.blue;
                   }
                 };
 
@@ -121,9 +121,9 @@ void Gosu::apply_color_key(Bitmap& bitmap, Color key)
 
                 Color replacement = Color::NONE;
                 if (neighbors > 0) {
-                    replacement.set_red(red / neighbors);
-                    replacement.set_green(green / neighbors);
-                    replacement.set_blue(blue / neighbors);
+                    replacement.red = red / neighbors;
+                    replacement.green = green / neighbors;
+                    replacement.blue = blue / neighbors;
                 }
                 bitmap.set_pixel(x, y, replacement);
             }

data/src/Color.cpp

@@ -9,9 +9,9 @@ namespace
     
     HSV color_to_hsv(const Gosu::Color& c)
     {
-        double r = c.red() / 255.0;
-        double g = c.green() / 255.0;
-        double b = c.blue() / 255.0;
+        double r = c.red / 255.0;
+        double g = c.green / 255.0;
+        double b = c.blue / 255.0;
         
         double min = std::min(std::min(r, g), b);
         double max = std::max(std::max(r, g), b);
@@ -22,7 +22,7 @@ namespace
             return hsv;
         }
         
-        HSV hsv;
+        HSV hsv{};
 
         // Value.
         hsv.v = max;
@@ -50,38 +50,33 @@ namespace
 }
 
 Gosu::Color Gosu::Color::from_hsv(double h, double s, double v)
-{
-    return from_ahsv(255, h, s, v);
-}
-
-Gosu::Color Gosu::Color::from_ahsv(Channel alpha, double h, double s, double v)
 {
     // Normalize hue so that is always in the [0, 360) range and wraps around.
     h = normalize_angle(h);
     // Clamp s and v for consistency with the Ruby/Gosu ARGB getters/setters.
-    s = clamp(s, 0.0, 1.0);
-    v = clamp(v, 0.0, 1.0);
-    
+    s = std::clamp(s, 0.0, 1.0);
+    v = std::clamp(v, 0.0, 1.0);
+
     int sector = static_cast<int>(h / 60);
     double factorial = h / 60 - sector;
-    
-    double p = v * (1 - s);
-    double q = v * (1 - s * factorial);
-    double t = v * (1 - s * (1 - factorial));
-    
+
+    Channel p = static_cast<Channel>(255 * v * (1 - s));
+    Channel q = static_cast<Channel>(255 * v * (1 - s * factorial));
+    Channel t = static_cast<Channel>(255 * v * (1 - s * (1 - factorial)));
+
     switch (sector) {
     case 0:
-        return Color(alpha, v * 255, t * 255, p * 255);
+        return Color{static_cast<Channel>(255 * v), t, p};
     case 1:
-        return Color(alpha, q * 255, v * 255, p * 255);
+        return Color{q, static_cast<Channel>(255 * v), p};
     case 2:
-        return Color(alpha, p * 255, v * 255, t * 255);
+        return Color{p, static_cast<Channel>(255 * v), t};
     case 3:
-        return Color(alpha, p * 255, q * 255, v * 255);
+        return Color{p, q, static_cast<Channel>(255 * v)};
     case 4:
-        return Color(alpha, t * 255, p * 255, v * 255);
+        return Color{t, p, static_cast<Channel>(255 * v)};
     default: // sector 5
-        return Color(alpha, v * 255, p * 255, q * 255);
+        return Color{static_cast<Channel>(255 * v), p, q};
     }
 }
 
@@ -92,7 +87,7 @@ double Gosu::Color::hue() const
 
 void Gosu::Color::set_hue(double h)
 {
-    *this = from_ahsv(alpha(), h, saturation(), value());
+    *this = from_hsv(h, saturation(), value()).with_alpha(alpha);
 }
 
 double Gosu::Color::saturation() const
@@ -102,7 +97,7 @@ double Gosu::Color::saturation() const
 
 void Gosu::Color::set_saturation(double s)
 {
-    *this = from_ahsv(alpha(), hue(), s, value());
+    *this = from_hsv(hue(), s, value()).with_alpha(alpha);
 }
 
 double Gosu::Color::value() const
@@ -112,33 +107,42 @@ double Gosu::Color::value() const
 
 void Gosu::Color::set_value(double v)
 {
-    *this = from_ahsv(alpha(), hue(), saturation(), v);
+    *this = from_hsv(hue(), saturation(), v).with_alpha(alpha);
 }
 
-Gosu::Color Gosu::interpolate(Color a, Color b, double weight)
+Gosu::Color Gosu::lerp(Color a, Color b, double t)
 {
-    return Color(clamp<long>(round(interpolate(a.alpha(), b.alpha(), weight)), 0, 255),
-                 clamp<long>(round(interpolate(a.red(),   b.red(),   weight)), 0, 255),
-                 clamp<long>(round(interpolate(a.green(), b.green(), weight)), 0, 255),
-                 clamp<long>(round(interpolate(a.blue(),  b.blue(),  weight)), 0, 255));
+    const auto lerp_channel = [](Color::Channel a, Color::Channel b, double t) {
+        return static_cast<Color::Channel>(std::clamp(std::round(lerp(a, b, t)), 0.0, 255.0));
+    };
+
+    Color result;
+    result.red = lerp_channel(a.red, b.red, t);
+    result.green = lerp_channel(a.green, b.green, t);
+    result.blue = lerp_channel(a.blue, b.blue, t);
+    result.alpha = lerp_channel(a.alpha, b.alpha, t);
+    return result;
 }
 
 Gosu::Color Gosu::multiply(Color a, Color b)
 {
-    return Color(round(a.alpha() * b.alpha() / 255.0),
-                 round(a.red()   * b.red()   / 255.0),
-                 round(a.green() * b.green() / 255.0),
-                 round(a.blue()  * b.blue()  / 255.0));
+    Color result;
+    result.red = static_cast<Color::Channel>(std::round(a.red * b.red / 255.0));
+    result.green = static_cast<Color::Channel>(std::round(a.green * b.green / 255.0));
+    result.blue = static_cast<Color::Channel>(std::round(a.blue * b.blue / 255.0));
+    result.alpha = static_cast<Color::Channel>(std::round(a.alpha * b.alpha / 255.0));
+    return result;
 }
 
-const Gosu::Color Gosu::Color::NONE      (0x00000000);
-const Gosu::Color Gosu::Color::BLACK     (0xff000000);
-const Gosu::Color Gosu::Color::GRAY      (0xff808080);
-const Gosu::Color Gosu::Color::WHITE     (0xffffffff);
-const Gosu::Color Gosu::Color::AQUA      (0xff00ffff);
-const Gosu::Color Gosu::Color::RED       (0xffff0000);
-const Gosu::Color Gosu::Color::GREEN     (0xff00ff00);
-const Gosu::Color Gosu::Color::BLUE      (0xff0000ff);
-const Gosu::Color Gosu::Color::YELLOW    (0xffffff00);
-const Gosu::Color Gosu::Color::FUCHSIA   (0xffff00ff);
-const Gosu::Color Gosu::Color::CYAN      (0xff00ffff);
+const Gosu::Color Gosu::Color::NONE{0x00'000000};
+const Gosu::Color Gosu::Color::BLACK{0, 0, 0};
+const Gosu::Color Gosu::Color::GRAY{128, 128, 128};
+const Gosu::Color Gosu::Color::WHITE{255, 255, 255};
+
+const Gosu::Color Gosu::Color::AQUA{0, 255, 255};
+const Gosu::Color Gosu::Color::RED{255, 0, 0};
+const Gosu::Color Gosu::Color::GREEN{0, 255, 0};
+const Gosu::Color Gosu::Color::BLUE{0, 0, 255};
+const Gosu::Color Gosu::Color::YELLOW{255, 255, 0};
+const Gosu::Color Gosu::Color::FUCHSIA{255, 0, 255};
+const Gosu::Color Gosu::Color::CYAN{0, 255, 255};

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/GosuViewController.cpp

@@ -121,6 +121,8 @@ static void handle_audio_interruption(void* unused, UInt32 inInterruptionState)
 - (void)applicationWillEnterForeground:(NSNotification*)notification
 {
     [self setupTimerOrDisplayLink];
+    
+    self.gosuWindowReference.gain_focus();
 }
 
 - (void)applicationDidEnterBackground:(NSNotification*)notification

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);
 }

data/src/Image.cpp

@@ -57,7 +57,7 @@ unsigned Gosu::Image::height() const
 }
 
 void Gosu::Image::draw(double x, double y, ZPos z, double scale_x, double scale_y, Color c,
-    AlphaMode mode) const
+    BlendMode mode) const
 {
     double x2 = x + width() * scale_x;
     double y2 = y + height() * scale_y;
@@ -66,7 +66,7 @@ void Gosu::Image::draw(double x, double y, ZPos z, double scale_x, double scale_
 }
 
 void Gosu::Image::draw_mod(double x, double y, ZPos z, double scale_x, double scale_y, Color c1,
-    Color c2, Color c3, Color c4, AlphaMode mode) const
+    Color c2, Color c3, Color c4, BlendMode mode) const
 {
     double x2 = x + width() * scale_x;
     double y2 = y + height() * scale_y;
@@ -75,7 +75,8 @@ void Gosu::Image::draw_mod(double x, double y, ZPos z, double scale_x, double sc
 }
 
 void Gosu::Image::draw_rot(double x, double y, ZPos z, double angle,
-    double center_x, double center_y, double scale_x, double scale_y, Color c, AlphaMode mode) const
+    double center_x, double center_y, double scale_x, double scale_y, Color c,
+                           BlendMode mode) const
 {
     double size_x = width() * scale_x;
     double size_y = height() * scale_y;

data/src/Input.cpp

@@ -78,20 +78,11 @@ struct Gosu::Input::Impl
 
     void update_mouse_position()
     {
-    #if SDL_VERSION_ATLEAST(2, 0, 5)
-        // SDL_GetGlobalMouseState was added in SDL 2.0.4, but it only started using the same
-        // coordinate system as SDL_GetWindowPosition on X11 in 2.0.5.
         int x, y, window_x, window_y;
         SDL_GetWindowPosition(window, &window_x, &window_y);
         SDL_GetGlobalMouseState(&x, &y);
         mouse_x = x - window_x;
         mouse_y = y - window_y;
-    #else
-        int x, y;
-        SDL_GetMouseState(&x, &y);
-        mouse_x = x;
-        mouse_y = y;
-    #endif
     }
 
     void set_mouse_position(double x, double y)
@@ -100,7 +91,7 @@ struct Gosu::Input::Impl
                               static_cast<int>((x - mouse_offset_x) / mouse_scale_x),
                               static_cast<int>((y - mouse_offset_y) / mouse_scale_y));
 
-    #if SDL_VERSION_ATLEAST(2, 0, 4) && !defined(GOSU_IS_X)
+    #if !defined(GOSU_IS_X)
         // On systems where we have a working GetGlobalMouseState, we can warp the mouse and
         // retrieve its position directly afterwards.
         update_mouse_position();

data/src/LargeImageData.cpp

@@ -69,7 +69,7 @@ void Gosu::LargeImageData::draw(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) const
+                                ZPos z, BlendMode mode) const
 {
     normalize_coordinates(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
     
@@ -84,25 +84,25 @@ void Gosu::LargeImageData::draw(double x1, double y1, Color c1,
             double rel_y_t = y / h;
             double rel_y_b = (y + tile.height()) / h;
             
-        #define INTERPOLATE(what, x_weight, y_weight) \
-            interpolate(interpolate(what##1, what##3, y_weight), \
-                        interpolate(what##2, what##4, y_weight), \
-                        x_weight);
-
-            double x_t_l = INTERPOLATE(x, rel_x_l, rel_y_t);
-            double x_t_r = INTERPOLATE(x, rel_x_r, rel_y_t);
-            double x_b_l = INTERPOLATE(x, rel_x_l, rel_y_b);
-            double x_b_r = INTERPOLATE(x, rel_x_r, rel_y_b);
-
-            double y_t_l = INTERPOLATE(y, rel_x_l, rel_y_t);
-            double y_t_r = INTERPOLATE(y, rel_x_r, rel_y_t);
-            double y_b_l = INTERPOLATE(y, rel_x_l, rel_y_b);
-            double y_b_r = INTERPOLATE(y, rel_x_r, rel_y_b);
-
-            Color  c_t_l = INTERPOLATE(c, rel_x_l, rel_y_t);
-            Color  c_t_r = INTERPOLATE(c, rel_x_r, rel_y_t);
-            Color  c_b_l = INTERPOLATE(c, rel_x_l, rel_y_b);
-            Color  c_b_r = INTERPOLATE(c, rel_x_r, rel_y_b);
+        #define LERP2D(what, x_weight, y_weight) \
+            lerp(lerp(what##1, what##3, y_weight), \
+            lerp(what##2, what##4, y_weight), \
+            x_weight);
+
+            double x_t_l = LERP2D(x, rel_x_l, rel_y_t);
+            double x_t_r = LERP2D(x, rel_x_r, rel_y_t);
+            double x_b_l = LERP2D(x, rel_x_l, rel_y_b);
+            double x_b_r = LERP2D(x, rel_x_r, rel_y_b);
+
+            double y_t_l = LERP2D(y, rel_x_l, rel_y_t);
+            double y_t_r = LERP2D(y, rel_x_r, rel_y_t);
+            double y_b_l = LERP2D(y, rel_x_l, rel_y_b);
+            double y_b_r = LERP2D(y, rel_x_r, rel_y_b);
+
+            Color  c_t_l = LERP2D(c, rel_x_l, rel_y_t);
+            Color  c_t_r = LERP2D(c, rel_x_r, rel_y_t);
+            Color  c_b_l = LERP2D(c, rel_x_l, rel_y_b);
+            Color  c_b_r = LERP2D(c, rel_x_r, rel_y_b);
 
             tile.draw(x_t_l, y_t_l, c_t_l,
                       x_t_r, y_t_r, c_t_r,

data/src/LargeImageData.hpp

@@ -25,7 +25,7 @@ public:
               double x2, double y2, Color c2,
               double x3, double y3, Color c3,
               double x4, double y4, Color c4,
-              ZPos z, AlphaMode mode) const override;
+              ZPos z, BlendMode mode) const override;
 
     const GLTexInfo* gl_tex_info() const override { return nullptr; }