gosu_extensions 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/traits/attachable.rb

@@ -4,7 +4,7 @@ module Attachable extend Trait
   
   Detach = :detach
   
-  attr_accessor :relative_position, :pod
+  attr_accessor :relative_position, :relative_rotation, :pod
   
   def detach
     pod.detach self
@@ -13,12 +13,18 @@ module Attachable extend Trait
   # Callback after detachment.
   #
   def detached; end
+  #
+  # after attachment
+  #
+  def attached
+    self.relative_rotation = pod.rotation + self.rotation
+  end
   
   # Move relative to the pod.
   #
   def move_relative
     self.position = pod.relative_position self
-    self.rotation = pod.rotation unless self.kind_of? Turnable
+    self.rotation = pod.relative_rotation self unless self.kind_of? Turnable
   end
   
 end

data/lib/traits/pod.rb

@@ -75,6 +75,7 @@ module Pod extend Trait
       attachment.extend Attachable # This is where Ruby shines.
       attachment.pod = self
       attachment.show
+      attachment.attached
     end
     
     #
@@ -96,6 +97,11 @@ module Pod extend Trait
     def relative_position attachment
       self.position + attachment.relative_position.rotate(self.rotation_vector)
     end
+    #
+    #
+    def relative_rotation attachment
+      self.rotation + attachment.relative_rotation
+    end
     
     #
     #

data/lib/traits/shooter.rb

@@ -14,8 +14,12 @@ module Shooter extend Trait
     end
   end
   module Velocity
-    def self.front initial_speed
-      lambda { |_| self.rotation_vector*initial_speed }
+    def self.front initial_speed, random = nil
+      if random
+        lambda { |_| (self.rotation_vector + CP::Vec2.new(rand*random, rand*random))*initial_speed }
+      else
+        lambda { |_| self.rotation_vector*initial_speed }
+      end
     end
   end
   module Rotation
@@ -129,7 +133,7 @@ module Shooter extend Trait
     sometimes :loading, self.shooting_rate do
       projectile = self.shot.shoot_from self
       projectile.rotation = self.muzzle_rotation
-      # projectile.velocity = self.muzzle_rotation.normalize
+      # projectile.velocity = self.muzzle_rotation.radians_to_vec2.normalize
       projectile.speed = self.muzzle_velocity * projectile.velocity + self.speed
     end
   end

data/spec/lib/traits/attachable_spec.rb

@@ -4,7 +4,7 @@ describe Attachable do
   
   before(:each) do
     @window = stub :window, :things => []
-    @pod = stub :pod, :relative_position => :relative_position, :rotation => :some_rotation
+    @pod = stub :pod, :relative_position => :relative_position, :relative_rotation => :relative_rotation, :rotation => :some_rotation
     @attachable = test_class_with(Attachable).new @window
     @attachable.pod = @pod
   end
@@ -19,7 +19,7 @@ describe Attachable do
       @attachable.move_relative
     end
     it "should set the rotation to the pod's rotation" do
-      @attachable.should_receive(:rotation=).once.with :some_rotation
+      @attachable.should_receive(:rotation=).once.with :relative_rotation
       
       @attachable.move_relative
     end

data/spec/lib/traits/pod_spec.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe Pod do
+
+  # describe "instance" do
+  #   before(:each) do
+  #     @things = stub :things, :null_object => true
+  #     @window = stub :window, :things => @things
+  #     @pod = test_class_with(Pod).new @window
+  #   end
+  #   describe "attach" do
+  #     before(:each) do
+  #       @attachable = Class.new(Thing) do
+  #         shape :circle, 8
+  #       end.new @window
+  #     end
+  #     it "should not fail" do
+  #       lambda { @pod.attach(@attachable, 10, 20) }.should_not raise_error
+  #     end
+  #   end
+  # end
+  
+  # describe "class traits" do
+  #   before(:each) do
+  #     @window = stub :window, :things => []
+  #   end
+  #   describe "attach" do
+  #     before(:each) do
+  #       klass = Class.new(Thing) do
+  #         shape :circle, 10
+  #       end
+  #       @pod = test_class_with(Pod) do
+  #         attach klass, 10, 10
+  #       end.new @window
+  #     end
+  #     it "should have one attachment" do
+  #       @pod.attachments.should == []
+  #     end
+  #   end
+  # end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Florian Hanke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,6 +148,7 @@ test_files:
 - spec/lib/traits/controllable_spec.rb
 - spec/lib/traits/damaging_spec.rb
 - spec/lib/traits/imageable_spec.rb
+- spec/lib/traits/pod_spec.rb
 - spec/lib/traits/shooter_spec.rb
 - spec/lib/traits/short_lived_spec.rb
 - spec/lib/traits/shot_spec.rb