chingu 0.6.5 → 0.6.6

data/chingu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-12}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby.
 Builds on the awesome Gosu (Ruby/C++) which provides all the core functionality.
 It adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and automation of common task.}
@@ -25,11 +25,11 @@ It adds simple yet powerful game states, prettier input handling, deployment saf
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
+      s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
     else
-      s.add_dependency(%q<hoe>, [">= 2.3.3"])
+      s.add_dependency(%q<hoe>, [">= 2.4.0"])
     end
   else
-    s.add_dependency(%q<hoe>, [">= 2.3.3"])
+    s.add_dependency(%q<hoe>, [">= 2.4.0"])
   end
 end

data/examples/example15.rb

@@ -3,6 +3,9 @@ require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu
 include Chingu
 
+#
+# Testing advanced options of timer-trait 
+#
 class Game < Chingu::Window
   def initialize
     super(640,400)
@@ -16,10 +19,23 @@ class Stuff < GameState
   
   def initialize(options = {})
     super
-    
+    self.input = {:t => :toggle, :"1" => :fast, :"2" => :slow}
     @thing = Thing.create(:x => $window.width/2, :y => $window.height / 2 )
-    #every(1000) { Thing.create(:x => 200)}
-    every(500){ @thing.visible? ? @thing.hide! : @thing.show!}
+    
+    every(500, :name => :blink) { @thing.visible? ? @thing.hide! : @thing.show! }
+    p timer_exists?(:blink)
+  end
+  
+  def toggle
+    stop_timer(:name => :blink)
+  end
+  
+  def fast
+    every(200, :name => :blink) { @thing.visible? ? @thing.hide! : @thing.show! }
+  end
+  
+  def slow
+    every(1000, :name => :blink) { @thing.visible? ? @thing.hide! : @thing.show! }
   end
   
   def update
@@ -33,10 +49,6 @@ class Thing < GameObject
     super
     @image = Image["circle.png"]
   end
-  
-  def update
-    #@y += 1
-  end
 end
 
 Game.new.show

data/lib/chingu.rb

@@ -33,7 +33,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/traits/collision_detection.rb

@@ -111,7 +111,7 @@ module Chingu
       # Explicit radius-collision
       # Works like each_collsion but with inline-code for speedups
       #
-      def each_bounding_circle_collision(klasses = [])
+      def each_bounding_circle_collision(*klasses)
         Array(klasses).each do |klass|
           klass.all.each do |object|
             yield(self, object) if Gosu.distance(self.x, self.y, object.x, object.y) < self.radius + object.radius
@@ -123,7 +123,7 @@ module Chingu
       # Explicit bounding_box-collision
       # Works like each_collision but with inline-code for speedups
       #
-      def each_bounding_box_collision(klasses = [])
+      def each_bounding_box_collision(*klasses)
         Array(klasses).each do |klass|
           klass.all.each do |object|
             yield(self, object) if self.bounding_box.collide_rect?(object.bounding_box)
@@ -136,7 +136,7 @@ module Chingu
         #
         # Works like each_collision but with inline-code for speedups
         #
-        def each_bounding_circle_collision(klasses = [])
+        def each_bounding_circle_collision(*klasses)
           Array(klasses).each do |klass|
             object2_list = klass.all
             #total_radius = object1.radius + object2.radius  # possible optimization?
@@ -153,7 +153,7 @@ module Chingu
         #
         # Works like each_collsion but with explicit bounding_box collisions (inline-code for speedups)
         #
-        def each_bounding_box_collision(klasses = [])
+        def each_bounding_box_collision(*klasses)
           Array(klasses).each do |klass|
             object2_list = klass.all
             self.all.each do |object1|

data/lib/chingu/traits/timer.rb

@@ -36,64 +36,118 @@ module Chingu
       def setup_trait(options)        
         #
         # Timers are saved as an array of arrays where each entry contains:
-        # [start_time, end_time (or nil if one-shot), &block]
+        # [name, start_time, end_time (or nil if one-shot), &block]
         #
         @_timers = Array.new
         @_repeating_timers = Array.new
         super
       end
 
-      def during(time, &block)
+      #
+      # Executes block each update during 'time' milliseconds 
+      #
+      def during(time, options = {}, &block)
+        return if timer_exists?(options[:name]) && options[:replace] == false
+        stop_timer(options[:name])
+
         ms = Gosu::milliseconds()
-        @_last_timer = [ms, ms + time, block]
+        @_last_timer = [options[:name], ms, ms + time, block]
         @_timers << @_last_timer
         self
       end
       
-      def after(time, &block)
+      #
+      # Executes block after 'time' milliseconds 
+      #
+      def after(time, options = {}, &block)
+        return if timer_exists?(options[:name]) && options[:replace] == false
+        stop_timer(options[:name])
+
         ms = Gosu::milliseconds()
