lotu 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/hello_world/hello_world.rb

@@ -3,11 +3,7 @@ LIB_PATH = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'lotu.rb')
 require File.expand_path(LIB_PATH)
 include Gosu::Button
 
-class Player < Lotu::Actor
-  is_drawable
-  is_controllable
-
-  attr_reader :speed
+class MovingRuby < Lotu::Actor
 
   def initialize
     super
@@ -34,30 +30,26 @@ class Player < Lotu::Actor
     @y += 1
   end
 
-  def warp(x, y)
-    @x, @y = x, y
-  end
 end
 
 class Example < Lotu::Window
-  is_controllable
-  is_resourceful
 
   def initialize
     super
     set_keys KbEscape => :close
+
     with_path(__FILE__) do
       load_images '../media'
-      load_sounds '../media'
     end
 
-    @player = Player.new
+    @ruby = MovingRuby.new
   end
 
   def draw
     super
     @fps_counter.draw
   end
+
 end
 
 Example.new.show

data/examples/mouse_pointer/mouse_pointer.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+LIB_PATH = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'lotu.rb')
+require File.expand_path(LIB_PATH)
+include Gosu::Button
+
+class WarpingRuby < Lotu::Actor
+  def initialize
+    super
+    set_image 'CptnRuby Gem.png'
+  end
+
+  def warp(x, y)
+    @x, @y = x, y
+  end
+end
+
+class Example < Lotu::Window
+  def initialize
+    super
+    set_keys KbEscape => :close
+
+    with_path __FILE__ do
+      load_images '../media'
+    end
+
+    @ruby = WarpingRuby.new
+    @cursor1 = Lotu::Cursor.new(:image => 'crosshair.png',
+                                :keys => {MsLeft => [:click, false]})
+    @cursor2 = Lotu::Cursor.new(:image => 'crosshair.png',
+                                :use_mouse => false,
+                                :keys => {
+                                  KbSpace => [:click, false],
+                                  KbUp => :up,
+                                  KbDown => :down,
+                                  KbLeft => :left,
+                                  KbRight => :right
+                                })
+
+    @cursor1.on(:click) do |x,y|
+      @ruby.warp(x,y)
+    end
+    @cursor2.on(:click) do |x,y|
+      @ruby.warp(x,y)
+    end
+  end
+
+  def draw
+    super
+    @fps_counter.draw
+    @font.draw("@cursor1: #{@cursor1.clicked_x}, #{@cursor1.clicked_y}", 10, 30, 0, 1.0, 1.0, 0xfffff000)
+    @font.draw("@cursor2: #{@cursor2.clicked_x}, #{@cursor2.clicked_y}", 10, 30+@font.height, 0, 1.0, 1.0, 0xfffff000)
+  end
+end
+
+Example.new.show

data/lib/lotu/actor.rb

@@ -1,18 +1,25 @@
 module Lotu
   class Actor
-    extend HasBehavior
-
     attr_accessor :parent, :x, :y
 
     def initialize(opts={})
-      super()
-      @x = opts[:x] || 0
-      @y = opts[:y] || 0
+      default_opts = {
+        :x => 0,
+        :y => 0,
+        :color => 0xffffffff
+      }
+      opts = default_opts.merge!(opts)
+      @x = opts[:x]
+      @y = opts[:y]
+      @color = opts[:color]
       @parent = $window
       @parent.update_queue << self
 
-      # Initialize the behaviors included in subclasses
-      init_behavior
+      # Add extra functionality
+      self.extend Drawable
+      self.extend Controllable
+      self.extend Eventful
+      self.extend Collidable
     end
 
     # Easy access to delta-time
@@ -25,8 +32,6 @@ module Lotu
       @parent.update_queue.delete(self)
     end
 
-    # Meant to be overriden by behaviors
-    def init_behavior;end
     def update;end
   end
 end

data/lib/lotu/behaviors/collidable.rb

@@ -0,0 +1,27 @@
+module Lotu
+  module Collidable
+
+    def self.extended(instance)
+      instance.init_behavior
+    end
+
+    def init_behavior
+      @collision_tag = nil
+    end
+
+    def collides_as(tag)
+      @collision_tag = tag
+      @parent.systems[:collision].add_entity(self, tag)
+    end
+
+    def collides_with(other)
+      Gosu.distance(@x, @y, other.x, other.y) < @collision_radius + other.collision_radius
+    end
+
+    def die
+      super
+      @parent.systems[:collision].remove_entity(self, @collision_tag)
+    end
+
+  end
+end

data/lib/lotu/behaviors/{input_controller.rb → controllable/input_controller.rb}

@@ -51,5 +51,6 @@ module Lotu
     def button_up(id)
       @actions.delete(@keys[id])
     end
