lotu 0.1.18 → 0.1.19

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

data/examples/03_collisions/box.rb

@@ -36,7 +36,7 @@ class Painting < Actor
 end
 
 class Example < Game
-  use CollisionSystem
+  use_systems :collision
 
   def initialize
     super

data/examples/04_steering_behaviors/pursuit_and_evade.rb

@@ -14,8 +14,7 @@ include Lotu
 # Let's define a Missile class that will use a Steering system to
 # control it's movement
 class Missile < Actor
-  use SteeringSystem
-  use AnimationSystem
+  use_systems :steering, :animation
 
   def teleport(x, y)
     @pos.x, @pos.y = x, y

data/lib/lotu.rb

@@ -1,10 +1,38 @@
+# Get the path to this file to reference the lotu folder and stuff it
+# in the front of $LOAD_PATH so our relative requires are found
+# quickly without problems
 LOTU_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'lotu'))
 $LOAD_PATH.unshift(LOTU_ROOT)
 
 require 'rubygems'
 require 'gosu'
-%w{vector2d string kernel util}.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}
+
+# Load helper files
+['vector2d',
+ 'string',
+ 'kernel',
+ 'util'].each{|file| require "helpers/#{file}"}
+
+# Load behavior files
+['resource_manager',
+ 'system_user',
+ 'collidable',
+ 'controllable',
+ 'eventful'].each{|file| require "behaviors/#{file}"}
+
+# Load system files
+['base',
+ 'interpolation',
+ 'animation',
+ 'input_manager',
+ 'stalker',
+ 'collision',
+ 'steering'].map{|s| "#{s}_system"}.each{|file| require "systems/#{file}"}
+
+# Load core files
+['behavior',
+ 'actor',
+ 'cursor',
+ 'text_box',
+ 'game'].each{|file| require file}
 

data/lib/lotu/actor.rb

@@ -1,5 +1,5 @@
 module Lotu
-  class Actor
+  class Actor < GameEntity
     include Lotu::Helpers::Util
     extend Lotu::Behavior
 
@@ -15,7 +15,7 @@ module Lotu
 
     def initialize(opts={})
       # if debug is set, print out class info
