lotu 0.1.15 → 0.1.16

data/lib/lotu/game.rb

@@ -1,12 +1,17 @@
 module Lotu
   class Game < Gosu::Window
-    # Accessors for time delta, systems and fonts
-    attr_reader :dt, :systems, :fonts
+    extend Behavior
+
+    behave_like SystemUser
+    use InputManagerSystem
+
+    behave_like ResourceManager
+
+    # Accessors for elapsed time since last update (time delta) and fonts
+    attr_reader :dt
     # Accessors for queues
     attr_accessor :update_queue, :draw_queue, :input_listeners
 
-    include SystemUser
-
     def initialize(opts={})
       default_opts = {
         :width => 1024,
@@ -24,14 +29,19 @@ module Lotu
 
       # For timer initialization
       @last_time = Gosu::milliseconds
-      # Memoize fonts by size
-      @fonts = Hash.new{|h,k| h[k] = Gosu::Font.new(self, Gosu::default_font_name, k)}
+
+      # so it can start behaving
+      init_behavior opts
 
       # Call hook methods
       load_resources
-      setup_systems
       setup_actors
       setup_input
+      setup_events
+    end
+
+    def fps
+      Gosu::fps
     end
 
     def pause!
@@ -51,13 +61,10 @@ module Lotu
     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)
-    end
+    def load_resources; end
+    def setup_actors; end
+    def setup_input; end
+    def setup_events; end
 
     # Setup various containers
     def setup_containers
@@ -65,12 +72,6 @@ module Lotu
       @update_queue = []
       @draw_queue = []
       @input_register = Hash.new{|hash,key| hash[key] = []}
-
-      # For resource management
-      @images = {}
-      @sounds = {}
-      @songs = {}
-      @animations = Hash.new{|h,k| h[k] = []}
     end
 
     # Main update loop
@@ -79,10 +80,9 @@ module Lotu
       @dt = (new_time - @last_time)/1000.0
       @last_time = new_time
 
-      # Update each system
-      @systems.each_value do |system|
-        system.update
-      end
+      # to call update on behaviors (that in turn wil call
+      # update on systems, for example)
+      super
 
       # Update each actor
       @update_queue.each do |actor|
@@ -92,10 +92,9 @@ module Lotu
 
     # Main draw loop
     def draw
-      # Systems may report interesting stuff
-      @systems.each_value do |system|
-        system.draw
-      end
+      # to call draw on behaviors (that in turn will call
+      # draw on systems, for example)
+      super
 
       # Draw each actor in queue
       @draw_queue.each do |actor|
@@ -134,93 +133,5 @@ module Lotu
       @update_queue << controller
     end
 
-    # These are for managing resources
-    def image(name)
-      @images[name]
-    end
-
-    def sound(name)
-      @sounds[name]
-    end
-
-    def song(name)
-      @songs[name]
-    end
-
-    def animation(name)
-      @animations[name]
-    end
-
-    def load_images(path)
-      count = 0
-      with_files(/\.png$|\.jpg$|\.bmp$/, path) do |file_name, file_path|
-        count += 1
-        @images[file_name] = Gosu::Image.new($lotu, file_path)
-      end
-      puts "\n#{count} image(s) loaded."
-    end
-
-    def load_sounds(path)
-      count = 0
-      with_files(/\.ogg$|\.mp3$|\.wav$/, path) do |file_name, file_path|
-        count += 1
-        @sounds[file_name] = Gosu::Sample.new($lotu, file_path)
-      end
-      puts "\n#{count} sounds(s) loaded."
-    end
-
-    def load_songs(path)
-      count = 0
-      with_files(/\.ogg$|\.mp3$|\.wav$/, path) do |file_name, file_path|
-        count += 1
-        @songs[file_name] = Gosu::Song.new($lotu, file_path)
-      end
-      puts "\n#{count} song(s) loaded."
-    end
-
-    def load_animations(path)
-      count = 0
-      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
-        false
-      end
-
-      with_files(/\.png$|\.jpg$|\.bmp$/, path) do |file_name, file_path|
-        name, extension = file_name.split('.')
-        count += 1 if coords[name]
-        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 "\n#{count} animation(s) loaded."
-    end
-
-    def with_path_from_file(path, &blk)
-      @path = File.expand_path(File.dirname path)
-      yield
-    end
-
-    def with_files(regexp, path)
-      path = File.expand_path(File.join(@path, path))
-      puts "\nLoading from: #{path}".blue if @debug
-
-      Dir.entries(path).grep(regexp).each do |entry|
-        begin
-          report = yield(entry, File.join(path, entry))
-          print '.'.green if report
-        rescue Exception => e
-          print '.'.red
-          puts e, File.join(path, entry) if @debug
-        end
-      end
-    end
-
   end
 end

