chingu 0.8.0.5 → 0.8.1

data/lib/chingu/traits/sprite.rb

@@ -28,7 +28,6 @@ module Chingu
     #  :x, :y, :angle, :factor_x, :factor_y, :center_x, :center_y, :zorder, :mode, :visible
     #
     module Sprite
-      include Chingu::Helpers::OptionsSetter
       include Chingu::Helpers::RotationCenter    # Adds easy and verbose modification of @center_x and @center_y
       
       module ClassMethods
@@ -37,21 +36,31 @@ module Chingu
         end
       end
       
-      attr_accessor :x, :y, :angle, :factor_x, :factor_y, :center_x, :center_y, :zorder, :mode, :visible, :color
+      attr_accessor :x, :y, :angle, :factor_x, :factor_y, :center_x, :center_y, :zorder, :mode, :color
       attr_reader :factor, :center, :height, :width, :image     
+      attr_accessor :visible # kill this? force use of setter      
 
       def setup_trait(object_options = {})        
-        # default settings for all variables unless set in constructor
-        defaults = {
-          :x => 0, :y => 0, :angle => 0, :factor => ($window.factor||1.0),
-          :zorder => 100, :center_x => 0.5, :center_y => 0.5,
-          :mode => :default, :color => nil, :visible => true
-        }
+        @visible = true   unless options[:visible] == false
+        self.image =  options[:image]  if options[:image]
+        self.color =  options[:color] || ::Gosu::Color::WHITE.dup
+        self.alpha =  options[:alpha]  if options[:alpha]
+        self.mode =   options[:mode] || :default
+        self.x =      options[:x] || 0
+        self.y =      options[:y] || 0
+        self.zorder = options[:zorder] || 100
+        self.angle =  options[:angle] || 0
         
-        # if user specs :image take care of it first since width, height etc depends on it.
-        self.image = object_options.delete(:image)  if object_options[:image]
+        self.factor = options[:factor] || options[:scale] || $window.factor || 1.0
+        self.factor_x = options[:factor_x].to_f if options[:factor_x]
+        self.factor_y = options[:factor_y].to_f if options[:factor_y]
+        self.rotation_center = options[:rotation_center] || :center_center
         
-        set_options(trait_options[:sprite].merge(object_options), defaults)
+        if self.image
+          self.width  = options[:width]   if options[:width]
+          self.height = options[:height]  if options[:height]
+          self.size   = options[:size]    if options[:size]
+        end
         
         super
       end
@@ -196,6 +205,7 @@ module Chingu
       # Disable automatic calling of draw and draw_trait each game loop
       #
       def hide!
+        @parent.game_objects.hide_game_object(self)  if @parent && @visible == true
         @visible = false
       end
     
@@ -203,6 +213,7 @@ module Chingu
       # Enable automatic calling of draw and draw_trait each game loop
       #
       def show!
+        @parent.game_objects.show_game_object(self)  if @parent && @visible == false
         @visible = true
       end
     

data/spec/chingu/basic_game_object_spec.rb

@@ -3,6 +3,9 @@ require 'spec_helper'
 class MyBasicGameObject < Chingu::BasicGameObject
 end
 
+class MyBasicGameObject2 < Chingu::BasicGameObject
+end
+
 class MyBasicGameObjectWithSetup < Chingu::BasicGameObject
   def setup
     @paused = true
@@ -28,10 +31,11 @@ module Chingu
     it { should respond_to(:draw_trait) }
     it { should respond_to(:filename) }
 
-    context "A class inherited from BasicGameObject" do
+    context "A class inherited from BasicGameObject using classmethod create" do
+      
       it "should be automatically stored in $window.game_objects" do
+        MyBasicGameObject.instances = []
         3.times { go = MyBasicGameObject.create }
-        $window.update
         $window.game_objects.size.should == 3
       end
       
@@ -41,34 +45,47 @@ module Chingu
       end
       
       it "should keep track of its instances in class#all" do
+        MyBasicGameObject.instances = []
         3.times { MyBasicGameObject.create }
         #
         # Can/should we remove the dependency on #update here before the created objects gets saved?
         # We mostly protect against adding to the object array while iterating over it
         #
-        $window.update
         MyBasicGameObject.all.size.should == 3
         MyBasicGameObject.size.should == 3
       end
       
       it "should be removed from game_objects list when destroy() is called" do
