gosu_extensions 0.1.28 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.28
+0.2.0

data/lib/core/environment.rb

@@ -0,0 +1,10 @@
+class Environment < CP::Space
+  
+  # Remove body and shape from self.
+  #
+  def remove shape
+    self.remove_body shape.body
+    self.remove_shape shape
+  end
+  
+end

data/lib/core/game_window.rb

@@ -199,7 +199,7 @@ class GameWindow < Gosu::Window
     @font = Gosu::Font.new self, self.font_name, self.font_size
   end
   def setup_environment
-    @environment = CP::Space.new
+    @environment = Environment.new
     class << @environment
       attr_accessor :window
     end

data/lib/core/remove_shapes.rb

@@ -2,6 +2,9 @@
 #
 class RemoveShapes
   
+  attr_reader :shapes
+  delegate :clear, :empty?, :to => :@shapes
+  
   def initialize
     @shapes = []
   end
@@ -9,7 +12,7 @@ class RemoveShapes
   #
   #
   def add shape
-    @shapes << shape
+    shapes << shape
   end
   
   #
@@ -23,13 +26,12 @@ class RemoveShapes
     # We would probably solve this by creating a separate @remove_bodies array to remove the Bodies
     # of the Stars that were gathered by the Player
     #
-    return if @shapes.empty?
-    @shapes.each do |shape|
-      environment.remove_body shape.body
-      environment.remove_shape shape
-      moveables.remove shape
+    return if empty?
+    shapes.each do |shape|
+      environment.remove shape
+      moveables.remove shape # TODO Should the environment be the owner of the moveables? Probably, yes.
     end
-    @shapes.clear
+    clear
   end
   
 end

data/lib/gosu_extensions.rb

@@ -33,6 +33,7 @@ require 'remove_shapes'
 require 'wave'
 require 'waves'
 require 'scheduling'
+require 'environment'
 require 'game_window'
 require 'control'
 require 'controls'

data/lib/units/thing.rb

@@ -31,29 +31,45 @@ class Thing
     @layer || Layer::Players
   end
   
+  def mass
+    0.1
+  end
+  def moment
+    0.1
+  end
+  
   class << self
-    @@form_shape_class_mapping = { :circle => CP::Shape::Circle }
-    def shape form
+    @@form_shape_class_mapping = {
+      :circle  => CP::Shape::Circle, # :circle, radius
+      :poly    => CP::Shape::Poly,   # :poly, CP::Vec2.new(-22, -18), CP::Vec2.new(-22, -10), etc.
+      :segment => CP::Shape::Segment # :segment, ...
+      # TODO :image => # Special, just traces the extent of the image.
+    }
+    def shape form, *args
       form_shape_class_mapping = @@form_shape_class_mapping
+      define_method :radius do
+        args.first # TODO fix!
+      end
       InitializerHooks.append self do
         shape_class = form_shape_class_mapping[form]
         raise "Shape #{form} does not exist." unless shape_class
-        @shape = shape_class.new(CP::Body.new(self.mass, self.moment), self.radius, CP::Vec2.new(0.0, 0.0))
+        
+        params = []
+        params << CP::Body.new(self.mass, self.moment)
+        params += args
+        params << CP::Vec2.new(0.0, 0.0)
+        
+        @shape = shape_class.new *params
       end
     end
     def mass amount
       define_method :mass do
-        amount || 1.0
+        amount
       end
     end
     def moment amount
       define_method :moment do
-        amount || 1.0
-      end
-    end
-    def radius amount
-      define_method :radius do
-        amount || 10.0
+        amount
       end
     end
     

data/spec/lib/core/remove_shapes_spec.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe RemoveShapes do
+  
+  before(:each) do
+    @remove_shapes = RemoveShapes.new
+  end
+  
+  it "should have no shapes, unprimed" do
+    @remove_shapes.empty?.should == true
+  end
+  
+  describe "add" do
+    before(:each) do
+      @shapes = stub :shapes
+      @remove_shapes.stub! :shapes => @shapes
+    end
+    it "should << the shape to the shapes" do
+      @shapes.should_receive(:<<).once.with :some_shape
+      
+      @remove_shapes.add :some_shape
+    end
+  end
+  
+  describe "remove_from" do
+    context 'without shapes' do
+      before(:each) do
+        @remove_shapes.stub! :empty? => true
+      end
+      it "should just return" do
+        @remove_shapes.should_receive(:shapes).never
+        
+        @remove_shapes.remove_from stub, stub
+      end
+    end
+    context 'with shapes' do
+      before(:each) do
+        @shape = stub :shape
+        @remove_shapes.stub! :empty? => false, :shapes => [@shape]
+      end
+      it "should remove the shapes from the environment and the moveables" do
+        environment = stub :environment
+        moveables   = stub :moveables
+        
+        environment.should_receive(:remove).once.with @shape
+        moveables.should_receive(:remove).once.with @shape
+        
+        @remove_shapes.remove_from environment, moveables
+      end
+    end
+  end
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 28
-  version: 0.1.28
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +02:00
+date: 2010-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - generator/gogogosu.rb
 - lib/core/control.rb
 - lib/core/controls.rb
+- lib/core/environment.rb
 - lib/core/game_window.rb
 - lib/core/initializer_hooks.rb
 - lib/core/it_is_a.rb
@@ -126,6 +127,7 @@ test_files:
 - spec/lib/core/it_is_a_spec.rb
 - spec/lib/core/layer_spec.rb
 - spec/lib/core/moveables_spec.rb
+- spec/lib/core/remove_shapes_spec.rb
 - spec/lib/core/trait_spec.rb
 - spec/lib/core/traits_spec.rb
 - spec/lib/extensions/module_spec.rb