ippa-chingu 0.5.4 → 0.5.5

data/Manifest.txt

@@ -8,11 +8,13 @@ benchmarks/benchmark.rb
 benchmarks/benchmark3.rb
 benchmarks/benchmark4.rb
 benchmarks/benchmark5.rb
+benchmarks/benchmark6.rb
 benchmarks/meta_benchmark.rb
 benchmarks/meta_benchmark2.rb
 chingu.gemspec
 examples/example1.rb
 examples/example10.rb
+examples/example11.rb
 examples/example2.rb
 examples/example3.rb
 examples/example4.rb
@@ -43,6 +45,7 @@ lib/chingu/core_extensions.rb
 lib/chingu/effects.rb
 lib/chingu/fpscounter.rb
 lib/chingu/game_object.rb
+lib/chingu/game_object_list.rb
 lib/chingu/game_state.rb
 lib/chingu/game_state_manager.rb
 lib/chingu/game_states/debug.rb
@@ -60,9 +63,7 @@ lib/chingu/require_all.rb
 lib/chingu/text.rb
 lib/chingu/traits/collision_detection.rb
 lib/chingu/traits/effect.rb
-lib/chingu/traits/effect_module.rb
 lib/chingu/traits/input.rb
 lib/chingu/traits/rotation_center.rb
 lib/chingu/traits/velocity.rb
-lib/chingu/traits/velocity_module.rb
 lib/chingu/window.rb

data/README.rdoc

@@ -22,7 +22,8 @@ The last years I've dabbled around a lot with game development.
 I've developed games in both Rubygame and Gosu. I've looked at gamebox.
 Rubygame is a very capable framework with a lot of functionality (collision detection, very good event system etc). Gosu is way more minimalistic but also faster with OpenGL -acceleration. Gosu isn't likely to get much more complex since it does what it should do very well and fast.
 
