lotu 0.1.10 → 0.1.11

data/README.rdoc

@@ -25,32 +25,48 @@ So, what can you do if you spot some patters here, a few more there? well, you d
 
 If you have any questions of suggestions don't hesitate and send me a message!
 
+#--
+== So you want to make a game with *lotu*?
 
-== Features
-* Easy way to manage input, rendering, updating, etc.
-* Simple access to game resources (images, sounds, songs, etc).
-* Steering behaviors
+Ok, then you need to know a bit about the facilities it provides. Let's start with the main classes:
 
+=== Main classes
 
-== Coming features
-* Utility classes for viewports, game states, etc.
-* Pathfinding and more AI stuff
+==== Game
 
+==== Actor
+
+==== Cursor
+
+==== TextBox
+
+=== Systems
+
+==== Collision
+
+==== Fps
+
+==== Input
+
+==== Stalker
+
+==== Steering
+#++
 
 == Game frameworks
 Here are some other Gosu based frameworks:
-* [Chingu] (http://github.com/ippa/chingu)
-* [Exuberant] (http://github.com/adamsanderson/lexery/tree/master/lib/exuberant)
-* [FWD] (http://github.com/walski/FWD)
-* [Nimo] (http://github.com/moonpxi/nimo)
-* [PuitUniverse] (http://github.com/oneup/puituniverse)
-* [Ramverk] (http://github.com/deps/Ramverk)
-* [Space Shooter Engine] (http://github.com/belen-albeza/space-shooter/tree/master/engine/)
-* [SpriteJam] (http://github.com/richardeden/spritejam)
+* Chingu[http://github.com/ippa/chingu]
+* Exuberant[http://github.com/adamsanderson/lexery/tree/master/lib/exuberant]
+* FWD[http://github.com/walski/FWD]
+* Nimo[http://github.com/moonpxi/nimo]
+* PuitUniverse[http://github.com/oneup/puituniverse]
+* Ramverk[http://github.com/deps/Ramverk]
+* {Space Shooter Engine}[http://github.com/belen-albeza/space-shooter/tree/master/engine/]
+* SpriteJam[http://github.com/richardeden/spritejam]
 
 There are others not base on Gosu you might like to check out:
-* [gamebox](http://github.com/shawn42/gamebox)
-* [jemini](http://github.com/jemini/jemini-core)
+* gamebox[http://github.com/shawn42/gamebox]
+* jemini[http://github.com/jemini/jemini-core]
 
 Be sure I will take inspiration from them. ;)
 Nevertheless I'm doing this because I want to become better at architecturing software. And this seems like fitting practice. :D

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/examples/hello_world/hello_world.rb

@@ -10,12 +10,7 @@ class MovingRuby < Actor
   def initialize(opts={})
     super
     # Use the image which filename is CptnRuby Gem.png
-    set_image 'CptnRuby Gem.png'
-    # Map keys to some methods
-    set_keys(KbRight => :move_right,
-             KbLeft => :move_left,
-             KbUp => :move_up,
-             KbDown => :move_down)
+    set_image 'lobo_tuerto.png', :factor_x => 0.5, :factor_y => 0.5
   end
 
   # Let's define some basic movement methods
@@ -45,22 +40,36 @@ class Example < Game
     # declared in the parent class
     super
     # When the Escape key is pressed, call the close method on class Example
-    set_keys(KbEscape => :close)
+    set_keys(KbEscape => :close,
+             KbD => [:debug!, false])
   end
 
   def load_resources
     # From this file,
     with_path_from_file(__FILE__) do
       # go back one dir and search inside media/
-      load_images '../media/'
+      load_images '../media/images'
     end
   end
 
   def setup_actors
+    # Create a ruby in the middle of the screen
     @ruby = MovingRuby.new(:x => width/2, :y => height/2)
+    # Map keys to some methods
+    @ruby.set_keys(KbRight => :move_right,
+                   KbLeft => :move_left,
+                   KbUp => :move_up,
+                   KbDown => :move_down)
+    @ruby2 = MovingRuby.new(:x => width/2, :y => height/2)
+    # Map keys to some methods
+    @ruby2.set_keys(KbRight => :move_left,
+                    KbLeft => :move_right,
+                    KbUp => :move_up,
+                    KbDown => :move_down)
     # Create a TextBox so we can display a message on screen
     @info = TextBox.new
-    @info.text("Move around with arrow keys")
+    @info.text("Hello world!")
+    @info.text("Move around with arrow keys", :size => 16, :color => 0xff33ccff)
   end
 
 end

data/examples/media/animations/missile.txt

@@ -0,0 +1,18 @@
+miss0000 = 380 0 75 75
+miss0001 = 380 76 75 75
+miss0002 = 304 76 75 75
+miss0003 = 304 0 75 75
+miss0004 = 228 152 75 75
+miss0005 = 76 228 75 75
+miss0006 = 152 228 75 75
+miss0007 = 0 228 75 75
+miss0008 = 304 152 75 75
+miss0009 = 380 152 75 75
+miss0010 = 228 76 75 75
+miss0011 = 0 76 75 75
+miss0012 = 76 76 75 75
+miss0013 = 152 0 75 75
+miss0014 = 0 0 75 75
+miss0015 = 76 0 75 75
+miss0016 = 152 152 75 75
+miss0017 = 228 0 75 75

data/examples/mouse_pointer/mouse_pointer.rb

@@ -8,7 +8,7 @@ include Lotu
 class WarpingRuby < Actor
   def initialize(opts={})
     super
-    set_image 'CptnRuby Gem.png'
+    set_image 'lobo_tuerto.png', :factor_x => 0.3, :factor_y => 0.3
   end
 
   def warp(x, y)
@@ -23,13 +23,12 @@ class Example < Game
     # declared in the parent class
     super
     # Custom setup methods for this class
-    setup_input
     setup_events
   end
 
   def load_resources
     with_path_from_file(__FILE__) do
-      load_images '../media'
+      load_images '../media/images'
     end
   end
 
@@ -37,15 +36,31 @@ class Example < Game
     # It's important to call super here to setup the InputSystem
     super
     use(FpsSystem)
-    use(StalkerSystem, :stalk => [Actor, Cursor, WarpingRuby, TextBox, Object])
+    use(StalkerSystem, :stalk => [Actor, Cursor, TextBox, WarpingRuby, Object])
+  end
+
+  def setup_input
+    set_keys(KbEscape => :close,
+             KbD => [:debug!, false])
+  end
+
+  def setup_events
+    @cursor1.on(:click) do |x,y|
+      @ruby.warp(x,y)
+    end
+    @cursor2.on(:click) do |x,y|
+      @ruby.warp(x,y)
+    end
   end
 
   def setup_actors
     @ruby = WarpingRuby.new(:x => width/2, :y => height/2)
-    @cursor1 = Cursor.new(:image => 'crosshair.png',
+    @cursor1 = Cursor.new(:image => 'crosshair-1.png',
                           :keys => {MsLeft => [:click, false]},
-                          :color => 0xff0099ff)
-    @cursor2 = Cursor.new(:image => 'crosshair.png',
+                          :color => 0xff0099ff,
+                          :width => 100,
+                          :height => 100)
+    @cursor2 = Cursor.new(:image => 'crosshair-2.png',
                           :use_mouse => false,
                           :keys => {
                             KbSpace => [:click, false],
@@ -53,14 +68,16 @@ class Example < Game
                             KbDown => :down,
                             KbLeft => :left,
                             KbRight => :right},
-                          :color => 0xff99ff00)
+                          :color => 0xff99ff00,
+                          :factor_x => 0.5,
+                          :factor_y => 0.5)
     @cursor2.x = width*3/4
     @cursor2.y = height/2
 
     # Create a TextBox with default option :size => 15
     @info = TextBox.new(:size => 15)
     @info.watch(@systems[FpsSystem])
-    @info.watch(@systems[StalkerSystem])
+    @info.watch(@systems[StalkerSystem], :color => 0xff3ffccf)
     # We can change the size for a specific line of text
     @info.watch("@cursor1 data:", :size => 20)
     # Color too
@@ -70,19 +87,6 @@ class Example < Game
     @info.text("Move @cursor1 with mouse and @cursor2 with arrow keys (click with space!)")
   end
 
-  def setup_input
-    set_keys KbEscape => :close
-  end
-
-  def setup_events
-    @cursor1.on(:click) do |x,y|
-      @ruby.warp(x,y)
-    end
-    @cursor2.on(:click) do |x,y|
-      @ruby.warp(x,y)
-    end
-  end
-
 end
 
 Example.new.show

data/examples/steering_behaviors/steering.rb

@@ -8,7 +8,6 @@ include Lotu
 class SteeringRuby < Actor
   def initialize(opts={})
     super
-    set_image 'CptnRuby Gem.png'
     use(SteeringSystem, opts)
   end
 
@@ -24,40 +23,45 @@ class Example < Game
     # declared in the parent class
     super
     # Custom setup methods for this class
-    setup_input
     setup_events
   end
 
   def load_resources
     with_path_from_file(__FILE__) do
-      load_images '../media'
+      load_images '../media/images'
+      load_animations '../media/animations'
     end
   end
 
   def setup_input
     set_keys(KbEscape => :close,
-             MsRight => :reset_ruby)
+             MsRight => :reset_ruby,
+             KbD => [:debug!, false])
   end
 
   def setup_systems
     # It's important to call super here to setup the InputSystem
     super
     use(FpsSystem)
+    use(StalkerSystem, :stalk => [Actor, Vector2d, Object])
   end
 
   def setup_actors
     @ruby = SteeringRuby.new(:mass => 0.3, :max_speed => 100, :max_turn_rate => 140)
     @ruby.warp(width/2, height/2)
     @ruby.activate(:evade)
+    @ruby.play_animation('missile.png')
 
     @ruby2 = SteeringRuby.new
     @ruby2.activate(:pursuit)
+    @ruby2.play_animation('missile.png', :factor_x => 0.5, :factor_y => 0.5, :fps => 60)
 
-    @cursor = Cursor.new(:image => 'crosshair.png',
+    @cursor = Cursor.new(:image => 'crosshair-1.png',
                          :keys => {MsLeft => [:click, false]})
 
     @window_info = TextBox.new(:size => 15)
     @window_info.watch(@systems[FpsSystem])
+    @window_info.watch(@systems[StalkerSystem])
     @window_info.watch(@cursor, :color => 0xffff0000)
     @window_info.text("Click to start the simulation")
     @window_info.text("One will pursuit while the other evades, right click to center evader on screen")

data/lib/lotu/actor.rb

@@ -2,7 +2,8 @@ module Lotu
   class Actor
     attr_accessor :parent, :x, :y, :systems,
     :z, :angle, :center_x, :center_y,
-    :factor_x, :factor_y, :color, :mode, :image
+    :factor_x, :factor_y, :color, :mode, :image,
+    :width, :height
 
     include SystemUser
     include Controllable
@@ -21,25 +22,17 @@ module Lotu
         :mode => :default,
         :parent => $lotu
       }
-      @opts = default_opts.merge!(opts)
-      @image = nil
-      @x = @opts[:x]
-      @y = @opts[:y]
-      @z = @opts[:z]
-      @angle = @opts[:angle]
-      @center_x = @opts[:center_x]
-      @center_y = @opts[:center_y]
-      @factor_x = @opts[:factor_x]
-      @factor_y = @opts[:factor_y]
-      @color = @opts[:color]
-      @mode = @opts[:mode]
-      @parent = @opts[:parent]
+      opts = default_opts.merge!(opts)
+      @parent = opts[:parent]
       @parent.manage_me(self)
+      set_image(opts[:image], opts) if opts[:image]
+      parse_options(opts)
       @systems = {}
 
       # Add extra functionality
       self.extend Eventful
       self.extend Collidable
+      use(AnimationSystem)
     end
 
     # Easy access to delta-time
@@ -47,12 +40,49 @@ module Lotu
       $lotu.dt
     end
 
-    def set_image(image)
+    def parse_options(opts)
+      @x = opts[:x] || @x
+      @y = opts[:y] || @y
+      @z = opts[:z] || @z
+      @angle = opts[:angle] || @angle
+      @center_x = opts[:center_x] || @center_x
+      @center_y = opts[:center_y] || @center_y
+      @factor_x = opts[:factor_x] || @factor_x
+      @factor_y = opts[:factor_y] || @factor_y
+      @color = opts[:color] || @color
+      @mode = opts[:mode] || @mode
+    end
+
+    def set_image(image, opts={})
       @image = @parent.image(image)
+      puts "Image \"#{image}\" not found".red if @image.nil?
+      parse_options(opts)
+      @width = opts[:width] || @image.width
+      @height = opts[:height] || @image.height
+      calc_zoom
+    end
+
+    def set_gosu_image(image, opts={})
+      @image = image
+      parse_options(opts)
+      @width = opts[:width] || @image.width
+      @height = opts[:height] || @image.height
+      calc_zoom
+    end
+
+    def width=(width)
+      @width = width
+      calc_zoom
     end
 
-    def unset_image
-      @image = nil
+    def height=(height)
+      @height = height
+      calc_zoom
+    end
+
+    def calc_zoom
+      @zoom_x = Float(@width)/@image.width
+      @zoom_y = Float(@height)/@image.height
     end
 
     # Remove ourselves from the update queue
@@ -67,7 +97,20 @@ module Lotu
     end
 
     def draw
-      @image.draw_rot(@x, @y, @z, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode) unless @image.nil?
+      @image.draw_rot(@x, @y, @z, @angle, @center_x, @center_y, @factor_x*@zoom_x, @factor_y*@zoom_y, @color, @mode) unless @image.nil?
+      draw_debug if $lotu.debug? unless @image.nil?
+    end
+
+    def draw_debug
+      draw_box(@x-@image.width/2, @y-@image.height/2, @image.width, @image.height)
+      draw_box(@x-@width/2, @y-@height/2, @width, @height, 0xff00ff00)
+    end
+
+    def draw_box(x, y, w, h, c = 0xffff0000)
+      $lotu.draw_line(x, y, c, x+w, y, c)
+      $lotu.draw_line(x, y, c, x, y+h, c)
+      $lotu.draw_line(x+w, y+h, c, x+w, y, c)
+      $lotu.draw_line(x+w, y+h, c, x, y+h, c)
     end
 
   end

data/lib/lotu/behaviors/collidable.rb

@@ -20,7 +20,7 @@ module Lotu
 
     def die
       super
-      @parent.systems[CollisionSystem].remove_entity(self, @collision_tag)
+      @parent.systems[CollisionSystem].remove_entity(self, @collision_tag) if @parent.systems[CollisionSystem]
     end
 
   end

data/lib/lotu/cursor.rb

@@ -18,7 +18,6 @@ module Lotu
       @clicked_x = @clicked_y = 0
       @speed = opts[:speed]
       @use_mouse = opts[:use_mouse]
-      set_image(opts[:image]) unless opts[:image].nil?
       set_keys(opts[:keys]) unless opts[:keys].nil?
     end
 

data/lib/lotu/game.rb

@@ -12,7 +12,7 @@ module Lotu
 
       # Handy global window variable
       $lotu = self
-      @debug = true
+      @debug = false
       setup_containers
 
       # For timer initialization
@@ -24,12 +24,21 @@ module Lotu
       load_resources
       setup_systems
       setup_actors
+      setup_input
     end
 
+    def debug!
+      @debug = !@debug
+    end
+
+    def debug?
+      @debug
+    end
 
     # Hook methods, these are meant to be replaced by subclasses
     def load_resources;end
     def setup_actors;end
+    def setup_input;end
 
     def setup_systems
       use(InputSystem)
@@ -49,7 +58,7 @@ module Lotu
       @images = {}
       @sounds = {}
       @songs = {}
-      @animations = {}
+      @animations = Hash.new{|h,k| h[k] = []}
     end
 
     # Main update loop
@@ -149,19 +158,23 @@ module Lotu
     end
 
     def load_animations(path)
-      path = File.expand_path(File.join(@path, path))
-      puts "Loading from: #{path}"
+      coords = Hash.new{|h,k| h[k] = []}
+
+      with_files(/\.txt/, path) do |file_name, file_path|
+        name = File.basename(file_name, '.txt')
+        File.open(file_path) do |file|
+          file.lines.each do |line|
+            coords[name] << line.scan(/\d+/).map!(&:to_i)
+          end
+        end
+      end
 
-      count = 0
-      Dir.entries(path).grep(regexp).each do |entry|
-        begin
-          @animations[entry] = klass.new($lotu, File.join(path, entry))
-          count += 1
-        rescue Exception => e
-          puts e, File.join(path, entry)
+      with_files(/\.png|\.jpg|\.bmp/, path) do |file_name, file_path|
+        name, extension = file_name.split('.')
+        coords[name].each do |index, x, y, width, height|
+          @animations[file_name] << Gosu::Image.new($lotu, file_path, true, x, y, width, height)
         end
       end
-      puts "#{count} #{klass} files loaded."
     end
 
     def with_path_from_file(path, &blk)

data/lib/lotu/system.rb

@@ -0,0 +1,15 @@
+module Lotu
+  class System
+
+    def initialize(user, opts={})
+      @user = user
+    end
+
+    def dt
+      $lotu.dt
+    end
+
+    def draw;end
+
+  end
+end

data/lib/lotu/systems/animation_system.rb

@@ -0,0 +1,55 @@
+module Lotu
+  class AnimationSystem < System
+
+    def initialize(user, opts={})
+      super
+      @user.extend(UserMethods)
+    end
+
+    def animated?
+      defined?(@length)
+    end
+
+    def play_animation(name, opts={})
+      default_opts = {
+        :fps => 30
+      }
+      opts = default_opts.merge!(opts)
+      @name = name
+      @length = $lotu.animation(@name).length
+      @time_per_frame = 1.0/opts[:fps]
+      @current_frame = 0
+      @accum_time = 0
+      @user.set_gosu_image($lotu.animation(@name)[0], opts)
+    end
+
+    def update
+      if animated?
+        @accum_time += dt
+        if @accum_time >= @time_per_frame
+          frames = @accum_time/@time_per_frame
+          @current_frame += frames
+          @accum_time -= @time_per_frame * frames
+          @current_frame = 0 if @current_frame >= @length
+          image = $lotu.animation(@name)[@current_frame]
+          @user.image = image
+        end
+      end
+    end
+
+    def to_s
+      ["Name: #{@name}",
+       "Current frame: #{@current_frame}",
+       "Accumulated time: #{format('%.2f', @accum_time)}",
+       "Time per frame: #{format('%.2f', @time_per_frame)}",
+       "Length: #{@length}"]
+    end
+
+    module UserMethods
+      def play_animation(name, opts={})
+        @systems[AnimationSystem].play_animation(name, opts)
+      end
+    end
+
+  end
+end

data/lib/lotu/systems/fps_system.rb

@@ -3,19 +3,19 @@ module Lotu
 
     def initialize(user, opts={})
       default_opts = {
-        :samples => 10
+        :ticks_per_update => 10
       }
       opts = default_opts.merge!(opts)
       @accum = 0.0
       @ticks = 0
       @fps = 0.0
-      @samples = opts[:samples]
+      @ticks_per_update = opts[:ticks_per_update]
     end
 
     def update
       @ticks += 1
       @accum += $lotu.dt
-      if @ticks >= @samples
+      if @ticks >= @ticks_per_update
         @fps = @ticks/@accum
         @ticks = 0
         @accum = 0.0
@@ -23,7 +23,7 @@ module Lotu
     end
 
     def to_s
-      "Samples per second: #{@samples} | FPS: #{format("%.2f",@fps)}"
+      "Ticks per update: #{@ticks_per_update} | FPS: #{format("%.2f",@fps)}"
     end
 
     def draw;end

data/lib/lotu/systems/stalker_system.rb

@@ -3,9 +3,12 @@ module Lotu
 
     def initialize(user, opts={})
       default_opts = {
-        :stalk => [Actor]
+        :stalk => [Actor],
+        :ticks_per_update => 30
       }
       opts = default_opts.merge!(opts)
+      @ticks = 0
+      @ticks_per_update = opts[:ticks_per_update]
       @stalked = {}
       opts[:stalk].each do |type|
         @stalked[type] = 0
@@ -13,8 +16,12 @@ module Lotu
     end
 
     def update
-      @stalked.each_key do |type|
-        @stalked[type] = ObjectSpace.each_object(type).count
+      @ticks += 1
+      if @ticks >= @ticks_per_update
+        @stalked.each_key do |type|
+          @stalked[type] = ObjectSpace.each_object(type).count
+        end
+        @ticks = 0
       end
     end
 

data/lib/lotu/systems/steering_system.rb

@@ -157,10 +157,10 @@ module Lotu
     module UserMethods
 
       def self.extended(instance)
-        instance.steering_setup
+        instance.setup_steering
       end
 
-      def steering_setup
+      def setup_steering
         # Create accessors for the user
         class << self
           attr_accessor :mass, :pos, :heading, :vel, :accel,
@@ -193,6 +193,10 @@ module Lotu
 
       def draw
         super
+        draw_debug if $lotu.debug?
+      end
+
+      def draw_debug
         $lotu.draw_line(0, 0, 0xff999999, @pos.x, @pos.y, 0xff333333)
         $lotu.draw_line(@pos.x, @pos.y, 0xffffffff, (@pos + @heading*50).x, (@pos+@heading*50).y, 0xffff0000)
         $lotu.draw_line(@pos.x, @pos.y, 0xffffffff, @target.x, @target.y, 0xff00ff00) if @target

data/lib/lotu.rb

@@ -4,5 +4,5 @@ $LOAD_PATH.unshift(LOTU_ROOT)
 require 'gosu'
 %w{vector2d string}.each{|file| require "misc/#{file}"}
 %w{system_user collidable controllable eventful}.each{|file| require "behaviors/#{file}"}
-%w{input_system stalker_system fps_system collision_system steering_system}.each{|file| require "systems/#{file}"}
-%w{game actor cursor text_box}.each{|file| require file}
+%w{game system actor cursor text_box}.each{|file| require file}
+%w{animation_system input_system stalker_system fps_system collision_system steering_system}.each{|file| require "systems/#{file}"}

data/lotu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lotu}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-03-27}
   s.description = %q{lotu aims to bring an agile and simple game development framework to life. It provides useful abstractions so you can concentrate on developing your game.}
   s.email = %q{dev@lobotuerto.com}
   s.extra_rdoc_files = [
@@ -25,24 +25,17 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "examples/hello_world/hello_world.rb",
-     "examples/media/Beep.wav",
-     "examples/media/CptnRuby Gem.png",
-     "examples/media/CptnRuby Map.txt",
-     "examples/media/CptnRuby Tileset.png",
-     "examples/media/CptnRuby.png",
-     "examples/media/Cursor.png",
-     "examples/media/Earth.png",
-     "examples/media/Explosion.wav",
-     "examples/media/LargeStar.png",
-     "examples/media/Smoke.png",
-     "examples/media/Soldier.png",
-     "examples/media/Space.png",
-     "examples/media/Star.png",
-     "examples/media/Starfighter.bmp",
-     "examples/media/amenoske.png",
-     "examples/media/crosshair.png",
-     "examples/media/lobo_tuerto.png",
-     "examples/media/title.png",
+     "examples/media/animations/missile.png",
+     "examples/media/animations/missile.txt",
+     "examples/media/images/cohete-big.png",
+     "examples/media/images/cohete-medium.png",
+     "examples/media/images/cohete-small.png",
+     "examples/media/images/crosshair-1.png",
+     "examples/media/images/crosshair-2.png",
+     "examples/media/images/crosshair-3.png",
+     "examples/media/images/lobo_tuerto.png",
+     "examples/media/images/missile-med.png",
+     "examples/media/images/silo.png",
      "examples/mouse_pointer/mouse_pointer.rb",
      "examples/steering_behaviors/steering.rb",
      "lib/lotu.rb",
@@ -55,6 +48,8 @@ Gem::Specification.new do |s|
      "lib/lotu/game.rb",
      "lib/lotu/misc/string.rb",
      "lib/lotu/misc/vector2d.rb",
+     "lib/lotu/system.rb",
+     "lib/lotu/systems/animation_system.rb",
      "lib/lotu/systems/collision_system.rb",
      "lib/lotu/systems/fps_system.rb",
      "lib/lotu/systems/input_system.rb",

data/test/actor_test.rb

@@ -3,7 +3,9 @@ require 'rubygems'
 require 'protest'
 require 'rr'
 require File.dirname(__FILE__) + '/../lib/lotu'
- 
+
+include Lotu
+
 class Protest::TestCase
   include RR::Adapters::TestUnit
 end
@@ -12,34 +14,46 @@ Protest.report_with(:documentation)
  
 Protest.context('An Actor') do
   setup do
-    $lotu = Lotu::Window.new
-    @actor = Lotu::Actor.new
+    @game = Game.new
+    @actor = Actor.new
   end
  
-  it 'has an x coordinate. (default: 0)' do
+  it 'has an x coordinate (default: 0)' do
     assert_equal 0, @actor.x
   end
  
-  it 'has an y coordinate. (default: 0)' do
+  it 'has an y coordinate (default: 0)' do
     assert_equal 0, @actor.y
   end
  
-  # faltaría el attr_reader :color en actor.rb
-  #
-  it 'has a color. (default: 0xffffffff)' do
-    pending
-    #assert_equal Gosu::Color::WHITE, @actor.color
+  it 'has a color (default: 0xffffffff)' do
+    assert_equal 0xffffffff, @actor.color
   end
   
-  it 'has a window reference.' do
-    assert_equal $lotu, @actor.parent
+  it 'has a parent reference == Game' do
+    assert_equal @game, @actor.parent
+  end
+
+  context 'when creating' do
+    it 'asks Game to manage it' do
+      pending
+      #crear método 'init' para poder probar esto?
+    end
   end
  
-  # some context...
-  #
   context 'when dying' do
-    it 'removes itself from Window update_queue.' do
-      mock.proxy($lotu.update_queue).delete(@actor)
+    it 'asks Game to kill it' do
+      mock.proxy(@game).kill_me(@actor)
+      @actor.die
+    end
+
+    it 'is removed from Game update_queue' do
+      mock.proxy(@game.update_queue).delete(@actor)
+      @actor.die
+    end
+
+    it 'is removed from Game draw_queue' do
+      mock.proxy(@game.update_queue).delete(@actor)
       @actor.die
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - lobo_tuerto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -06:00
+date: 2010-03-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,24 +49,17 @@ files:
 - Rakefile
 - VERSION
 - examples/hello_world/hello_world.rb
-- examples/media/Beep.wav
-- examples/media/CptnRuby Gem.png
-- examples/media/CptnRuby Map.txt
-- examples/media/CptnRuby Tileset.png
-- examples/media/CptnRuby.png
-- examples/media/Cursor.png
-- examples/media/Earth.png
-- examples/media/Explosion.wav
-- examples/media/LargeStar.png
-- examples/media/Smoke.png
-- examples/media/Soldier.png
-- examples/media/Space.png
-- examples/media/Star.png
-- examples/media/Starfighter.bmp
-- examples/media/amenoske.png
-- examples/media/crosshair.png
-- examples/media/lobo_tuerto.png
-- examples/media/title.png
+- examples/media/animations/missile.png
+- examples/media/animations/missile.txt
+- examples/media/images/cohete-big.png
+- examples/media/images/cohete-medium.png
+- examples/media/images/cohete-small.png
+- examples/media/images/crosshair-1.png
+- examples/media/images/crosshair-2.png
+- examples/media/images/crosshair-3.png
+- examples/media/images/lobo_tuerto.png
+- examples/media/images/missile-med.png
+- examples/media/images/silo.png
 - examples/mouse_pointer/mouse_pointer.rb
 - examples/steering_behaviors/steering.rb
 - lib/lotu.rb
@@ -79,6 +72,8 @@ files:
 - lib/lotu/game.rb
 - lib/lotu/misc/string.rb
 - lib/lotu/misc/vector2d.rb
+- lib/lotu/system.rb
+- lib/lotu/systems/animation_system.rb
 - lib/lotu/systems/collision_system.rb
 - lib/lotu/systems/fps_system.rb
 - lib/lotu/systems/input_system.rb

data/examples/media/CptnRuby Map.txt

@@ -1,25 +0,0 @@
-#....................................................#
-#....................................................#
-#.............xx......x.x............................#
-#............x..x....................................#
-#x....x...x..x.......#####..xxx....................x.#
-#.x.........................xxx.........##.........x.#
-#...............""..........###...##..........##.....#
-#..##..###..##..##...................................#
-#........................................xx........###
-#.............................###....................#
-##....##.............................................#
-#....................##....##......##....##....##....#
-#.................................................x..#
-#...x....##....##.......x...x.....................x..#
-#.....x...............x...x...x...................x..#
-#......x...##.....##.................................#
-#.......x.........................................#..#
-#...........##........#...#...#..#.......x...........#
-#...#................................................#
-#....."""".................x.......#..#####...###....#
-#x....#......................##......................#
-#"""""#.....#.....x..................#...............#
-##xxxx......#........................................#
-##xxxx...#####............."...""""".................#
-######"""#############################################