chingu 0.7.7.3 → 0.7.7.4

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.7.3"
+  s.version = "0.7.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2010-08-20}
+  s.date = %q{2010-08-22}
   s.description = %q{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 game object and stackable game logic.}
   s.email = %q{ippa@rubylicio.us}
   s.extra_rdoc_files = [

data/examples/example6_transitional_game_state.rb

@@ -14,7 +14,7 @@ class Game < Chingu::Window
     switch_game_state(State1)
     self.input = {:space => :push, :return => :switch, :esc => :exit}
     self.caption = "Example of transitional game state FadeTo when switchin between two game states"
-    transitional_game_state(Chingu::GameStates::FadeTo, :speed => 10)
+    transitional_game_state(Chingu::GameStates::FadeTo, {:speed => 5, :debug => true})
   end
   
   def push

data/lib/chingu.rb

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

data/lib/chingu/game_object_map.rb

@@ -53,35 +53,40 @@ module Chingu
             
       @game_objects.each do |game_object|
         puts "#{game_object.class} @ #{game_object.x} / #{game_object.y}" if @debug
-                
-        start_x = (game_object.bb.left / @grid[0]).to_i
-        stop_x =  ( (game_object.bb.right-1) / @grid[0] ).to_i
-        
-        #if game_object.zorder == 80
-        #  puts "x: #{game_object.x}, y: #{game_object.y}"
-        #  puts "width: #{game_object.width}, height: #{game_object.height}"
-        #  puts "start_x: #{start_x}, stop_x: #{stop_x}"
-        #end
+        insert(game_object)                
+      end
+    end
+    
+    #
+    # Insert game_object into the map
+    #
+    def insert(game_object)
+      start_x = ( game_object.bb.left / @grid[0] ).to_i
+      stop_x =  ( (game_object.bb.right) / @grid[0] ).to_i
         
+      #if game_object.zorder == 80
+      #  puts "x: #{game_object.x}, y: #{game_object.y}"
+      #  puts "width: #{game_object.width}, height: #{game_object.height}"
+      #  puts "start_x: #{start_x}, stop_x: #{stop_x}"
+      #end
         
-        (start_x .. stop_x).each do |x|
-          start_y = (game_object.bb.top / @grid[1] ).to_i
-          stop_y =  ( (game_object.bb.bottom-1) / @grid[1] ).to_i
+      (start_x ... stop_x).each do |x|
+        start_y = (game_object.bb.top / @grid[1] ).to_i
+        stop_y =  ( (game_object.bb.bottom) / @grid[1] ).to_i
           
-          @game_object_positions[game_object] = [(start_x .. stop_x), (start_y .. stop_y)]
+        @game_object_positions[game_object] = [(start_x ... stop_x), (start_y ... stop_y)]
           
-          @map[x] ||= []
-          (start_y .. stop_y).each do |y|
-            @map[x][y] = game_object
-          end
+        @map[x] ||= []
+        (start_y ... stop_y).each do |y|
+          @map[x][y] = game_object
         end
-      end
+      end      
     end
-    
+        
     #
     # Removes a specific game object from the map
     #
-    def clear_game_object(game_object)
+    def delete(game_object)
       range_x, range_y = @game_object_positions[game_object]
       
       range_x.each do |x|
@@ -90,6 +95,7 @@ module Chingu
         end
       end
     end
+    alias :clear_game_object :delete
       
     #
     # Clear game object from the array-map on a certain X/Y
@@ -113,17 +119,34 @@ module Chingu
       start_x = (game_object.bb.left / @grid[0]).to_i
       stop_x =  (game_object.bb.right / @grid[0]).to_i
       
-      (start_x .. stop_x).each do |x|
+      (start_x ... stop_x).each do |x|
         start_y = (game_object.bb.top / @grid[1]).to_i
         stop_y =  (game_object.bb.bottom / @grid[1]).to_i
           
-        (start_y .. stop_y).each do |y|
+        (start_y ... stop_y).each do |y|
           return @map[x][y]   if @map[x] && @map[x][y]
         end
         
       end
       return nil
     end
-
+    
+    #
+    # Yields each object in the map colliding with the given game object
+    #
+    def each_collision(game_object)
+      start_x = (game_object.bb.left / @grid[0]).to_i
+      stop_x =  (game_object.bb.right / @grid[0]).to_i
+      
+      (start_x ... stop_x).each do |x|
+        start_y = (game_object.bb.top / @grid[1]).to_i
+        stop_y =  (game_object.bb.bottom / @grid[1]).to_i
+          
+        (start_y ... stop_y).each do |y|
+          yield @map[x][y]   if @map[x] && @map[x][y] && @map[x][y] != game_object  # Don't yield collisions with itself
+        end
+      end
+    end
+    
   end
 end

data/lib/chingu/game_state_manager.rb

@@ -49,7 +49,6 @@ module Chingu
       @game_states = []
       @transitional_game_state = nil
       @transitional_game_state_options = {}
-      @previous_game_state = nil
     end
     
     #
@@ -101,8 +100,6 @@ module Chingu
     #
     def switch_game_state(state, options = {})
       options = {:setup => true, :finalize => true, :transitional => true}.merge(options)
-
-      @previous_game_state = current_game_state
       
       new_state = game_state_instance(state)
       
@@ -124,7 +121,7 @@ module Chingu
           # 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)
+          self.push_game_state(transitional_game_state, :transitional => false)
         else
           if current_game_state.nil?
             @game_states << new_state
@@ -147,8 +144,6 @@ module Chingu
     #
     def push_game_state(state, options = {})
       options = {:setup => true, :finalize => true, :transitional => true}.merge(options)
-
-      @previous_game_state = current_game_state
       
       new_state = game_state_instance(state)
             
@@ -195,7 +190,6 @@ module Chingu
       # 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]
-      @previous_game_state = current_game_state
 
       #
       # Activate the game state "bellow" current one with a simple Array.pop
@@ -213,7 +207,7 @@ module Chingu
         # 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)
+        self.push_game_state(transitional_game_state, :transitional => false)
       end
       
       ## MOVED: self.inside_state = current_game_state
@@ -225,7 +219,7 @@ module Chingu
     # Returns the previous game state. Shortcut: "previous"
     #
     def previous_game_state
-      @previous_game_state
+      current_game_state.previous_game_state
     end
     alias :previous previous_game_state
     

data/lib/chingu/game_states/fade_to.rb

@@ -36,6 +36,7 @@ module Chingu
     class FadeTo < Chingu::GameState
       
       def initialize(new_game_state, options = {})
+        super(options)
         @options = {:speed => 3, :zorder => INFINITY}.merge(options)
         
         @new_game_state = new_game_state
@@ -45,11 +46,12 @@ module Chingu
     
       def setup
         @color = Gosu::Color.new(0,0,0,0)
-        
         if previous_game_state
+          p "* Setup: fading out"   if options[:debug]
           @fading_in = false
           @alpha = 0.0
         else
+          p "* Setup: fading in"    if options[:debug]
           @fading_in = true 
           @alpha = 255.0
         end
@@ -62,7 +64,11 @@ module Chingu
         @alpha = 0    if @alpha < 0
         @alpha = 255  if @alpha > 255
         
-        @fading_in = true   if @alpha == 255
+        if @alpha == 255
+          @fading_in = true
+          p "* Update: fading in"    if options[:debug]
+        end
+        
         @color.alpha = @alpha.to_i
         @drawn = false
       end

data/lib/chingu/helpers/game_state.rb

@@ -52,10 +52,6 @@ module Chingu
     def current_game_state
       game_state_manager.current_game_state
     end
-
-    #def previous_game_state
-    #  game_state_manager.previous_game_state
-    #end
     
     def clear_game_states
       game_state_manager.clear_game_states

data/lib/chingu/traits/bounding_box.rb

@@ -58,9 +58,11 @@ module Chingu
         
         width, height = self.size
         
-        if trait_options[:bounding_box][:scale]
-          width = width * trait_options[:bounding_box][:scale]
-          height = height * trait_options[:bounding_box][:scale]
+        if scale = trait_options[:bounding_box][:scale]
+          width_scale, height_scale = scale, scale
+          width_scale, height_scale = scale[0], scale[1]  if scale.is_a? Array
+          width *= width_scale
+          height *= height_scale
         end
                 
         x = self.x - width * self.center_x

data/lib/chingu/traits/collision_detection.rb

@@ -154,6 +154,20 @@ module Chingu
 
       
       module ClassMethods
+        #
+        # Yield all objects of this class that is colliding with point x,y
+        #
+        # Example:
+        #   Enemy.each_at(sword.x, sword.y) { |enemy| enemy.die }
+        #
+        def each_at(x,y)
+          self.all.each do |object|
+            next  unless object.collidable
+            yield object if object.respond_to?(:bb) && object.bb.collide_point?(x,y)
+            yield object if object.respond_to?(:radius) && Gosu.distance(object.x, object.y, x, y) < object.radius
+          end
+        end
+      
         #
         # Works like each_collision but with inline-code for speedups
         #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 99
   prerelease: false
   segments: 
   - 0
   - 7
   - 7
-  - 3
-  version: 0.7.7.3
+  - 4
+  version: 0.7.7.4
 platform: ruby
 authors: 
 - ippa
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 294392976
+        hash: 859163661
         segments: 
         - 2
         - 0