gosu_extensions 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/core/game_window.rb

@@ -54,6 +54,7 @@ class GameWindow < Gosu::Window
     setup_steps
     setup_scheduling
     setup_font
+    setup_uis
     
     setup_containers
     
@@ -163,7 +164,7 @@ class GameWindow < Gosu::Window
     
     attr_accessor :collisions
     def no_collision this, that = this
-      # Doesn't work, as &nil == nil
+      # The next line doesn't work, as &nil == nil
       # collision this, that, &Collision::None
       InitializerHooks.register self do
         self.collisions << Collision.new(self, this, that)
@@ -235,6 +236,9 @@ class GameWindow < Gosu::Window
   def setup_font
     @font = Gosu::Font.new self, self.font_name, self.font_size
   end
+  def setup_uis
+    @uis = []
+  end
   def setup_environment
     @environment = Environment.new
     class << @environment
@@ -288,6 +292,7 @@ class GameWindow < Gosu::Window
     @current_loop = lambda do
       proceed if proceed_condition && instance_eval(&proceed_condition)
       advance_step
+      handle_input
       # TODO stopped
     end
     after_stopping
@@ -354,8 +359,18 @@ class GameWindow < Gosu::Window
   #       end
   #
   def unregister thing
+    # explicitly call unregister_ui thing if you want it
     remove thing.shape
   end
+  # Register a user interfaceable object.
+  #
+  def register_ui thing
+    @uis << thing
+  end
+  def unregister_ui thing
+    @uis.delete thing
+  end
+  
   # Remove this shape the next turn.
   #
   # Note: Internal use. Use unregister to properly remove a moveable.
@@ -444,7 +459,7 @@ class GameWindow < Gosu::Window
   # @font.draw "P1 Score: ", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffff0000
   #
   def draw_ui
-    
+    @uis.each(&:draw_ui)
   end
   #
   #

data/lib/gosu_extensions.rb

@@ -41,6 +41,7 @@ require 'controls'
 require 'layer'
 
 $:.unshift File.join(File.dirname(__FILE__), '/traits')
+require 'user_interface'
 require 'pod'
 require 'attachable'
 require 'damaging'

data/lib/traits/user_interface.rb

@@ -0,0 +1,32 @@
+#
+#
+module UserInterface extend Trait
+  
+  def self.included base
+    base.extend ClassMethods
+  end
+  
+  # Call this to install an UI on all instances of
+  # this class at the given position.
+  #
+  module ClassMethods
+    attr_accessor :ui
+    def ui x = 20, y = 10, color = Gosu::Color::BLACK, &display
+      InitializerHooks.append self do
+        ui x, y, color, &display
+      end
+    end
+  end
+  
+  # Call this to dynamically add itself to the ui displaying.
+  #
+  def ui x = 20, y = 10, color = Gosu::Color::BLACK, &display
+    metaclass.instance_eval do
+      define_method :draw_ui do
+        window.font.draw instance_eval(&display), x, y, Layer::UI, 1.0, 1.0, color
+      end
+    end
+    window.register_ui self
+  end
+  
+end

data/spec/lib/core/traits_spec.rb

@@ -6,7 +6,7 @@ describe Traits do
     it "should return a list of all traits that can be included using it_is_a, it_is, or it_has" do
       ActiveSupport::Deprecation.stub! :warn => :shut_up
       
-      Traits.list.should == [Attachable, Controllable, Damaging, Generator, Hitpoints, Imageable, Lives, Moveable, Pod, Shooter, ShortLived, Shot, Targetable, Targeting::Closest, Turnable]
+      Traits.list.should == [Attachable, Controllable, Damaging, Generator, Hitpoints, Imageable, Lives, Moveable, Pod, Shooter, ShortLived, Shot, Targetable, Targeting::Closest, Turnable, UserInterface]
     end
   end
   

data/spec/lib/traits/user_interface_spec.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe UserInterface do
+  
+  before(:each) do
+    @window = stub :window
+    @user_interface = test_class_with(UserInterface).new @window
+  end
+  
+  describe "ui" do
+    before(:each) do
+      @font = stub :font, :null_object => true
+      @window.stub! :font => @font
+      @window.stub! :register_ui
+    end
+    it "should register itself with window" do
+      @window.should_receive(:register_ui).once.with @user_interface
+      
+      @user_interface.ui
+    end
+    it "should install a method draw_ui" do
+      @user_interface.ui do end
+      
+      lambda { @user_interface.draw_ui }.should_not raise_error
+    end
+    it "should do the right thing on calling draw_ui (defaults)" do
+      some_block = lambda { :some_result }
+      @user_interface.ui &some_block
+      
+      @font.should_receive(:draw).once.with :some_result, 20, 10, Layer::UI, 1.0, 1.0, Gosu::Color::BLACK
+      
+      @user_interface.draw_ui 
+    end
+    it "should do the right thing on calling draw_ui" do
+      some_block = lambda { :some_result }
+      @user_interface.ui :some_x, :some_y, :some_color, &some_block
+      
+      @font.should_receive(:draw).once.with :some_result, :some_x, :some_y, Layer::UI, 1.0, 1.0, :some_color
+      
+      @user_interface.draw_ui 
+    end
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Florian Hanke
@@ -89,6 +89,7 @@ files:
 - lib/traits/targeting.rb
 - lib/traits/targeting/closest.rb
 - lib/traits/turnable.rb
+- lib/traits/user_interface.rb
 - lib/units/sprite.rb
 - lib/units/thing.rb
 has_rdoc: true
@@ -145,4 +146,5 @@ test_files:
 - spec/lib/traits/targetable_spec.rb
 - spec/lib/traits/targeting_spec.rb
 - spec/lib/traits/turnable_spec.rb
+- spec/lib/traits/user_interface_spec.rb
 - spec/lib/units/thing_spec.rb