data/lib/lotu/helpers/kernel.rb

@@ -0,0 +1,8 @@
+module Kernel
+
+  # Taken from http://rubyworks.github.com/facets/doc/api/core/Kernel.html#method-i-deep_copy
+  def deep_copy
+    Marshal::load(Marshal::dump(self))
+  end
+
+end

data/lib/lotu/{misc → helpers}/vector2d.rb

@@ -4,7 +4,7 @@ module Lotu
     attr_reader :x, :y
 
     def self.up
-      new(0, -1)
+      @up ||= new(0, -1)
     end
 
     def initialize(x=0, y=0)

data/lib/lotu/systems/animation_system.rb

@@ -1,5 +1,5 @@
 module Lotu
-  class AnimationSystem < System
+  class AnimationSystem < BaseSystem
 
     def initialize(user, opts={})
       super
@@ -40,8 +40,8 @@ module Lotu
     def to_s
       ["Name: #{@name}",
        "Current frame: #{@current_frame}",
-       "Accumulated time: #{format('%.2f', @accum_time)}",
-       "Time per frame: #{format('%.2f', @time_per_frame)}",
+       "Accumulated time: #{format('%.2f', @accum_time || 0)}",
+       "Time per frame: #{format('%.2f', @time_per_frame || 0)}",
        "Length: #{@length}"]
     end
 

data/lib/lotu/{system.rb → systems/base_system.rb}

@@ -1,5 +1,5 @@
 module Lotu
-  class System
+  class BaseSystem
 
     def initialize(user, opts={})
       @user = user
@@ -9,7 +9,8 @@ module Lotu
       $lotu.dt
     end
 
-    def draw;end
+    def draw; end
+    def update; end
 
   end
 end

data/lib/lotu/systems/collision_system.rb

@@ -1,5 +1,5 @@
 module Lotu
-  class CollisionSystem < System
+  class CollisionSystem < BaseSystem
 
     def initialize(user, opts={})
       super

data/lib/lotu/systems/{input_system.rb → input_manager_system.rb}

@@ -1,5 +1,5 @@
 module Lotu
-  class InputSystem < System
+  class InputManagerSystem < BaseSystem
 
     def initialize(user, opts={})
       super
@@ -59,15 +59,15 @@ module Lotu
 
     module UserMethods
       def set_keys(keys)
-        systems[InputSystem].set_keys(self, keys)
+        systems[InputManagerSystem].set_keys(self, keys)
       end
 
       def button_down(key)
-        systems[InputSystem].button_down(key)
+        systems[InputManagerSystem].button_down(key)
       end
 
       def button_up(key)
-        systems[InputSystem].button_up(key)
+        systems[InputManagerSystem].button_up(key)
       end
     end
 

data/lib/lotu/systems/interpolation_system.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module Lotu
-  class InterpolationSystem < System
+  class InterpolationSystem < BaseSystem
 
     def initialize(user, opts={})
       super

data/lib/lotu/systems/stalker_system.rb

@@ -1,5 +1,5 @@
 module Lotu
-  class StalkerSystem < System
+  class StalkerSystem < BaseSystem
 
     def initialize(user, opts={})
       super

data/lib/lotu/systems/steering_system.rb

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 module Lotu
-  class SteeringSystem < System
+  class SteeringSystem < BaseSystem
 
     def initialize(user, opts={})
       super
+
       # Add new functionality to Actor
       @user.extend UserMethods
 
@@ -17,7 +18,6 @@ module Lotu
         :wander_distance => 240.0
       }
       opts = default_opts.merge!(opts)
-
       @user.mass = opts[:mass]
       @user.max_speed = opts[:max_speed]
       @user.max_turn_rate = opts[:max_turn_rate]

data/lib/lotu/text_box.rb

@@ -51,13 +51,18 @@ module Lotu
       @watch_list.each do |watched, opts|
         my_size = opts[:size] || @size
         my_color = opts[:color] || @color
-        my_text = watched.to_s
+        if watched.kind_of?(Proc)
+          my_text = watched.call.to_s
+        else
+          my_text = watched.to_s
+        end
+
         if my_text.is_a?(String)
-          $lotu.fonts[my_size].draw(my_text, @x, @y + pos_y, @z, @factor_x, @factor_y, my_color)
+          $lotu.default_font[my_size].draw(my_text, @x, @y + pos_y, @z, @factor_x, @factor_y, my_color)
           pos_y += my_size
         else
           my_text.each do |line|
-            $lotu.fonts[my_size].draw(line, @x, @y + pos_y, @z, @factor_x, @factor_y, my_color)
+            $lotu.default_font[my_size].draw(line, @x, @y + pos_y, @z, @factor_x, @factor_y, my_color)
             pos_y += my_size
           end
         end

data/lib/lotu.rb

