chingu 0.8rc2 → 0.8rc3

data/examples/game1.rb

@@ -79,7 +79,7 @@ class Level < Chingu::GameState
     game_objects.destroy_if { |game_object| game_object.respond_to?("outside_window?") && game_object.outside_window? }
 
     # Collide bullets with terrain
-    Bullet.all.select { |o| solid_pixel_at?(o.x, o.y)}.each { |o| o.die }
+    Bullet.select { |o| solid_pixel_at?(o.x, o.y)}.each { |o| o.die }
         
     # Collide player with terrain
     push_game_state(GameOver) if solid_pixel_at?(@player.x, @player.y)

data/lib/chingu.rb

@@ -37,8 +37,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  # VERSION = "0.7.7.5"
-  VERSION = "0.8rc2"
+  VERSION = "0.8rc3"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/animation.rb

@@ -10,7 +10,7 @@ module Chingu
   # Is autodetection of width / height possible? 
   #
   class Animation
-    attr_accessor :frames, :delay, :step, :loop, :bounce, :step
+    attr_accessor :frames, :delay, :step, :loop, :bounce, :step, :index
     
     #
     # Create a new Animation. 
@@ -107,18 +107,25 @@ module Chingu
     end
     
     #
-    # Returns first frame (GOSU::Image) from animation
+    # Returns the first frame (Gosu::Image) from animation
     #
     def first
       @frames.first
     end
 
     #
-    # Returns last frame (GOSU::Image) from animation
+    # Returns the last frame (Gosu::Image) from animation
     #
     def last
       @frames.last
     end
+    
+    #
+    # [width, height] for each frame in the animation
+    #
+    def size
+      [@width, @height]
+    end
 		
 		#
 		# Returns true if the current frame is the last
@@ -151,7 +158,7 @@ module Chingu
     end
 
     #
-    # Get the current frame (a Gosu#Image)
+    # Get the current frame (a Gosu::Image)
     #
     def image
       @frames[@index]
@@ -186,7 +193,7 @@ module Chingu
     #
     def next(recursion = true)
         
-      if (@dt += $window.milliseconds_since_last_tick) > @delay
+      if (@dt += $window.milliseconds_since_last_tick) >= @delay
         @dt = 0
         @previous_index = @index
         @index += @step
@@ -196,6 +203,7 @@ module Chingu
           if @bounce
             @step *= -1   # invert number
             @index += @step
+            @index += @step
           elsif @loop
             @index = 0	
           else

data/lib/chingu/assets.rb

@@ -101,7 +101,7 @@ module Gosu
     include Chingu::NamedResource
 		
     def self.autoload(name)
-      (path = find_file(name)) ? Gosu::Song.new($window, path) : nil
+      (path = find_file(name)) ? Gosu::Song.new(path) : nil
     end
   end
   
@@ -109,7 +109,7 @@ module Gosu
     include Chingu::NamedResource
     
     def self.autoload(name)
-      (path = find_file(name)) ? Gosu::Sample.new($window, path) : nil
+      (path = find_file(name)) ? Gosu::Sample.new(path) : nil
     end
   end
   Sound = Sample  # Gosu uses Sample, but Sound makes sense too.

data/lib/chingu/basic_game_object.rb

@@ -10,7 +10,7 @@ module Chingu
   class BasicGameObject
     include Chingu::Helpers::ClassInheritableAccessor # adds classmethod class_inheritable_accessor
     
-    attr_reader :options, :paused, :visible
+    attr_reader :options, :paused
     attr_accessor :parent
     
     class_inheritable_accessor :trait_options
@@ -24,7 +24,6 @@ module Chingu
     def self.trait(trait, options = {})
       
       if trait.is_a?(::Symbol) || trait.is_a?(::String)
-        ## puts "trait #{trait}, #{options}"
         begin
           # Convert user-given symbol (eg. :timer) to a Module (eg. Chingu::Traits::Timer)
           mod = Chingu::Traits.const_get(Chingu::Inflector.camelize(trait))
@@ -56,11 +55,7 @@ module Chingu
       Array(traits).each { |trait_name| trait trait_name }
     end
     class << self; alias :has_traits :traits; end
-		
-		#def self.inherited(subclass)
-		#	subclass.initialize_inherited_trait	if subclass.method_defined?(:initialize_inherited_trait)
-		#end
-			
+					
     alias :game_state :parent
     alias :game_state= :parent=
     
@@ -75,17 +70,11 @@ module Chingu
       #
       # A GameObject either belong to a GameState or our mainwindow ($window)
       #
-      #if !@parent && $window && $window.respond_to?(:game_state_manager)
-      #  @parent = $window.game_state_manager.inside_state || $window
-      #end
       @parent = $window.current_scope if !@parent && $window
       
       # if true, BasicGameObject#update will be called
