gosu_extensions 0.2.9 → 0.3.0

data/lib/core/rotation.rb

@@ -1,6 +1,9 @@
 module Rotation
   
-  Half    = Math::HalfPI
-  Quarter = Math::QuarterPI
+  Full    = 2*Math::PI
+  Half    =   Math::PI
+  Third   = 2*Math::PI/3
+  Quarter =   Math::HalfPI
+  Eight   =   Math::QuarterPI
   
 end

data/lib/core/sprites.rb

@@ -0,0 +1,38 @@
+# Holds the things that are drawn.
+#
+class Sprites
+  
+  def initialize elements = []
+    @elements = elements
+    @to_remove = []
+  end
+  
+  def register element
+    @elements << element
+  end
+  def registered? element
+    @elements.include? element
+  end
+  
+  def move
+    @elements.each &:move
+  end
+  
+  def draw
+    @elements.each &:draw
+  end
+  
+  def remove object
+    @to_remove << object
+  end
+  
+  #
+  #
+  def remove_marked
+    @to_remove.each do |object|
+      @elements.delete object
+    end
+    @to_remove.clear
+  end
+  
+end

data/lib/core/things.rb

@@ -0,0 +1,33 @@
+# Holds the things that can collide, are moved and drawn.
+#
+class Things < Sprites
+  
+  delegate :each, :to => :@elements
+  
+  def initialize environment, elements = []
+    @environment = environment
+    super elements
+  end
+  
+  def register element
+    element.add_to @environment
+    super element
+  end
+  
+  def targeting # TODO
+    @elements.select { |m| m.respond_to? :target }.each do |gun|
+      gun.target *@elements.select { |m| m.kind_of? Enemy }
+    end
+  end
+  
+  #
+  #
+  def remove_marked
+    @to_remove.each do |thing|
+      @environment.remove thing
+      @elements.delete thing # TODO Should the environment be the owner of the things? Probably, yes.
+    end
+    @to_remove.clear
+  end
+  
+end

data/lib/core/wave.rb

@@ -1,5 +1,7 @@
 #
 #
+# TODO This is almost a generator.
+#
 class Wave
   
   attr_reader :generated_type, :execution_amount, :positioning_function
@@ -38,7 +40,7 @@ class Wave
     lambda do
       self.execution_amount.times do
         instance = self.generated_type.new window
-        window.register instance
+        instance.show
         self.positioning_function.call(window, instance)
       end
     end

data/lib/gosu_extensions.rb

@@ -31,8 +31,9 @@ require 'traits'
 require 'it_is_a'
 
 require 'background'
-require 'moveables'
-require 'remove_shapes'
+require 'sprites'
+require 'things'
+require 'objects'
 require 'wave'
 require 'waves'
 require 'scheduling'

data/lib/traits/attachable.rb

@@ -2,9 +2,21 @@
 #
 module Attachable extend Trait
   
-  attr_accessor :relative_position
+  Detach = :detach
   
-  def move_relative pod
+  attr_accessor :relative_position, :pod
+  
+  def detach
+    pod.detach self
+  end
+  
+  # Callback after detachment.
+  #
+  def detached; end
+  
+  # Move relative to the pod.
+  #
+  def move_relative
     self.position = pod.relative_position self
     self.rotation = pod.rotation unless self.kind_of? Turnable
   end

data/lib/traits/generator.rb

@@ -70,8 +70,8 @@ end
   #
   def generate klass
     generated = klass.new self.window
-    generated.warp self.position
-    self.window.register generated
+    generated.warp self.position * 1.0
+    generated.show
     generated
   end
   

data/lib/traits/lives.rb

@@ -16,47 +16,44 @@ module Lives extend Trait
   
   def self.included target_class
     target_class.extend IncludeMethods
-    target_class.send :include, InstanceMethods
   end
   
   module IncludeMethods
     
     # Define the amount of lives in the class.
     #
-    def lives amount
+    def lives amount = 3
+      cattr_accessor :prototype_lives
+      self.prototype_lives = amount
       InitializerHooks.register self do
         self.lives = amount
       end
-      attr_reader :lives # override the default
     end
     
   end
   