+        MyBasicGameObject.instances = []
         go = MyBasicGameObject.create
-        $window.update
         $window.game_objects.size.should == 1
         go.destroy
-        $window.update
         $window.game_objects.size.should == 0
       end
 
-      it "should have all instances removed with classmethod #destroy_all()" do
+      it "should have all internal list cleared with classmethod destroy_all()" do
+        MyBasicGameObject.instances = []
         3.times { MyBasicGameObject.create }
-        $window.update
         MyBasicGameObject.destroy_all
-        $window.update
-        $window.game_objects.size.should == 0
+        MyBasicGameObject.size.should == 0
       end
 
+      it "should have all instances removed from parent-list with classmethod destroy_all()" do
+        MyBasicGameObject.instances = []
+        3.times { MyBasicGameObject.create }
+        MyBasicGameObject.destroy_all
+        $window.game_objects.size.should == 0
+      end
+    end
+    
+    context "A class inherited from BasicGameObject" do
+      it "should return empty array on classmethod all() if no objects have been created" do
+        # Only place MyBasicGameObject2 is used
+        MyBasicGameObject2.all.should == []
+      end
+        
       it "should take hash-argument, parse it and save in options" do
+        MyBasicGameObject.instances = []
         game_object = MyBasicGameObject.new(:paused => false, :foo => :bar)
         game_object.paused?.should == false
         game_object.options.should == {:paused => false, :foo => :bar}
@@ -96,8 +113,7 @@ module Chingu
 
     end
     
-    context "when created with defaults in Chingu::Window" do
-      
+    context "when created with defaults in Chingu::Window" do      
       it "should belong to main window it not created inside a game state" do
         subject.parent.should == @game
       end      

data/spec/chingu/console_spec.rb

@@ -6,7 +6,11 @@ module Chingu
     before :each do
       @console = Chingu::Console.new
     end
-    
+
+    after :each do
+      $window = nil
+    end
+
     it { @console.should respond_to :start }
     it { @console.should respond_to :fps }
     it { @console.should respond_to :update }

data/spec/chingu/game_object_list_spec.rb

@@ -4,7 +4,7 @@ module Chingu
 
   describe GameObjectList do
     before :each do
-      @game = Chingu::Window.new      
+      @game = Chingu::Window.new
     end
     
     after :each do
@@ -45,6 +45,24 @@ module Chingu
         @game.game_objects.update
       end
 
+      it "should keep track of unpaused game objects" do
+        go = GameObject.create
+        go.should_receive(:update)
+        @game.game_objects.update
+        go.pause
+        go.should_not_receive(:update)
+        @game.game_objects.update
+      end
+
+      it "should keep track of visible game objects" do
+        go = GameObject.create
+        go.should_receive(:draw)
+        @game.game_objects.draw
+        go.hide!
+        go.should_not_receive(:draw)
+        @game.game_objects.draw
+      end
+
       it "should call draw() on all visible game objects" do
         GameObject.create.should_receive(:draw)
         GameObject.create(:visible => false).should_not_receive(:draw)

