gosu 0.14.6.pre1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8da5cf8c3c455ebaa47ee8e9dc31091fcc2ecc10afce1acac4fb4802cd0b9a
-  data.tar.gz: 12c781dbcbda39f7417b8afcbb4fc72e7998fb5574fa0dfed15d4e4b2c0e97fb
+  metadata.gz: 9ba5fe75439828dc20ce57aaeca27e464ae1aba262f743febf5405fc6fac738b
+  data.tar.gz: 7f7b333a69fb3435ebc09c3c6b2c7ebd647f68cdc2b689d85a13bd6e66583241
 SHA512:
-  metadata.gz: a84524ee920802fa45abf1bcf980c6bd0ec0456a3b47c42ee3bc139e4c364261f6fb1369e2456dd886a5bc0eae8f8903b21a9a80c930abc14fad665f13253d8a
-  data.tar.gz: 43cc93051d22b7ddbf49987dd50efd70b001752acab675e29235f351e7a30d318acb11ed9853937ead8024185d494fc6d872307a961cef3a37ddca4f09e84442
+  metadata.gz: 266afe66c7524c6b0efaca9c7c0eef37494c33f27bc896c2d6777ef8bbe86d2238ebb1c4866ad6a599f9e3d9a56a8304fe2c47b8c58e6295707152571828c5a6
+  data.tar.gz: '0038955bca0bbaa7bc374aa389abc4416786fe900b6eb9011db60194c1129b9823bdc6df896f4a929fde5258f0d0ddac746e0d8f44b3bff8617e3dacaedc89dc'

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 #include <string>
 
 #define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 14