-  module InstanceMethods
-    
-    attr_writer :lives
-    
-    def lives
-      3
-    end
-    
-    # Override to handle killed!
-    #
-    def killed!
-      
-    end
-    
-    # Does three things:
-    # * Deduct 1 live.
-    # * Check to see if the amount is 0.
-    # * Calls #destroy! if yes.
-    #
-    def kill!
-      self.lives -= 1
-      killed! if self.lives > 0
-      destroy! if self.lives == 0
-    end
-    
+  attr_accessor :lives
+  
+  # Override to handle killed!
+  #
+  def killed!; end
+  
+  # Does three things:
+  # * Deduct 1 live.
+  # * Check to see if the amount is 0.
+  # * Calls #destroy! if yes.
+  #
+  def kill!
+    self.lives -= 1
+    killed! if self.lives > 0
+    destroy! if self.lives == 0
+  end
+  
+  # Revive extension.
+  #
+  def revive
+    self.lives = self.class.prototype_lives
+    super
   end
   
 end

data/lib/traits/moveable.rb

@@ -30,55 +30,4 @@ module Moveable extend Trait
     accelerate -0.5*strength
   end
   
-  # Movement rules
-  #
-  # TODO Move to Sprite?
-  #
-  # Note: Call in method move.
-  #
-  def bounce_off_border_x elasticity = 1.0
-    if position.x > window.screen_width || position.x < 0
-      shape.body.v.x = -shape.body.v.x.to_f*elasticity
-    end
-  end
-  def bounce_off_border_y elasticity = 1.0
-    if position.y > window.screen_height || position.y < 0
-      shape.body.v.y = -shape.body.v.y.to_f*elasticity
-    end
-  end
-  def bounce_off_border elasticity = 1.0
-    bounce_off_border_x elasticity
-    bounce_off_border_y elasticity
-  end
-  def wrap_around_border_x
-    if position.x > window.screen_width
-      position.x -= window.screen_width
-    elsif position.x < 0
-      position.x += window.screen_width
-    end
-  end
-  def wrap_around_border_y
-    if position.y > window.screen_height
-      position.y -= window.screen_height
-    elsif position.y < 0
-      position.y += window.screen_height
-    end
-  end
-  def wrap_around_border
-    wrap_around_border_x
-    wrap_around_border_y
-  end
-  def obey_gravity
-    self.speed += window.gravity_vector
-  end
-  def on_hitting_x
-    yield if block_given? && position.x > window.screen_width || position.x < 0
-  end
-  def on_hitting_y
-    yield if block_given? && position.y > window.screen_height || position.y < 0
-  end
-  def rotate_towards_velocity
-    self.rotation = self.speed.to_angle
-  end
-  
 end

data/lib/traits/pod.rb

@@ -64,13 +64,17 @@ module Pod extend Trait
     # Detach an instance from this.
     #
     def detach attachment
-      self.attachments.delete attachment if self.attachments
+      if self.attachments
+        detached = self.attachments.delete attachment
+        detached.detached if detached # callback
+      end
     end
     
     
     def materialize attachment
       attachment.extend Attachable # This is where Ruby shines.
-      window.register attachment
+      attachment.pod = self
+      attachment.show
     end
     
     #
@@ -83,7 +87,7 @@ module Pod extend Trait
     #
     def move_attachments
       self.attachments.each do |attachment|
-        attachment.move_relative self
+        attachment.move_relative
       end
     end
     

data/lib/traits/shooter.rb

@@ -10,7 +10,7 @@ module Shooter extend Trait
       relative_position = CP::Vec2.new x, y
       relative_length   = relative_position.length
       relative_rotation = relative_position.to_angle
-      lambda { self.position + (self.rotation - relative_rotation).radians_to_vec2*relative_length }
+      lambda { self.position + (self.rotation - relative_rotation).radians_to_vec2 * relative_length }
     end
   end
   module Velocity

data/lib/traits/shot.rb

@@ -9,7 +9,7 @@ module Shot extend Trait
   def shoot_from shooter
     self.position = shooter.muzzle_position
     self.originator = shooter
-    self.window.register self
+    self.show
     self
   end
   

data/lib/units/sprite.rb

@@ -10,20 +10,33 @@ class Sprite
   include ItIsA
   it_is   Moveable
   
-  attr_reader :window
+  attr_reader :window,
+              :objects
+  attr_accessor :position,
+                :speed
   
   # Every thing knows the window it is attached to.
   #
+  # Also, it knows who it is managed by.
+  #
   def initialize window
