ippa-chingu 0.5.3 → 0.5.4

data/Manifest.txt

@@ -1,4 +1,5 @@
 History.txt
+LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
@@ -6,10 +7,12 @@ 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
@@ -53,12 +56,13 @@ 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/deprecated_module_visual.rb
-lib/chingu/traits/deprecated_visual.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

@@ -83,14 +83,14 @@ A class for easy paralaxxscrolling. See example3.rb for more.
 === Various Helpers
 Both $window and game states gets some new graphical helpers, currently only 3, but quite useful:
 
-fill()          # Fills whole window with color 'color'.
-fill_rect()     # Fills a given Rect 'rect' with Color 'color'
-fill_gradient() # Fills window or a given rect with a gradient between two colors.
+  fill()          # Fills whole window with color 'color'.
+  fill_rect()     # Fills a given Rect 'rect' with Color 'color'
+  fill_gradient() # Fills window or a given rect with a gradient between two colors.
 
 If you base your models on GameObject (or BasicGameObject) you get:
-Enemy.all                 # Returns all object based on this class
-Enemy.each                # Iterates through all objects of class Enemt.
-Enemy.destroy_if(&block)  # destroy all objects for which &block returns true
+  Enemy.all                 # Returns all object based on this class
+  Enemy.each                # Iterates through all objects of class Enemt.
+  Enemy.destroy_if(&block)  # destroy all objects for which &block returns true
 
 
 == BASICS / EXAMPLES
@@ -514,6 +514,7 @@ See http://www.libgosu.org/rdoc/classes/Gosu/Window.html for a full set of metho
 * Jacius of Rubygame (For doing cool stuff that's well documented as re-usable). So far rect.rb and named_resource.rb is taken from Rubygame.
 * Jduff for input / commits.
 * Jlnr,Philymore,Shawn24,JamesKilton for constructive feedback/discussions.
+* Thanks to http://github.com/tarcieri for require_all code, good stuff
 
 == REQUIREMENTS:
 * Gosu latest version

data/benchmarks/benchmark5.rb

@@ -0,0 +1,29 @@
+require 'benchmark'
+require 'rubygems'
+require 'randomr'
+
+class Foo
+  def initialize
+  end
+  
+  def bar
+  end
+end
+
+foo = Foo.new
+
+a = Array.new
+n = 1000000
+Benchmark.bm(22) do |x|
+  x.report('respond_to?') do
+    n.times do
+      foo.respond_to?(:bar)
+    end
+  end
+
+  x.report('foo.bar method call') do
+    n.times do
+      foo.bar
+    end
+  end
+end

data/chingu.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-09-09}
+  s.date = %q{2009-09-17}
   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", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.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/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/deprecated_module_visual.rb", "lib/chingu/traits/deprecated_visual.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.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.homepage = %q{http://github.com/ippa/chingu/tree/master}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/example10.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'opengl'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+$stderr.sync = $stdout.sync = true
+
+#
+# Testing out a new module-only-super-chain trait system
+#
+class Game < Chingu::Window
+  def initialize
+    super(400,400)
+    self.caption = "Testing out new module-based traits (SPACE for more spaceships)"
+    self.input = { :space => :new_thing, :esc => :exit }
+    new_thing(200,200)
+  end
+
+  def update
+    puts "--- UPDATE ---"
+    super
+  end
+  
+  def draw
+    puts "--- DRAW ---"
+    super
+  end
+  
+  def new_thing(x=nil, y=nil)
+    Thing.new(:x => x||rand($window.width), :y => y||rand($window.height), :debug => true)
+  end
+end
+
+class Thing < Chingu::GameObject
+  has_trait :effect
+  has_trait :velocity
+  
+  def initialize(options)
+    super
+    @image = Image["spaceship.png"]
+    self.rotation_center(:center)
+
+    # Julians ninjahack to get that sweet pixely feeling when zooming :)
+    glBindTexture(GL_TEXTURE_2D, @image.gl_tex_info.tex_name)
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+
+    self.factor = 8
+    self.rotating = 2
+    self.velocity_x = 2
+  end
+  
+  def update
+    puts "Thing#update"
+    if outside_window?
+      @velocity_x = -@velocity_x
+      @rotating = -@rotating
+    end
+    
+    super
+  end
+  
+  def draw
+    puts "Thing#draw"
+    super
+  end
+  
+end
+
+
+Game.new.show

data/examples/example9.rb

@@ -19,6 +19,14 @@ end
 
 class FireCube < Chingu::GameObject
   has_traits :velocity, :effect
+  has_trait :collision_detection
+  #
+  # TODO:
+  # has_trait :collision_detection, :type => :bounding_box
+  # has_trait :collision_detection, :type => :radius
+  #
+  
+  attr_accessor :color
   
   def initialize(options)
     super    
@@ -27,17 +35,18 @@ class FireCube < Chingu::GameObject
     # 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)
-    @rect = Rect.new([@x, @y, 20, 20])    
+    @bounding_box = Rect.new([@x, @y, 20, 20])    
+    @color = Color.new(255,100,255,255)
   end
   
-  def update
-    super
-    @rect.x = @x
-    @rect.y = @y    
+  def draw
+    $window.fill_rect(@bounding_box, @color)
   end
   