+
   end
 end

data/lib/lotu/behaviors/controllable.rb

@@ -1,28 +1,28 @@
 # Convenience module to set up an InputController
 module Lotu
   module Controllable
-    def is_controllable
-      include InstanceMethods
+
+    def self.extended(instance)
+      instance.init_behavior
+    end
+
+    def init_behavior
+      @input_controller = nil
     end
 
-    module InstanceMethods
-      def init_behavior
-        super
-        @_input_controller = nil
-      end
-      # This will call #go_up every game loop
-      # Gosu::Button::KbUp => :go_up
-      # This is the same as the above
-      # Gosu::Button::KbUp => [:go_up, 0]
-      #
-      # This will call #go_up once
-      # Gosu::Button::KbUp => [:go_up, false]
-      #
-      # This will call #go_up every 50ms
-      # Gosu::Button::KbUp => [:go_up, 50]
-      def set_keys(keys)
-        @_input_controller = InputController.new(self, keys)
-      end
+    # This will call #go_up every game loop
+    # Gosu::Button::KbUp => :go_up
+    # This is the same as the above
+    # Gosu::Button::KbUp => [:go_up, 0]
+    #
+    # This will call #go_up once
+    # Gosu::Button::KbUp => [:go_up, false]
+    #
+    # This will call #go_up every 50ms
+    # Gosu::Button::KbUp => [:go_up, 50]
+    def set_keys(keys)
+      @input_controller = InputController.new(self, keys)
     end
+
   end
 end

data/lib/lotu/behaviors/drawable.rb

@@ -1,28 +1,36 @@
 module Lotu
   module Drawable
-    def is_drawable
-      include InstanceMethods
+
+    def self.extended(instance)
+      instance.init_behavior
     end
 
-    module InstanceMethods
-      def init_behavior
-        super
-        @_image = nil
-      end
+    def init_behavior
+      @image = nil
+      @color = 0xffffffff
+      @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
+    end
 
-      def set_image(image)
-        @_image = $window.image(image)
-        @parent.draw_queue << self unless @parent.draw_queue.include?(self)
-      end
+    def set_image(image)
+      @image = @parent.image(image)
+      @parent.draw_queue << self unless @parent.draw_queue.include?(self)
+    end
 
-      def draw
-        @_image.draw(@x,@y,0)
-      end
+    def draw
+      @image.draw_rot(@x, @y, @z, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode)
+    end
 
-      def die
-        super
-        @parent.draw_queue.delete(self)
-      end
+    def die
+      super
+      @parent.draw_queue.delete(self)
     end
+
   end
 end

data/lib/lotu/behaviors/eventful.rb

@@ -17,23 +17,22 @@
 
 module Lotu
   module Eventful
-    def is_eventful
-      include InstanceMethods
+
+    def self.extended(instance)
+      instance.init_behavior
     end
 
-    module InstanceMethods
-      def init_behavior
-        super
-        @_events = {}
-      end
+    def init_behavior
+      @events = {}
+    end
 
-      def on(event, &blk)
-        @_events[event] = blk
-      end
+    def on(event, &blk)
+      @events[event] = blk
+    end
 
-      def fire(event, *args)
-        @_events[event].call(*args) if @_events[event]
-      end
+    def fire(event, *args)
+      @events[event].call(*args) if @events[event]
     end
+
   end
 end

data/lib/lotu/behaviors/resourceful.rb

@@ -1,64 +1,63 @@
 # Add methods to load and access images, sounds & songs
 module Lotu
   module Resourceful
-    def is_resourceful
-      include InstanceMethods
-    end
 
-    module InstanceMethods
-      def init_behavior
-        @_images = {}
-        @_sounds = {}
-        @_songs = {}
-      end
+    def self.extended(instance)
+      instance.init_behavior
+    end
 
-      def image(name)
-        @_images[name]
-      end
+    def init_behavior
+      @images = {}
+      @sounds = {}
+      @songs = {}
+    end
 
-      def sound(name)
-        @_sounds[name]
-      end
+    def image(name)
+      @images[name]
+    end
 
-      def song(name)
-        @_songs[name]
-      end
+    def sound(name)
+      @sounds[name]
+    end
 
-      def load_images(path)
-        load_resources(@_images, /\.png|\.jpg|\.bmp/, path, Gosu::Image)
-      end
+    def song(name)
+      @songs[name]
+    end
 
-      def load_sounds(path)
-        load_resources(@_sounds, /\.ogg|\.mp3|\.wav/, path, Gosu::Sample)
-      end
+    def load_images(path)
+      load_resources(@images, /\.png|\.jpg|\.bmp/, path, Gosu::Image)
+    end
 
