gosu_extensions 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/traits/moveable.rb

@@ -12,143 +12,26 @@ module Moveable extend Trait
   Backwards  = :backwards;  def self.backwards  strength = 1.0; [Backwards,  strength] end
   # TODO Jump       = :jump
   
-  def self.included klass
-    klass.extend ClassMethods
-  end
-  
-  module ClassMethods
-    
-    # Initial setting.
-    #
-    def friction amount = nil, &block
-      to_execute = block_given? ? block : lambda { amount }
-      InitializerHooks.register self do
-        self.friction = to_execute[]
-      end
-    end
-    def velocity amount = nil, &block
-      to_execute = block_given? ? block : lambda { amount }
-      InitializerHooks.register self do
-        self.velocity = to_execute[]
-      end
-    end
-    def rotation amount = nil, &block
-      to_execute = block_given? ? block : lambda { amount }
-      InitializerHooks.register self do
-        self.rotation = to_execute[]
-      end
-    end
-    
-    def random_rotation
-      rotation { 2*Math::PI*rand }
-    end
-    
-  end
-  
-  # Directly set the position of our Moveable using a vector.
-  #
-  def warp vector
-    @shape.body.p = vector
-  end
-  
-  # Directly set the position of our Moveable.
-  #
-  def warp_to x, y
-    @shape.body.p = CP::Vec2.new(x, y)
-  end
-  
-  # Directly set the position of our Moveable.
-  #
-  def position= position
-    @shape.body.p = position
-  end
-  def position
-    @shape.body.p
-  end
-  
-  # Directly set the torque of our Moveable.
-  #
-  def torque= torque
-    @shape.body.t = torque
-  end
-  def torque
-    @shape.body.t
-  end
-  
-  # Directly set the speed of our Moveable.
-  #
-  def speed= v
-    @shape.body.v = v
-  end
-  def speed
-    @shape.body.v
-  end
-  def current_speed
-    speed.length
-  end
-  
-  # Directly set the rotation of our Moveable.
-  #
-  def rotation= rotation
-    @shape.body.a = rotation % (2*Math::PI)
-  end
-  def rotation
-    @shape.body.a
-  end
-  def drawing_rotation
-    self.rotation.radians_to_gosu
-  end
-  def rotation_vector
-    @shape.body.a.radians_to_vec2
-  end
-  
-  def friction= friction
-    @shape.u = friction
-  end
-  def friction
-    @shape.u
-  end
-  
-  # Length is the vector length you want.
-  #
-  # Note: radians_to_vec2
-  #
-  def rotation_as_vector length
-    rotation = -self.rotation + Math::PI / 2
-    x = Math.sin rotation
-    y = Math.cos rotation
-    total_length = Math.sqrt(x**2 + y**2)
-    multiplier = length / total_length
-    CP::Vec2.new(x * multiplier, y * multiplier)
-  end
-  
-  def move
-    
-  end
-  
-  # Methods for controls.
+  # Default methods for controls.
   #
   def accelerate strength = 1.0
     self.speed += self.rotation_vector * strength/SUBSTEPS
   end
   def move_left strength = 1.0
-    self.speed += CP::Vec2.new(-strength.to_f/SUBSTEPS, 0) 
+    self.speed += CP::Vec2.new(-strength.to_f/SUBSTEPS, 0)
   end
   def move_right strength = 1.0
-    self.speed += CP::Vec2.new(strength.to_f/SUBSTEPS, 0) 
+    self.speed += CP::Vec2.new(strength.to_f/SUBSTEPS, 0)
   end
   def move_up strength = 1.0
-    self.speed += CP::Vec2.new(0, -strength.to_f/SUBSTEPS) 
+    self.speed += CP::Vec2.new(0, -strength.to_f/SUBSTEPS)
   end
   def move_down strength = 1.0
-    self.speed += CP::Vec2.new(0, strength.to_f/SUBSTEPS) 
+    self.speed += CP::Vec2.new(0, strength.to_f/SUBSTEPS)
   end
   def backwards strength = 1.0
     accelerate -0.5*strength
   end
-  # def jump strength = 100
-  #   self.speed += CP::Vec2.new(0, -strength.to_f/SUBSTEPS) if self.current_speed <= 1
-  # end
   
   # Movement rules
   #

data/lib/traits/pod.rb

@@ -26,6 +26,7 @@ module Pod extend Trait
     
     def holds_attachments
       class_inheritable_accessor :prototype_attachments
+      self.prototype_attachments ||= []
       hook = lambda do
         self.class.prototype_attachments.each do |type, x, y|
           attach type.new(self.window), x, y
@@ -42,7 +43,6 @@ module Pod extend Trait
     #   attach Cannon, 30, 10
     #
     def attach type, x, y
-      self.prototype_attachments ||= []
       self.prototype_attachments << [type, x, y]
     end
     
@@ -50,18 +50,7 @@ module Pod extend Trait
   
   module InstanceMethods
     