-      @paused = options[:paused] || false
+      @paused = options[:paused] || options[:pause] || false
       
-      # if true, BasicGameObject#draw will be called
-      @visible = options[:visible] || true
-
       # This will call #setup_trait on the latest trait mixed in
       # which then will pass it on to the next setup_trait() with a super-call.
       setup_trait(options)
@@ -94,14 +83,14 @@ module Chingu
     end
 
     #
-    # Creates a new object from class just as new() but also:
-    # - adds game object to current game state
-    # - or $window if no game state exists
+    # Works just as BasicGameObject#new with the addition that Chingu will keep track of the new object.
+    # The object will be assigned to a game_objects list. If created within a game state it will be added to that_game_state.game_objects.
+    # Otherwise it will be added to $window.game_objects list.
+    # The naming is inspired from ActiveRecord#create which will persist the object in the database right away.
     #
-    # Use create() instead of new() if you want to keep track of your objects through
-    # Chingus "game_objects" which is available in all game states and the main window.
+    # Chingu will automatically call update() and draw() on stored game objects.
+    # Often in a smaller game this is exaclty what you want. If not, use the normal new().
     #
-    #def self.create(options = {})
     def self.create(*options, &block)
       instance = self.new(*options, &block)
       
@@ -113,15 +102,7 @@ module Chingu
       
       return instance
     end
-
-    #
-    # This ruby callback is called each time someone subclasses BasicGameObject or GameObject
-    # We hook into it to keep track of all game object classes (just as we keep track of game objects instances)
-    #
-    ## def self.inherited(klass)
-    ##   instance.parent.add_game_object_class(klass) if instance.parent
-    ## end
-
+    
     #
     # Disable automatic calling of update() and update_trait() each game loop
     #
@@ -176,7 +157,29 @@ module Chingu
     end
     
     #
-    # Returns
+    # As Array.each on the instances of the current class
+    #
+    def self.each
+      all.each { |object| yield object }
+    end
+
+    #
+    # As Array.each_with_index on the instances of the current class
+    #
+    def self.each_with_index
+      all.each_with_index { |object, index| yield object, index }
+    end
+
+    #
+    # As Array.select but on the instances of current class
+    #
+    def self.select
+      all.select { |object| yield object }
+    end
+    
+    
+    #
+    # Returns the total amount of game objects based on this class
     #
     def self.size
       $window.current_scope.game_objects.of_class(self).size

data/lib/chingu/game_object.rb

@@ -30,10 +30,5 @@ module Chingu
   class GameObject < Chingu::BasicGameObject
     trait :sprite
     include Chingu::Helpers::InputClient        # Adds input and input=
-    
-    #def initialize(options = {})
-    #  super
-    #  setup
-    #end
   end
 end

data/lib/chingu/game_object_list.rb

@@ -29,8 +29,8 @@ module Chingu
         
     def initialize(options = {})
       @game_objects = options[:game_objects] || []
-			@add_game_objects = []
-			@remove_game_objects = []
+      @add_game_objects = []
+      @remove_game_objects = []      
     end
     
     def to_s
@@ -48,13 +48,15 @@ module Chingu
     alias :remove_all :destroy_all
     
     def add_game_object(object)
-			@add_game_objects.push(object)
+      @game_objects.push(object)
+      #@add_game_objects.push(object)
     end
     
     def remove_game_object(object)
-			@remove_game_objects.push(object)	
+      @game_objects.delete(object)
+      #@remove_game_objects.push(object)
     end
-    
+        
     def destroy_if
       @game_objects.reject! { |object| yield(object) }
     end
@@ -68,44 +70,46 @@ module Chingu
     end
     
     def draw
-      @game_objects.each{ |object| object.visible }.each do |object| 
+      @game_objects.select { |object| object.visible }.each do |object|
         object.draw_trait
         object.draw
       end
     end
 
     def draw_relative(x=0, y=0, zorder=0, angle=0, center_x=0, center_y=0, factor_x=0, factor_y=0)
-      @game_objects.each{ |object| object.visible }.each do |object| 
+      @game_objects.select { |object| object.visible }.each do |object| 
         object.draw_trait
         object.draw_relative(x, y, zorder, angle, center_x, center_y, factor_x, factor_y)
       end
     end
-    
-    def sync
-			@game_objects += @add_game_objects
-			@add_game_objects.clear
-			
-			@game_objects -= @remove_game_objects
-			@remove_game_objects.clear      
-    end
-      
+          
     def update
-      sync
-				
-      @game_objects.select{ |object| not object.paused }.each do |object| 
+      @game_objects.select { |object| not object.paused }.each do |object| 
         object.update_trait 
         object.update
       end
     end
     
     def each