data/spec/chingu/game_object_map_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+include Chingu
+
+
+# Creates 20x20 pixel sized objects 
+class MyGameObject < Chingu::GameObject
+  trait :bounding_box
+  def setup
+    @image = Gosu::Image["rect_20x20.png"]
+    self.rotation_center = :top_left
+  end  
+end
+
+# Creates 40x40 pixel sized objects 
+class MyBigGameObject < Chingu::GameObject
+  trait :bounding_box
+  def setup
+    @image = Gosu::Image["rect_20x20.png"]
+    self.rotation_center = :top_left
+    self.size = [40,40]
+  end
+end
+
+module Chingu
+
+  describe "GameObjectMap with grid [20,20]" do
+    before :each do
+      @game = Chingu::Window.new
+      
+      # Gosu uses the paths based on where rspec is, not where this file is, so we need to do it manually!
+      Gosu::Image::autoload_dirs.unshift File.join(File.dirname(File.expand_path(__FILE__)), 'images')
+      
+      MyGameObject.destroy_all
+      MyBigGameObject.destroy_all
+      @game_object = MyGameObject.create
+      @big_game_object = MyBigGameObject.create
+    end
+
+    after :each do
+      @game.close
+    end
+    
+    context "setup of test should consist of" do
+      it "should contain 1 MyGameObject" do
+        MyGameObject.size.should == 1
+      end
+      it "should contain 1 MyBigGameObject" do
+        MyBigGameObject.size.should == 1
+      end
+      
+    end
+
+    context "containing a game object size 20x20 postion 0,0" do
+      before :each do
+        @game_object_map = GameObjectMap.new(:game_objects => MyGameObject.all, :grid => [20,20])
+      end
+      
+      it "should be found at 0,0" do
+        @game_object_map.at(0,0).should == @game_object
+      end
+
+      it "should be found at 10,10" do
+        @game_object_map.at(10,10).should == @game_object
+      end
+
+      it "should be found at 20,20" do
+        @game_object_map.at(20,20).should == nil
+      end
+      
+      it "should Not be found at 21,21" do
+        @game_object_map.at(21,21).should == nil
+      end
+    end
+
+    context "containing a game object size 40x40 postion 0,0" do
+      before :each do
+        @game_object_map = GameObjectMap.new(:game_objects => MyBigGameObject.all, :grid => [20,20])
+      end
+      
+      it "should be found at 0,0" do
+        @game_object_map.at(0,0).should == @big_game_object
+      end
+      it "should be found at 20,20" do
+        @game_object_map.at(20,20).should == @big_game_object
+      end
+      it "should be found at 39,39" do
+        @game_object_map.at(39,39).should == @big_game_object
+      end
+
+      it "should Not be found at 40,40" do
+        @game_object_map.at(40,40).should == nil
+      end
+
+    end
+  end
+end

data/spec/chingu/game_object_spec.rb

@@ -171,6 +171,7 @@ module Chingu
     
     context "class methods" do
       it "should go through all instances of class on #each" do
+        GameObject.destroy_all
         go1 = GameObject.create
         go2 = GameObject.create
         
@@ -183,6 +184,7 @@ module Chingu
       end
 
       it "should go through all instances of class on #each_with_index" do
+        GameObject.destroy_all
         go1 = GameObject.create
         go2 = GameObject.create
         

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  - 5
-  version: 0.8.0.5
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - ippa
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +01:00
+date: 2011-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,15 +115,20 @@ files:
 - README.rdoc
 - Rakefile
 - benchmarks/README.txt
+- benchmarks/array_vs_hash.rb
 - benchmarks/arrays_bench.rb
 - benchmarks/benchmark.rb
 - benchmarks/benchmark3.rb
 - benchmarks/benchmark4.rb
 - benchmarks/benchmark5.rb
 - benchmarks/benchmark6.rb
+- benchmarks/game_object_list_benchmark.rb
 - benchmarks/game_objects_benchmark.rb
+- benchmarks/lookup_benchmark.rb
 - benchmarks/meta_benchmark.rb
 - benchmarks/meta_benchmark2.rb
+- benchmarks/trait_benchmark.rb
+- benchmarks/window_benchmark.rb
 - chingu.gemspec
 - examples/example10_traits_retrofy.rb
 - examples/example11_animation.rb
@@ -248,6 +252,7 @@ files:
 - lib/chingu/traits/collision_detection.rb
 - lib/chingu/traits/effect.rb
 - lib/chingu/traits/retrofy.rb
+- lib/chingu/traits/simple_sprite.rb
 - lib/chingu/traits/sprite.rb
 - lib/chingu/traits/timer.rb
 - lib/chingu/traits/velocity.rb
@@ -260,6 +265,7 @@ files:
 - spec/chingu/console_spec.rb
 - spec/chingu/fpscounter_spec.rb
 - spec/chingu/game_object_list_spec.rb
+- spec/chingu/game_object_map_spec.rb
 - spec/chingu/game_object_spec.rb
 - spec/chingu/game_state_manager_spec.rb
 - spec/chingu/helpers/input_client_spec.rb
@@ -343,6 +349,7 @@ test_files:
 - spec/chingu/console_spec.rb
 - spec/chingu/fpscounter_spec.rb
 - spec/chingu/game_object_list_spec.rb
+- spec/chingu/game_object_map_spec.rb
 - spec/chingu/game_object_spec.rb
 - spec/chingu/game_state_manager_spec.rb
 - spec/chingu/helpers/input_client_spec.rb