-#define GOSU_POINT_VERSION 6
+#define GOSU_MINOR_VERSION 15
+#define GOSU_POINT_VERSION 0
 
 namespace Gosu
 {

data/lib/gosu/compat.rb

@@ -68,9 +68,14 @@ module Gosu
   end
 end
 
+# These were useful for working with Direct3D and the Win32 API a long time ago,
+# there was never a real reason to have them available in Ruby.
+Gosu.deprecate Gosu::Color, :bgr, :none
+Gosu.deprecate Gosu::Color, :abgr, :none
+
 # No need to pass a Window to Image.
 class Gosu::Image
-  alias initialize_without_window initialize
+  alias_method :initialize_without_window, :initialize
 
   def initialize(*args)
     if args[0].is_a? Gosu::Window
@@ -86,7 +91,7 @@ class Gosu::Image
   end
 
   class << self
-    alias from_text_without_window from_text
+    alias_method :from_text_without_window, :from_text
   end
 
   def self.from_text(*args)
@@ -105,7 +110,7 @@ end
 
 # No need to pass a Window to Sample.
 class Gosu::Sample
-  alias initialize_without_window initialize
+  alias_method :initialize_without_window, :initialize
 
   def initialize(*args)
     if args.first.is_a? Gosu::Window
@@ -118,7 +123,7 @@ end
 
 # No need to pass a Window to Song.
 class Gosu::Song
-  alias initialize_without_window initialize
+  alias_method :initialize_without_window, :initialize
 
   def initialize(*args)
     if args.first.is_a? Gosu::Window

data/lib/gosu/patches.rb

@@ -28,6 +28,12 @@ class Gosu::Font
 end
 
 class Gosu::Image
+  BlobHelper = Struct.new(:columns, :rows, :to_blob)
+  
+  def self.from_blob(width, height, rgba = "\0\0\0\0" * (width * height))
+    self.new(BlobHelper.new(width, height, rgba))
+  end
+  
   # from_markup will stop parsing markup in Gosu 1.0.
   def self.from_markup(*args)
     self.from_text(*args)
@@ -54,7 +60,7 @@ module Gosu
     FUCHSIA = Gosu::ImmutableColor.new(0xff_ff00ff)
     CYAN    = Gosu::ImmutableColor.new(0xff_00ffff)
 
-    alias hash gl
+    alias_method :hash, :gl
     def eql?(other)
       gl == other.gl
     end
@@ -65,7 +71,7 @@ class Gosu::Window
   # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
   # Ruby's Thread class.
 
-  alias _tick tick
+  alias_method :_tick, :tick
 
   def tick
     Thread.pass

data/lib/gosu/swig_patches.rb

@@ -3,7 +3,7 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  alias initialize_without_hash initialize
+  alias_method :initialize_without_hash, :initialize
 
   def initialize width, height, *args
     if args.empty? or args.first.is_a? Hash
@@ -40,7 +40,7 @@ class Gosu::Window
     $gosu_gl_blocks = nil
   end
   
-  alias show_internal show
+  alias_method :show_internal, :show
   def show
     show_internal
     # Try to format the message nicely, without any useless patching that we are
@@ -68,7 +68,13 @@ module Gosu
   end
 end
 
-# SWIG will not let me rename my method to '[]=', so use alias here.
+# SWIG somehow maps the instance method "argb" as an overload of the class
+# method of the same name.
+class Gosu::Color
+  alias_method :argb, :to_i
+end
+
+# SWIG will not let me rename my method to '[]=', so use alias_method here.
 class Gosu::Font
-  alias []= set_image
+  alias_method :[]=, :set_image
 end

data/rdoc/gosu.rb

@@ -190,10 +190,19 @@ module Gosu
 
     # @!endgroup
 
-    # Returns a 32-bit representation of the color suitable for use with OpenGL calls. This color is stored in a fixed order in memory and its integer value may vary depending on your system's byte order.
+    ##
+    # @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
 
     ##
     # @return [Color] a copy of the color.
@@ -348,6 +357,14 @@ module Gosu
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#tileability Tileability explained in the Gosu Wiki
     def initialize(source, options = {}); end
 
+    ##
+    # Creates a new image with the given dimensions and RGBA pixel data.
+    #
+    # @param [Integer] width Width of the image in pixels.
+    # @param [Integer] height Height of the image in pixels.
+    # @param [String] rgba A string containing raw binary image data, with either one byte ('uint8') or four bytes ('float') per RGBA component.
+    def self.from_blob(width, height, rgba = "\0\0\0\0" * (width * height)); end
+
     ##
     # Creates a reusable image from one or more lines of text.
     #

data/src/Graphics.cpp

@@ -68,7 +68,7 @@ struct Gosu::Graphics::Impl
     {
         glPushAttrib(GL_ALL_ATTRIB_BITS);
         glDisable(GL_BLEND);
-        // Reset the colour to white to avoid surprises.
+        // Reset the color to white to avoid surprises.
         // https://www.libgosu.org/cgi-bin/mwf/topic_show.pl?pid=9115#pid9115
         glColor4ubv(reinterpret_cast<const GLubyte*>(&Color::WHITE));
         while (glGetError() != GL_NO_ERROR);
@@ -287,13 +287,16 @@ Gosu::Image Gosu::Graphics::render(int width, int height, const function<void ()
 
     // This is the actual render-to-texture step.
     Image result = OffScreenTarget(width, height, image_flags).render([&] {
+        glPushAttrib(GL_ALL_ATTRIB_BITS);
         glClearColor(0, 0, 0, 0);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glEnable(GL_BLEND);
         queues.emplace_back(QM_RENDER_TO_TEXTURE);
         f();
         queues.back().perform_draw_ops_and_code();
         queues.pop_back();
         glFlush();
+        glPopAttrib();
     });
     
     // Restore previous matrix and glViewport.

data/src/GraphicsImpl.hpp

@@ -110,7 +110,6 @@ namespace Gosu
     void ensure_current_context();
     
     inline std::string escape_markup(const std::string& text) {
-        // Escape all markup and delegate to layout_markup.
         auto markup = text;
         for (std::string::size_type pos = 0; pos < markup.length(); ++pos) {
             if (markup[pos] == '&') {

data/src/MarkupParser.cpp

@@ -119,17 +119,25 @@ bool Gosu::MarkupParser::parse_markup()
 
 bool Gosu::MarkupParser::parse_escape_entity()
 {
+    auto translate_to = [this](char ch) {
+        if (word_state == ADDING_WHITESPACE) {
+            flush_to_consumer();
+            word_state = ADDING_WORD;
+        }
+        add_composed_substring(u32string(1, ch));
+    };
+    
     // These are not entities (images) but escapes for markup characters.
     if (match_and_skip("<")) {
-        add_composed_substring(u32string(1, '<'));
+        translate_to('<');
         return true;
     }
     if (match_and_skip("&gt;")) {
-        add_composed_substring(u32string(1, '>'));
+        translate_to('>');
         return true;
     }
     if (match_and_skip("&amp;")) {
-        add_composed_substring(u32string(1, '&'));
+        translate_to('&');
         return true;
     }
 

data/src/RubyGosu.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -332,6 +332,7 @@ template <typename T> T SwigValueInit() {
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
 #define SWIG_CAST_NEW_MEMORY       0x2
+#define SWIG_POINTER_NO_NULL       0x4
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -970,6 +971,9 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifndef RSTRUCT_PTR
 # define RSTRUCT_PTR(x) RSTRUCT(x)->ptr
 #endif
+#ifndef RTYPEDDATA_P
+# define RTYPEDDATA_P(x) (TYPE(x) != T_DATA)
+#endif
 
 
 
@@ -1193,7 +1197,7 @@ void Ruby_Format_OverloadedError(
 /* -----------------------------------------------------------------------------
  * rubytracking.swg
  *
- * This file contains support for tracking mappings from 
+ * This file contains support for tracking mappings from
  * Ruby objects to C++ objects.  This functionality is needed
  * to implement mark functions for Ruby's mark and sweep
  * garbage collector.
@@ -1220,7 +1224,7 @@ extern "C" {
 #endif
 
 /* Global hash table to store Trackings from C/C++
-   structs to Ruby Objects. 
+   structs to Ruby Objects.
 */
 static st_table* swig_ruby_trackings = NULL;
 
@@ -1234,7 +1238,7 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   /* Create a hash table to store Trackings from C++
      objects to Ruby objects. */
 
-  /* Try to see if some other .so has already created a 
+  /* Try to see if some other .so has already created a
      tracking hash table, which we keep hidden in an instance var
      in the SWIG module.
      This is done to allow multiple DSOs to share the same
@@ -1293,13 +1297,14 @@ SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
 
 /* This is a helper method that unlinks a Ruby object from its
    underlying C++ object.  This is needed if the lifetime of the
-   Ruby object is longer than the C++ object */
+   Ruby object is longer than the C++ object. */
 SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
   VALUE object = SWIG_RubyInstanceFor(ptr);
 
   if (object != Qnil) {
-    if (TYPE(object) != T_DATA)
-      abort();
+    // object might have the T_ZOMBIE type, but that's just
+    // because the GC has flagged it as such for a deferred
+    // destruction. Until then, it's still a T_DATA object.
     DATA_PTR(object) = 0;
   }
 }
@@ -1532,10 +1537,11 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
   swig_class *sklass;
   VALUE klass;
   VALUE obj;
-  
+
   if (!ptr)
     return Qnil;
-  
+
+  assert(type);
   if (type->clientdata) {
     sklass = (swig_class *) type->clientdata;
 		
@@ -1543,7 +1549,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     track = sklass->trackObjects;
     if (track) {
       obj = SWIG_RubyInstanceFor(ptr);
-      
+
       /* Check the object's type and make sure it has the correct type.
         It might not in cases where methods do things like 
         downcast methods. */
@@ -1575,7 +1581,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     obj = Data_Wrap_Struct(klass, 0, 0, ptr);
   }
   rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
-  
+
   return obj;
 }
 
@@ -1607,7 +1613,7 @@ typedef struct {
 SWIGRUNTIME swig_ruby_owntype
 SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
   swig_ruby_owntype oldown = {0, 0};
-  if (obj) {
+  if (TYPE(obj) == T_DATA && !RTYPEDDATA_P(obj)) {
     oldown.datafree = RDATA(obj)->dfree;
     RDATA(obj)->dfree = own.datafree;
   }
@@ -1626,9 +1632,9 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
   if (NIL_P(obj)) {
     if (ptr)
       *ptr = 0;
-    return SWIG_OK;
+    return (flags & SWIG_POINTER_NO_NULL) ? SWIG_NullReferenceError : SWIG_OK;
   } else {
-    if (TYPE(obj) != T_DATA) {
+    if (TYPE(obj) != T_DATA || (TYPE(obj) == T_DATA && RTYPEDDATA_P(obj))) {
       return SWIG_ERROR;
     }
     Data_Get_Struct(obj, void, vptr);
@@ -1723,7 +1729,7 @@ SWIG_Ruby_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
   return rb_str_new2(result);
 }
 
-/* Convert a packed value value */
+/* Convert a packed pointer value */
 SWIGRUNTIME int
 SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
   swig_cast_info *tc;
@@ -1995,43 +2001,6 @@ namespace Swig {
     }
   };
 
-  /* unknown exception handler  */
-  class UnknownExceptionHandler {
-#ifdef SWIG_DIRECTOR_UEH
-    static void handler() {
-      try {
-	throw;
-      } catch (DirectorException& e) {
-	std::cerr << "SWIG Director exception caught:" << std::endl
-		  << e.what() << std::endl;
-      } catch (std::exception& e) {
-	std::cerr << "std::exception caught: "<< e.what() << std::endl;
-      } catch (...) {
-	std::cerr << "Unknown exception caught." << std::endl;
-      }
-      std::cerr << std::endl
-		<< "Ruby interpreter traceback:" << std::endl;
-      std::cerr << std::endl;
-      std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
-		<< "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
-		<< std::endl
-		<< "Exception is being re-thrown, program will like abort/terminate." << std::endl;
-      throw;
-    }
-
-  public:
-    std::unexpected_handler old;
-    UnknownExceptionHandler(std::unexpected_handler nh = handler) {
-      old = std::set_unexpected(nh);
-    }
-
-    ~UnknownExceptionHandler() {
-      std::set_unexpected(old);
-    }
-#endif
-  };
-
-
   /* Type mismatch in the return value from a Ruby method call */
   class DirectorTypeMismatchException : public DirectorException {
   public:
@@ -2221,7 +2190,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x030012 
+#define SWIGVERSION 0x040001 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2519,7 +2488,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.12/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/4.0.1/share/swig/4.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2561,7 +2530,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.12/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/4.0.1/share/swig/4.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2628,6 +2597,9 @@ SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_1(Gosu::Color::Channel a,Gosu::Colo
 SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_2(std::uint32_t argb){
         return Gosu::Color(argb);
     }
+SWIGINTERN std::uint32_t Gosu_Color_to_i(Gosu::Color const *self){
+      return self->argb();
+    }
 SWIGINTERN Gosu::Color Gosu_Color_dup(Gosu::Color const *self){
         return *self;
     }
@@ -2763,7 +2735,7 @@ SWIG_AsPtr_std_string (VALUE obj, std::string **val)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.12/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/4.0.1/share/swig/4.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -3195,10 +3167,10 @@ SwigDirector_TextInput::~SwigDirector_TextInput() {
 }
 
 std::string SwigDirector_TextInput::filter(std::string text) const {
-  std::string c_result ;
   VALUE obj0 = Qnil ;
   VALUE SWIGUNUSED result;
   
+  std::string c_result;
   obj0 = SWIG_From_std_string(static_cast< std::string >(text));
   result = rb_funcall(swig_get_self(), rb_intern("filter"), 1,obj0);
   std::string *swig_optr = 0;
@@ -3224,15 +3196,15 @@ SwigDirector_Window::~SwigDirector_Window() {
 void SwigDirector_Window::show() {
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("show"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("show"), 0, Qnil);
 }
 
 
 bool SwigDirector_Window::tick() {
-  bool c_result ;
+  bool c_result = SwigValueInit< bool >() ;
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("tick"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("tick"), 0, Qnil);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3246,29 +3218,29 @@ bool SwigDirector_Window::tick() {
 void SwigDirector_Window::close() {
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("close"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("close"), 0, Qnil);
 }
 
 
 void SwigDirector_Window::update() {
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, Qnil);
 }
 
 
 void SwigDirector_Window::draw() {
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, Qnil);
 }
 
 
 bool SwigDirector_Window::needs_redraw() const {
-  bool c_result ;
+  bool c_result = SwigValueInit< bool >() ;
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, Qnil);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3280,10 +3252,10 @@ bool SwigDirector_Window::needs_redraw() const {
 
 
 bool SwigDirector_Window::needs_cursor() const {
-  bool c_result ;
+  bool c_result = SwigValueInit< bool >() ;
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, Qnil);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3297,14 +3269,14 @@ bool SwigDirector_Window::needs_cursor() const {
 void SwigDirector_Window::lose_focus() {
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, Qnil);
 }
 
 
 void SwigDirector_Window::release_memory() {
   VALUE SWIGUNUSED result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("release_memory"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("release_memory"), 0, Qnil);
 }
 
 
@@ -5016,6 +4988,44 @@ fail:
 }
 
 
+/*
+  Document-method: Gosu::Color.to_i
+
+  call-seq:
+    to_i -> std::uint32_t
+
+Convert Color to an Integer.
+*/
+SWIGINTERN VALUE
+_wrap_Color_to_i(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::uint32_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","to_i", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
+  {
+    try {
+      result = Gosu_Color_to_i((Gosu::Color const *)arg1);
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
 
 /*
   Document-method: Gosu::Color.dup
@@ -5056,7 +5066,6 @@ fail:
 }
 
 
-
 /*
   Document-method: Gosu::Color.inspect
 
@@ -5096,7 +5105,6 @@ fail:
 }
 
 
-
 /*
   Document-method: Gosu::Color.==
 
@@ -5699,7 +5707,7 @@ SWIGINTERN VALUE _wrap_new_Font(int nargs, VALUE *args, VALUE self) {
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Gosu__Window, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Gosu__Window, SWIG_POINTER_NO_NULL);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
@@ -7125,7 +7133,7 @@ SWIGINTERN VALUE _wrap_Image_load_tiles(int nargs, VALUE *args, VALUE self) {
   if (argc == 5) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Gosu__Window, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Gosu__Window, SWIG_POINTER_NO_NULL);
     _v = SWIG_CheckState(res);
     if (_v) {
       _v = (argv[1] != 0);
@@ -7298,7 +7306,6 @@ fail:
 }
 
 
-
 /*
   Document-method: Gosu::Image.insert
 
@@ -7353,7 +7360,6 @@ fail:
 }
 
 
-
 /*
   Document-method: Gosu::Image.inspect
 
@@ -11589,7 +11595,7 @@ SWIG_InitializeModule(void *clientdata) {
 
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
-  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+  printf("SWIG_InitializeModule: size %lu\n", (unsigned long)swig_module.size);
 #endif
   for (i = 0; i < swig_module.size; ++i) {
     swig_type_info *type = 0;
@@ -11597,7 +11603,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_cast_info *cast;
 
 #ifdef SWIGRUNTIME_DEBUG
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
 #endif
 
     /* if there is another module already loaded */
@@ -11673,7 +11679,7 @@ SWIG_InitializeModule(void *clientdata) {
   for (i = 0; i < swig_module.size; ++i) {
     int j = 0;
     swig_cast_info *cast = swig_module.cast_initial[i];
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
     while (cast->type) {
       printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
       cast++;
@@ -11741,8 +11747,8 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "VERSION", SWIG_From_std_string(static_cast< std::string >(Gosu::VERSION)));
   rb_define_const(mGosu, "LICENSES", SWIG_From_std_string(static_cast< std::string >(Gosu::LICENSES)));
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
-  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(14)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(5)));
+  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(15)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);
@@ -11786,6 +11792,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_singleton_method(SwigClassColor.klass, "rgb", VALUEFUNC(_wrap_Color_rgb), -1);
   rb_define_singleton_method(SwigClassColor.klass, "rgba", VALUEFUNC(_wrap_Color_rgba), -1);
   rb_define_singleton_method(SwigClassColor.klass, "argb", VALUEFUNC(_wrap_Color_argb), -1);
+  rb_define_method(SwigClassColor.klass, "to_i", VALUEFUNC(_wrap_Color_to_i), -1);
   rb_define_method(SwigClassColor.klass, "dup", VALUEFUNC(_wrap_Color_dup), -1);
   rb_define_method(SwigClassColor.klass, "inspect", VALUEFUNC(_wrap_Color_inspect), -1);
   rb_define_method(SwigClassColor.klass, "==", VALUEFUNC(_wrap_Color___eq__), -1);

data/src/RubyGosu.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make

data/src/TexChunk.cpp

@@ -82,39 +82,49 @@ Gosu::Bitmap Gosu::TexChunk::to_bitmap() const
     return texture->to_bitmap(x, y, w, h);
 }
 
-void Gosu::TexChunk::insert(const Bitmap& original, int x, int y)
+void Gosu::TexChunk::insert(const Bitmap& original_bitmap, int x, int y)
 {
-    Bitmap alternate;
-    const Bitmap* bitmap = &original;
+    Bitmap clipped_bitmap;
+    const Bitmap* bitmap = &original_bitmap;
     
-    if (x < 0 || y < 0 || x + original.width() > w || y + original.height() > h) {
-        int offset_x = 0, offset_y = 0;
-        int trimmed_width = original.width(), trimmed_height = original.height();
+    // If inserting the bitmap at the given position exceeds the boundaries of the space allocated
+    // for this image on the texture, we need to clip the bitmap and insert the clipped version
+    // instead.
+    if (x < 0 || y < 0 || x + original_bitmap.width() > w || y + original_bitmap.height() > h) {
+        // How many pixels to remove at the top and left sides.
+        int clip_left = 0, clip_top = 0;
+        // How large the clipped version needs to be.
+        int clipped_width = original_bitmap.width(), clipped_height = original_bitmap.height();
+
+        // Clip away pixels on the left side, if necessary.
         if (x < 0) {
-            offset_x = x;
-            trimmed_width += x;
+            clip_left = -x;
+            clipped_width -= -x;
             x = 0;
         }
+        // Clip away pixels at the top, if necessary.
         if (y < 0) {
-            offset_y = y;
-            trimmed_height += y;
+            clip_top = -y;
+            clipped_height -= -y;
             y = 0;
         }
-        if (x + trimmed_width > w) {
-            trimmed_width -= (w - x - trimmed_width);
+        // Clip away pixels on the right side, if necessary.
+        if (x + clipped_width > w) {
+            clipped_width = (w - x);
         }
-        if (y + trimmed_height > h) {
-            trimmed_height -= (h - y - trimmed_height);
+        // Clip away pixels on the bottom, if necessary.
+        if (y + clipped_height > h) {
+            clipped_height = (h - y);
         }
 
-        if (trimmed_width <= 0 || trimmed_height <= 0) return;
+        if (clipped_width <= 0 || clipped_height <= 0) return;
         
-        alternate.resize(trimmed_width, trimmed_height);
-        alternate.insert(original, offset_x, offset_y);
-        bitmap = &alternate;
+        clipped_bitmap.resize(clipped_width, clipped_height);
+        clipped_bitmap.insert(original_bitmap, -clip_left, -clip_top);
+        bitmap = &clipped_bitmap;
     }
     
     glBindTexture(GL_TEXTURE_2D, tex_name());
     glTexSubImage2D(GL_TEXTURE_2D, 0, this->x + x, this->y + y, bitmap->width(), bitmap->height(),
-        Color::GL_FORMAT, GL_UNSIGNED_BYTE, bitmap->data());
+                    Color::GL_FORMAT, GL_UNSIGNED_BYTE, bitmap->data());
 }

data/src/Text.cpp

@@ -33,6 +33,7 @@ Gosu::Bitmap Gosu::layout_text(const string& text, const string& font_name,
                                double font_height, double line_spacing,
                                int width, Alignment align, unsigned font_flags)
 {
+    // Escape all markup and delegate to layout_markup.
     return layout_markup(escape_markup(text), font_name,
                          font_height, line_spacing,
                          width, align, font_flags);

data/src/TextBuilder.cpp

@@ -58,7 +58,7 @@ void Gosu::TextBuilder::flush_current_line(EndOfLineReason reason)
     }
     
     double whitespace_factor = 1.0;
-    if (align == AL_JUSTIFY && reason == LINE_TOO_LONG) {
+    if (align == AL_JUSTIFY && whitespace_width != 0 && reason == LINE_TOO_LONG) {
         whitespace_factor = (result.width() - words_width) / whitespace_width;
     }
     
@@ -132,7 +132,7 @@ void Gosu::TextBuilder::feed_word(vector<FormattedString>&& word)
     current_line.emplace_back(new_word);
     current_line_width += new_word.width;
 
-    if (current_line_width > result.width() || new_word.is_end_of_line) {
-        flush_current_line(new_word.is_end_of_line ? END_OF_PARAGRAPH : LINE_TOO_LONG);
+    if (new_word.is_end_of_line) {
+        flush_current_line(END_OF_PARAGRAPH);
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.14.6.pre1
+  version: 0.15.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -163,11 +163,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 2D game development library.