lotu 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/examples/hello_world/hello_world.rb

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 LIB_PATH = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'lotu.rb')
 require File.expand_path(LIB_PATH)
+
 include Gosu::Button
+include Lotu
 
-class MovingRuby < Lotu::Actor
+class MovingRuby < Actor
 
   def initialize(opts={})
     super
@@ -35,7 +37,7 @@ class MovingRuby < Lotu::Actor
 
 end
 
-class Example < Lotu::Window
+class Example < Game
 
   def initialize
     # This will call the hooks:
@@ -57,7 +59,7 @@ class Example < Lotu::Window
   def setup_actors
     @ruby = MovingRuby.new(:x => width/2, :y => height/2)
     # Create a TextBox so we can display a message on screen
-    @info = Lotu::TextBox.new
+    @info = TextBox.new
     @info.text("Move around with arrow keys")
   end
 

data/examples/mouse_pointer/mouse_pointer.rb

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 LIB_PATH = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'lotu.rb')
 require File.expand_path(LIB_PATH)
+
 include Gosu::Button
+include Lotu
 
-class WarpingRuby < Lotu::Actor
+class WarpingRuby < Actor
   def initialize(opts={})
     super
     set_image 'CptnRuby Gem.png'
@@ -14,7 +16,7 @@ class WarpingRuby < Lotu::Actor
   end
 end
 
-class Example < Lotu::Window
+class Example < Game
   def initialize
     # This will call the hooks:
     # load_resources, setup_systems and setup_actors
@@ -32,31 +34,33 @@ class Example < Lotu::Window
   end
 
   def setup_systems
-    use(Lotu::FpsSystem)
-    use(Lotu::StalkerSystem, :stalk => [Lotu::Actor, Lotu::InputController, Object])
+    # It's important to call super here to setup the InputSystem
+    super
+    use(FpsSystem)
+    use(StalkerSystem, :stalk => [Actor, Cursor, WarpingRuby, TextBox, Object])
   end
 
   def setup_actors
     @ruby = WarpingRuby.new(:x => width/2, :y => height/2)
-    @cursor1 = Lotu::Cursor.new(:image => 'crosshair.png',
-                                :keys => {MsLeft => [:click, false]},
-                                :color => 0xff0099ff)
-    @cursor2 = Lotu::Cursor.new(:image => 'crosshair.png',
-                                :use_mouse => false,
-                                :keys => {
-                                  KbSpace => [:click, false],
-                                  KbUp => :up,
-                                  KbDown => :down,
-                                  KbLeft => :left,
-                                  KbRight => :right},
-                                :color => 0xff99ff00)
+    @cursor1 = Cursor.new(:image => 'crosshair.png',
+                          :keys => {MsLeft => [:click, false]},
+                          :color => 0xff0099ff)
+    @cursor2 = Cursor.new(:image => 'crosshair.png',
+                          :use_mouse => false,
+                          :keys => {
+                            KbSpace => [:click, false],
+                            KbUp => :up,
+                            KbDown => :down,
+                            KbLeft => :left,
+                            KbRight => :right},
+                          :color => 0xff99ff00)
     @cursor2.x = width*3/4
     @cursor2.y = height/2
 
     # Create a TextBox with default option :size => 15
-    @info = Lotu::TextBox.new(:size => 15)
-    @info.watch(@systems[Lotu::FpsSystem])
-    @info.watch(@systems[Lotu::StalkerSystem])
+    @info = TextBox.new(:size => 15)
+    @info.watch(@systems[FpsSystem])
+    @info.watch(@systems[StalkerSystem])
     # We can change the size for a specific line of text
     @info.watch("@cursor1 data:", :size => 20)
     # Color too

data/examples/steering_behaviors/steering.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 LIB_PATH = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'lotu.rb')
 require File.expand_path(LIB_PATH)
+
 include Gosu::Button
+include Lotu
 
-class SteeringRuby < Lotu::Actor
+class SteeringRuby < Actor
   def initialize(opts={})
     super
     set_image 'CptnRuby Gem.png'
-    use(Lotu::SteeringSystem, opts)
+    use(SteeringSystem, opts)
   end
 
   def warp(x, y)
@@ -15,7 +17,7 @@ class SteeringRuby < Lotu::Actor
   end
 end
 
