gosu_extensions 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/core/game_window.rb

@@ -6,6 +6,7 @@
 class GameWindow < Gosu::Window
   
   include InitializerHooks
+  include Threading
   
   # TODO handle more elegantly
   #
@@ -401,26 +402,6 @@ class GameWindow < Gosu::Window
     @uis.delete thing
   end
   
-  # Scheduling
-  #
-  
-  # Run some code at relative time <time>.
-  #
-  # Example:
-  #   # Will destroy the object that calls this method
-  #   # in 20 steps.
-  #   #
-  #   window.threaded 20 do
-  #     destroy!
-  #   end
-  #
-  # Note: You can also use after instead of threaded.
-  #
-  def threaded time = 1, &code
-    @scheduling.add time, &code
-  end
-  alias after threaded
-  
   
   # Utility Methods
   #

data/lib/core/threading.rb

@@ -0,0 +1,37 @@
+# Use this if you want something to run only some times,
+# or something to run after x time.
+#
+module Threading
+  
+  # Do something threaded.
+  #
+  # Default is: Instantly, in the next step.
+  #
+  # Note: Can also be called with after.
+  #
+  def threaded time = 1, &code
+    self.window.scheduling.add time, &code
+  end
+  alias after threaded
+  
+  # Some things you can only do every x time units.
+  # 
+  # Example:
+  #   sometimes :loading, self.frequency do
+  #     projectile = self.shot.shoot_from self
+  #     projectile.rotation = self.muzzle_rotation[target]
+  #     projectile.speed = self.muzzle_velocity[target] * projectile.velocity
+  #   end
+  #
+  def sometimes variable, units = 1, &block
+    name = :"@__sometimes_#{variable}"
+    return if instance_variable_get(name)
+    instance_variable_set name, true
+    result = block.call
+    threaded units.to_i do
+      self.instance_variable_set name, false
+    end
+    result
+  end
+  
+end

data/lib/gosu_extensions.rb

@@ -32,6 +32,7 @@ require 'trait'
 require 'traits'
 require 'it_is_a'
 
+require 'threading'
 require 'background'
 require 'sprites'
 require 'things'

data/lib/traits/hitpoints.rb

@@ -11,8 +11,8 @@ module Hitpoints extend Trait
     Example:
       hitpoints 10_000
     
-    Call hit(damage = 1) to remove hitpoints. This will call
-    * hit! if hitpoints are still higher than 0.
+    Call hit!(damage = 1) to remove hitpoints. This will call
+    * callback hit if hitpoints are still higher than 0.
     * kill!, and if not available, destroy! if hitpoints are lower than 0.
   MANUAL
   
@@ -39,11 +39,9 @@ module Hitpoints extend Trait
     
     attr_accessor :hitpoints
     
-    # Override to handle hit!
+    # Override to handle hit.
     #
-    def hit!
-      
-    end
+    def hit; end
     
     # Hit the thing with that much damage.
     #
@@ -51,10 +49,19 @@ module Hitpoints extend Trait
     # kill!-s if lower, or destroy!-s if kill!
     # is not available.
     #
-    def hit damage = 1
+    def hit! damage = 1
       self.hitpoints -= damage
-      hit! if hitpoints > 0
-      respond_to?(:kill!) ? kill! : destroy! if hitpoints == 0
+      hit if hitpoints > 0
+      respond_to?(:kill!) ? kill! : destroy! if hitpoints < 0
+    end
+    
+    # kill! must reset hitpoints
+    #
+    # TODO Do irrespective of kill! call order
+    #
+    def kill!
+      super
+      self.hitpoints = self.class.prototype_hitpoints
     end
     
   end

data/lib/traits/lives.rb

@@ -34,9 +34,9 @@ module Lives extend Trait
   
   attr_accessor :lives
   
-  # Override to handle killed!
+  # Override to handle kill!
   #
-  def killed!; end
+  def killed; end
   
   # Does three things:
   # * Deduct 1 live.
@@ -45,7 +45,7 @@ module Lives extend Trait
   #
   def kill!
     self.lives -= 1
-    killed! if self.lives > 0
+    killed   if self.lives > 0
     destroy! if self.lives == 0
   end
   

data/lib/traits/turnable.rb

@@ -17,7 +17,7 @@ module Turnable extend Trait
   #
   module ClassMethods
     def turn_speed amount
-      amount = amount.to_f / 2
+      amount = (amount.to_f*SUBSTEPS) / 10
       define_method :turn_speed do
         amount
       end

data/lib/units/sprite.rb

@@ -7,6 +7,7 @@ class Sprite
   include VectorUtilities
   include Imageable
   include InitializerHooks
+  include Threading
   include ItIsA
   it_is   Moveable
   
@@ -78,37 +79,6 @@ class Sprite
     
   end
   
