gosu_extensions 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/core/collision.rb

@@ -0,0 +1,73 @@
+class Collision
+  
+  # Default collision functions
+  #
+  None   = nil       # do not collide
+  Simple = lambda {} # just collide
+  # Kill   = lambda { kill! }
+  # Damage = lambda { damage! }
+  
+  #
+  #
+  attr_reader :window, :this, :that, :definition
+  
+  #
+  #
+  def initialize window, this, that = this, &definition
+    @window     = window # TODO Remove.
+    @this       = this
+    @that       = that
+    @definition = definition && package(definition)
+  end
+  
+  # TODO Extend the definition to incorporate this
+  #      method. Or at least #complex, #simple.
+  #
+  def package definition
+    if definition.arity == 2
+      complex_package definition
+    else
+      simple_package definition
+    end
+  end
+  
+  #
+  #
+  def simple_package definition
+    lambda do |this_shape, _|
+      # TODO break if found.
+      #
+      window.moveables.each do |movable|
+        if movable.shape == this_shape
+          movable.instance_eval &definition
+        end
+      end
+    end
+  end
+  
+  #
+  #
+  def complex_package definition
+    lambda do |this_shape, that_shape|
+      this_that = Array.new(2)
+      # TODO break if found
+      #
+      window.moveables.each do |movable|
+        if movable.shape == this_shape
+          this_that[0] = movable
+        end
+        if movable.shape == that_shape
+          this_that[1] = movable
+        end
+      end
+      definition.call *this_that
+    end
+  end
+  
+  # Install this collision on the given environment.
+  #
+  def install_on environment
+    environment.add_collision_func this, that, &definition
+  end
+  
+end

data/lib/core/game_window.rb

@@ -29,9 +29,12 @@ class GameWindow < Gosu::Window
   attr_reader :environment,
               :moveables,
               :font,
-              :scheduling
+              :scheduling,
+              :collisions
   attr_accessor :background_path,
-                :background_hard_borders
+                :background_hard_borders,
+                :stop_condition,
+                :proceed_condition
   
   def initialize
     setup_window
@@ -40,6 +43,8 @@ class GameWindow < Gosu::Window
     setup_controls
     setup_window_control # e.g. ESC => exits
     
+    @collisions = []
+    
     after_initialize
     
     super self.screen_width, self.screen_height, self.full_screen, 16
@@ -61,6 +66,8 @@ class GameWindow < Gosu::Window
     setup_collisions
     
     install_main_loop
+    
+    after_setup
   end
   
   # This is the main game loop.
@@ -153,12 +160,42 @@ class GameWindow < Gosu::Window
         self.full_screen = true
       end
     end
-    def collisions &block
-      raise "collisions are defined in a block" unless block_given?
+    
+    attr_accessor :collisions
+    def no_collision this, that = this
+      # Doesn't work, as &nil == nil
+      # collision this, that, &Collision::None
+      InitializerHooks.register self do
+        self.collisions << Collision.new(self, this, that)
+      end
+    end
+    def collision this, that = this, &definition
+      definition ||= Collision::Simple
       InitializerHooks.register self do
-        @collision_definitions = block
+        self.collisions << Collision.new(self, this, that, &definition)
       end
     end
+    
+    # Stop the game if this condition is true.
+    #
+    # Block will instance eval in the window.
+    #
+    # Use the callback after_stopping.
+    #
+    def stop_on &condition
+      InitializerHooks.register self do
+        self.stop_condition = condition
+      end
+    end
+    
+    # # Proceed if this condition is true.
+    # #
+    # def proceed_on &condition
+    #   InitializerHooks.register self do
+    #     self.proceed_condition = condition
+    #   end
+    # end
+    
   end
   
   # Setup methods
@@ -206,11 +243,16 @@ class GameWindow < Gosu::Window
     @environment.window = self
     @environment.damping = -self.damping + 1 # recalculate the damping such that 0.0 has no damping.
   end
-  # Override.
+  # Callbacks:
   #
   def setup_players; end
   def setup_enemies; end
   def setup_waves; end
+  def after_setup; end
+  def after_stopping; end
+  def before_proceeding; end
+  def step; end # The most important callback
+  
   #
   #
   # Example:
@@ -218,7 +260,7 @@ class GameWindow < Gosu::Window
   #     add_collision_func ...
   #
   def setup_collisions
-    self.environment.instance_eval &@collision_definitions if @collision_definitions
+    self.collisions.each { |collision| collision.install_on(environment) }
   end
   
   # Add controls for a player.
