gosu_extensions 0.1.19 → 0.1.20

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/lib/core/control.rb

@@ -0,0 +1,28 @@
+#
+#
+class Control
+  
+  #
+  #
+  def initialize window, controllable, mapping = nil
+    @window = window
+    @controllable = controllable
+    @mapping = mapping || controllable.respond_to?(:controls_mapping) && controllable.controls_mapping
+  end
+  
+  #
+  #
+  def mapping?
+    @mapping && !@mapping.empty?
+  end
+  
+  # 
+  #
+  def handle
+    return if @controllable.destroyed?
+    @mapping.each do |key, command|
+      @controllable.send(command) if @window.button_down? key
+    end
+  end
+  
+end

data/lib/core/controls.rb

@@ -1,35 +1,30 @@
-# Controls for a controllable.
-# Example:
-#   # Note: left, right, full_speed_ahead, reverse, revive are
-#   #       methods on the @player.
-#   #
-#   @controls << Controls.new(self, @player,
-#     Gosu::Button::KbA => :left,
-#     Gosu::Button::KbD => :right,
-#     Gosu::Button::KbW => :full_speed_ahead,
-#     Gosu::Button::KbS => :reverse,
-#     Gosu::Button::Kb1 => :revive
-#   )
-#
 #
 #
 class Controls
   
   #
   #
-  def initialize window, controllable
-    @window = window
-    @controllable = controllable
-    @mapping = controllable.controls_mapping
+  def initialize
+    @controls = []
+  end
+  
+  # Add the given control to the controls, except if it is nil or has no mapping.
+  #
+  def << control
+    return unless control && control.mapping?
+    @controls << control
+  end
+  
+  # Remove the control(s) with the given controllable.
+  #
+  def remove_all_of controllable
+    @controls.reject { |control| control.controllable == controllable }
   end
   
   # 
   #
   def handle
-    return if @controllable.destroyed?
-    @mapping.each do |key, command|
-      @controllable.send(command) if @window.button_down? key
-    end
+    @controls.each &:handle
   end
   
 end

data/lib/core/game_window.rb

@@ -37,6 +37,7 @@ class GameWindow < Gosu::Window
     setup_moveables
     setup_remove_shapes
     setup_controls
+    setup_window_control # e.g. ESC => exits
     
     after_initialize
     
@@ -195,7 +196,10 @@ class GameWindow < Gosu::Window
     @remove_shapes = RemoveShapes.new
   end
   def setup_controls
-    @controls = []
+    @controls = Controls.new
+  end
+  def setup_window_control
+    add_controls_for self
   end
   def setup_containers
     @players = []
@@ -247,7 +251,7 @@ class GameWindow < Gosu::Window
   #                              Gosu::Button::Kb1 => :revive
   #
   def add_controls_for object
-    @controls << Controls.new(self, object)
+    @controls << Control.new(self, object)
   end
   
   def next_step
@@ -270,7 +274,7 @@ class GameWindow < Gosu::Window
   # Each step, this is called to handle any input.
   #
   def handle_input
-    @controls.each &:handle
+    @controls.handle
   end
   # Does a single step.
   #
@@ -364,6 +368,8 @@ class GameWindow < Gosu::Window
     moveable.add_to @environment
   end
   
+  # Remove the shapes that are marked for removal.
+  #
   def remove_shapes
     @remove_shapes.remove_from @environment, @moveables
   end
@@ -383,35 +389,40 @@ class GameWindow < Gosu::Window
   # Drawing methods
   #
   
+  # Method called by Gosu.
+  #
   def draw
     draw_background
     draw_ambient
     draw_moveables
     draw_ui
   end
+  # Draws a background image.
+  #
   def draw_background
     @background_image.draw 0, 0, Layer::Background, 1.0, 1.0 if @background_image
   end
+  # Draw ambient objects, like asteroids or the like that do not influence the player.
+  #
   def draw_ambient
     
   end
+  # Draw the moveables.
+  #
   def draw_moveables
     @moveables.draw
   end
-  def draw_ui
-    # @font.draw "P1 Score: ", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffff0000
-  end
-  
-  # Escape exits by default.
+  # Override for example with
+  # @font.draw "P1 Score: ", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffff0000
   #
-  def button_down id
-    close if exit?(id)
+  def draw_ui
+    
   end
   
-  # Override exit? if you want to define another exit rule.
+  # 
   #
-  def exit? id = nil
-    id == Gosu::Button::KbEscape
+  def button_down *
+    handle_input
   end
   
 end

data/lib/gosu_extensions.rb

@@ -32,6 +32,7 @@ require 'moveables'
 require 'remove_shapes'
 require 'scheduling'
 require 'game_window'
+require 'control'
 require 'controls'
 require 'waves'
 require 'layer'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 +02:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: gogogosu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - Rakefile
 - VERSION
 - generator/gogogosu.rb
+- lib/core/control.rb
 - lib/core/controls.rb
 - lib/core/game_window.rb
 - lib/core/initializer_hooks.rb
@@ -118,7 +119,6 @@ signing_key:
 specification_version: 3
 summary: Default extensions built onto the popular Gosu Framework. Uses Chipmunk for game physics. That's it for now. I'm working on them. Anyway, GAME ON!
 test_files: 
-- spec/lib/core/game_window_spec.rb
 - spec/lib/core/initializer_hooks_spec.rb
 - spec/lib/core/it_is_a_spec.rb
 - spec/lib/core/trait_spec.rb

data/spec/lib/core/game_window_spec.rb

@@ -1,51 +0,0 @@
-require File.join(File.dirname(__FILE__), '/../../spec_helper')
-
-describe GameWindow do
-  
-  class Gosu::Window
-    def initialize(*)
-      # Note: Let's not initialize a real window.
-    end
-  end
-  
-  class GameWindowTest < GameWindow
-    def setup_font
-      # Note: Causes errors, test separately.
-    end
-  end
-  
-  before(:each) do
-    @window = GameWindowTest.new
-  end
-  
-  describe "gravity and gravity_vector" do
-    context 'default' do
-      it "should have a calculated value" do
-        @window.gravity_vector.x.should == 0.0
-        @window.gravity_vector.y.should == 0.098
-      end
-    end
-    context 'user defined' do
-      before(:each) do
-        GameWindowTest.gravity 100
-        @window = GameWindowTest.new
-      end
-      it "should have a user defined value" do
-        @window.gravity_vector.x.should == 0.0
-        @window.gravity_vector.y.should == (100/SUBSTEPS)
-      end
-    end
-  end
-  
-  describe "draw" do
-    it "should call other draw methods in sequence" do
-      @window.should_receive(:draw_background).once.with
-      @window.should_receive(:draw_ambient).once.with
-      @window.should_receive(:draw_moveables).once.with
-      @window.should_receive(:draw_ui).once.with
-      
-      @window.draw
-    end
-  end
-  
-end