-After 10+ game prototypes and some finished smaller games I started to see patterns each time I started a new game. Making classes with x/y/image/other-parameters that I called update/draw on in the main loop. This became the basic Chingu::GameObject which encapsulates Gosus "Image.draw_rot" and enables automatic updating/drawing.
+After 10+ game prototypes and some finished smaller games I started to see patterns each time I started a new game. Making classes with x/y/image/other-parameters that I called update/draw on in the main loop. 
+This became the basic Chingu::GameObject which encapsulates Gosus "Image.draw_rot" and enables automatic updating/drawing through "game_objects".
 
 There was always a huge big chunk of checking keyboard-events in the main loop.
 Borrowing ideas from Rubygame this has now become @player.keyboard(:left => :move_left, :space => :fire ... etc.
@@ -39,13 +40,14 @@ Available thoughout your source as $window (Yes, that's the only global Chingu h
 === Chingu::GameObject
 Use this for all your in game objects. The player, the enemies, the bullets, the powerups, the loot laying around.
 It's very reusable and doesn't contain any game-logic (that's up to you!). Only stuff to put it on screen a certain way.
-It also gives you a couple of bonuses with chingu, as automatic updates/draws and easier input-mapping.
-Has either Chingu::Window or a Chingu::GameState as "owner".
+If you do GameObject.create() instead of new() Chingu will keep save the object in the "game_object"-list for automatic updates/draws.
+GameObjects also have the nicer Chingu input-mapping: @player.input = { :left => :move_left, :right => :move_right, :space => :fire}
+Has either Chingu::Window or a Chingu::GameState as "parent".
 
 === Chingu::BasicGameObject
 For those who think GameObject is a too little fat, there's BasicGameObject (GameObject inherits from BasicGameObject).
 BasicGameObject is just an empty frame (no x,y,image accessors or draw-logic) for you to build on.
-It _can_ be extended with Chingus trait-system though.
+It _can_ be extended with Chingus trait-system though. The new() vs create() behaivor of GameObject comes from BasicGameObject.
 BasicGameObject#parent points to either $window or a game state and is automaticly set on creation time.
 
 === Chingu::GameStateManager
@@ -62,10 +64,9 @@ For example, inside game state Menu you call push_game_state(Level). When Level
 
 === Traits
 Traits are extensions (or plugins if you so will) to BasicGameObjects. 
-The aim is so encapsulate common behaivor into stand alone classes and modules for easy inclusion in your game classes.
-In it's most basic form it's just a class which answers to setup() (called on your game objects creation), update() and draw().
-Traits are a fairly new addition to Chingu and will probably morph some more before stabilizing. 
-
+The aim is so encapsulate common behaivor into modules for easy inclusion in your game classes.
+Making a trait is easy, just an ordinary module with the methods setup_trait(), update() and/or draw().
+It currently has to be namespaced to Chingu::Traits for "has_trait" to work inside GameObject-classes.
 
 == OTHER CLASSES / HELPERS
 
@@ -157,7 +158,7 @@ Chingu doesn't change any fundamental concept of Gosu, but it will make the abov
       # Player will automaticly be updated and drawn since it's a Chingu::GameObject
       # You'll need your own Game#update/#draw after a while, but just put #super there and Chingu can do its thing.
       #
-      @player = Player.new
+      @player = Player.create
       @player.input = {:left => :move_left, :right => :move_right}
     end    
   end
@@ -192,7 +193,8 @@ If you've worked with Gosu for a while you're probably tired of passing around t
 Chingu solves this (as has many other developers) with a global variable $window. Yes, globals are bad, but in this case it kinda makes sense. It's used under the hood in various places.
 
 === Chingu::GameObject
-This is our basic "game unit"-class, meaning most in game objects (players, enemies, bullets etc) should be inherited from Chingu::GameObject. The basic ideas behind it are:
+This is our basic "game unit"-class, meaning most in game objects (players, enemies, bullets etc) should be inherited from Chingu::GameObject.
+The basic ideas behind it are:
 
 * Encapsulate only the very common basics that Most in game objects need
 * Keep naming close to Gosu, but add smart convenient methods / shortcuts and a more rubyish feeling
@@ -452,20 +454,25 @@ Text is a class to give the use of Gosu::Font more rubyish feel and fit it bette
   @font.draw("A Text", 200, 50, 55, 2.0)
   
 # Chingu
-  @text = Chingu::Text.new(:text => "A Text", :x => 200, :y => 50, :zorder => 55, :factor_x => 2.0)
+  @text = Chingu::Text.create(:text => "A Text", :x => 200, :y => 50, :zorder => 55, :factor_x => 2.0)
   @text.draw
 
-@text.draw is usually not needed as Text is a GameObject and therefore autodrawn.
-It's not only that the second example is readable by ppl now even familiar with Gosu, @text comes with a number of changeable properties, x,y,zorder,angle,factor_x,color,mode etc. Set a new x or angle or color and it will instantly update on screen.
+@text.draw is usually not needed as Text is a GameObject and therefore automaticly updated/drawn (it #create is used instead of #new)
+It's not only that the second example is readable by ppl now even familiar with Gosu, @text comes with a number of changeable properties, x,y,zorder,angle,factor_x,color,mode etc. 
+Set a new x or angle or color and it will instantly update on screen.
 
 
 == MISC / FAQ
-How do I access my main-window easily?
-
+=== How do I access my main-window easily?
 Chingu keeps a global variable, $window, which contains the Chingu::Window instance. 
 Since Chingu::Window is just Gosu::Window + some cheese you can do your $window.button_down?, $window.draw_line() etc from anywhere.
 See http://www.libgosu.org/rdoc/classes/Gosu/Window.html for a full set of methods.
 
+=== How did you decide on naming of methods / classes?
+There's 1 zillion ways of naming stuff. As a general guideline I've tried to follow Gosus naming.
+If Gosu didn't have a good name for a certain thing/method I've checked Ruby itself and then Rails since alot
+ of Ruby-devs are familiar with Rails.
+
 == TODO:
 * add :padding and :align => :topleft etc to class Text
 * (skip) rename Chingu::Window so 'include Chingu' and 'include Gosu' wont make Window collide
@@ -486,7 +493,7 @@ See http://www.libgosu.org/rdoc/classes/Gosu/Window.html for a full set of metho
 * (done) Automate gemgenning rake-task even more
 * (done) More examples when effects are more complete
 * class ChipmunkObject
-* (has_trait :velocity :p..) class Actor/MovingActor with maybe a bit more logic then the basic GameObject. Would ppl find is useful?
+* (done) class Actor/MovingActor with maybe a bit more logic then the basic GameObject.
 * (60% done) Spell check all docs, sloppy spelling turns ppl off. tnx jduff ;).
 * Tests
 * (done) Streamline fps / tick code

data/benchmarks/benchmark5.rb

@@ -1,9 +1,22 @@
 require 'benchmark'
 require 'rubygems'
-require 'randomr'
+require 'set'
 
 class Foo
+  @list = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  @@list2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  
+  def self.list
+    @list
+  end
+
+  def self.list2
+    @@list2
+  end
+
+  attr_accessor :list
   def initialize
+    @list = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
   end
   
   def bar
@@ -12,7 +25,35 @@ end
 
 foo = Foo.new
 
+
+s = Set.new
 a = Array.new
+h = Hash.new
+h[:a] = Array.new
+
+n = 1000000
+Benchmark.bm(22) do |x|
+  x.report('Array << ') do
+    n.times do
+      a << n
+    end
+  end
+  
+  x.report('Set << ') do
+    n.times do
+      s << n
+    end
+  end
+
+  x.report('Hash[:a] << ') do
+    n.times do
+      h[:a] << n
+    end
+  end
+end
+
+
+
 n = 1000000
 Benchmark.bm(22) do |x|
   x.report('respond_to?') do
@@ -27,3 +68,24 @@ Benchmark.bm(22) do |x|
     end
   end
 end
+
+n = 100000
+Benchmark.bm(22) do |x|
+  x.report('ivar axx') do
+    n.times do
+      foo.list.each { |num| }
+    end
+  end
+
+  x.report('class attribute axx') do
+    n.times do
+      Foo.list.each { |num| }
+    end
+  end
+  
+  x.report('class var axx') do
+    n.times do
+      Foo.list2.each { |num| }
+    end
+  end  
+end

data/benchmarks/benchmark6.rb

@@ -0,0 +1,23 @@
+require 'benchmark'
+require 'rubygems'
+require 'set'
+
+a = [1,2,3,4,5]
+h = {1=>"b",2=>"b",3=>"b",4=>"b",5=>"b"}
+
+n = 1000000
+Benchmark.bm(22) do |x|
+  
+  x.report('Array.each ') do
+    n.times do
+      a.each {}
+    end
+  end
+  
+  x.report('Hash.each') do
+    n.times do
+      h.each {}
+    end
+  end
+  
+end

data/chingu.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-09-17}
+  s.date = %q{2009-09-22}
   s.description = %q{Game framework built on top of the OpenGL accelerated game lib Gosu. 
 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.}
   s.email = ["ippa@rubylicio.us"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "benchmarks/README.txt"]
-  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/particle.png", "examples/media/ruby.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/actor.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/effects.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/gfx_helpers.rb", "lib/chingu/helpers.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/effect_module.rb", "lib/chingu/traits/input.rb", "lib/chingu/traits/rotation_center.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/traits/velocity_module.rb", "lib/chingu/window.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/particle.png", "examples/media/ruby.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/actor.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/effects.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/gfx_helpers.rb", "lib/chingu/helpers.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/input.rb", "lib/chingu/traits/rotation_center.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
   s.homepage = %q{http://github.com/ippa/chingu/tree/master}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/example1.rb

@@ -14,7 +14,7 @@ include Gosu
 class Game < Chingu::Window
   def initialize
     super(640,480,false)  # leave it blank and it will be 800,600,non fullscreen
-    @player = Player.new(:x => 200, :y => 200, :image => Image["spaceship.png"])
+    @player = Player.create(:x => 200, :y => 200, :image => Image["spaceship.png"])
     @player.input = { :holding_left => :move_left, :holding_right => :move_right, 
                       :holding_up => :move_up, :holding_down => :move_down, :escape => :exit}
     p RUBY_VERSION

data/examples/example10.rb

@@ -10,10 +10,10 @@ $stderr.sync = $stdout.sync = true
 #
 class Game < Chingu::Window
   def initialize
-    super(400,400)
+    super(600,400)
     self.caption = "Testing out new module-based traits (SPACE for more spaceships)"
-    self.input = { :space => :new_thing, :esc => :exit }
-    new_thing(200,200)
+    self.input = { :space => :create_thing, :esc => :exit }
+    create_thing(200,200)
   end
 
   def update
@@ -26,8 +26,8 @@ class Game < Chingu::Window
     super
   end
   
-  def new_thing(x=nil, y=nil)
-    Thing.new(:x => x||rand($window.width), :y => y||rand($window.height), :debug => true)
+  def create_thing(x=nil, y=nil)
+    Thing.create(:x => x||rand($window.width), :y => y||rand($window.height), :debug => true)
   end
 end
 

data/examples/example11.rb

@@ -0,0 +1,51 @@
+require 'rubygems'
+require 'opengl'
+require 'gosu'
+#include Gosu
+
+class Game < Gosu::Window
+  def initialize
+    super(400,400,false)
+  end
+  
+  def update
+  end
+  
+  def draw
+    gl do
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)  
+
+      # Reset the view
+      glLoadIdentity
+
+      # Move to the left 1.5 units and into the screen 6.0 units
+      glTranslate(-1.5, 0.0, -6.0)
+
+      # -- Draw a triangle --
+      glColor(1.0,1.0,1.0)
+      
+      # Begin drawing a polygon
+      glBegin(GL_POLYGON)
+         glVertex3f( 0.0, 1.0, 0.0)    # Top vertex
+         glVertex3f( 1.0, -1.0, 0.0)    # Bottom right vertex
+         glVertex3f(-1.0, -1.0, 0.0)    # Bottom left vertex
+      # Done with the polygon
+      glEnd
+
+      # Move 3 units to the right
+      glTranslate(3.0, 0.0, 0.0)
+
+      # -- Draw a square (quadrilateral) --
+      # Begin drawing a polygon (4 sided)
+      glBegin(GL_QUADS)
+        glVertex3f(-1.0, 1.0, 0.0)       # Top Left vertex
+        glVertex3f( 1.0, 1.0, 0.0)       # Top Right vertex
+        glVertex3f( 1.0, -1.0, 0.0)      # Bottom Right vertex
+         glVertex3f(-1.0, -1.0, 0.0)      # Bottom Left  
+      glEnd                
+      glFlush
+    end
+  end  
+end
+
+Game.new.show

data/examples/example2.rb

@@ -16,7 +16,7 @@ class Game < Chingu::Window
     #
     super
     
-    push_game_state(Play.new)
+    push_game_state(Play)
   end
 end
 
@@ -35,7 +35,7 @@ class Player < Chingu::GameObject
   def move_down;  @y += 1; end 
 
   def fire
-    Bullet.new(:x => @x, :y => @y)
+    Bullet.create(:x => @x, :y => @y)
   end  
 end
 
@@ -59,7 +59,7 @@ class Play < Chingu::GameState
   
   def initialize
     super
-    @player = Player.new(:x => 200, :y => 200)
+    @player = Player.create(:x => 200, :y => 200)
     @player.input = { :holding_left => :move_left, 
                       :holding_right => :move_right, 
                       :holding_up => :move_up, 
@@ -108,7 +108,7 @@ class Play < Chingu::GameState
     #
       
     super
-    $window.caption = "FPS: #{$window.fps} - milliseconds_since_last_tick: #{$window.milliseconds_since_last_tick} - game objects# #{current_game_state.game_objects.size}"
+    $window.caption = "FPS: #{$window.fps} - milliseconds_since_last_tick: #{$window.milliseconds_since_last_tick} - game objects# #{current_game_state.game_objects.size} Bullets# #{Bullet.size}"
   end  
 end
 

data/examples/example3.rb

@@ -11,7 +11,7 @@ class Game < Chingu::Window
     super    
     self.input = {:holding_left => :scroll_left, :holding_right => :scroll_right, :escape => :exit}
     
-    @parallax = Chingu::Parallax.new(:x => 0, :y => 0, :center_x => 0, :center_y => 0)
+    @parallax = Chingu::Parallax.create(:x => 0, :y => 0, :center_x => 0, :center_y => 0)
     
     #
     # If no :zorder is given to @parallax.add_background it defaults to first added -> lowest zorder

data/examples/example4.rb

@@ -34,7 +34,7 @@ class Game < Chingu::Window
     push_game_state(Intro)
     
     # Yes you can do crazy things like this :)
-    self.input = { :left_mouse_button => lambda{Chingu::Text.new(:text => "Woff!")}, :esc => :exit}    
+    self.input = { :left_mouse_button => lambda{Chingu::Text.create(:text => "Woff!")}, :esc => :exit}    
   end
 end
 
@@ -51,9 +51,11 @@ class Player < Chingu::GameObject
   def move_down;  @y += 1; end 
 
   def fire
-    Bullet.new(:x => @x - 20, :y => @y)
-    Bullet.new(:x => @x, :y => @y) 
-    Bullet.new(:x => @x + 20, :y => @y)
+    #puts $window.current_parent.to_s
+    #puts $window.game_state_manager.inside_state
+    Bullet.create(:x => @x - 20, :y => @y)
+    Bullet.create(:x => @x, :y => @y) 
+    Bullet.create(:x => @x + 20, :y => @y)
   end  
 end
 
@@ -74,9 +76,9 @@ end
 # GAMESTATE #1 - INTRO
 #
 class Intro < Chingu::GameState 
-  def initialize(options)
+  def initialize(options = {})
     super
-    @title = Chingu::Text.new(:text=>"Press and release F1", :x=>200, :y=>50, :size=>30)
+    @title = Chingu::Text.create(:text=>"Press and release F1", :x=>200, :y=>50, :size=>30)
     self.input = { :f1 => :pressed, :released_f1 => :released, :f2 => Menu}
   end
   
@@ -93,9 +95,9 @@ end
 # GAMESTATE #2 - MENU
 #
 class Menu < Chingu::GameState
-  def initialize(options)
+  def initialize(options = {})
     super
-    @title = Chingu::Text.new(:text => "Press 'S' to Start game", :x=>100, :y=>50, :size=>30)
+    @title = Chingu::Text.create(:text => "Press 'S' to Start game", :x=>100, :y=>50, :size=>30)
     self.input = { :s => Level.new(:level => 10) }
   end
 end
@@ -107,10 +109,10 @@ class Level < Chingu::GameState
   #
   # initialize() is called when you create the game state
   #
-  def initialize(options)
+  def initialize(options = {})
     super
-    @title = Chingu::Text.new(:text=>"Level #{options[:level].to_s}. P: pause R:restart", :x=>20, :y=>10, :size=>30)
-    @player = Player.new
+    @title = Chingu::Text.create(:text=>"Level #{options[:level].to_s}. P: pause R:restart", :x=>20, :y=>10, :size=>30)
+    @player = Player.create
     @player.input = { :holding_left => :move_left, 
                       :holding_right => :move_right, 
                       :holding_up => :move_up, 
@@ -127,7 +129,7 @@ class Level < Chingu::GameState
   def update
     super
     Bullet.destroy_if {|bullet| bullet.outside_window? }
-    $window.caption = "FPS: #{$window.fps} - GameObjects: #{game_objects.size}"
+    $window.caption = "FPS: #{$window.fps} - GameObjects: #{game_objects.size} - Bullets: #{Bullet.size}"
   end
   
   #
@@ -137,8 +139,12 @@ class Level < Chingu::GameState
   # This can be useful if you want to display some kind of box above the gameplay (pause/options/info/... box)
   #
   def setup
+    # Destroy all created objects of class Bullet
+    #p Bullet.size
+    #puts Bullet.all
+    Bullet.destroy_all
+    
     # Place player in a good starting position
-    Bullet.clear
     @player.x = $window.width/2
     @player.y = $window.height - @player.image.height
   end
@@ -150,9 +156,9 @@ end
 # NOTICE: Chingu now comes with a predefined Chingu::GameStates::Pause that works simular to this!
 #
 class Pause < Chingu::GameState
-  def initialize(options)
+  def initialize(options = {})
     super
-    @title = Chingu::Text.new(:text=>"PAUSED (press 'u' to un-pause)", :x=>100, :y=>200, :size=>20, :color => Color.new(0xFF00FF00))
+    @title = Chingu::Text.create(:text=>"PAUSED (press 'u' to un-pause)", :x=>100, :y=>200, :size=>20, :color => Color.new(0xFF00FF00))
     self.input = { :u => :un_pause }
   end
 
@@ -161,8 +167,8 @@ class Pause < Chingu::GameState
   end
   
   def draw
-    previous_game_state.draw           # Draw prev game state onto screen (in this case our level)
-    super                         # Draw game objects in current game state, this includes Chingu::Texts
+    previous_game_state.draw    # Draw prev game state onto screen (in this case our level)
+    super                       # Draw game objects in current game state, this includes Chingu::Texts
   end  
 end
 

data/examples/example7.rb

@@ -87,7 +87,7 @@ class Particles < Chingu::GameState
     #
     # Fire 1. Dies quickly (big :fade). Small in size (small :zoom)
     #
-    Chingu::Particle.new( :x => 100, 
+    Chingu::Particle.create( :x => 100, 
                           :y => @ground_y, 
                           :animation => @fireball_animation,
                           :zooming => +0.05, 
@@ -99,7 +99,7 @@ class Particles < Chingu::GameState
     #
     # Fire 2. Higher flame, :fade only -4. Wide Flame with bigger :zoom.
     #
-    Chingu::Particle.new( :x => 300, 
+    Chingu::Particle.create( :x => 300, 
                           :y => @ground_y, 
                           :animation => @fireball_animation, 
                           :zooming => +0.2, 
@@ -110,15 +110,15 @@ class Particles < Chingu::GameState
     #
     # Fire 3. Blue plasma with smooth particle.png and color-overlay.
     #
-    Chingu::Particle.new( :x => 500, 
+    Chingu::Particle.create( :x => 500, 
                           :y => @ground_y,
                           :image => "particle.png", 
                           :color => @blue_laserish,
                           :mode => :additive
                         )
 
-    game_objects_of_class(Particle).each { |particle| particle.y -= 5; particle.x += 2 - rand(4) }
-    self.game_objects.reject! { |object| object.outside_window? || object.color.alpha == 0 }
+    Particle.all.each { |particle| particle.y -= 5; particle.x += 2 - rand(4) }
+    game_objects.destroy_if { |object| object.outside_window? || object.color.alpha == 0 }
     super
   end
   

data/examples/example8.rb

@@ -54,10 +54,10 @@ class Particles < Chingu::GameState
     # first optimization: 490 particles, 47 fps (350 @ 60)
     # optimized GameObject if/elsif: 490 particles, 50 fps
     #
-    Plasma.new(:x => 0, :y => 0 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 10)
-    Plasma.new(:x => 0, :y => 50 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 14)
-    Plasma.new(:x => 0, :y => 100 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 7)
-    Plasma.new(:x => 0, :y => 200 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 6)
+    Plasma.create(:x => 0, :y => 0 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 10)
+    Plasma.create(:x => 0, :y => 50 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 14)
+    Plasma.create(:x => 0, :y => 100 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 7)
+    Plasma.create(:x => 0, :y => 200 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 6)
         
     Plasma.all.each do |particle|
       #
@@ -93,7 +93,7 @@ class Particles < Chingu::GameState
     # +4 fps
     #
     #self.game_objects.reject! { |object| object.outside_window? || object.color.alpha == 0 }
-    self.game_objects.reject! { |object| object.color.alpha == 0 }
+    self.game_objects.destroy_if { |object| object.color.alpha == 0 }
     
     super
   end

data/examples/example9.rb

@@ -18,7 +18,8 @@ class Game < Chingu::Window
 end
 
 class FireCube < Chingu::GameObject
-  has_traits :velocity, :effect
+  has_trait :velocity
+  has_trait :effect
   has_trait :collision_detection
   #
   # TODO:
@@ -26,27 +27,39 @@ class FireCube < Chingu::GameObject
   # has_trait :collision_detection, :type => :radius
   #
   
-  attr_accessor :color
+  attr_accessor :color, :radius
   
   def initialize(options)
     super    
     @mode = :additive
     
     # initialize with a rightwards velocity with some damping to look more realistic
-    @velocity_x = options[:velocity_x] || 3 - rand(6)
-    @velocity_y = options[:velocity_y] || 3 - rand(6)
-    @bounding_box = Rect.new([@x, @y, 20, 20])    
-    @color = Color.new(255,100,255,255)
+    @velocity_x = options[:velocity_x] || 1 + rand(2)
+    @velocity_y = options[:velocity_y] || 1 + rand(2)
+    
+    @bounding_box = Rect.new([@x, @y, 10, 10])
+    @radius = 12
+    
+    @blue = Color.new(255,100,255,255)
+    @red = Color.new(255,255,10,10)
+    @color = @blue
   end
   
   def draw
     $window.fill_rect(@bounding_box, @color)
   end
   
+  def update
+    @color = @blue
+    super
+  end
+  
+  def collides?(object2)
+    radius_collision?(object2)
+  end
+    
   def die!
-    @color = Color.new(255,255,255,255)
-    self.fading = -20
-    self.detect_collisions = false
+    @color = @red
   end
   
 end
@@ -54,14 +67,16 @@ end
 class Particles < Chingu::GameState
   def setup    
     self.input = { :space => :new_fire_cube }
-    20.times { new_fire_cube }
+    100.times { new_fire_cube }
   end
   
   def new_fire_cube
-    FireCube.new(:x => rand($window.width), :y => rand($window.height))
+    FireCube.create(:x => rand($window.width), :y => rand($window.height))
   end
   
-  def update        
+  def update
+    super
+    
     FireCube.all.each do |particle|
       if particle.x < 0 || particle.x > $window.width
         particle.velocity_x = -particle.velocity_x
@@ -73,20 +88,18 @@ class Particles < Chingu::GameState
     end
     
     #
-    # GameObject.each_collsion wont collide an object with itself
+    # GameObject.each_collsion / each_radius_collision wont collide an object with itself
     #
-    FireCube.each_collision(FireCube) do |cube1, cube2|
+    FireCube.each_radius_collision(FireCube) do |cube1, cube2|
       cube1.die!
       cube2.die!
     end
       
-    self.game_objects.reject! { |object| object.color.alpha == 0 }
-    
-    super
+    game_objects.destroy_if { |object| object.color.alpha == 0 }
   end
   
   def draw
-    $window.caption = "particle example (esc to quit) [particles#: #{game_objects.size} - framerate: #{$window.fps}]"
+    $window.caption = "Radius based collision Detection between all particles. Particles#: #{game_objects.size} - FPS: #{$window.fps}"
     super
   end
 end

data/lib/chingu/basic_game_object.rb

@@ -6,8 +6,9 @@ module Chingu
   # It will also acts as a container for the trait-system of chingu.
   #
   class BasicGameObject
-    attr_reader :options, :parent
-    
+    attr_reader :options
+    attr_accessor :parent
+        
     #
     # adds a trait or traits to a certain game class
     # 
@@ -29,29 +30,40 @@ module Chingu
     end
         
     #
-    # BasicGameUnit initialize
-    #
-    # - caches all trait methods for fast calls later on
-    # - call .setup() on all traits that implements it
-    # - adds game object to correct game state or $window if no game state exists
+    # BasicGameObject initialize
+    # - call .setup_trait() on all traits that implements it
     #
     def initialize(options = {})
       @options = options
       
+      # This will call #setup_trait on the latest trait mixed in
+      # which then will pass it on to the next setup_trait() with a super-call.
+      setup_trait(options)
+    end
+    
+    #
+    # Creates a new object from class just as new() but also:
+    # - adds game object to current game state
+    # - or $window if no game state exists
+    #
+    # Use create() instead of new() if you want to keep track of your objects through
+    # Chingus "game_objects" which is available in all game states and the main window.
+    #
+    def self.create(options = {})
+      instance = self.new(options)
+      
       #
-      # A GameObject can either belong to a GameState or our mainwindow ($window)
-      # .. or live in limbo with manual updates
+      # A GameObject either belong to a GameState or our mainwindow ($window)
       #
       if $window && $window.respond_to?(:game_state_manager)
-        @parent = $window.game_state_manager.inside_state || $window
-        @parent.add_game_object(self) if @parent
+        if (instance.parent = $window.game_state_manager.inside_state || $window)
+          instance.parent.add_game_object(instance)
+        end
       end
       
-      # This will call #setup on the latest trait mixed in, which then will pass it on with super.
-      setup_trait(options) 
+      return instance
     end
     
-
     def setup_trait(options)
     end
     
@@ -62,20 +74,26 @@ module Chingu
     end    
         
     #
-    # Fetch all objects of a current class.
-    #   Bullet.all   # => Enumerator of all objects of class Bullet
+    # Returns an array with all objects of current class.
+    # BasicGameObject#all is state aware so only objects belonging to the current state will be returned.
     #
-    # NOTE: ObjectSpace doesn't play nice with jruby.
+    #   Bullet.all.each do {}  # Iterate through all bullets in current game state
     #
     def self.all
-      ObjectSpace.each_object(self)
+      $window.current_parent.game_objects.of_class(self).dup
+    end
+    
+    #
+    # Returns
+    #
+    def self.size
+      $window.current_parent.game_objects.of_class(self).size
     end
     
     #
     # Destroy all instances of current class that fills a certain condition
     #   Enemy.destroy_if(&:dead?)   # Assumes Enemy.dead? returns true/false depending on aliveness :)
     #
-    #
     def self.destroy_if(&block)
       all.each do |object|
         object.destroy! if yield(object)
@@ -83,11 +101,11 @@ module Chingu
     end
     
     #
-    # Clear all intances of objects class:
-    #   Bullet.clear    # Removes all Bullet objects from the game
+    # Destroys all intances of objects class:
+    #   Bullet.destroy_all    # Removes all Bullet objects from the game
     #
-    def self.clear
-      all.each { |object| object.destroy! }
+    def self.destroy_all
+      self.all.each { |object| object.destroy! }
     end
 
     #

data/lib/chingu/game_object_list.rb

@@ -0,0 +1,81 @@
+#--
+#
+# Chingu -- Game framework built on top of the opengl accelerated gamelib Gosu
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+
+module Chingu
+  #
+  # Manages a list of game objects
+  # An instance of GameObjectList is automaticly created as "game_objects" if using Chingu::Window
+  #
+  class GameObjectList
+        
+    def initialize
+      @game_objects = Array.new
+      #@game_objects_by_class = Hash.new
+    end
+    
+    def to_s
+      "#{@game_objects.size} game objects."
+    end
+    
+    def of_class(klass)
+      @game_objects.select { |game_object| game_object.is_a? klass }
+      #@game_objects_by_class[klass] || []
+    end
+    
+    def remove_all
+      @game_objects.clear
+      #@game_objects_of_class.clear
+    end
+    alias :clear :remove_all
+    
+    def add_game_object(object)
+      @game_objects.push(object)
+      #(@game_objects_by_class[object.class] ||= []).push(object)
+    end
+    
+    def remove_game_object(object)
+      @game_objects.delete(object)
+      #@game_objects_by_class[object.class].delete(object)
+    end
+    
+    def destroy_if
+      @game_objects.reject! { |object| yield(object) }
+      #@game_objects_by_class.delete_if { |klass, object| yield(object) }
+    end
+    
+    def size
+      @game_objects.size
+    end
+    
+    def draw
+      @game_objects.each { |object| object.draw }
+    end
+    
+    def update
+      @game_objects.each { |object| object.update }
+    end
+    
+    def each
+      @game_objects.each { |object| yield object }
+    end
+  end  
+end

data/lib/chingu/game_state.rb

@@ -56,12 +56,12 @@ module Chingu
     include Chingu::InputClient
     
     attr_reader :options                # so jlnr can access his :level-number
-    attr_accessor :game_state_manager
+    attr_accessor :game_state_manager, :game_objects
     
     def initialize(options = {})
       @options = options
       ## @game_state_manager = options[:game_state_manager] || $window.game_state_manager
-      @game_objects = Set.new
+      @game_objects = GameObjectList.new
       @input_clients = Set.new          # Set is like a unique Array with Hash lookupspeed
       
       # Game state mamanger can be run alone
@@ -69,12 +69,7 @@ module Chingu
         $window.game_state_manager.inside_state = self
       end
     end
-    
-    def game_objects
-      return [] unless defined?(@game_objects)
-      return @game_objects
-    end
-    
+        
     #
     # An unique identifier for the GameState-class, 
     # Used in game state manager to keep track of created states.
@@ -86,13 +81,6 @@ module Chingu
     def to_s
       self.class.to_s
     end
-
-    def add_game_object(object)
-      @game_objects << object
-    end
-    def remove_game_object(object)
-      @game_objects.delete(object)
-    end
     
     def setup
       # Your game state setup logic here.
@@ -122,14 +110,14 @@ module Chingu
       
       @input_clients.each { |game_object| dispatch_input_for(game_object) }      
       
-      @game_objects.each { |object| object.update }
+      @game_objects.update
     end
     
     #
     # Calls Draw on each game object that has current game state as parent (created inside that game state)
     #
     def draw
-      @game_objects.each { |object| object.draw }
+      @game_objects.draw
     end
         
     #

data/lib/chingu/game_state_manager.rb

@@ -280,7 +280,7 @@ module Chingu
       # If state is a GameState-class, create it.
       #        
       elsif state.superclass == Chingu::GameState
-        new_state = state.new({})
+        new_state = state.new
       end
       
       return new_state

data/lib/chingu/helpers.rb

@@ -142,6 +142,19 @@ module Chingu
   end
   
   module GameObjectHelpers
+  
+    def add_game_object(object)
+      @game_objects.add_game_object(object)
+    end
+    
+    def remove_game_object(object)
+      @game_objects.remove_game_object(object)
+    end
+    
+    def game_objects
+      @game_objects
+    end
+    
     #
     # Fetch game objects of a certain type/class
     #

data/lib/chingu/traits/collision_detection.rb

@@ -23,8 +23,11 @@
 module Chingu
   module Traits
     #
+    # Research:
+    # 1) QuadTrees: http://lab.polygonal.de/2007/09/09/quadtree-demonstration/
+    # 2) Sweep and Prune
     #
-    # Use QuadTrees: http://lab.polygonal.de/2007/09/09/quadtree-demonstration/
+    # SEE: http://www.shmup-dev.com/forum/index.php?board=65.0
     #
     # Makes use of 3 attributes
     #   @bounding_box      - a Rect-instance, uses in bounding_box collisions
@@ -32,7 +35,8 @@ module Chingu
     #   @detect_collisions - [true|false], should object be checked for collisions with Object.each_collision
     #
     module CollisionDetection
-      attr_accessor :bounding_box, :radius, :detect_collisions
+      attr_accessor :bounding_box, :radius
+      ## attr_accessor :detect_collisions # slowed down example9 with 3 fps
       
       def self.included(base)
         base.extend(ClassMethods)
@@ -47,10 +51,10 @@ module Chingu
         end
         
         if @image
-          @radius ||= @image.width / 2
+          @radius ||= (@image.height + @image.width) / 2 * 0.80
         end
         
-        @detect_collisions = true
+        ## @detect_collisions = true
         super
       end
       
@@ -59,9 +63,9 @@ module Chingu
       # By default it calls bounding_box_collision? which will check for intersectons between the 
       # two objects "bounding_box" attributs (a Chingu::Rect instance)
       #
-      def collision?(object2)
-        #bounding_box_collision?(object2)
-        radius_collision?(object2)
+      def collides?(object2)
+        bounding_box_collision?(object2)
+        #radius_collision?(object2)
       end
       
       #
@@ -77,7 +81,7 @@ module Chingu
       # Returns true if colliding.
       #
       def radius_collision?(object2)
-        distance(self.x, self.y, object2.x, object2.y) < self.radius + object2.radius
+        distance(self.x, self.y, object2.x, object2.y) < self.radius# + object2.radius
       end
       
       #
@@ -92,8 +96,39 @@ module Chingu
         super
       end
 
+      #
+      # Collides self with all objects of given classes
+      # Yields self and the objects it collides with
+      #
+      def each_collision(klasses = [])
+        Array(klasses).each do |klass|        
+          klass.all.each do |object|
+            if object.detect_collisions
+              yield(self, object)   if collides?(object)
+            end
+          end
+        end
+      end
+
       
       module ClassMethods
+      
+        #
+        # Works like each_collsion but with inline-code for speedups
+        #
+        def each_radius_collision(klasses = [])
+          Array(klasses).each do |klass|
+            object2_list = klass.all
+            
+            self.all.each do |object1|
+              object2_list.each do |object2|
+                next  if object1 == object2  # Don't collide objects with themselves
+                yield object1, object2  if distance(object1.x, object1.y, object2.x, object2.y) < object1.radius
+              end
+            end
+          end          
+        end
+        
         #
         # Class method that will check for collisions between all instances of two classes
         # and yield the 2 colliding game object instances.
@@ -108,17 +143,17 @@ module Chingu
         def each_collision(klasses = [])
           # Make sure klasses is always an array.
           Array(klasses).each do |klass|
+            object2_list = klass.all
+            
             self.all.each do |object1|
-              klass.all.each do |object2|
+              object2_list.all.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves
-                
-                if object1.detect_collisions && object2.detect_collisions
-                  yield object1, object2  if object1.collision?(object2)
-                end
+                yield object1, object2  if object1.collides?(object2)
               end
             end
           end
         end
+        
       end
       
     end

data/lib/chingu/window.rb

@@ -39,7 +39,7 @@ module Chingu
       Gosu::Tile.autoload_dirs = [".", File.join(@root, "gfx"), File.join(@root, "media")]
       Gosu::Song.autoload_dirs = [".", File.join(@root, "sfx"), File.join(@root, "media")]
 			
-      @game_objects = Set.new
+      @game_objects = GameObjectList.new
       @input_clients = Set.new  # Set is like a unique Array with Hash lookupspeed
       
       @fps_counter = FPSCounter.new
@@ -47,13 +47,10 @@ module Chingu
       @milliseconds_since_last_tick = 0
     end
     
-    def add_game_object(object)
-      @game_objects << object
+    def current_parent
+      game_state_manager.current_game_state || self
     end
-    def remove_game_object(object)
-      @game_objects.delete(object)
-    end
-        
+    
     #
     # Frames per second, access with $window.fps or $window.framerate
     #
@@ -126,7 +123,7 @@ module Chingu
       #
       # Draw all game objects associated with the main window.      
       #
-      @game_objects.each { |object| object.draw }
+      @game_objects.draw
       
       #
       # Let the game state manager call draw on the active game state (if any)
@@ -138,7 +135,7 @@ module Chingu
     # Call update() on all game objects in main game window.
     #
     def update_game_objects
-      @game_objects.each { |object| object.update }
+      @game_objects.update
     end
     
     #

data/lib/chingu.rb

@@ -28,5 +28,5 @@ require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ippa-chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - ippa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,11 +44,13 @@ files:
 - benchmarks/benchmark3.rb
 - benchmarks/benchmark4.rb
 - benchmarks/benchmark5.rb
+- benchmarks/benchmark6.rb
 - benchmarks/meta_benchmark.rb
 - benchmarks/meta_benchmark2.rb
 - chingu.gemspec
 - examples/example1.rb
 - examples/example10.rb
+- examples/example11.rb
 - examples/example2.rb
 - examples/example3.rb
 - examples/example4.rb
@@ -79,6 +81,7 @@ files:
 - lib/chingu/effects.rb
 - lib/chingu/fpscounter.rb
 - lib/chingu/game_object.rb
+- lib/chingu/game_object_list.rb
 - lib/chingu/game_state.rb
 - lib/chingu/game_state_manager.rb
 - lib/chingu/game_states/debug.rb
@@ -96,11 +99,9 @@ files:
 - lib/chingu/text.rb
 - lib/chingu/traits/collision_detection.rb
 - lib/chingu/traits/effect.rb
-- lib/chingu/traits/effect_module.rb
 - lib/chingu/traits/input.rb
 - lib/chingu/traits/rotation_center.rb
 - lib/chingu/traits/velocity.rb
-- lib/chingu/traits/velocity_module.rb
 - lib/chingu/window.rb
 has_rdoc: false
 homepage: http://github.com/ippa/chingu/tree/master

data/lib/chingu/traits/effect_module.rb

@@ -1,86 +0,0 @@
-module Chingu
-  module Traits
-    module Effect
-      #
-      # Adds .rotating .fading and .zooming to any GameObject.
-      #
-      # TODO: better naming? suggestions:
-      #
-      # basic gosu unit <-> automation name
-      # ==============================================
-      # angle <-> rotation? rotating? automatic_angle?
-      # factor <-> growth? scale? automatic_zoom?
-      # alpha <-> fade
-      #
-      attr_accessor :rotating, :fading, :zooming
-      
-      def initialize(options)
-        puts "Effect#initialize"
-        super
-      end
-      
-      # Zoom - increase @factor_x and @factor_y at the same time.
-      def zoom(amount = 0.1)
-        @factor_x += amount
-        @factor_y += amount
-      end
-          
-      # Zoom Out - decrease @factor_x and @factor_y at the same time.
-      def zoom_out(amount = 0.1)
-        @factor_x -= amount
-        @factor_y -= amount
-      end
-    
-      # Rotate object 'amount' degrees
-      def rotate(amount = 1)
-        @angle += amount
-      end
-  
-      # Fade object by decreasing/increasing color.alpha
-      def fade(amount = 1)
-        return if amount == 0
-            
-        new_alpha = @color.alpha + amount
-        if amount < 0
-          @color.alpha =  [0, new_alpha].max
-        else
-          @color.alpha =  [0, new_alpha].min
-        end
-      end
-
-      # Fade out objects color by decreasing color.alpha
-      def fade_out(amount = 1)
-        fade(-amount)
-      end
-
-      # Fade in objects color by increasing color.alpha
-      def fade_in(amount = 1)
-        fade(amount)
-      end
-      
-      #
-      # Setup
-      #
-      def setup(options)
-        puts "Effect#setup"
-        @rotating = options[:rotating] || nil
-        @zooming = options[:zooming] || nil
-        @fading = options[:fading] || nil
-        super
-      end
-      
-      def draw
-        puts "Effect#draw"
-        super
-      end
-      
-      def update
-        puts "Effect#update"
-        rotate(@rotating)    if @rotating
-        fade(@fading)        if @fading
-        zoom(@zooming)       if @zooming
-        super
-      end
-    end
-  end
-end

data/lib/chingu/traits/velocity_module.rb

@@ -1,44 +0,0 @@
-module Chingu
-  module Traits
-    #
-    # A chingu component providing velocity and acceleration logic. 
-    #
-    module Velocity
-      attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
-      
-      def initialize(options)
-        puts "Velocity#initialize"
-        super
-      end
-      
-      def stop
-        @acceleration_y = @acceleration_x = @velocity_y = @acceleration_y = 0
-      end
-      
-      #
-      # Setup
-      #
-      def setup(options)
-        puts "Velocity#setup"
-        @velocity_x = options[:velocity_x] || 0
-        @velocity_y = options[:velocity_y] || 0
-        @acceleration_x = options[:acceleration_x] || 0
-        @acceleration_y = options[:acceleration_y] || 0
-        @max_velocity = options[:max_velocity] || 1000
-        super
-      end
-      
-      #
-      # Modifies X & Y of parent
-      #
-      def update
-        puts "Velocity#update"
-        @velocity_y += @acceleration_y		if	(@velocity_y + @acceleration_y).abs < @max_velocity
-        @velocity_x += @acceleration_x		if	(@velocity_x + @acceleration_x).abs < @max_velocity
-        @y += @velocity_y
-        @x += @velocity_x
-        super
-      end
-    end
-  end
-end