-class Example < Lotu::Window
+class Example < Game
   def initialize
     # This will call the hooks:
     # load_resources, setup_systems and setup_actors
@@ -38,7 +40,9 @@ class Example < Lotu::Window
   end
 
   def setup_systems
-    use(Lotu::FpsSystem)
+    # It's important to call super here to setup the InputSystem
+    super
+    use(FpsSystem)
   end
 
   def setup_actors
@@ -49,16 +53,16 @@ class Example < Lotu::Window
     @ruby2 = SteeringRuby.new
     @ruby2.activate(:pursuit)
 
-    @cursor = Lotu::Cursor.new(:image => 'crosshair.png',
-                               :keys => {MsLeft => [:click, false]})
+    @cursor = Cursor.new(:image => 'crosshair.png',
+                         :keys => {MsLeft => [:click, false]})
 
-    @window_info = Lotu::TextBox.new(:size => 15)
-    @window_info.watch(@systems[Lotu::FpsSystem])
+    @window_info = TextBox.new(:size => 15)
+    @window_info.watch(@systems[FpsSystem])
     @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")
 
-    @ruby_info = Lotu::TextBox.new(:attach_to => @ruby, :size => 14)
+    @ruby_info = TextBox.new(:attach_to => @ruby, :size => 14)
     @ruby_info.watch(@ruby)
   end
 

data/lib/lotu/actor.rb

@@ -1,37 +1,63 @@
 module Lotu
   class Actor
-    attr_accessor :parent, :x, :y, :systems
+    attr_accessor :parent, :x, :y, :systems,
+    :z, :angle, :center_x, :center_y,
+    :factor_x, :factor_y, :color, :mode, :image
 
     include SystemUser
+    include Controllable
 
     def initialize(opts={})
       default_opts = {
         :x => 0,
-        :y => 0
+        :y => 0,
+        :z => 0,
+        :angle => 0.0,
+        :center_x => 0.5,
+        :center_y => 0.5,
+        :factor_x => 1.0,
+        :factor_y => 1.0,
+        :color => 0xffffffff,
+        :mode => :default,
+        :parent => $lotu
       }
       @opts = default_opts.merge!(opts)
+      @image = nil
       @x = @opts[:x]
       @y = @opts[:y]
-      @parent = $window
-      @parent.update_queue << self
+      @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]
+      @parent.manage_me(self)
+      @systems = {}
 
       # Add extra functionality
-      self.extend Drawable
-      self.extend Controllable
       self.extend Eventful
       self.extend Collidable
-
-      @systems = {}
     end
 
     # Easy access to delta-time
     def dt
-      $window.dt
+      $lotu.dt
+    end
+
+    def set_image(image)
+      @image = @parent.image(image)
+    end
+
+    def unset_image
+      @image = nil
     end
 
     # Remove ourselves from the update queue
     def die
-      @parent.update_queue.delete(self)
+      @parent.kill_me(self)
     end
 
     def update
@@ -40,7 +66,9 @@ module Lotu
       end
     end
 
-    def draw;end
+    def draw
+      @image.draw_rot(@x, @y, @z, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode) unless @image.nil?
+    end
 
   end
 end

data/lib/lotu/behaviors/controllable.rb

@@ -2,14 +2,6 @@
 module Lotu
   module Controllable
 
-    def self.extended(instance)
-      instance.init_behavior
-    end
-
-    def init_behavior
-      @input_controller = nil
-    end
-
     # This will call #go_up every game loop
     # Gosu::Button::KbUp => :go_up
     # This is the same as the above
@@ -21,7 +13,7 @@ module Lotu
     # This will call #go_up every 50ms
     # Gosu::Button::KbUp => [:go_up, 50]
     def set_keys(keys)
-      @input_controller = InputController.new(self, keys)
+      @parent.systems[InputSystem].set_keys(self, keys)
     end
 
   end

data/lib/lotu/cursor.rb

@@ -8,13 +8,13 @@ module Lotu
       default_opts = {
         :use_mouse => true,
         :speed => 100,
-        :x => $window.width/2,
-        :y => $window.height/2
+        :x => $lotu.width/2,
+        :y => $lotu.height/2
       }
       opts = default_opts.merge!(opts)
       super
