chingu 0.9rc8 → 0.9rc9

data/README.rdoc

@@ -411,21 +411,22 @@ Another example:
   class Game < Chingu::Window
     def initialize
       #
-      # We start by pushing Menu to the game state stack, making it active as the only state on stack.
-      # :setup => :false which will skip setup() from being called (standard when switching to a new state)
+      # We start by pushing Menu to the game state stack, making it active as it's the only state on stack.
+      #
+      # :setup => :false will skip setup() from being called (standard when switching to a new state)
       #
       push_game_state(Menu, :setup => false)
       
       #
       # We push another game state to the stack, Play. We now have 2 states, which active being first / active.
       #
-      # :finalize => false will skip setup() from being called on game state 
-      # that's being pushed down the stack, in this case Intro.setup().
+      # :finalize => false will skip finalize() from being called on game state 
+      # that's being pushed down the stack, in this case Menu.finalize().
       #
       push_game_state(Play, :finalize => false)
     
       #
-      # This would remove Play state from the stack, going back to the Menu-state. But also:
+      # Next, we remove Play state from the stack, going back to the Menu-state. But also:
       # .. skipping the standard call to Menu#setup     (the new game state)
       # .. skipping the standard call to Play#finalize  (the current game state)
       #
@@ -435,7 +436,11 @@ Another example:
       
       #
       # Replace the current game state with a new one.
-      # :setup and :finalize options are available here as well.
+      #
+      # :setup and :finalize options are available here as well but:
+      # .. setup and finalize are always skipped for Menu (the state under Play and Credits)
+      # .. the finalize option only affects the popped game state
+      # .. the setup option only affects the game state you're switching to
       #
       switch_game_state(Credits)
     end

data/lib/chingu.rb

@@ -36,11 +36,10 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu/async"
 require_all "#{CHINGU_ROOT}/chingu/async_tasks"
 require_all "#{CHINGU_ROOT}/chingu"
+require_all "#{CHINGU_ROOT}/chingu/version"
 
 module Chingu
-  VERSION = "0.9rc8"
-  
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999
   INFINITY = 1.0 / 0
-end
+end

data/lib/chingu/basic_game_object.rb

@@ -223,7 +223,10 @@ module Chingu
     # If the object isn't being managed by Chingu (ie. you're doing manual update/draw calls) the object is only frozen, not removed from any updae cycle (because you are controlling that).
     #
     def destroy
-      @parent.remove_game_object(self)  if @parent
+      if @parent
+        @parent.remove_game_object(self)
+        @parent.remove_input_client(self)
+      end
       self.class.instances.delete(self)
     end
     alias :destroy! :destroy

data/lib/chingu/traits/collision_detection.rb

@@ -133,7 +133,8 @@ module Chingu
       def each_bounding_circle_collision(*klasses)
         Array(klasses).each do |klass|
           (klass.respond_to?(:all) ? klass.all : Array(klass)).each do |object|
-            next  unless self.collidable && object.collidable
+            next if object == self
+            next unless self.collidable && object.collidable
             yield(self, object) if Gosu.distance(self.x, self.y, object.x, object.y) < self.radius + object.radius
           end
         end
@@ -146,7 +147,8 @@ module Chingu
       def each_bounding_box_collision(*klasses)
         Array(klasses).each do |klass|
           (klass.respond_to?(:all) ? klass.all : Array(klass)).each do |object|
-            return false  unless self.collidable && object.collidable
+            next if object == self
+            next unless self.collidable && object.collidable
             yield(self, object) if self.bounding_box.collide_rect?(object.bounding_box)
           end
         end
@@ -259,4 +261,4 @@ module Chingu
       end
     end
   end
-end
+end

data/lib/chingu/version.rb

@@ -0,0 +1,4 @@
+module Chingu
+  VERSION = "0.9rc9"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chingu
 version: !ruby/object:Gem::Version
-  version: 0.9rc8
+  version: 0.9rc9
   prerelease: 3
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &25541928 !ruby/object:Gem::Requirement
+  requirement: &26152668 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.43
+        version: 0.7.45
   type: :runtime
   prerelease: false
-  version_requirements: *25541928
+  version_requirements: *26152668
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &25541628 !ruby/object:Gem::Requirement
+  requirement: &26152380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.43
+        version: 0.7.45
   type: :runtime
   prerelease: false
-  version_requirements: *25541628
+  version_requirements: *26152380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25541340 !ruby/object:Gem::Requirement
+  requirement: &26152092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *25541340
+  version_requirements: *26152092
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &25541052 !ruby/object:Gem::Requirement
+  requirement: &26151804 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25541052
+  version_requirements: *26151804
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &25540716 !ruby/object:Gem::Requirement
+  requirement: &26151516 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25540716
+  version_requirements: *26151516
 description: OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++)
   which provides all the core functionality. Chingu adds simple yet powerful game
   states, prettier input handling, deployment safe asset-handling, a basic re-usable
@@ -143,6 +143,7 @@ files:
 - lib/chingu/traits/timer.rb
 - lib/chingu/traits/velocity.rb
 - lib/chingu/traits/viewport.rb
+- lib/chingu/version.rb
 - lib/chingu/viewport.rb
 - lib/chingu/window.rb
 - lib/chingu.rb