-  # Do something threaded.
-  #
-  # Default is: Instantly, in the next step.
-  #
-  # Note: Can also be called with after.
-  #
-  def threaded time = 1, &code
-    self.window.threaded time, &code
-  end
-  alias after threaded
-  
-  # Some things you can only do every x time units.
-  # 
-  # Example:
-  #   sometimes :loading, self.frequency do
-  #     projectile = self.shot.shoot_from self
-  #     projectile.rotation = self.muzzle_rotation[target]
-  #     projectile.speed = self.muzzle_velocity[target] * projectile.velocity
-  #   end
-  #
-  def sometimes variable, units = 1, &block
-    name = :"@#{variable}"
-    return if instance_variable_get(name)
-    instance_variable_set name, true
-    result = block.call
-    threaded units.to_i do
-      self.instance_variable_set name, false
-    end
-    result
-  end
-  
   # A sprite is not added to the physical environment.
   #
   # Override if you want it to.

data/lib/units/thing.rb

@@ -35,7 +35,7 @@ class Thing < Sprite
         params = []
         params << CP::Body.new(self.mass, self.moment)
         params += args
-        params << CP::Vec2.new(0.0, 0.0)
+        params << CP::Vec2.new(0.0, 0.0) unless CP::Vec2 === args.first
         
         @shape = shape_class.new *params
       end

data/spec/lib/core/threading_spec.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe Threading do
+  
+  before(:each) do
+    @window = stub :window, :things => []
+    @threaded = test_class_with(Threading).new @window
+  end
+  
+  describe "sometimes" do
+    it "should only call the block's content every x times" do
+      @threaded.stub! :threaded => nil
+      
+      @threaded.sometimes(:some_id, :some_time) { :some_result }.should == :some_result
+      @threaded.sometimes(:some_id, :some_time) { :some_result }.should == nil
+      
+      @threaded.instance_variable_set(:'@__sometimes_some_id', false)
+      @threaded.sometimes(:some_id, :some_time) { :some_result }.should == :some_result
+    end
+  end
+  
+  describe "threaded" do
+    before(:each) do
+      @scheduling = stub :scheduling
+      @window.stub! :scheduling => @scheduling
+    end
+    it "should delegate to the window's scheduling" do
+      some_block = lambda {}
+      @scheduling.should_receive(:add).once.with :some_time, &some_block
+      
+      @threaded.threaded :some_time, &some_block
+    end
+  end
+  
+end

data/spec/lib/traits/turnable_spec.rb

@@ -41,21 +41,21 @@ describe Turnable do
       it "should have a defined turn_speed method" do
         lambda { @turnable.turn_speed }.should_not raise_error
       end
-      it "should return the class defined turn_speed divided by 2" do
-        @turnable.turn_speed.should == 0.65
+      it "should return the class defined turn_speed" do
+        @turnable.turn_speed.should == 1.3
       end
     end
   
     describe "turn_left" do
       it "should subtract an amount from the rotation" do
-        @turnable.should_receive(:rotation=).once.with 0.9935
+        @turnable.should_receive(:rotation=).once.with 0.987
         
         @turnable.turn_left
       end
     end
     describe "turn_right" do
       it "should add an amount to the rotation" do
-        @turnable.should_receive(:rotation=).once.with 1.0065
+        @turnable.should_receive(:rotation=).once.with 1.013
         
         @turnable.turn_right
       end

data/spec/lib/units/thing_spec.rb

@@ -70,10 +70,14 @@ describe Thing do
   end
   
   describe "threaded" do
+    before(:each) do
+      @scheduling = stub :scheduling
+      @window.stub! :scheduling => @scheduling
+    end
     it "should delegate to the window" do
       some_block = Proc.new {}
       
-      @window.should_receive(:threaded).once.with :some_time, &some_block
+      @scheduling.should_receive(:add).once.with :some_time, &some_block
       
       @thing.threaded :some_time, &some_block
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Florian Hanke
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
-default_executable: gogogosu
+date: 2010-04-16 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gosu
@@ -44,8 +44,8 @@ dependencies:
   version_requirements: *id002
 description: ""
 email: florian.hanke@gmail.com
-executables: 
-- gogogosu
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -69,6 +69,7 @@ files:
 - lib/core/scheduling.rb
 - lib/core/sprites.rb
 - lib/core/things.rb
+- lib/core/threading.rb
 - lib/core/trait.rb
 - lib/core/traits.rb
 - lib/core/vector_utilities.rb
@@ -138,6 +139,7 @@ test_files:
 - spec/lib/core/initializer_hooks_spec.rb
 - spec/lib/core/it_is_a_spec.rb
 - spec/lib/core/layer_spec.rb
+- spec/lib/core/threading_spec.rb
 - spec/lib/core/trait_spec.rb
 - spec/lib/core/traits_spec.rb
 - spec/lib/extensions/module_spec.rb

data/bin/gogogosu

@@ -1,33 +0,0 @@
-#!/usr/local/bin/ruby
-# TODO remove
-
-Signal.trap("INT") { puts; exit } # CTRL-C
-
-File.open(File.join(File.dirname(__FILE__), '../VERSION')) do |f|
-  puts "Gosu Extensions #{f.read}"
-end
-
-application = ARGV.first
-
-puts "Usage: gogogosu <application_name>" and exit(1) unless application
-
-require File.dirname(__FILE__) + '/../generator/gogogosu'
-
-generator = Generator::Gogogosu.new
-
-generator.dir application do
-  generator.dir 'lib' do
-    
-  end
-  generator.dir 'media' do
-    
-  end
-end
-
-puts <<-START
-Great!
-
-Now proceed as follows:
-1. cd #{application}
-2. 
-START