@@ -1,8 +1,10 @@
 LOTU_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'lotu'))
 $LOAD_PATH.unshift(LOTU_ROOT)
 
+require 'rubygems'
 require 'gosu'
-%w{vector2d string}.each{|file| require "misc/#{file}"}
-%w{system_user collidable controllable eventful}.each{|file| require "behaviors/#{file}"}
-%w{game system actor cursor text_box}.each{|file| require file}
-%w{interpolation animation input stalker fps collision steering}.map{|s| "#{s}_system"}.each{|file| require "systems/#{file}"}
+%w{vector2d string kernel}.each{|file| require "helpers/#{file}"}
+%w{resource_manager system_user collidable controllable eventful}.each{|file| require "behaviors/#{file}"}
+%w{base interpolation animation input_manager stalker collision steering}.map{|s| "#{s}_system"}.each{|file| require "systems/#{file}"}
+%w{behavior actor cursor text_box game}.each{|file| require file}
+

data/lotu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lotu}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-02-24}
   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 = [
@@ -24,7 +24,11 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "examples/hello_world/moving_portraits.rb",
+    "examples/01_hello_world/moving_portraits.rb",
+    "examples/02_screen_cursor/mouse_and_keyboard_cursors.rb",
+    "examples/03_collisions/box.rb",
+    "examples/04_steering_behaviors/pursuit_and_evade.rb",
+    "examples/04_steering_behaviors/pursuit_and_evade_multiple.rb",
     "examples/media/animations/missile.png",
     "examples/media/animations/missile.txt",
     "examples/media/images/cohete-big.png",
@@ -36,24 +40,23 @@ Gem::Specification.new do |s|
     "examples/media/images/lobo_tuerto.png",
     "examples/media/images/missile-med.png",
     "examples/media/images/silo.png",
-    "examples/screen_cursor/mouse_and_keyboard_cursors.rb",
-    "examples/steering_behaviors/pursuit_and_evade.rb",
-    "examples/steering_behaviors/pursuit_and_evade_multiple.rb",
     "lib/lotu.rb",
     "lib/lotu/actor.rb",
+    "lib/lotu/behavior.rb",
     "lib/lotu/behaviors/collidable.rb",
     "lib/lotu/behaviors/controllable.rb",
     "lib/lotu/behaviors/eventful.rb",
+    "lib/lotu/behaviors/resource_manager.rb",
     "lib/lotu/behaviors/system_user.rb",
     "lib/lotu/cursor.rb",
     "lib/lotu/game.rb",
-    "lib/lotu/misc/string.rb",
-    "lib/lotu/misc/vector2d.rb",
-    "lib/lotu/system.rb",
+    "lib/lotu/helpers/kernel.rb",
+    "lib/lotu/helpers/string.rb",
+    "lib/lotu/helpers/vector2d.rb",
     "lib/lotu/systems/animation_system.rb",
+    "lib/lotu/systems/base_system.rb",
     "lib/lotu/systems/collision_system.rb",
-    "lib/lotu/systems/fps_system.rb",
-    "lib/lotu/systems/input_system.rb",
+    "lib/lotu/systems/input_manager_system.rb",
     "lib/lotu/systems/interpolation_system.rb",
     "lib/lotu/systems/stalker_system.rb",
     "lib/lotu/systems/steering_system.rb",
@@ -61,6 +64,7 @@ Gem::Specification.new do |s|
     "lotu.gemspec",
     "spec/lotu/actor_spec.rb",
     "spec/lotu/game_spec.rb",
+    "spec/lotu/shared_spec.rb",
     "test/actor_test.rb"
   ]
   s.homepage = %q{http://github.com/lobo-tuerto/lotu}
@@ -68,12 +72,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.5.0}
   s.summary = %q{A simple, agile Ruby game development framework.}
   s.test_files = [
-    "examples/hello_world/moving_portraits.rb",
-    "examples/screen_cursor/mouse_and_keyboard_cursors.rb",
-    "examples/steering_behaviors/pursuit_and_evade.rb",
-    "examples/steering_behaviors/pursuit_and_evade_multiple.rb",
+    "examples/01_hello_world/moving_portraits.rb",
+    "examples/02_screen_cursor/mouse_and_keyboard_cursors.rb",
+    "examples/03_collisions/box.rb",
+    "examples/04_steering_behaviors/pursuit_and_evade.rb",
+    "examples/04_steering_behaviors/pursuit_and_evade_multiple.rb",
     "spec/lotu/actor_spec.rb",
     "spec/lotu/game_spec.rb",
+    "spec/lotu/shared_spec.rb",
     "test/actor_test.rb"
   ]
 

data/spec/lotu/actor_spec.rb

@@ -1,15 +1,51 @@
 require 'lotu'
 