-        @_last_timer = [ms + time, nil, block]
+        @_last_timer = [options[:name], ms + time, nil, block]
         @_timers << @_last_timer
         self
       end
-      
-      def between(start_time, end_time, &block)
+
+      #
+      # Executes block each update during 'start_time' and 'end_time'
+      #
+      def between(start_time, end_time, options = {}, &block)
+        return if timer_exists?(options[:name]) && options[:replace] == false
+        stop_timer(options[:name])
+
         ms = Gosu::milliseconds()
-        @_last_timer = [ms + start_time, ms + end_time, block]
+        @_last_timer = [options[:name], ms + start_time, ms + end_time, block]
         @_timers << @_last_timer
         self
       end
 
+      #
+      # Executes block every 'delay' milliseconds 
+      #
+      def every(delay, options = {}, &block)
+        return if timer_exists?(options[:name]) && options[:replace] == false
+        stop_timer(options[:name])
+        
+        ms = Gosu::milliseconds()
+        @_repeating_timers << [options[:name], ms + delay, delay, block]
+      end
+
+      #
+      # Executes block after the last timer ends 
+      # ...use one-shots start_time for our trailing "then".
+      # ...use durable timers end_time for our trailing "then".      
+      #
       def then(&block)
-        # ...use one-shots start_time for our trailing "then".
-        # ...use durable timers end_time for our trailing "then".
-        start_time = @_last_timer[1].nil? ? @_last_timer[0] : @_last_timer[1]
-        @_timers << [start_time, nil, block]
+        start_time = @_last_timer[2].nil? ? @_last_timer[1] : @_last_timer[2]
+        @_timers << [@_last_timer[0], start_time, nil, block]
+      end
+
+
+      #
+      # See if a timer with name 'name' exists
+      #
+      def timer_exists?(timer_name = nil)
+        return false if timer_name.nil?
+        @_timers.each { |name, | return true if timer_name == name }
+        @_repeating_timers.each { |name, | return true if timer_name == name }
+        return false
+      end
+
+      #
+      # Stop timer with name 'name'
+      #
+      def stop_timer(name)
+        @_timers.reject! { |name, start_time, end_time, block| name == name }
+        @_repeating_timers.reject! { |name, start_time, end_time, block| name == name }
       end
       
-      def every(delay, &block)
-        ms = Gosu::milliseconds()
-        @_repeating_timers << [ms + delay, delay, block]
-      end      
+      #
+      # Stop all timers
+      #
+      def stop_timers
+        @_timers.clear
+        @_repeating_timers.clear
+      end
       
       def update_trait
         ms = Gosu::milliseconds()
         
-        @_timers.each do |start_time, end_time, block|
+        @_timers.each do |name, start_time, end_time, block|
           block.call  if ms > start_time && (end_time == nil || ms < end_time)
         end
                 
         index = 0
-        @_repeating_timers.each do |start_time, delay, block|
+        @_repeating_timers.each do |name, start_time, delay, block|
           if ms > start_time
             block.call  
-            @_repeating_timers[index] = [ms + delay, delay, block]
+            @_repeating_timers[index] = [name, ms + delay, delay, block]
           end
           index += 1
         end
 
         # Remove one-shot timers (only a start_time, no end_time) and all timers which have expired
-        @_timers.reject! { |start_time, end_time, block| (ms > start_time && end_time == nil) || (end_time != nil && ms > end_time) }
+        @_timers.reject! { |name, start_time, end_time, block| (ms > start_time && end_time == nil) || (end_time != nil && ms > end_time) }
       
         super
       end

data/lib/chingu/traits/velocity.rb

@@ -23,9 +23,13 @@ module Chingu
   module Traits
     #
     # A chingu trait providing velocity and acceleration logic. 
+    # Adds parameters: velocity_x/y, acceleration_x/y and modifies self.x / self.y
+    # Also keeps previous_x and previous_y which is the x, y before modification.
+    # Can be useful for example collision detection
     #
     module Velocity
       attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
+      attr_reader :previous_x, :previous_y
       
       def setup_trait(options)
         @velocity_options = {:debug => false}.merge(options)        
@@ -44,13 +48,19 @@ module Chingu
       def update_trait        
         @velocity_y += @acceleration_y		if	(@velocity_y + @acceleration_y).abs < @max_velocity
         @velocity_x += @acceleration_x		if	(@velocity_x + @acceleration_x).abs < @max_velocity
+        
+        @previous_y = @y
+        @previous_x = @x
+        
         self.y += @velocity_y
         self.x += @velocity_x
         super
       end
       
       def stop
-        @acceleration_y = @acceleration_x = @velocity_y = @acceleration_y = 0
+        # @acceleration_y = @acceleration_x = 0
+        @velocity_x = 0
+        @velocity_y = 0
       end      
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2009-12-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   OpenGL accelerated 2D game framework for Ruby.