chingu 0.6.3 → 0.6.4

data/chingu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-26}
+  s.date = %q{2009-11-29}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby.
 Builds on the awesome Gosu (Ruby/C++) which provides all the core functionality.
 It adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and automation of common task.}

data/examples/example14.rb

@@ -41,7 +41,7 @@ class Game < Chingu::Window
     # Before optmization: 25 FPS  (20 boxes and 20 circles)
     # Cached radius and rects:
     #
-    #[Box, Circle].each_collision(Box, Circle) { |o, o2| o.color, o2.color = @blue, @blue }
+    [Box, Circle].each_collision(Box, Circle) { |o, o2| o.color, o2.color = @blue, @blue }
     
     #
     # Only collide boxes with other boxes

data/lib/chingu.rb

@@ -33,7 +33,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/game_state_manager.rb

@@ -123,6 +123,7 @@ module Chingu
         if @transitional_game_state && options[:transitional]
           # If we have a transitional, switch to that instead, with new_state as first argument
           transitional_game_state = @transitional_game_state.new(new_state, @transitional_game_state_options)
+          transitional_game_state.game_state_manager = self
           self.switch_game_state(transitional_game_state, :transitional => false)
         else
           if current_game_state.nil?
@@ -156,19 +157,20 @@ module Chingu
         # So BasicGameObject#create connects object to new state in its setup()
         self.inside_state = new_state
         
-        # Call setup
-        new_state.setup               if new_state.respond_to?(:setup) && options[:setup]
-        
         # Make sure the game state knows about the manager
         # Is this doubled in GameState.initialize() ?
         new_state.game_state_manager = self
         
+        # Call setup
+        new_state.setup               if new_state.respond_to?(:setup) && options[:setup]
+                
         # Give the soon-to-be-disabled state a chance to clean up by calling finalize() on it.
         current_game_state.finalize   if current_game_state.respond_to?(:finalize) && options[:finalize]
         
         if @transitional_game_state && options[:transitional]
           # If we have a transitional, push that instead, with new_state as first argument
           transitional_game_state = @transitional_game_state.new(new_state, @transitional_game_state_options)
+          transitional_game_state.game_state_manager = self
           self.push_game_state(transitional_game_state, :transitional => false)
         else
           # Push new state on top of stack and therefore making it active
@@ -210,6 +212,7 @@ module Chingu
       if @transitional_game_state && options[:transitional]
         # If we have a transitional, push that instead, with new_state as first argument
         transitional_game_state = @transitional_game_state.new(current_game_state, @transitional_game_state_options)
+        transitional_game_state.game_state_manager = self
         self.switch_game_state(transitional_game_state, :transitional => false)
       end
       
@@ -270,7 +273,8 @@ module Chingu
     #
     # If you're using Chingu::Window instead of Gosu::Window this will automaticly be called.
     #
-    def update
+    def update(options = {})
+      puts current_game_state.to_s  if options[:debug]
       if current_game_state
         current_game_state.update_trait
         current_game_state.update

data/lib/chingu/game_states/fade_to.rb

@@ -41,13 +41,14 @@ module Chingu
         @new_game_state = new_game_state
         @new_game_state = new_game_state.new if new_game_state.is_a? Class
         
-        @manager = options[:game_state_manager] || self
+        #@manager = options[:game_state_manager] || self
         #@manager = game_state_manager
       end
     
       def setup
         @color = Gosu::Color.new(0,0,0,0)
-        if @manager.previous_game_state
+        ## if @manager.previous_game_state
+        if previous_game_state
           @fading_in = false
           @alpha = 0.0
         else
@@ -76,7 +77,8 @@ module Chingu
           if @fading_in
             @new_game_state.draw
           else
-            @manager.previous_game_state.draw
+            ## @manager.previous_game_state.draw
+            previous_game_state.draw
           end
       
           $window.draw_quad( 0,0,@color,
@@ -86,7 +88,8 @@ module Chingu
         end
         
         if @fading_in && @alpha == 0
-          @manager.switch_game_state(@new_game_state, :transitional => false)
+          ##@manager.switch_game_state(@new_game_state, :transitional => false)
+          switch_game_state(@new_game_state, :transitional => false)
         end
                             
       end

data/lib/chingu/game_states/pause.rb

@@ -39,11 +39,11 @@ module Chingu
       end
     
       def button_down(id)
-        game_state_manager.pop_game_state(:setup => false)    # Return the previous game state, dont call setup()
+        pop_game_state(:setup => false)    # Return the previous game state, dont call setup()
       end
       
       def draw
-        game_state_manager.previous_game_state.draw    # Draw prev game state onto screen (in this case our level)
+        previous_game_state.draw    # Draw prev game state onto screen (in this case our level)
         $window.draw_quad(  0,0,@color,
                             $window.width,0,@color,
                             $window.width,$window.height,@color,

data/lib/chingu/gosu_ext/image.rb

@@ -34,7 +34,7 @@ module Gosu
       begin
         self.get_pixel(x,y)[3] == 0
       rescue
-        puts "Error in get_pixel at x/y: #{x}/#{y}"
+        puts "Error in get_pixel at x/y: #{x}/#{y}: #{$!}"
       end
     end
     

data/lib/chingu/helpers/game_state.rb

@@ -30,31 +30,38 @@ module Chingu
   #
   module GameState
     def push_game_state(state, options = {})
-      $window.game_state_manager.push_game_state(state, options)      
+      #$window.game_state_manager.push_game_state(state, options)
+      game_state_manager.push_game_state(state, options)
     end
   
     def pop_game_state(options = {})
-      $window.game_state_manager.pop_game_state(options)
+      #$window.game_state_manager.pop_game_state(options)
+      game_state_manager.pop_game_state(options)
     end
 
     def switch_game_state(state, options = {})
-      $window.game_state_manager.switch_game_state(state, options)
+      #$window.game_state_manager.switch_game_state(state, options)
+      game_state_manager.switch_game_state(state, options)
     end
 
     def transitional_game_state(state, options = {})
-      $window.game_state_manager.transitional_game_state(state, options)      
+      ##$window.game_state_manager.transitional_game_state(state, options)
+      game_state_manager.transitional_game_state(state, options)
     end
 
     def current_game_state
-      $window.game_state_manager.current_game_state
+      ##$window.game_state_manager.current_game_state
+      game_state_manager.current_game_state
     end
 
     def previous_game_state
-      $window.game_state_manager.previous_game_state
+      ##$window.game_state_manager.previous_game_state
+      game_state_manager.previous_game_state
     end
     
     def clear_game_states
-      $window.game_state_manager.clear_game_states
+      #$window.game_state_manager.clear_game_states
+      game_state_manager.clear_game_states
     end
   end
   

data/lib/chingu/traits/timer.rb

@@ -78,6 +78,7 @@ module Chingu
       
       def update_trait
         ms = Gosu::milliseconds()
+        
         @_timers.each do |start_time, end_time, block|
           block.call  if ms > start_time && (end_time == nil || ms < end_time)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-26 00:00:00 +01:00
+date: 2009-11-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency