chingu 0.7.6.4 → 0.7.6.5

data/examples/example6_transitional_game_state.rb

@@ -49,13 +49,14 @@ class State1 < Chingu::GameState
   # This is another way of achieving the same thing as the out-commeted draw-code
   # Since .create is used, it's automatically updated and drawn
   #
-  def setup
+  def initialize(options = {})
+    super
     Chingu::GameObject.create(:image => "ruby.png", :rotation_center => :top_left)
   end
   
   #def draw
   #  Image["ruby.png"].draw(0,0,0)
-  #end
+  #end  
 end
 
 class State2 < Chingu::GameState 

data/examples/example9_collision_detection.rb

@@ -19,40 +19,31 @@ class Game < Chingu::Window
 end
 
 class FireCube < Chingu::GameObject
-  traits :velocity, :collision_detection  
-  attr_accessor :color, :radius
+  traits :velocity, :collision_detection, :bounding_circle
+  attr_accessor :color
   
   def initialize(options)
     super
     @mode = :additive
     
+    @image = Image["circle.png"]
+    
     # initialize with a rightwards velocity with some damping to look more realistic
-    @velocity_x = options[:velocity_x] || 1 + rand(2)
-    @velocity_y = options[:velocity_y] || 1 + rand(2)
+    self.velocity_x = options[:velocity_x] || 1 + rand(2)
+    self.velocity_y = options[:velocity_y] || 1 + rand(2)
+    self.factor = 2
     
-    @box = Rect.new([@x, @y, 10, 10])
-    @radius = 6
+    @color = Color::BLUE
     
-    @blue = Color.new(255,100,255,255)
-    @red = Color.new(255,255,10,10)
-    @color = @blue
-  end
-  
-  def bounding_box
-    @box
-  end
-  
-  def draw
-    $window.fill_rect(@box, @color)
+    cache_bounding_circle # This does a lot for performance
   end
   
   def update
-    @box.x, @box.y = @x, @y
-    @color = @blue
+    @color = Color::BLUE
   end
   
   def die!
-    @color = @red
+    @color = Color::RED
   end
   
 end
@@ -95,8 +86,7 @@ class ParticleState < Chingu::GameState
       cube1.die!
       cube2.die!
     end
-      
-    game_objects.destroy_if { |object| object.color.alpha == 0 }
+    
   end
   
   def draw

data/lib/chingu.rb

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

data/lib/chingu/assets.rb

@@ -33,7 +33,9 @@ module Gosu
     include Chingu::NamedResource
     
     def self.autoload(name)
-      (path = find_file(name)) ? Gosu::Image.new($window, path, true) : nil
+      ret = (path = find_file(name)) ? Gosu::Image.new($window, path, true) : nil
+      raise "Can't load image \"#{name}\"" if ret.nil?
+      return ret
     end
   end
 

data/lib/chingu/basic_game_object.rb

@@ -217,4 +217,4 @@ module Chingu
     end
     alias :destroy! :destroy
   end
-end
+end

data/lib/chingu/core_ext/array.rb

@@ -1,4 +1,5 @@
 class Array
+  
   def each_collision(*args)
     list = (self + args).uniq
     collide_pair = []

data/lib/chingu/game_object_list.rb

@@ -31,7 +31,6 @@ module Chingu
       @game_objects = options[:game_objects] || []
 			@add_game_objects = []
 			@remove_game_objects = []
-      #@game_objects_by_class = Hash.new
     end
     
     def to_s
@@ -40,34 +39,24 @@ module Chingu
     
     def of_class(klass)
       @game_objects.select { |game_object| game_object.is_a? klass }
-      #@game_objects_by_class[klass] || []
     end
     
     def destroy_all
       @game_objects.clear
-      #@game_objects_of_class.clear
     end
     alias :clear :destroy_all
     alias :remove_all :destroy_all
     
     def add_game_object(object)
-      #@game_objects.push(object)
 			@add_game_objects.push(object)
-			
-			
-      #(@game_objects_by_class[object.class] ||= []).push(object)
     end
     
     def remove_game_object(object)
-      #@game_objects.delete(object)
 			@remove_game_objects.push(object)	
-			
-      #@game_objects_by_class[object.class].delete(object)
     end
     
     def destroy_if
       @game_objects.reject! { |object| yield(object) }
-      #@game_objects_by_class.delete_if { |klass, object| yield(object) }
     end
     
     def size
@@ -141,4 +130,4 @@ module Chingu
       @game_objects.each { |object| object.show! }
     end
   end  
-end
+end

data/lib/chingu/game_state.rb

@@ -78,7 +78,7 @@ module Chingu
           # Include the module, which will add the containing methods as instance methods
           include mod
                    
-          # Does sub-module "ClessMethods" exists?
+          # Does sub-module "ClassMethods" exists?
           # (eg: Chingu::Traits::Timer::ClassMethods)
           if mod.const_defined?("ClassMethods")
             # Add methods in scope ClassMethods as.. class methods!

data/lib/chingu/game_state_manager.rb

@@ -100,6 +100,7 @@ module Chingu
     # .. and finalize() is called on the game state we're switching _from_.
     #
     def switch_game_state(state, options = {})
+      puts state.class
       options = {:setup => true, :finalize => true, :transitional => true}.merge(options)
 
       @previous_game_state = current_game_state

data/lib/chingu/game_states/edit.rb

@@ -136,10 +136,13 @@ module Chingu
             if game_object.image
               game_object.size = [32,32]
               game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
+              x += 40
+            else
+              puts "Skipping #{klass} - no image" if @debug
+              game_object.destroy
             end
-            x += 40
           rescue
-            puts "Couldn't use #{klass} in editor."
+            puts "Couldn't use #{klass} in editor: #{$!}"
           end
         end
       end

data/lib/chingu/game_states/fade_to.rb

@@ -39,15 +39,13 @@ module Chingu
         @options = {:speed => 3}.merge(options)
         
         @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 = game_state_manager
+        @new_game_state = new_game_state.new if new_game_state.is_a? Class        
+        @new_game_state.game_objects.sync
       end
     
       def setup
         @color = Gosu::Color.new(0,0,0,0)
-        ## if @manager.previous_game_state
+        
         if previous_game_state
           @fading_in = false
           @alpha = 0.0
@@ -55,7 +53,7 @@ module Chingu
           @fading_in = true 
           @alpha = 255.0
         end
-        # @new_game_state.update      # Make sure states game logic is run Once (for a correct draw())
+        
         update                        # Since draw is called before update
       end
     
@@ -77,7 +75,6 @@ module Chingu
           if @fading_in
             @new_game_state.draw
           else
-            ## @manager.previous_game_state.draw
             previous_game_state.draw
           end
       
@@ -88,7 +85,6 @@ module Chingu
         end
         
         if @fading_in && @alpha == 0
-          ##@manager.switch_game_state(@new_game_state, :transitional => false)
           switch_game_state(@new_game_state, :transitional => false)
         end
                             

data/lib/chingu/text.rb

@@ -51,7 +51,7 @@ module Chingu
     #
     # Takes the standard GameObject-hash-arguments but also:
     #   :text               - a string of text
-    #   :font_name|:font    - Name of a system font, or a filename to a TTF file (must contain �/�, does not work on Linux). 
+    #   :font_name|:font    - Name of a system font, or a filename to a TTF file (must contain ? does not work on Linux). 
     #   :height|:size       - Height of the font in pixels. 
     #   :line_spacing	      - Spacing between two lines of text in pixels. 
     #   :max_width	        - Width of the bitmap that will be returned. Text will be split into multiple lines to avoid drawing over the right border. When a single word is too long, it will be truncated.

data/lib/chingu/traits/bounding_circle.rb

@@ -47,11 +47,8 @@ module Chingu
       end
       
       def radius
-        return @cached_radius if @cached_radius
-        
-        width = self.image.width * self.factor_x.abs
-        height = self.image.height * self.factor_y.abs
-        radius = (width + height) / 4
+        return @cached_radius if @cached_radius        
+        radius = (self.width + self.height) / 4
         radius = radius * trait_options[:bounding_circle][:scale] if  trait_options[:bounding_circle][:scale]
         return radius
       end
@@ -61,7 +58,6 @@ module Chingu
       end
       
       def cache_bounding_circle
-        @cached_radius = nil
         @cached_radius = self.radius
       end
       

data/lib/chingu/traits/collision_detection.rb

@@ -111,7 +111,7 @@ module Chingu
       #
       def each_collision(*klasses)
         Array(klasses).each do |klass|
-          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
+          (klass.respond_to?(:all) ? klass.all : Array(klass)).each do |object|
             yield(self, object)   if collides?(object)
           end
         end
@@ -119,7 +119,7 @@ module Chingu
 
       def first_collision(*klasses)
         Array(klasses).each do |klass|
-          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
+          (klass.respond_to?(:all) ? klass.all : Array(klass)).each do |object|
             return object   if collides?(object)
           end
         end
@@ -132,7 +132,7 @@ module Chingu
       #
       def each_bounding_circle_collision(*klasses)
         Array(klasses).each do |klass|
-          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
+          (klass.respond_to?(:all) ? klass.all : Array(klass)).each do |object|
             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
@@ -145,7 +145,7 @@ module Chingu
       #
       def each_bounding_box_collision(*klasses)
         Array(klasses).each do |klass|
-          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
+          (klass.respond_to?(:all) ? klass.all : Array(klass)).each do |object|
             return false  unless self.collidable && object.collidable
             yield(self, object) if self.bounding_box.collide_rect?(object.bounding_box)
           end
@@ -159,7 +159,7 @@ module Chingu
         #
         def each_bounding_circle_collision(*klasses)
           Array(klasses).each do |klass|
-            object2_list = (klass.respond_to?(:all) ? klass.all : klass)
+            object2_list = (klass.respond_to?(:all) ? klass.all : Array(klass))
             #total_radius = object1.radius + object2.radius  # possible optimization?
             
             self.all.each do |object1|
@@ -177,7 +177,7 @@ module Chingu
         #
         def each_bounding_box_collision(*klasses)
           Array(klasses).each do |klass|
-            object2_list = (klass.respond_to?(:all) ? klass.all : klass)
+            object2_list = (klass.respond_to?(:all) ? klass.all : Array(klass))
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves
@@ -233,7 +233,7 @@ module Chingu
             #    end
             #  end
             #end
-            object2_list = (klass.respond_to?(:all) ? klass.all : klass)
+            object2_list = (klass.respond_to?(:all) ? klass.all : Array(klass))
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves

data/lib/chingu/traits/velocity.rb

@@ -58,8 +58,9 @@ module Chingu
       #
       # Sets X and Y velocity with one single call. Takes an Array-argument with 2 values.
       #
-      def velocity=(velocity)
-        @velocity_x, @velocity_y = velocity
+      def velocity=(value)
+        @velocity_x, @velocity_y = value && return    if value.is_a? Array
+        @velocity_x, @velocity_y = value, value
       end
 			
       def velocity; [@velocity_x, @velocity_y]; end
@@ -67,8 +68,9 @@ module Chingu
       #
       # Sets X and Y acceleration with one single call. Takes an Array-argument with 2 values.
       #
-      def acceleration=(acceleration)
-        @acceleration_x, @acceleration_y = acceleration
+      def acceleration=(value)
+        @acceleration_x, @acceleration_y = value && return    if value.is_a? Array
+        @acceleration_x, @acceleration_y = value, value
       end
 	
       def acceleration; [@acceleration_x, @acceleration_y]; end
@@ -76,8 +78,9 @@ module Chingu
       #
       # Sets X and Y acceleration with one single call. Takes an Array-argument with 2 values.
       #
-      def max_velocity=(max_velocity)
-        @max_velocity_x, @max_velocity_y = max_velocity
+      def max_velocity=(value)
+        @max_velocity_x, @max_velocity_y = value && return    if value.is_a? Array
+        @max_velocity_x, @max_velocity_y = value, value
       end
 	
       def max_velocity; [@max_velocity_x, @max_velocity_y]; end

data/spec/chingu/fpscounter_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Chingu
+
+  describe FPSCounter do
+
+    it { should respond_to(:fps) }
+    it { should respond_to(:milliseconds_since_last_tick) }
+    it { should respond_to(:ticks) }
+
+    describe "#register_tick" do
+      before do
+        Gosu.stub(:milliseconds).and_return(1000)
+        subject { FPSCounter.new }
+      end
+
+      it "increases the tick counter" do
+        expect {
+          subject.register_tick
+        }.to change(subject, :ticks).from(0).to(1)
+      end
+
+      it "keeps track of the fps" do
+        expect {
+          subject.register_tick
+          Gosu.stub(:milliseconds).and_return(1500)
+          subject.register_tick
+          Gosu.stub(:milliseconds).and_return(2000)
+          subject.register_tick
+        }.to change(subject, :fps).from(0).to(3) # #register_tick has been called 3 times within 1 second = 3 FPS
+      end
+
+      it "calculates how many milliseconds passed since last game loop iteration and returns that value" do
+        Gosu.stub(:milliseconds).and_return(2000)
+        subject.register_tick.should equal 1000
+        subject.milliseconds_since_last_tick.should eql(1000) 
+      end
+      
+    end
+
+  end
+
+end

data/spec/chingu/game_object_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+module Chingu
+
+  describe GameObject do
+    
+    before(:all) do 
+      @game = Chingu::Window.new
+    end
+
+    it { should respond_to(:x) }
+    it { should respond_to(:y) }
+    it { should respond_to(:angle) }
+    it { should respond_to(:center_x) }
+    it { should respond_to(:center_y) }
+    it { should respond_to(:factor_x) }
+    it { should respond_to(:factor_y) }
+    it { should respond_to(:zorder) }
+    it { should respond_to(:mode) }
+    it { should respond_to(:color) }
+
+    describe "a newly created GameObject" do
+      before do
+        subject { GameObject.new }
+      end
+      
+      it "should have default values" do
+        subject.angle.should == 0
+        subject.x.should == 0
+        subject.y.should == 0
+        subject.factor_x.should == 1
+        subject.factor_y.should == 1
+        subject.center_x.should == 0.5
+        subject.center_y.should == 0.5
+        subject.mode.should == :default
+        subject.image.should == nil        
+        subject.color.to_s.should == Gosu::Color::WHITE.to_s
+        subject.alpha.should == 255
+      end
+      
+      it "should wrap angle at 360" do
+        subject.angle.should == 0
+        subject.angle += 30
+        subject.angle.should == 30
+        subject.angle += 360
+        subject.angle.should == 30
+      end
+
+      it "shouldn't allow alpha below 0" do
+        subject.alpha = -10
+        subject.alpha.should == 0
+      end
+
+      it "shouldn't allow alpha above 255" do
+        subject.alpha = 1000
+        subject.alpha.should == 255
+      end
+      
+    end
+
+    describe "GameObject with an image" do
+      before do
+        p Image.autoload_dirs
+        subject { GameObject.new(:image => "rect_20x20.png") }
+      end
+      
+      it "should have width,height & size" do
+        subject.height.should == 20
+        subject.width.should == 20
+        subject.size.should == [20,20]
+      end
+      
+      it "should adapt width,height & size to scaling" do
+        subject.factor = 2
+        subject.height.should == 40
+        subject.width.should == 40
+        subject.size.should == [40,40]
+      end
+
+      it "should adapt factor_x/factor_y to new size" do
+        subject.size = [10,40]  # half the width, double the height
+        subject.height.should == 10
+        subject.width.should == 40
+        subject.factor_x.should == 0.5
+        subject.factor_y.should == 2
+      end
+      
+    end
+
+    after(:all) do
+      $window.close
+    end
+    
+  end
+
+end