-      class_debug_info
+      class_debug_info if $lotu.debug
 
       default_opts = {
         :x => 0,
@@ -43,7 +43,7 @@ module Lotu
       init_behavior opts
 
       # if debug is set, print out instance info
-      instance_debug_info
+      instance_debug_info if $lotu.debug
     end
 
     # Easy access to delta-time
@@ -60,6 +60,7 @@ module Lotu
       @center_y = opts[:center_y] || @center_y
       @factor_x = opts[:factor_x] || @factor_x
       @factor_y = opts[:factor_y] || @factor_y
+      @width = opts[:width]
       @color = opts[:color] || @color
       if @color.kind_of?(Integer)
         @color = Gosu::Color.new(opts[:color])
@@ -67,6 +68,10 @@ module Lotu
       @mode = opts[:mode] || @mode
     end
 
+    def factor= factor
+      @factor_x = @factor_y = factor
+    end
+
     def rand_color
       Gosu::Color.from_hsv(rand(360), 1, 1)
     end

data/lib/lotu/behaviors/resource_manager.rb

@@ -12,6 +12,7 @@ module Lotu
       @default_font = Hash.new{ |h,k| h[k] = Gosu::Font.new( self, Gosu::default_font_name, k ) }
     end
 
+    # TODO: cambiar a Image['hola.png']
     def image( name )
       @images[name]
     end

data/lib/lotu/behaviors/system_user.rb

@@ -7,6 +7,8 @@ module Lotu
       base.extend ClassMethods
     end
 
+    # PONDER: Cambiar por initialize? y controlar el punto de llamado
+    # con super?
     def init_behavior user_opts
       super if defined? super
       @systems ||= Hash.new
@@ -40,6 +42,23 @@ module Lotu
 
     # Allows to activate a system in the host
     module ClassMethods
+      # specify the systems you want to use, using symbols
+      # instead of module names
+      def use_systems *system_names
+        system_names.each do |system_name|
+          if system_name.is_a? Symbol
+            use Lotu.const_get("#{system_name.capitalize}System")
+          elsif system_name.is_a? Hash
+            system_name.each do |key,value|
+              use Lotu.const_get("#{key.capitalize}System"), value
+            end
+          else
+            raise "Unsupported system name as #{system_name.class}"
+          end
+        end
+      end
+
+      # specify the systems you want to use, using module names
       def use( klass, opts={} )
         behavior_options[SystemUser] ||= Hash.new
         behavior_options[SystemUser][klass] = opts

data/lib/lotu/cursor.rb

@@ -1,7 +1,7 @@
 # Provides a mouse pointer usable through mouse or keyboard
 module Lotu
   class Cursor < Actor
-    use InterpolationSystem
+    use_systems :interpolation
 
     attr_reader :clicked_x, :clicked_y
     attr_accessor :speed, :use_mouse

data/lib/lotu/game.rb

@@ -40,7 +40,7 @@ module Lotu
       setup_containers
 
       # if debug is set, print out class info
-      class_debug_info
+      class_debug_info if @debug
 
       # call the Gosu::Window constructor
       super(opts[:width], opts[:height], opts[:fullscreen])
@@ -58,7 +58,7 @@ module Lotu
       setup_events
 
       # if debug is set, print out instance info
-      instance_debug_info
+      instance_debug_info if @debug
     end
 
     def fps

data/lib/lotu/game_entity.rb

@@ -0,0 +1,6 @@
+class GameEntity
+
+  def draw; end
+  def update; end
+
+end

data/lib/lotu/helpers/vector2d.rb

@@ -129,11 +129,20 @@ module Lotu
       dot(vector) > 0
     end
 
+    def rotate radians
+      new_x = @x * Math.cos(radians) - @y * Math.sin(radians)
+      new_y = @y * Math.cos(radians) + @x * Math.sin(radians)
+      #self.x = new_x
+      #self.y = new_y
+      #self
+      Vector2d.new( new_x, new_y )
+    end
+
     def to_s
       # TODO tratar de reducir la cantidad de vectores creados, al
       # menos cuando no se está moviendo
       #format('%d %.2f, %.2f', object_id, @x, @y)
-      format('%.2f, %.2f', @x, @y)
+      format('<%.2f, %.2f>', @x, @y)
     end
 
   end

data/lib/lotu/systems/interpolation_system.rb

@@ -2,8 +2,11 @@
 module Lotu
   class InterpolationSystem < BaseSystem
 
+    attr_accessor :interpolations
+
     def initialize(user, opts={})
       super
+      # TODO: cambiar esto por un include en la clase mejor
       user.extend(UserMethods)
       @interpolations = []
       @tagged_for_deletion = []
@@ -20,7 +23,10 @@ module Lotu
         :end => Float(opts[:end]),
         :duration => opts[:duration] || 1,
         :start_in => opts[:start_in] || 0,
-        :on_result => opts[:on_result],
+        :on_stop => opts[:on_stop] || :current,
+        :every_value => opts[:every_value],
+        # TODO: implement callback mechanism
+        :callback => opts[:callback],
         :loop => opts[:loop],
         :bounce => opts[:bounce],
         :bouncing_back => false
@@ -29,6 +35,10 @@ module Lotu
     end
 
     # TODO: incluir código para :loop_for => n
+    # TODO: incluir soporte para "encimar" varias interpolaciones
+    # sobre una misma propiedad, de esa manera podemos "acumular"
+    # varias interpolaciones y el resultado se suma y se aplica a la
+    # propiedad una vez que todo el grupo ha sido calculado
     def update
       @interpolations.each do |t|
         t[:accum_time] += dt
@@ -49,7 +59,7 @@ module Lotu
             end
           end
           value = t[:init] + t[:calc]
-          value = value.send(t[:on_result]) if t[:on_result]
+          value = value.send(t[:every_value]) if t[:every_value]
           t[:object].send( t[:property_setter], value )
         end
       end
@@ -70,10 +80,28 @@ module Lotu
     end
 
     module UserMethods
+      # Clear all interpolations on this object
+      def stop_interpolations
+        @systems[InterpolationSystem].interpolations.each do |t|
+          if t[:on_stop] == :complete
+            value = t[:end]
+          else
+            value = t[:init] + t[:calc]
+          end
+          value = value.send(t[:every_value]) if t[:every_value]
+          t[:object].send( t[:property_setter], value )
+        end
+        @systems[InterpolationSystem].interpolations.clear
+      end
+
       def interpolate(object, property, opts)
         @systems[InterpolationSystem].interpolate(object, property, opts)
       end
 
+      def interpolate_my(property, opts)
+        interpolate(self, property, opts)
+      end
+
       # Image helpers
       def interpolate_angle(opts)
         interpolate(self, :angle, opts)
@@ -89,19 +117,19 @@ module Lotu
 
       # Color helpers
       def interpolate_alpha(opts)
-        interpolate(@color, :alpha, opts.merge!(:on_result => :to_i))
+        interpolate(@color, :alpha, opts.merge!(:every_value => :to_i))
       end
 
       def interpolate_red(opts)
-        interpolate(@color, :red, opts.merge!(:on_result => :to_i))
+        interpolate(@color, :red, opts.merge!(:every_value => :to_i))
       end
 
       def interpolate_green(opts)
-        interpolate(@color, :green, opts.merge!(:on_result => :to_i))
+        interpolate(@color, :green, opts.merge!(:every_value => :to_i))
       end
 
       def interpolate_blue(opts)
-        interpolate(@color, :blue, opts.merge!(:on_result => :to_i))
+        interpolate(@color, :blue, opts.merge!(:every_value => :to_i))
       end
 
       def interpolate_hue(opts)

data/lib/lotu/systems/steering_system.rb

@@ -34,6 +34,9 @@ module Lotu
     end
 
     def update
+      @user.pos.x = @user.x
+      @user.pos.y = @user.y
+
       @force.zero!
       @behaviors.each_pair do |behavior, active|
         @force += send(behavior) if active

data/lotu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lotu}
-  s.version = "0.1.18"
+  s.version = "0.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2011-02-25}
+  s.date = %q{2011-02-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 = [
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
     "lib/lotu/behaviors/system_user.rb",
     "lib/lotu/cursor.rb",
     "lib/lotu/game.rb",
+    "lib/lotu/game_entity.rb",
     "lib/lotu/helpers/kernel.rb",
     "lib/lotu/helpers/string.rb",
     "lib/lotu/helpers/util.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotu
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-25 00:00:00.000000000 -06:00
+date: 2011-02-27 00:00:00.000000000 -06:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &23259460 !ruby/object:Gem::Requirement
+  requirement: &7915280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.27.1
   type: :runtime
   prerelease: false
-  version_requirements: *23259460
+  version_requirements: *7915280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23258660 !ruby/object:Gem::Requirement
+  requirement: &7914320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *23258660
+  version_requirements: *7914320
 description: 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.
@@ -77,6 +77,7 @@ files:
 - lib/lotu/behaviors/system_user.rb
 - lib/lotu/cursor.rb
 - lib/lotu/game.rb
+- lib/lotu/game_entity.rb
 - lib/lotu/helpers/kernel.rb
 - lib/lotu/helpers/string.rb
 - lib/lotu/helpers/util.rb