+class Actress < Lotu::Actor
+  use Lotu::SteeringSystem
+end
+
 describe "Actor" do
+
   before :each do
     @game = Lotu::Game.new
     @actor = Lotu::Actor.new
+    @actress = Actress.new
+    @user = @actor
   end
 
   after :each do
     @actor.die
   end
 
+  describe "Behavior" do
+    it_should_behave_like "system user"
+    it_should_behave_like "eventful"
+    it_should_behave_like "collidable"
+    it_should_behave_like "controllable"
+  end
+
+  describe "Descendants" do
+    it "should have a different object hash for behavior_options" do
+      @actress.class.behavior_options[Actress].should_not be @actor.class.behavior_options[Lotu::Actor]
+    end
+
+    it "should have different values in behavior_options" do
+      @actress.class.behavior_options[Actress].should_not == @actor.class.behavior_options[Lotu::Actor]
+    end
+  end
+
+  it "should have the appropiate number of systems" do
+    @actor.systems.length.should be 2
+  end
+
+  it "should have the appropiate type of systems" do
+    @actor.systems.keys.should == [Lotu::AnimationSystem, Lotu::InterpolationSystem]
+  end
+
+  it "should have the appropiate behavior options set" do
+    @actor.class.behavior_options.should == {Lotu::SystemUser=>{Lotu::AnimationSystem=>{}, Lotu::InterpolationSystem=>{}}, Lotu::Collidable=>{}}
+  end
+
   it{ @actor.should respond_to :x }
   it{ @actor.should respond_to :y }
   it{ @actor.should respond_to :parent }

data/spec/lotu/game_spec.rb

@@ -1,13 +1,32 @@
 require 'lotu'
 
 describe "Game" do
-  before :each do
-    @game = Lotu::Game.new
+  it_should_behave_like "system user"
+  it_should_behave_like "resource manager"
+
+  before :all do
+    @game = Lotu::Game.new #:debug => true
+    @game.with_path_from_file(__FILE__) do |g|
+      load_images '../../examples/media/images'
+    end
+
+    @user = @game
   end
 
-  it{ @game.should respond_to :close }
   it{ @game.should respond_to :update }
   it{ @game.should respond_to :draw }
+  it{ @game.should respond_to :dt }
+  it{ @game.should respond_to :update_queue }
+  it{ @game.should respond_to :draw_queue }
+  it{ @game.should respond_to :image }
+  it{ @game.should respond_to :sound }
+  it{ @game.should respond_to :song }
+  it{ @game.should respond_to :animation }
+  it{ @game.should respond_to :load_images }
+  it{ @game.should respond_to :load_sounds }
+  it{ @game.should respond_to :load_songs }
+  it{ @game.should respond_to :load_animations }
+  it{ @game.should respond_to :fps }
 
   describe "every game tick" do
     before :each do
@@ -30,15 +49,3 @@ describe "Game" do
   end
 
 end
-
-%Q{
-1.upto(100) do |i|
-   if i % 3 == 0 || i % 5 == 0
-     print 'Fizz' if i % 3 == 0
-     print 'Buzz' if i % 5 == 0
-   else
-    print i
-   end
-   print "\n"
-end
-}.size

data/spec/lotu/shared_spec.rb

@@ -0,0 +1,41 @@
+shared_examples_for "system user" do
+  it{ @user.should be_kind_of Lotu::SystemUser }
+  describe "the user class" do
+    it{ @user.class.should respond_to :use }
+  end
+end
+
+shared_examples_for "eventful" do
+  it{ @user.should be_kind_of Lotu::Eventful }
+  it{ @user.should respond_to :on }
+  it{ @user.should respond_to :fire }
+end
+
+shared_examples_for "collidable" do
+  it{ @user.should be_kind_of Lotu::Collidable }
+  it{ @user.should respond_to :collides_with }
+  describe "the user class" do
+    it{ @user.class.should respond_to :collides_as }
+  end
+end
+
+shared_examples_for "controllable" do
+  it{ @user.should be_kind_of Lotu::Controllable }
+  it{ @user.should respond_to :set_keys }
+end
+
+shared_examples_for "resource manager" do
+  it{ @user.should be_kind_of Lotu::ResourceManager }
+  it{ @user.should respond_to :image }
+  it{ @user.should respond_to :images }
+  it{ @user.should respond_to :sound }
+  it{ @user.should respond_to :sounds }
+  it{ @user.should respond_to :song }
+  it{ @user.should respond_to :songs }
+  it{ @user.should respond_to :animation }
+  it{ @user.should respond_to :animations }
+  it{ @user.should respond_to :load_images }
+  it{ @user.should respond_to :load_sounds }
+  it{ @user.should respond_to :load_songs }
+  it{ @user.should respond_to :load_animations }
+end