-  def draw
-    $window.fill_rect(@rect, Color.new(@color.alpha,100,255,255))
+  def die!
+    @color = Color.new(255,255,255,255)
+    self.fading = -20
+    self.detect_collisions = false
   end
   
 end
@@ -45,7 +54,7 @@ end
 class Particles < Chingu::GameState
   def setup    
     self.input = { :space => :new_fire_cube }
-    100.times { new_fire_cube }
+    20.times { new_fire_cube }
   end
   
   def new_fire_cube
@@ -62,12 +71,14 @@ class Particles < Chingu::GameState
         particle.velocity_y = -particle.velocity_y
       end
     end
-    #FireCube.all.each do |particle|
-    #  FireCube.all.each do |particle2|
-    #    if particle.rect.collides_with
-    #    
-    #  end
-    #end
+    
+    #
+    # GameObject.each_collsion wont collide an object with itself
+    #
+    FireCube.each_collision(FireCube) do |cube1, cube2|
+      cube1.die!
+      cube2.die!
+    end
       
     self.game_objects.reject! { |object| object.color.alpha == 0 }
     

data/lib/chingu.rb

@@ -1,55 +1,32 @@
+#--
 #
+# 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.
 #
-unless RUBY_VERSION =~ /1\.9/
-  require 'rubygems'
-end
-require 'gosu'
-require 'set'
-
-%w{ collision_detection
-    effect
-    velocity
-    input
-    rotation_center
-		}.each do |lib|
-      root ||= File.dirname(File.expand_path(__FILE__))
-      require File.join(root,"chingu","traits",lib)
-    end
+# 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
+#
+#++
 
-%w{	helpers
-    inflector
-    gfx_helpers
-    core_extensions
-    basic_game_object
-    game_object
-    actor
-    effects
-    game_state_manager
-    game_state
-    window
-		fpscounter
-		named_resource
-		assets
-    text
-		rect
-		animation
-    particle    
-		input
-    parallax
-		}.each do |lib|
-      root ||= File.dirname(File.expand_path(__FILE__))
-      require File.join(root,"chingu",lib)
-    end
+CHINGU_ROOT = File.dirname(File.expand_path(__FILE__))
 
-%w{ pause
-    fade_to
-    debug
-		}.each do |lib|
-      root ||= File.dirname(File.expand_path(__FILE__))
-      require File.join(root,"chingu","game_states",lib)
-    end
+require 'rubygems' unless RUBY_VERSION =~ /1\.9/
+require 'gosu'
+require 'set'
+require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.com/tarcieri/require_all !
+require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/chingu/basic_game_object.rb

@@ -8,22 +8,10 @@ module Chingu
   class BasicGameObject
     attr_reader :options, :parent
     
-    #
-    # Create class variable @traits in every new class derived from GameObject
-    #
-    def self.inherited(subclass)
-      subclass.instance_variable_set("@traits", Set.new)
-    end
-   
-    class << self
-      attr_accessor :traits
-    end
-    
     #
     # adds a trait or traits to a certain game class
     # 
     # Executes a ruby "include" the specified module
-    # and sets up update and draw hooks.
     #
     def self.has_trait(*traits)
       has_traits(*traits)
@@ -34,17 +22,8 @@ module Chingu
     #
     def self.has_traits(*traits)
       Array(traits).each do |trait|
-        
         if trait.is_a?(::Symbol) || trait.is_a?(::String)
-          string = "Chingu::Traits::#{Chingu::Inflector.camelize(trait)}"
-          klass_or_module = eval(string)
-          
-          if klass_or_module.is_a?(Class)
-            trait = klass_or_module.new(self, {})
-            @traits << trait
-          elsif klass_or_module.is_a?(Module)
-            include klass_or_module
-          end
+          include Chingu::Traits.const_get(Chingu::Inflector.camelize(trait))
         end
       end
     end
@@ -58,11 +37,6 @@ module Chingu
     #
     def initialize(options = {})
       @options = options
-      setupable_traits
-      updateable_traits
-      drawable_traits
-      
-      @setupable_traits.each { |c| c.setup(self, options) }
       
       #
       # A GameObject can either belong to a GameState or our mainwindow ($window)
@@ -73,37 +47,19 @@ module Chingu
         @parent.add_game_object(self) if @parent
       end
       
+      # This will call #setup on the latest trait mixed in, which then will pass it on with super.
+      setup_trait(options) 
     end
     
-    #
-    # Get all traits
-    #
-    def traits; self.class.traits || [];  end
-    
-    def setupable_traits
-      @setupable_traits ||= traits.select { |c| c.respond_to?(:setup) }
-    end
-    def updateable_traits
-      @updateable_traits ||= traits.select { |c| c.respond_to?(:update) }
-    end
-    def drawable_traits
-      @drawable_traits ||= traits.select { |c| c.respond_to?(:draw) }
+
+    def setup_trait(options)
     end
     
-    #
-    # Call .update on all traits that implements it
-    #
     def update
-      @updateable_traits.each { |c| c.update(self) }
 		end
     
-    #
-    # Call .draw on all traits that implements it
-    #    
     def draw
-      @drawable_traits.each { |c| c.draw(self) }
-    end
-    
+    end    
         
     #
     # Fetch all objects of a current class.

data/lib/chingu/core_extensions.rb

@@ -1,3 +1,25 @@
+#--
+#
+# 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
+#
+#++
+
+
 #
 # Core extensions to GOSU
 # Some of these require the gem 'texplay'