-      $window.mouse_x = opts[:x]
-      $window.mouse_y = opts[:y]
+      $lotu.mouse_x = opts[:x]
+      $lotu.mouse_y = opts[:y]
       @clicked_x = @clicked_y = 0
       @speed = opts[:speed]
       @use_mouse = opts[:use_mouse]
@@ -24,8 +24,8 @@ module Lotu
 
     def update
       if @use_mouse
-        @x = $window.mouse_x
-        @y = $window.mouse_y
+        @x = $lotu.mouse_x
+        @y = $lotu.mouse_y
       end
     end
 
@@ -40,8 +40,8 @@ module Lotu
     end
 
     def adjust_mouse
-      $window.mouse_y = @y
-      $window.mouse_x = @x
+      $lotu.mouse_y = @y
+      $lotu.mouse_x = @x
     end
 
     def up

data/lib/lotu/{window.rb → game.rb}

@@ -1,5 +1,5 @@
 module Lotu
-  class Window < Gosu::Window
+  class Game < Gosu::Window
     # Accessors for time delta, systems and fonts
     attr_reader :dt, :systems, :fonts
     # Accessors for queues
@@ -11,7 +11,7 @@ module Lotu
       super(800, 600, false)
 
       # Handy global window variable
-      $window = self
+      $lotu = self
       @debug = true
       setup_containers
 
@@ -20,9 +20,6 @@ module Lotu
       # Memoize fonts by size
       @fonts = Hash.new{|h,k| h[k] = Gosu::Font.new(self, Gosu::default_font_name, k)}
 
-      # Add extra functionality
-      extend Controllable
-
       # Call hook methods
       load_resources
       setup_systems
@@ -32,9 +29,12 @@ module Lotu
 
     # Hook methods, these are meant to be replaced by subclasses
     def load_resources;end
-    def setup_systems;end
     def setup_actors;end
 
+    def setup_systems
+      use(InputSystem)
+    end
+
     # Setup various containers
     def setup_containers
       # For systems
@@ -132,19 +132,19 @@ module Lotu
 
     def load_images(path)
       with_files(/\.png|\.jpg|\.bmp/, path) do |file_name, file_path|
-        @images[file_name] = Gosu::Image.new($window, file_path)
+        @images[file_name] = Gosu::Image.new($lotu, file_path)
       end
     end
 
     def load_sounds(path)
       with_files(/\.ogg|\.mp3|\.wav/, path) do |file_name, file_path|
-        @sounds[file_name] = Gosu::Sample.new($window, file_path)
+        @sounds[file_name] = Gosu::Sample.new($lotu, file_path)
       end
     end
 
     def load_songs(path)
       with_files(/\.ogg|\.mp3|\.wav/, path) do |file_name, file_path|
-        @songs[file_name] = Gosu::Song.new($window, file_path)
+        @songs[file_name] = Gosu::Song.new($lotu, file_path)
       end
     end
 
@@ -155,7 +155,7 @@ module Lotu
       count = 0
       Dir.entries(path).grep(regexp).each do |entry|
         begin
-          @animations[entry] = klass.new($window, File.join(path, entry))
+          @animations[entry] = klass.new($lotu, File.join(path, entry))
           count += 1
         rescue Exception => e
           puts e, File.join(path, entry)

data/lib/lotu/systems/fps_system.rb

@@ -14,7 +14,7 @@ module Lotu
 
     def update
       @ticks += 1
-      @accum += $window.dt
+      @accum += $lotu.dt
       if @ticks >= @samples
         @fps = @ticks/@accum
         @ticks = 0

data/lib/lotu/systems/input_system.rb