-    def materialize attachment
-      attachment.extend Attachable # This is where Ruby shines.
-      window.register attachment
-    end
-    
-    #
-    #
-    def attachments
-      @attachments || @attachments = []
-    end
-    
-    #
+    # Attach an instance to this.
     #
     def attach attachment, x, y
       # TODO Move to better place.
@@ -72,12 +61,24 @@ module Pod extend Trait
       attachments << attachment
     end
     
-    #
+    # Detach an instance from this.
     #
     def detach attachment
       self.attachments.delete attachment if self.attachments
     end
     
+    
+    def materialize attachment
+      attachment.extend Attachable # This is where Ruby shines.
+      window.register attachment
+    end
+    
+    #
+    #
+    def attachments
+      @attachments || @attachments = [] # TODO use Attachments.new
+    end
+    
     #
     #
     def move_attachments

data/lib/units/sprite.rb

@@ -1,5 +1,164 @@
+# Sprite is the basic object in Gosu Extensions.
+#
+# It is different from Thing in that it has no body. It's just a bodyless, displayed sprite.
+#
 class Sprite
   
   include VectorUtilities
+  include Imageable
+  include InitializerHooks
+  include ItIsA
+  it_is   Moveable
+  
+  attr_reader :window
+  
+  # Every thing knows the window it is attached to.
+  #
+  def initialize window
+    @window = window
+    self.destroyed = false
+    after_initialize
+  end
+  
+  # Default layer is Layer::Players.
+  #
+  def layer
+    Layer::Players
+  end
+  # Default rotation is upwards.
+  #
+  def rotation
+    @rotation || -Math::PI/2
+  end
+  
+  class << self
+    
+    # Define a layer.
+    #
+    def layer layer
+      define_method :layer do
+        layer
+      end
+    end
+    
+    #
+    #
+    def rotation amount = nil, &block
+      # Override default.
+      #
+      to_execute = block_given? ? block : lambda { amount }
+      InitializerHooks.append self do
+        self.rotation = to_execute[]
+      end
+    end
+    def random_rotation
+      rotation { 2*Math::PI*rand }
+    end
+    
+    # Plays a random sound of the given sounds.
+    #
+    def plays paths, options = {}
+      paths = [*paths]
+      InitializerHooks.register self do
+        sound = Gosu::Sample.new self.window, File.join(Resources.root, paths[rand(paths.size)])
+        sound.play options[:volume] || 1.0
+      end
+    end
+    
+  end
+  
+  # Override this.
+  #
+  def move
+    
+  end
+  
+  # Do something threaded.
+  #
+  # Default is: Instantly, in the next step.
+  #
+  def threaded time = 1, &code
+    self.window.threaded time, &code
+  end
+  
+  # Some things you can only do every x time units.
+  # 
+  # Example:
+  #   sometimes :loading, self.frequency do
+  #     projectile = self.shot.shoot_from self
+  #     projectile.rotation = self.muzzle_rotation[target]
+  #     projectile.speed = self.muzzle_velocity[target] * projectile.velocity
+  #   end
+  #
+  def sometimes variable, units = 1, &block
+    name = :"@#{variable}"
+    return if instance_variable_get(name)
+    instance_variable_set name, true
+    result = block.call
+    threaded units.to_i do
+      self.instance_variable_set name, false
+    end
+    result
+  end
+  
+  #
+  #
+  def add_to environment
+    # A sprite is not added to the physical environment.
+  end
+  
+  # Destroy this thing.
+  #
+  attr_writer :destroyed
+  def destroyed?
+    @destroyed
+  end
+  def destroyed!
+    # Override
+  end
+  def destroy!
+    return if self.destroyed?
+    self.destroyed!
+    self.destroyed = true
+  end
+  
+  # Draws its image.
+  #
+  def draw
+    self.image.draw_rot self.position.x, self.position.y, self.layer, self.drawing_rotation, 0.5, 0.5, *self.current_size
+  end
+  def current_size
+    [1.0, 1.0] # default implementation - change this to [1.0, 2.0] if you want a "light" version ;)
+  end
+  
+  # Derived Position/Movement methods.
+  #
+  def warp vector
+    self.position = vector
+  end
+  # Directly set the position of our Moveable.
+  #
+  def warp_to x, y
+    warp CP::Vec2.new(x, y)
+  end
+  def drawing_rotation
+    self.rotation.radians_to_gosu
+  end
+  def rotation_vector
+    self.rotation.radians_to_vec2
+  end
+  def current_speed
+    speed.length
+  end
+  
+  # Movement and Position.
+  #
+  
+  #
+  #
+  attr_accessor :position, :speed
+  def rotation= rotation
+    @rotation = rotation % (2*Math::PI)
+  end
   
 end

data/lib/units/thing.rb

@@ -1,34 +1,8 @@
+# Thing is a physical version of a sprite. Collides and has a mass and a moment.
+#
 class Thing < Sprite
   