@@ -242,12 +284,29 @@ class GameWindow < Gosu::Window
   def update
     @current_loop.call
   end
+  def stop
+    @current_loop = lambda do
+      proceed if proceed_condition && instance_eval(&proceed_condition)
+      advance_step
+      # TODO stopped
+    end
+    after_stopping
+  end
+  def proceed
+    before_proceeding
+    @current_loop = main_loop
+  end
   # Advances to the next step in the game.
   #
-  def next_step
+  def advance_step
     @step += 1
     @scheduling.step
   end
+  def next_step
+    stop if stop_condition && instance_eval(&stop_condition)
+    advance_step
+    step
+  end
   # Each step, this is called to handle any input.
   #
   def handle_input
@@ -326,6 +385,7 @@ class GameWindow < Gosu::Window
   def threaded time = 1, &code
     @scheduling.add time, &code
   end
+  alias after threaded
   
   
   # Utility Methods
@@ -339,11 +399,15 @@ class GameWindow < Gosu::Window
   end
   # Randomly adds a Thing to a uniform random position.
   #
-  def randomly_add type
+  def add type, x = nil, y = nil, &random_function
     thing = type.new self
-    thing.warp_to *uniform_random_position
+    position = x && y && [x, y] || random_function && random_function[]
+    thing.warp_to *position
     register thing
   end
+  def randomly_add type
+    add type, *uniform_random_position
+  end
   # Revives the player if not already in.
   #
   def revive player

data/lib/gosu_extensions.rb

@@ -33,6 +33,7 @@ require 'remove_shapes'
 require 'wave'
 require 'waves'
 require 'scheduling'
+require 'collision'
 require 'environment'
 require 'game_window'
 require 'control'

data/spec/lib/core/collision_spec.rb

@@ -0,0 +1,86 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe Collision do
+  
+  context 'with collision' do
+    before(:each) do
+      @some_function = lambda {}
+      @collision = Collision.new :some_window, :this, :that, &@some_function
+    end
+    describe "install_on" do
+      it "should install itself on the given thing correctly" do
+        environment = stub :environment
+        environment.should_receive(:add_collision_func).once.with :this, :that, &@some_function
+        
+        @collision.install_on environment
+      end
+    end
+  end
+  
+  context 'no collision' do
+    before(:each) do
+      @collision = Collision.new :some_window, :this, :that, &Collision::None
+    end
+    describe "install_on" do
+      it "should install itself on the given thing correctly" do
+        environment = stub :environment
+        environment.should_receive(:add_collision_func).once.with :this, :that, &Collision::None
+        
+        @collision.install_on environment
+      end
+    end
+  end
+  
+  describe "complex_package" do
+    before(:each) do
+      @collision = Collision.new :some_window, :this, :that
+    end
+    it "should return a lambda with two params" do
+      @collision.complex_package(lambda{}).arity.should == 2
+    end
+  end
+  
+  describe "simple_package" do
+    before(:each) do
+      @collision = Collision.new :some_window, :this, :that
+    end
+    it "should return a lambda with two params" do
+      @collision.simple_package(lambda{}).arity.should == 2
+    end
+  end
+  
+  describe "package" do
+    context 'definition with two params' do
+      before(:each) do
+        @definition = lambda { |one, two| }
+        @collision = Collision.new :some_window, :this, :that, &@definition
+      end
+      it "should use the complex packaging" do
+        @collision.should_receive(:complex_package).once.with @definition
+        
+        @collision.package @definition
+      end
+    end
+    context 'definition with no params' do
+      before(:each) do
+        @definition = lambda { }
+        @collision = Collision.new :some_window, :this, :that, &@definition
+      end
+      it "should use the simple packaging" do
+        @collision.should_receive(:simple_package).once.with @definition
+        
+        @collision.package @definition
+      end
+    end
+  end
+    
+  describe "constants" do
+    it "should be nil" do
+      Collision::None.should == nil
+    end
+    it "should be an empty lambda" do
+      Collision::Simple.call # well, Collision should not receive anything
+    end
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 +02:00
+date: 2010-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - Rakefile
 - VERSION
 - generator/gogogosu.rb
+- lib/core/collision.rb
 - lib/core/control.rb
 - lib/core/controls.rb
 - lib/core/environment.rb
@@ -122,6 +123,7 @@ 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/collision_spec.rb
 - spec/lib/core/control_spec.rb
 - spec/lib/core/controls_spec.rb
 - spec/lib/core/initializer_hooks_spec.rb