gosu 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a831194f9c3424b3866b28db95100d56da1621
-  data.tar.gz: e98300b664a62ff75bfe6de59542c779d939241e
+  metadata.gz: 4ce6ec413ea4f92e41a4adb0f6b622909e0afcbb
+  data.tar.gz: f37a8dfcc263d51194b354f91d4f8c8841e93f7b
 SHA512:
-  metadata.gz: 66d9c21c663b3bba6bbb48f6c2860c3075a75ebc0f77216a42251c851380dedcbb5a10da7479196b652d52ab138996bafaaaa3ff7e5ed4ec7c1b75f77190c347
-  data.tar.gz: ebd17c6adcfbc3b6bbfe7f63b18085273c430b18806148e77468ba5cca41ef290d49e35820681c919276351a6fda29e5ccea3dc67b89c9de9bb6acbc527401f7
+  metadata.gz: 5365979f253c9638eca55b4b4c1e09eff1d751dde85bbfaaf6251e61367731732c956ffd23ed9822c73d879a9aea80741b35ffc1efd784cc513c5fbc58be1a7f
+  data.tar.gz: bafe53467903dcead01226d8a07605e43d70683c3cf71ee57c3ad855ce3b265f81a1f076c86e96a6d7652bc200ec416e432e7106623be2e0b0cc579a1baee45d

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2016 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2001-2017 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/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 11
-#define GOSU_POINT_VERSION 1
+#define GOSU_POINT_VERSION 2
 
 namespace Gosu
 {

data/lib/gosu.rb

@@ -1,6 +1,6 @@
 require 'rbconfig'
 
-if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/ then
+if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
   binary_path = File.dirname(__FILE__)
   # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
   binary_path += '64' if RUBY_PLATFORM =~ /^x64-/

data/lib/gosu/patches.rb

@@ -42,8 +42,8 @@ class Gosu::Image
   alias initialize_without_window initialize
 
   def initialize(*args)
-    if args[0].is_a? Gosu::Window then
-      if args.size == 7 then
+    if args[0].is_a? Gosu::Window
+      if args.size == 7
         initialize_without_window args[1], :tileable => args[2], :rect => args[3..-1]
       else
         initialize_without_window args[1], :tileable => args[2]

data/lib/gosu/swig_patches.rb

@@ -9,13 +9,14 @@ class Gosu::Window
   alias initialize_without_hash initialize
   
   def initialize width, height, *args
-    if args.empty? or args.first.is_a? Hash then
+    if args.empty? or args.first.is_a? Hash
       options = args.first || {}
       fullscreen = options[:fullscreen]
       update_interval = options[:update_interval]
     else
       fullscreen, update_interval = *args
     end
+    $gosu_gl_blocks = nil
     initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666
   end
   
@@ -30,6 +31,7 @@ class Gosu::Window
         # Exit the message loop naturally, then re-throw
         @_exception = e
         close
+        false
       end
     end
   end
@@ -45,8 +47,8 @@ class Gosu::Window
     show_internal
     # Try to format the message nicely, without any useless patching that we are
     # doing here.
-    if defined? @_exception then
-      if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen? then
+    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

data/src/Graphics.cpp

@@ -256,9 +256,12 @@ namespace Gosu
         
         void operator()() const
         {
-            // Inlined begin_gl() to avoid flushing.
+            // Duplicated from begin_gl() (which we don't call, to avoid flushing).
             glPushAttrib(GL_ALL_ATTRIB_BITS);
             glDisable(GL_BLEND);
+            // Reset the colour 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);
             
             functor();

data/src/RubyGosu.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.11
+ * Version 3.0.12
  *
  * 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
@@ -2221,7 +2221,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x030011 
+#define SWIGVERSION 0x030012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2513,7 +2513,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.11/share/swig/3.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.12/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2555,7 +2555,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.11/share/swig/3.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.12/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2691,6 +2691,10 @@ SWIG_From_bool  (bool value)
 SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
+  if (TYPE(obj) != T_STRING) {
+    obj = rb_funcall(obj, rb_intern("to_s"), 0, NULL);
+  }
+
   if (TYPE(obj) == T_STRING) {
     char *cstr = StringValuePtr(obj); 
     size_t size = RSTRING_LEN(obj) + 1;
@@ -2753,7 +2757,7 @@ SWIG_AsPtr_std_string (VALUE obj, std::string **val)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.11/share/swig/3.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.12/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2854,9 +2858,11 @@ SWIGINTERN void Gosu_Font_set_image(Gosu::Font *self,wchar_t wc,VALUE source){
  * versions.
  *
  * Make sure namespace std exists to avoid compiler warnings.
+ *
+ * extern "C++" is required as this fragment can end up inside an extern "C" { } block
  */
 namespace std { }
-template<typename T>
+extern "C++" template<typename T>
 inline int SWIG_isfinite_func(T x) {
   using namespace std;
   return isfinite(x);
@@ -9830,7 +9836,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Window_set_mouse_x(int argc, VALUE *argv, VALUE self) {
+_wrap_Window_mouse_xe___(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -9866,7 +9872,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Window_set_mouse_y(int argc, VALUE *argv, VALUE self) {
+_wrap_Window_mouse_ye___(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -11517,7 +11523,7 @@ SWIGEXPORT void Init_gosu(void) {
   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 >(11)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(1)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
   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);
@@ -11936,8 +11942,8 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassWindow.klass, "mouse_x", VALUEFUNC(_wrap_Window_mouse_x), -1);
   rb_define_method(SwigClassWindow.klass, "mouse_y", VALUEFUNC(_wrap_Window_mouse_y), -1);
   rb_define_method(SwigClassWindow.klass, "set_mouse_position", VALUEFUNC(_wrap_Window_set_mouse_position), -1);
-  rb_define_method(SwigClassWindow.klass, "set_mouse_x", VALUEFUNC(_wrap_Window_set_mouse_x), -1);
-  rb_define_method(SwigClassWindow.klass, "set_mouse_y", VALUEFUNC(_wrap_Window_set_mouse_y), -1);
+  rb_define_method(SwigClassWindow.klass, "mouse_x=", VALUEFUNC(_wrap_Window_mouse_xe___), -1);
+  rb_define_method(SwigClassWindow.klass, "mouse_y=", VALUEFUNC(_wrap_Window_mouse_ye___), -1);
   SwigClassWindow.mark = (void (*)(void *)) mark_window;
   SwigClassWindow.destroy = (void (*)(void *)) free_Gosu_Window;
   SwigClassWindow.trackObjects = 1;

data/src/RubyGosu.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.11
+ * Version 3.0.12
  *
  * 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.