@@ -0,0 +1,76 @@
+module Lotu
+  class InputSystem
+
+    def initialize(user, opts={})
+      user.extend UserMethods
+      # Current ongoing actions (button is being pushed)
+      @actions = []
+      @unique_actions = []
+
+      # Last time an action was executed (so we can implement some
+      # rate of fire)
+      @last_time_fired = Hash.new{|h,k| h[k] = Hash.new{|h,k| h[k] = 0}}
+
+      # Think of it like a reverse proxy
+      @reverse_register = Hash.new{|h,k| h[k] = []}
+    end
+
+    # If there are some actions currently going on, dispatch them
+    def update
+      @unique_actions.each do |client, action_name, rate|
+        client.send(action_name)
+      end.clear
+
+      @actions.each do |client, action_name, rate|
+        # action usually is a [:action_name, rate_of_fire] pair, for
+        # example: [:fire, 50] will call #fire every 50ms
+        time_now = Gosu.milliseconds
+        if @last_time_fired[client][action_name] + (rate || 0) < time_now
+          client.send(action_name)
+          @last_time_fired[client][action_name] = time_now
+        end
+      end
+    end
+
+    def set_keys(client, keys)
+      keys.each do |key, action|
+        @reverse_register[key] << [client, action]
+      end
+    end
+
+    def button_down(key)
+      @reverse_register[key].each do |client, action|
+        action_name, rate = action
+        if rate == false
+          @unique_actions << [client, action_name, rate]
+        else
+          @actions << [client, action_name, rate]
+        end
+      end
+    end
+
+    def button_up(key)
+      @reverse_register[key].each do |client, action|
+        action_name, rate = action
+        @actions.delete [client, action_name, rate]
+      end
+    end
+
+    def draw;end
+
+    module UserMethods
+      def set_keys(keys)
+        systems[InputSystem].set_keys(self, keys)
+      end
+
+      def button_down(key)
+        systems[InputSystem].button_down(key)
+      end
+
+      def button_up(key)
+        systems[InputSystem].button_up(key)
+      end
+    end
+
+  end
+end

data/lib/lotu/systems/steering_system.rb

@@ -193,9 +193,9 @@ module Lotu
 
       def draw
         super
-        $window.draw_line(0, 0, 0xff999999, @pos.x, @pos.y, 0xff333333)
-        $window.draw_line(@pos.x, @pos.y, 0xffffffff, (@pos + @heading*50).x, (@pos+@heading*50).y, 0xffff0000)
-        $window.draw_line(@pos.x, @pos.y, 0xffffffff, @target.x, @target.y, 0xff00ff00) if @target
+        $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
       end
 
       # to_s utility methods

data/lib/lotu/text_box.rb

@@ -13,9 +13,6 @@ module Lotu
       @watch_list = []
       @size = opts[:size]
       @attached_to = opts[:attach_to]
-      # Since we aren't setting an image for this, we need to specify
-      # this actor needs to be drawed
-      draw_me
     end
 
     def text(text, opts={})
@@ -44,11 +41,11 @@ module Lotu
         my_color = opts[:color] || @color
         my_text = watched.to_s
         if my_text.is_a?(String)
-          $window.fonts[my_size].draw(my_text, @x, @y + pos_y, @z, @factor_x, @factor_y, my_color)
+          $lotu.fonts[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|
-            $window.fonts[my_size].draw(line, @x, @y + pos_y, @z, @factor_x, @factor_y, my_color)
+            $lotu.fonts[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

@@ -3,6 +3,6 @@ $LOAD_PATH.unshift(LOTU_ROOT)
 
 require 'gosu'
 %w{vector2d string}.each{|file| require "misc/#{file}"}
-%w{system_user collidable controllable drawable controllable/input_controller eventful}.each{|file| require "behaviors/#{file}"}
-%w{stalker_system fps_system collision_system steering_system}.each{|file| require "systems/#{file}"}
-%w{window actor cursor text_box}.each{|file| require 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}

data/lotu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lotu}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-03-26}
   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 = [
@@ -49,19 +49,18 @@ Gem::Specification.new do |s|
      "lib/lotu/actor.rb",
      "lib/lotu/behaviors/collidable.rb",
      "lib/lotu/behaviors/controllable.rb",
-     "lib/lotu/behaviors/controllable/input_controller.rb",
-     "lib/lotu/behaviors/drawable.rb",
      "lib/lotu/behaviors/eventful.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/systems/collision_system.rb",
      "lib/lotu/systems/fps_system.rb",
+     "lib/lotu/systems/input_system.rb",
      "lib/lotu/systems/stalker_system.rb",
      "lib/lotu/systems/steering_system.rb",
      "lib/lotu/text_box.rb",
-     "lib/lotu/window.rb",
      "lotu.gemspec",
      "test/actor_test.rb"
   ]

data/test/actor_test.rb