-  include InitializerHooks
-  include ItIsA
-  
-  # TODO Move these.
-  #
-  it_is Imageable
-  it_is Moveable
-  
-  attr_writer :layer
-  attr_reader :window, :shape
-  
-  # Every thing knows the window it is attached to.
-  #
-  def initialize window
-    @window = window
-    self.destroyed = false
-    after_initialize
-  end
-  
-  # Default layer is Layer::Players.
-  #
-  def self.layer layer
-    InitializerHooks.register self do
-      self.layer = layer
-    end
-  end
-  def layer
-    @layer || Layer::Players
-  end
+  attr_reader :shape
   
   def mass
     0.1
@@ -36,6 +10,9 @@ class Thing < Sprite
   def moment
     0.1
   end
+  def friction
+    100.0
+  end
   
   class << self
     @@form_shape_class_mapping = {
@@ -49,7 +26,7 @@ class Thing < Sprite
       define_method :radius do
         args.first # TODO fix!
       end
-      InitializerHooks.append self do
+      InitializerHooks.prepend self do
         shape_class = form_shape_class_mapping[form]
         raise "Shape #{form} does not exist." unless shape_class
         
@@ -71,6 +48,19 @@ class Thing < Sprite
         amount
       end
     end
+    def friction amount
+      define_method :friction do
+        amount
+      end
+    end
+    # TODO needed?
+    #
+    def velocity amount = nil, &block
+      to_execute = block_given? ? block : lambda { amount }
+      InitializerHooks.register self do
+        self.velocity = to_execute[]
+      end
+    end
     
     def collision_type type
       to_execute = lambda do |shape|
@@ -84,60 +74,12 @@ class Thing < Sprite
       end
     end
     
-    # Plays a random sound of the given sounds.
-    #
-    def plays paths, options = {}
-      paths = [*paths]
-      InitializerHooks.register self do
-        sound = Gosu::Sample.new self.window, File.join(Resources.root, paths[rand(paths.size)])
-        sound.play options[:volume] || 1.0
-      end
-    end
-    
   end
   
-  # Do something threaded.
+  # Unregister with the environment if destroyed.
   #
-  # Default is: Instantly, in the next step.
-  #
-  def threaded time = 1, &code
-    self.window.threaded time, &code
-  end
-  
-  # Destroy this thing.
-  #
-  attr_writer :destroyed
-  def destroyed?
-    @destroyed
-  end
-  def destroyed!
-    # Override
-  end
   def destroy!
-    return if self.destroyed?
-    self.destroyed!
-    self.window.unregister self
-    self.destroyed = true
-  end
-  
-  # Some things you can only do every x time units.
-  # 
-  # Example:
-  #   sometimes :loading, self.frequency do
-  #     projectile = self.shot.shoot_from self
-  #     projectile.rotation = self.muzzle_rotation[target]
-  #     projectile.speed = self.muzzle_velocity[target] * projectile.velocity
-  #   end
-  #
-  def sometimes variable, units = 1, &block
-    name = :"@#{variable}"
-    return if instance_variable_get(name)
-    instance_variable_set name, true
-    result = block.call
-    threaded units.to_i do
-      self.instance_variable_set name, false
-    end
-    result
+    self.window.unregister self if super
   end
   
   # Add this thing to an environment.
@@ -149,13 +91,48 @@ class Thing < Sprite
     environment.add_shape self.shape
   end
   
-  # Draws its image.
+  # Movement and Position
+  #
+  
+  #
+  #
+  def speed= v
+    @shape.body.v = v
+  end
+  def speed
+    @shape.body.v
+  end
+  #
+  #
+  def rotation= rotation
+    @shape.body.a = rotation % (2*Math::PI)
+  end
+  def rotation
+    @shape.body.a
+  end
+  #
+  #
+  def position= position
+    @shape.body.p = position
+  end
+  def position
+    @shape.body.p
+  end
+  #
+  #
+  def friction= friction
+    @shape.u = friction
+  end
+  def friction
+    @shape.u
+  end
+  # 
   #
-  def draw
-    self.image.draw_rot self.position.x, self.position.y, self.layer, self.drawing_rotation, 0.5, 0.5, *self.current_size
+  def torque= torque
+    @shape.body.t = torque
   end
-  def current_size
-    [1.0, 1.0] # default implementation - change this to [1.0, 2.0] if you want a "light" version ;)
+  def torque
+    @shape.body.t
   end
   
 end

data/spec/lib/units/thing_spec.rb

@@ -116,10 +116,12 @@ describe Thing do
     end
     context 'non-default' do
       before(:each) do
-        @thing.layer = :non_default_layer
+        class Thong < Thing
+          layer :non_default_layer
+        end
       end
       it "should be on the non default layer" do
-        @thing.layer.should == :non_default_layer
+        Thong.new(:some_window).layer.should == :non_default_layer
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Florian Hanke