lotu 0.1.0 → 0.1.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "dev@lobotuerto.com"
     gem.homepage = "http://github.com/lobo-tuerto/lotu"
     gem.authors = ["lobo_tuerto"]
-    gem.add_development_dependency "gosu", ">= 0.7.18"
+    gem.add_dependency "gosu", ">= 0.7.18"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/examples/mouse_pointer/mouse.rb

@@ -10,12 +10,12 @@ class Cursor < Lotu::Cursor
 
   def initialize
     super
-    set_keys(Gosu::Button::MsLeft => [:click, false],
-             Gosu::Button::KbSpace => [:click, false],
-             Gosu::Button::KbUp => :up,
-             Gosu::Button::KbDown => :down,
-             Gosu::Button::KbLeft => :left,
-             Gosu::Button::KbRight => :right)
+    set_keys(MsLeft => [:click, false],
+             KbSpace => [:click, false],
+             KbUp => :up,
+             KbDown => :down,
+             KbLeft => :left,
+             KbRight => :right)
   end
 end
 
@@ -78,8 +78,8 @@ class Example < Lotu::Window
 
   def draw
     super
-    @font.draw("FPS: #{@fps}", 10, 10, 0, 1.0, 1.0, 0xffffff00)
-    @font.draw("Click? #{@cursor.last_click}", 10, 30, 0, 1.0, 1.0, 0xfffff000)
+    @fps_counter.draw
+    @font.draw("Clicked on? #{@cursor.clicked_x}, #{@cursor.clicked_y}", 10, 30, 0, 1.0, 1.0, 0xfffff000)
   end
 end
 

data/lib/lotu/actor.rb

@@ -15,10 +15,16 @@ module Lotu
       init_behavior
     end
 
+    # Easy access to delta-time
     def dt
       $window.dt
     end
 
+    # Remove ourselves from the update queue
+    def die
+      @parent.update_queue.delete(self)
+    end
+
     # Meant to be overriden by behaviors
     def init_behavior;end
     def update;end

data/lib/lotu/behaviors/drawable.rb

@@ -12,12 +12,17 @@ module Lotu
 
       def set_image(image)
         @_image = $window.image(image)
-        $window.register_for_draw(self)
+        @parent.draw_queue << self unless @parent.draw_queue.include?(self)
       end
 
       def draw
         @_image.draw(@x,@y,0)
       end
+
+      def die
+        super
+        @parent.draw_queue.delete(self)
+      end
     end
   end
 end

data/lib/lotu/behaviors/resourceful.rb

@@ -33,7 +33,7 @@ module Lotu
       end
 
       def load_songs(path)
-        load_resources(@_sounds, /\.ogg|\.mp3|\.wav/, path, Gosu::Song)
+        load_resources(@_songs, /\.ogg|\.mp3|\.wav/, path, Gosu::Song)
       end
 
       def with_path(path, &blk)

data/lib/lotu/cursor.rb

@@ -1,48 +1,56 @@
 # Provides a mouse pointer usable through mouse or keyboard
 module Lotu
   class Cursor < Actor
-    attr_reader :click_x, :click_y
-    attr_accessor :arrow_speed
+    attr_reader :clicked_x, :clicked_y
+    attr_accessor :speed, :use_mouse
 
     def initialize
       super
-      @click_x = @click_y = 0
-      @arrow_speed = 1
+      @clicked_x = @clicked_y = 0
+      @speed = 100
+      @use_mouse = true
     end
 
     def update
-      @x = $window.mouse_x
-      @y = $window.mouse_y
+      if @use_mouse
+        @x = $window.mouse_x
+        @y = $window.mouse_y
+      end
     end
 
     # This is the method you want to call when a user press the
     # "click" key of your preference with something like:
     # set_keys Gosu::Button::MsLeft => :click
-    # It'll yield the x, y coordinates of the click
+    # It'll yield the x, y coordinates of the clicked point
     def click
-      @click_x = $window.mouse_x
-      @click_y = $window.mouse_y
-      fire(:click, @click_x, @click_y)
+      @clicked_x = @x
+      @clicked_y = @y
+      fire(:click, @clicked_x, @clicked_y)
+    end
+
+    def adjust_mouse
+      $window.mouse_y = @y
+      $window.mouse_x = @x
     end
 
     def up
-      $window.mouse_y -= @arrow_speed
+      @y -= @speed * dt
+      adjust_mouse if use_mouse
     end
 
     def down
-      $window.mouse_y += @arrow_speed
+      @y += @speed * dt
+      adjust_mouse if use_mouse
     end
 
     def left
-      $window.mouse_x -= @arrow_speed
+      @x -= @speed * dt
+      adjust_mouse if use_mouse
     end
 
     def right
-      $window.mouse_x += @arrow_speed
-    end
-
-    def last_click
-      "#{@click_x}, #{@click_y}"
+      @x += @speed * dt
+      adjust_mouse if use_mouse
     end
   end
 end

data/lib/lotu.rb

@@ -2,15 +2,5 @@ LOTU_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'lotu'))
 $LOAD_PATH.unshift(LOTU_ROOT)
 
 require 'gosu'
-
-require 'behaviors/controllable'
-require 'behaviors/resourceful'
-require 'behaviors/drawable'
-require 'behaviors/input_controller'
-require 'behaviors/eventful'
-require 'behaviors/has_behavior'
-
-require 'fps'
-require 'actor'
-require 'cursor'
-require 'window'
+%w{controllable resourceful drawable input_controller eventful has_behavior}.each{|file| require "behaviors/#{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.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2010-03-12}
+  s.date = %q{2010-03-17}
   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 = [
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gosu>, [">= 0.7.18"])
+      s.add_runtime_dependency(%q<gosu>, [">= 0.7.18"])
     else
       s.add_dependency(%q<gosu>, [">= 0.7.18"])
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - lobo_tuerto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -06:00
+date: 2010-03-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,7 @@ dependencies:
         - 7
         - 18
         version: 0.7.18
-  type: :development
+  type: :runtime
   version_requirements: *id001
 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.
 email: dev@lobotuerto.com