gosu_extensions 0.1.24 → 0.1.25

data/VERSION

@@ -1 +1 @@
-0.1.24
+0.1.25

data/lib/core/wave.rb

@@ -4,11 +4,23 @@ class Wave
   
   attr_reader :generated_type, :execution_amount, :positioning_function
   
-  UniformRandom = lambda { |window, instance| instance.warp_to *window.uniform_random_position }
-  TopBorder     = lambda { |window, instance| instance.warp_to rand(window.width), 0 }
-  RightBorder   = lambda { |window, instance| instance.warp_to window.width, rand(window.height) }
-  BottomBorder  = lambda { |window, instance| instance.warp_to rand(window.width), window.height }
-  LeftBorder    = lambda { |window, instance| instance.warp_to 0, rand(window.height) }
+  class << self
+    def uniform_random
+      lambda { |window, instance| instance.warp_to *window.uniform_random_position }
+    end
+    def top_border offset = 0
+      lambda { |window, instance| instance.warp_to rand(window.width), -offset }
+    end
+    def right_border offset = 0
+      lambda { |window, instance| instance.warp_to window.width+offset, rand(window.height) }
+    end
+    def bottom_border offset = 0
+      lambda { |window, instance| instance.warp_to rand(window.width), window.height+offset }
+    end
+    def left_border offset = 0
+      lambda { |window, instance| instance.warp_to -offset, rand(window.height) }
+    end
+  end
   
   #
   #
@@ -17,7 +29,7 @@ class Wave
   def initialize generated_type, execution_amount = 1, &positioning_function
     @generated_type      = generated_type
     @execution_amount    = execution_amount
-    @positioning_function = positioning_function || UniformRandom
+    @positioning_function = positioning_function || Wave.uniform_random
   end
   
   #

data/lib/traits/attachable.rb

@@ -5,7 +5,7 @@ module Attachable extend Trait
   attr_accessor :relative_position
   
   def move_relative pod
-    self.position = pod.position + relative_position # pod.rotation
+    self.position = pod.relative_position self
     self.rotation = pod.rotation
   end
   

data/lib/traits/pod.rb

@@ -15,25 +15,17 @@ module Pod extend Trait
   MANUAL
   
   def self.included target_class
-    target_class.extend IncludeMethods
+    target_class.extend ClassMethods
     target_class.holds_attachments
+    target_class.send :include, InstanceMethods
   end
   
-  # TODO is_a Rack
   #
-  # TODO Maybe
-  #      is_a Rack.
-  #           with(Cannon, 10, 10).
-  #           with(Cannon, 20, 10)
   #
-  module IncludeMethods
+  module ClassMethods
     
     def holds_attachments
-      include InstanceMethods
-      alias_method_chain :move, :attachments
-      
       class_inheritable_accessor :prototype_attachments
-      extend ClassMethods
       hook = lambda do
         self.class.prototype_attachments.each do |type, x, y|
           attach type.new(self.window), x, y
@@ -42,10 +34,6 @@ module Pod extend Trait
       InitializerHooks.append self, &hook
     end
     
-  end
-  
-  module ClassMethods
-    
     # Example:
     # class MotherShip
     #   is_a Pod
@@ -62,17 +50,26 @@ module Pod extend Trait
   
   module InstanceMethods
     
-    attr_accessor :attachments
+    def materialize attachment
+      attachment.extend Attachable # This is where Ruby shines.
+      window.register attachment
+    end
+    
+    #
+    #
+    def attachments
+      @attachments || @attachments = []
+    end
     
     #
     #
     def attach attachment, x, y
-      self.attachments ||= []
-      attachment.extend Attachable # This is where Ruby shines.
-      window.register attachment
-      # attachment.rotation = self.rotation
+      # TODO Move to better place.
+      self.class.alias_method_chain :move, :attachments unless respond_to?(:move_without_attachments)
+      #
+      materialize attachment
       attachment.relative_position = CP::Vec2.new x, y
-      self.attachments << attachment
+      attachments << attachment
     end
     
     #
@@ -89,12 +86,19 @@ module Pod extend Trait
       end
     end
     
+    #
+    #
+    def relative_position attachment
+      self.position + attachment.relative_position.rotate(self.rotation_vector)
+    end
+    
     #
     #
     def move_with_attachments
       move_attachments
       move_without_attachments
     end
+    # alias_method_chain :move, :attachments
     
   end
   

data/spec/lib/traits/attachable_spec.rb

@@ -8,11 +8,12 @@ describe Attachable do
   
   describe "move_relative" do
     before(:each) do
-      @attachable.stub! :relative_position => "+ attachable position", :position= => nil, :rotation= => nil
-      @pod = stub :pod, :position => "pod position ", :rotation => :some_rotation
+      @attachable.stub! :position= => nil, :rotation= => nil
+      
+      @pod = stub :pod, :relative_position => :relative_position, :rotation => :some_rotation
     end
     it "should set the position to the pod's position plus the relative position" do
-      @attachable.should_receive(:position=).once.with "pod position + attachable position"
+      @attachable.should_receive(:position=).once.with :relative_position
       
       @attachable.move_relative @pod
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 24
-  version: 0.1.24
+  - 25
+  version: 0.1.25
 platform: ruby
 authors: 
 - Florian Hanke