gosu 0.7.31-universal-darwin → 0.7.32-universal-darwin

data/Gosu/Fwd.hpp

@@ -10,6 +10,7 @@ namespace Gosu
     class Audio;
     class Bitmap;
     class Buffer;
+    class Button;
     class Color;
     class File;
     class Font;

data/Gosu/Version.hpp

@@ -3,7 +3,37 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 31
-#define GOSU_VERSION "0.7.31"
+#define GOSU_POINT_VERSION 32
+#define GOSU_VERSION "0.7.32"
 
+#define GOSU_COPYRIGHT_NOTICE \
+  "May contain `ogg', `vorbis' libraries (c) 2002-2008 Xiph.org Foundation" \
+  "\n\n" \
+  "Redistribution and use in source and binary forms, with or without" \
+  "modification, are permitted provided that the following conditions" \
+  "are met:" \
+  "\n\n" \
+  "- Redistributions of source code must retain the above copyright" \
+  "notice, this list of conditions and the following disclaimer." \
+  "\n\n" \
+  "- Redistributions in binary form must reproduce the above copyright" \
+  "notice, this list of conditions and the following disclaimer in the" \
+  "documentation and/or other materials provided with the distribution." \
+  "\n\n" \
+  "- Neither the name of the Xiph.org Foundation nor the names of its" \
+  "contributors may be used to endorse or promote products derived from" \
+  "this software without specific prior written permission." \
+  "\n\n" \
+  "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS" \
+  "``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT" \
+  "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR" \
+  "A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION" \
+  "OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL," \
+  "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT" \
+  "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE," \
+  "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY" \
+  "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" \
+  "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE" \
+  "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+  
 #endif

data/examples/ChipmunkIntegration.rb

@@ -4,7 +4,7 @@
 ## Date: 2007-10-05
 ## License: Same as for Gosu (MIT)
 ## Comments: Based on the Gosu Ruby Tutorial, but incorporating the Chipmunk Physics Engine
-## See http://code.google.com/p/gosu/wiki/RubyChipmunkIntegration for the accompanying text.
+## See https://github.com/jlnr/gosu/wiki/Ruby-Chipmunk-Integration for the accompanying text.
 
 require 'rubygems'
 require 'gosu'

data/lib/gosu.rb

@@ -1,16 +1,16 @@
-require 'rbconfig'
-
-begin
-  if defined? RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
-    version = '1_9'
-  else
-    version = '1_8'
-  end
-  require "#{File.dirname(__FILE__)}/gosu.for_#{version}.#{Config::CONFIG['DLEXT']}"
-  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
-rescue LoadError => e
-  require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
-  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
-end
-
-require "#{File.dirname(__FILE__)}/gosu/patches.rb"
+require 'rbconfig'
+
+begin
+  if defined? RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
+    version = '1_9'
+  else
+    version = '1_8'
+  end
+  require "#{File.dirname(__FILE__)}/gosu.for_#{version}.#{Config::CONFIG['DLEXT']}"
+  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
+rescue LoadError => e
+  require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
+  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
+end
+
+require "#{File.dirname(__FILE__)}/gosu/patches.rb"

data/lib/gosu/swig_patches.rb

@@ -3,27 +3,38 @@
 
 # Exceptions in Window callbacks often get lost, this is especially annoying in draw/update.
 # It is not clear whether this is a SWIG issue or if some stack frame is not exception
-# compatible, but I just call update_ and draw_ in the Ruby wrapper so I can add this
+# compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  def update_
-    update
-  rescue Exception => e
-    puts e.inspect
-    puts e.backtrace
-    raise e
+  %w(update draw needs_redraw? needs_cursor?
+     lose_focus button_down button_up).each do |callback|
+    define_method "protected_#{callback}" do |*args|
+      begin
+        # Turn into a boolean result for needs_cursor? etc while we are at it.
+        !!send(callback, *args) unless @_exception
+      rescue Exception => e
+        # Exit the message loop naturally, then re-throw
+        @_exception = e
+        close
+      end
+    end
   end
-
-  def draw_
-    draw
-  rescue Exception => e
-    puts e.inspect
-    puts e.backtrace
-    raise e
+  
+  alias show_internal show
+  def show
+    show_internal
+    # Try to format the message nicely, without any useless patching that we are
+    # doing here.
+    if @_exception then
+      if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen? then
+        @_exception.backtrace.reject! { |line| line.include? 'lib/gosu/swig_patches.rb' }
+      end
+      raise @_exception
+    end
   end
 end
 
-# SWIG doesn't understand the C++ overloading.
+# SWIG doesn't understand the C++ overloading, so we need this simple check in Ruby.
 class Gosu::Image
   def self.from_text(*args)
     args.size == 4 ? from_text4(*args) : from_text7(*args)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 67
   prerelease: 
   segments: 
   - 0
   - 7
-  - 31
-  version: 0.7.31
+  - 32
+  version: 0.7.32
 platform: universal-darwin
 authors: 
 - Julian Raschke
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +08:00
-default_executable: 
+date: 2011-06-05 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and Ruby-OpenGL.\n"
@@ -87,7 +86,6 @@ files:
 - examples/media/Starfighter.bmp
 - lib/gosu.for_1_8.bundle
 - lib/gosu.for_1_9.bundle
-has_rdoc: true
 homepage: http://libgosu.org/
 licenses: []
 
@@ -119,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: 2D game development library.