-      def load_songs(path)
-        load_resources(@_songs, /\.ogg|\.mp3|\.wav/, path, Gosu::Song)
-      end
+    def load_sounds(path)
+      load_resources(@sounds, /\.ogg|\.mp3|\.wav/, path, Gosu::Sample)
+    end
 
-      def with_path(path, &blk)
-        @_path = File.expand_path(File.dirname path)
-        yield
-      end
+    def load_songs(path)
+      load_resources(@songs, /\.ogg|\.mp3|\.wav/, path, Gosu::Song)
+    end
 
-      private
-      def load_resources(container, regexp, path, klass)
-        path = File.expand_path(File.join(@_path, path))
-        puts "Loading from: #{path}"
+    def with_path(path, &blk)
+      @path = File.expand_path(File.dirname path)
+      yield
+    end
 
-        count = 0
-        Dir.entries(path).select do |entry|
-          entry =~ regexp
-        end.each do |entry|
-          begin
-            container[entry] = klass.new($window, File.join(path, entry))
-            count += 1
-          rescue Exception => e
-            puts e, File.join(path, entry)
-          end
+    def load_resources(container, regexp, path, klass)
+      path = File.expand_path(File.join(@path, path))
+      puts "Loading from: #{path}"
+
+      count = 0
+      Dir.entries(path).select do |entry|
+        entry =~ regexp
+      end.each do |entry|
+        begin
+          container[entry] = klass.new($window, File.join(path, entry))
+          count += 1
+        rescue Exception => e
+          puts e, File.join(path, entry)
         end
-        puts "#{count} #{klass} files loaded."
       end
+      puts "#{count} #{klass} files loaded."
     end
+
   end
 end

data/lib/lotu/cursor.rb

@@ -4,11 +4,18 @@ module Lotu
     attr_reader :clicked_x, :clicked_y
     attr_accessor :speed, :use_mouse
 
-    def initialize
+    def initialize(opts={})
+      default_opts = {
+        :use_mouse => true,
+        :speed => 100
+      }
+      opts = default_opts.merge!(opts)
       super
       @clicked_x = @clicked_y = 0
-      @speed = 100
-      @use_mouse = true
+      @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
 
     def update
@@ -52,5 +59,6 @@ module Lotu
       @x += @speed * dt
       adjust_mouse if use_mouse
     end
+
   end
 end

data/lib/lotu/systems/collision.rb

@@ -0,0 +1,42 @@
+module Lotu
+  module Systems
+
+    module Collision
+      def self.extended(instance)
+        instance.systems[:collision] = CollisionSystem.new
+      end
+    end
+
+    class CollisionSystem
+
+      def initialize
+        @entities = Hash.new{ |h,k| h[k] = [] }
+        @actions = {}
+      end
+
+      def add_entity(obj, tag)
+        @entities[tag] << obj
+      end
+
+      def remove_entity(obj, tag)
+        @entities[tag].delete(obj)
+      end
+
+      def when_colliding(type1, type2, &blk)
+        @actions[[type1, type2]] = blk
+      end
+
+      def update
+        @actions.each do |tags, blk|
+          @entities[tags[0]].each do |ent1|
+            @entities[tags[1]].each do |ent2|
+              blk.call(ent1, ent2) if ent1.collides_with(ent2)
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/lotu/window.rb

@@ -1,9 +1,7 @@
 module Lotu
   class Window < Gosu::Window
-    extend HasBehavior
-
     # delta time
-    attr_reader :dt
+    attr_reader :dt, :systems
     attr_accessor :update_queue, :draw_queue, :input_listeners, :font
 
     def initialize(params={})
@@ -13,16 +11,19 @@ module Lotu
       $window = self
 
       # Systems setup
+      @systems = {}
       @update_queue = []
       @draw_queue = []
       @input_register = Hash.new{|hash,key| hash[key] = []}
 
       @fps_counter = FpsCounter.new
       @last_time = Gosu::milliseconds
-      @font = Gosu::Font.new(self, Gosu::default_font_name, 14)
+      @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
 
-      # Initialize the behaviors included in subclasses
-      init_behavior
+      # Add extra functionality
+      self.extend Controllable
+      self.extend Resourceful
+      extend Systems::Collision
     end
 
     def update
@@ -31,6 +32,10 @@ module Lotu
       @last_time = new_time
       @fps_counter.update(@dt)
 
+      @systems.each_value do |system|
+        system.update
+      end
+
       @update_queue.each do |item|
         item.update
       end
@@ -65,8 +70,5 @@ module Lotu
     def register_for_draw(object)
       @draw_queue << object
     end
-
-    # Meant to be overriden by behaviors
-    def init_behavior;end
   end
 end

data/lib/lotu.rb