-      @game_objects.each { |object| yield object }
+      @game_objects.dup.each { |object| yield object }
+    end
+    
+    def each_with_index
+      @game_objects.dup.each_with_index { |object, index| yield object, index }
     end
     
     def select
-      @game_objects.select { |object| yield object }
+      @game_objects.dup.select { |object| yield object }
     end
     
+    def first
+      @game_objects.first
+    end
+
+    def last
+      @game_objects.last
+    end
+
     #
     # Disable automatic calling of update() and update_trait() each game loop for all game objects
     #
@@ -138,5 +142,14 @@ module Chingu
     end
     alias :show :show!
     
+    private
+    
+    def sync
+      @game_objects += @add_game_objects
+      @add_game_objects.clear
+      
+      @game_objects -= @remove_game_objects
+      @remove_game_objects.clear      
+    end    
   end  
 end

data/lib/chingu/game_states/edit.rb

@@ -244,11 +244,7 @@ END_OF_STRING
       #
       # UPDATE
       #
-      def update
-        # Sync all changes to previous game states game objects list
-        # This is needed since we don't call update on it.
-        previous_game_state.game_objects.sync
-        
+      def update        
         super
         
         @status_text.text = "#{self.mouse_x.to_i} / #{self.mouse_y.to_i}"
@@ -467,6 +463,7 @@ END_OF_STRING
       def game_object_icon_at(x, y)
         game_objects.select do |game_object|
           next if game_object.is_a? Text
+          next unless game_object.image
           bounding_box(game_object).collide_point?(x,y)
         end.first
       end

data/lib/chingu/game_states/fade_to.rb

@@ -41,7 +41,6 @@ module Chingu
         
         @new_game_state = new_game_state
         @new_game_state = new_game_state.new if new_game_state.is_a? Class        
-        @new_game_state.game_objects.sync
       end
     
       def setup

data/lib/chingu/game_states/pause.rb

@@ -33,7 +33,7 @@ module Chingu
       
       def initialize(options = {})
         super
-        @white = Color.new(255,255,255,255)
+        @white = Gosu::Color.new(255,255,255,255)
         @color = Gosu::Color.new(200,0,0,0)
         @font = Gosu::Font[35]
         @text = "PAUSED - press ESC to return to game."

data/lib/chingu/helpers/game_object.rb

@@ -75,7 +75,6 @@ module Chingu
           end
         end
       end
-      self.game_objects.sync
     end
     
     #

data/lib/chingu/parallax.rb

@@ -159,7 +159,6 @@ module Chingu
   # put the last layer added on top of the rest.
   #
   class ParallaxLayer < Chingu::GameObject    
-    @@zorder_counter = 0
     attr_reader :damping
     attr_accessor :repeat_x, :repeat_y
     
@@ -178,9 +177,9 @@ module Chingu
       options = {
           :repeat_x => true, 
           :repeat_y => false, 
-          :zorder => (@@zorder_counter+=1)
+          :zorder   => @parallax ? (@parallax.zorder + @parallax.layers.count) : 100
       }.merge(options)
-      
+            
       @repeat_x = options[:repeat_x]
       @repeat_y = options[:repeat_y]
             
@@ -188,12 +187,7 @@ module Chingu
       
       @damping = options[:damping] || 1
     end
-    
-    def draw
-      super
-      #p "draw @ #{x} / #{y}: #{image} - #{zorder} - #{color}"
-    end
-    
+        
     #
     # Gets pixel from layers image
     # The pixel is from the window point of view, so coordinates are converted:

data/lib/chingu/simple_menu.rb

@@ -25,21 +25,20 @@ module Chingu
   #
   class SimpleMenu < BasicGameObject
     include Chingu::Helpers::InputClient
-    attr_accessor :menu_items
+    attr_accessor :menu_items, :visible
     
     def initialize(options = {})
       super
       
-      @menu_items = options.delete(:menu_items)# || {"Exit" => :exit}
-      
+      @menu_items = options.delete(:menu_items)     # || {"Exit" => :exit}
       @x = options.delete(:x) || $window.width/2
-      @y = options.delete(:x) || 100
-      @spacing = options.delete(:x) || 100
+      @y = options.delete(:y) || 100
+      @spacing = options.delete(:spacing) || 100
       @items = []
+      @visible = true
   
       y = @spacing
       menu_items.each do |key, value|
-        
         item = if key.is_a? String
           Text.new(key, options.dup)
         elsif key.is_a? Image
@@ -105,10 +104,10 @@ module Chingu
       when Proc, Method
         action[]
       when Chingu::GameState
-        push_game_state(action)
+        game_state.push_game_state(action)
       when Class
         if action.ancestors.include?(Chingu::GameState)
-          push_game_state(action)
+          game_state.push_game_state(action)
         end
       else
         # TODO possibly raise an error? This ought to be handled when the input is specified in the first place.