@@ -12,7 +12,7 @@ Protest.report_with(:documentation)
  
 Protest.context('An Actor') do
   setup do
-    $window = Lotu::Window.new
+    $lotu = Lotu::Window.new
     @actor = Lotu::Actor.new
   end
  
@@ -32,14 +32,14 @@ Protest.context('An Actor') do
   end
   
   it 'has a window reference.' do
-    assert_equal $window, @actor.parent
+    assert_equal $lotu, @actor.parent
   end
  
   # some context...
   #
   context 'when dying' do
     it 'removes itself from Window update_queue.' do
-      mock.proxy($window.update_queue).delete(@actor)
+      mock.proxy($lotu.update_queue).delete(@actor)
       @actor.die
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - lobo_tuerto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -06:00
+date: 2010-03-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,19 +73,18 @@ files:
 - lib/lotu/actor.rb
 - lib/lotu/behaviors/collidable.rb
 - lib/lotu/behaviors/controllable.rb
-- lib/lotu/behaviors/controllable/input_controller.rb
-- lib/lotu/behaviors/drawable.rb
 - lib/lotu/behaviors/eventful.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/systems/collision_system.rb
 - lib/lotu/systems/fps_system.rb
+- lib/lotu/systems/input_system.rb
 - lib/lotu/systems/stalker_system.rb
 - lib/lotu/systems/steering_system.rb
 - lib/lotu/text_box.rb
-- lib/lotu/window.rb
 - lotu.gemspec
 - test/actor_test.rb
 - TODO

data/lib/lotu/behaviors/controllable/input_controller.rb

@@ -1,56 +0,0 @@
-module Lotu
-  class InputController
-    attr_accessor :subject, :keys
-
-    def initialize(subject, keys)
-      # The subject being controlled
-      @subject = subject
-
-      # Key mappings {Gosu::Button::KbEscape => :quit, ...}
-      @keys = keys
-
-      # Current ongoing actions (button is being pushed)
-      @actions = []
-      @once_actions = []
-
-      # Last time an action was executed (so we can implement some
-      # rate of fire)
-      @executed_at = {}
-
-      # Register this controller with the main window
-      $window.register_for_input(self)
-    end
-
-    # If there are some actions currently going on, dispatch them
-    def update
-      @once_actions.each do |action_name, rate|
-        @subject.send(action_name)
-      end.clear
-
-      @actions.each do |action_name, rate|
-        # action usually is a [:action_name, rate_of_fire] pair, for
-        # example: [:fire, 50] will call #fire every 50ms
-        time_now = Gosu.milliseconds
-        if @executed_at[action_name] + (rate || 0) < time_now
-          @executed_at[action_name] = time_now
-          @subject.send(action_name)
-        end
-      end
-    end
-
-    def button_down(id)
-      action_name, rate = @keys[id]
-      @executed_at[action_name] ||= 0
-      if rate == false
-        @once_actions << @keys[id]
-      else
-        @actions << @keys[id]
-      end
-    end
-
-    def button_up(id)
-      @actions.delete(@keys[id])
-    end
-
-  end
-end

data/lib/lotu/behaviors/drawable.rb

@@ -1,61 +0,0 @@
-module Lotu
-  module Drawable
-
-    def self.extended(instance)
-      instance.init_behavior
-    end
-
-    def init_behavior
-      class << self
-        attr_accessor :z, :angle, :center_x, :center_y,
-        :factor_x, :factor_y, :color, :mode
-      end
-
-      default_opts = {
-        :z => 0,
-        :angle => 0.0,
-        :center_x => 0.5,
-        :center_y => 0.5,
-        :factor_x => 1.0,
-        :factor_y => 1.0,
-        :color => 0xffffffff,
-        :mode => :default
-      }
-      @opts = default_opts.merge!(@opts)
-
-      @image = nil
-      @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]
-    end
-
-    def draw_me
-      @parent.draw_queue << self unless @parent.draw_queue.include?(self)
-    end
-
-    def image
-      @image
-    end
-
-    def set_image(image)
-      @image = @parent.image(image)
-      draw_me
-    end
-
-    def draw
-      super
-      @image.draw_rot(@x, @y, @z, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode) unless @image.nil?
-    end
-
-    def die
-      super
-      @parent.draw_queue.delete(self)
-    end
-
-  end
-end