@@ -2,5 +2,6 @@ LOTU_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'lotu'))
 $LOAD_PATH.unshift(LOTU_ROOT)
 
 require 'gosu'
-%w{controllable resourceful drawable input_controller eventful has_behavior}.each{|file| require "behaviors/#{file}"}
+%w{collidable controllable resourceful drawable controllable/input_controller eventful}.each{|file| require "behaviors/#{file}"}
+%w{collision}.each{|file| require "systems/#{file}"}
 %w{fps actor cursor window}.each{|file| require file}

data/lotu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lotu}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-03-19}
   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 = [
@@ -42,17 +42,18 @@ Gem::Specification.new do |s|
      "examples/media/crosshair.png",
      "examples/media/lobo_tuerto.png",
      "examples/media/title.png",
-     "examples/mouse_pointer/mouse.rb",
+     "examples/mouse_pointer/mouse_pointer.rb",
      "lib/lotu.rb",
      "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/has_behavior.rb",
-     "lib/lotu/behaviors/input_controller.rb",
      "lib/lotu/behaviors/resourceful.rb",
      "lib/lotu/cursor.rb",
      "lib/lotu/fps.rb",
+     "lib/lotu/systems/collision.rb",
      "lib/lotu/window.rb",
      "lotu.gemspec"
   ]
@@ -63,7 +64,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A simple, agile Ruby game development framework.}
   s.test_files = [
     "examples/hello_world/hello_world.rb",
-     "examples/mouse_pointer/mouse.rb"
+     "examples/mouse_pointer/mouse_pointer.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - lobo_tuerto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -06:00
+date: 2010-03-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,17 +66,18 @@ files:
 - examples/media/crosshair.png
 - examples/media/lobo_tuerto.png
 - examples/media/title.png
-- examples/mouse_pointer/mouse.rb
+- examples/mouse_pointer/mouse_pointer.rb
 - lib/lotu.rb
 - 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/has_behavior.rb
-- lib/lotu/behaviors/input_controller.rb
 - lib/lotu/behaviors/resourceful.rb
 - lib/lotu/cursor.rb
 - lib/lotu/fps.rb
+- lib/lotu/systems/collision.rb
 - lib/lotu/window.rb
 - lotu.gemspec
 has_rdoc: true
@@ -111,4 +112,4 @@ specification_version: 3
 summary: A simple, agile Ruby game development framework.
 test_files: 
 - examples/hello_world/hello_world.rb
-- examples/mouse_pointer/mouse.rb
+- examples/mouse_pointer/mouse_pointer.rb

data/examples/mouse_pointer/mouse.rb

@@ -1,86 +0,0 @@
-#!/usr/bin/env ruby
-LIB_PATH = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'lotu.rb')
-require File.expand_path(LIB_PATH)
-include Gosu::Button
-
-class Cursor < Lotu::Cursor
-  is_eventful
-  is_controllable
-  is_drawable
-
-  def initialize
-    super
-    set_keys(MsLeft => [:click, false],
-             KbSpace => [:click, false],
-             KbUp => :up,
-             KbDown => :down,
-             KbLeft => :left,
-             KbRight => :right)
-  end
-end
-
-class Player < Lotu::Actor
-  is_drawable
-  is_controllable
-
-  attr_reader :speed
-
-  def initialize
-    super
-    set_image 'CptnRuby Gem.png'
-    set_keys(KbRight => :move_right,
-             KbLeft => :move_left,
-             KbUp => :move_up,
-             KbDown => :move_down)
-  end
-
-  def move_right
-    @x += 1
-  end
-
-  def move_left
-    @x -= 1
-  end
-
-  def move_up
-    @y -= 1
-  end
-
-  def move_down
-    @y += 1
-  end
-
-  def warp(x, y)
-    @x, @y = x, y
-  end
-end
-
-class Example < Lotu::Window
-  is_controllable
-  is_resourceful
-
-  def initialize
-    super
-    set_keys KbEscape => :close
-    with_path __FILE__ do
-      load_images '../media'
-      load_sounds '../media'
-    end
-
-    @player = Player.new
-    @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
-    @cursor = Cursor.new
-    @cursor.set_image('crosshair.png')
-    @cursor.on(:click) do |x,y|
-      @player.warp(x,y)
-    end
-  end
-
-  def draw
-    super
-    @fps_counter.draw
-    @font.draw("Clicked on? #{@cursor.clicked_x}, #{@cursor.clicked_y}", 10, 30, 0, 1.0, 1.0, 0xfffff000)
-  end
-end
-
-Example.new.show

data/lib/lotu/behaviors/has_behavior.rb

@@ -1,8 +0,0 @@
-module Lotu
-  module HasBehavior
-    include Eventful
-    include Controllable
-    include Drawable
-    include Resourceful
-  end
-end