-    @window = window
-    self.destroyed = false
+    @window  = window
+    @objects = Thing === self ? window.things : window.sprites
     after_initialize
   end
   
+  # Makes the object visible.
+  #
+  def show
+    self.speed     = CP::Vec2.new(0,0)
+    self.destroyed = false
+    objects.register self
+  end
+  
   # Default layer is Layer::Players.
   #
   def layer
-    Layer::Players
+    Layer::Ambient
   end
   # Default rotation is upwards.
   #
@@ -50,7 +63,7 @@ class Sprite
       end
     end
     def random_rotation
-      rotation { 2*Math::PI*rand }
+      rotation { Rotation::Full*rand }
     end
     
     # Plays a random sound of the given sounds.
@@ -65,19 +78,16 @@ class Sprite
     
   end
   
-  # Override this.
-  #
-  def move
-    
-  end
-  
   # Do something threaded.
   #
   # Default is: Instantly, in the next step.
   #
+  # Note: Can also be called with after.
+  #
   def threaded time = 1, &code
     self.window.threaded time, &code
   end
+  alias after threaded
   
   # Some things you can only do every x time units.
   # 
@@ -99,11 +109,15 @@ class Sprite
     result
   end
   
+  # A sprite is not added to the physical environment.
   #
+  # Override if you want it to.
   #
-  def add_to environment
-    # A sprite is not added to the physical environment.
-  end
+  def add_to environment; end
+  
+  # Override this method to do stuff after it is destroyed.
+  #
+  def destroyed!; end
   
   # Destroy this thing.
   #
@@ -111,18 +125,26 @@ class Sprite
   def destroyed?
     @destroyed
   end
-  def destroyed!
-    # Override
-  end
   def destroy!
     return if self.destroyed?
-    self.destroyed!
+    self.destroyed! # invoke callback
     self.destroyed = true
+    self.objects.remove self
+    # self.window.unregister self # TODO self.owner.unregister self
+  end
+  
+  # Revives this thing.
+  #
+  # TODO Override in Lives.
+  #
+  def revive
+    show unless objects.registered?(self)
   end
   
   # Draws its image.
   #
   def draw
+    # p [self.class, self.layer, self.drawing_rotation, 0.5, 0.5, *self.current_size] unless self.position
     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
@@ -151,12 +173,75 @@ class Sprite
   
   # Movement and Position.
   #
+  # Sprite Movement is not thought of as very realistic (no damping for example).
+  # These are just a few simple rules.
+  #
+  def move
+    self.position += self.speed/SUBSTEPS
+    moved
+  end
+  
+  # Callback where you can make it obey rules.
+  #
+  def moved; end
   
   #
   #
-  attr_accessor :position, :speed
   def rotation= rotation
     @rotation = rotation % (2*Math::PI)
   end
   
+  # Movement rules
+  #
+  # Note: Use these in method move.
+  #
+  def bounce_off_border_x elasticity = 1.0
+    if position.x > window.screen_width || position.x < 0
+      self.speed.x = -self.speed.x.to_f*elasticity
+    end
+  end
+  def bounce_off_border_y elasticity = 1.0
+    if position.y > window.screen_height || position.y < 0
+      self.speed.y = -self.speed.y.to_f*elasticity
+    end
+  end
+  def bounce_off_border elasticity = 1.0
+    bounce_off_border_x elasticity
+    bounce_off_border_y elasticity
+  end
+  def wrap_around_border_x
+    if position.x > window.screen_width
+      position.x -= window.screen_width
+    elsif position.x < 0
+      position.x += window.screen_width
+    end
+  end
+  def wrap_around_border_y
+    if position.y > window.screen_height
+      position.y -= window.screen_height
+    elsif position.y < 0
+      position.y += window.screen_height
+    end
+  end
+  def wrap_around_border
+    wrap_around_border_x
+    wrap_around_border_y
+  end
+  def obey_gravity
+    self.speed += window.gravity_vector
+  end
+  def on_hitting_x
+    yield if block_given? && position.x > window.screen_width || position.x < 0
+  end
+  def on_hitting_y
+    yield if block_given? && position.y > window.screen_height || position.y < 0
+  end
+  def on_hitting_border &block
+    on_hitting_x &block
+    on_hitting_y &block
+  end
+  def rotate_towards_velocity
+    self.rotation = self.speed.to_angle
+  end
+  
 end