chingu 0.6.1 → 0.6.2

data/Manifest.txt

@@ -35,6 +35,7 @@ examples/media/Parallax-scroll-example-layer-3.png
 examples/media/background1.png
 examples/media/bullet.png
 examples/media/bullet_hit.wav
+examples/media/circle.png
 examples/media/city1.csv
 examples/media/city1.png
 examples/media/city2.png
@@ -47,6 +48,7 @@ examples/media/laser.wav
 examples/media/particle.png
 examples/media/plane.csv
 examples/media/plane.png
+examples/media/rect.png
 examples/media/ruby.png
 examples/media/saucer.csv
 examples/media/saucer.gal
@@ -60,7 +62,7 @@ lib/chingu.rb
 lib/chingu/animation.rb
 lib/chingu/assets.rb
 lib/chingu/basic_game_object.rb
-lib/chingu/core_extensions.rb
+lib/chingu/core_ext/array.rb
 lib/chingu/fpscounter.rb
 lib/chingu/game_object.rb
 lib/chingu/game_object_list.rb
@@ -70,6 +72,8 @@ lib/chingu/game_states/debug.rb
 lib/chingu/game_states/edit.rb
 lib/chingu/game_states/fade_to.rb
 lib/chingu/game_states/pause.rb
+lib/chingu/gosu_ext/image.rb
+lib/chingu/helpers/class_inheritable_accessor.rb
 lib/chingu/helpers/game_object.rb
 lib/chingu/helpers/game_state.rb
 lib/chingu/helpers/gfx.rb
@@ -86,9 +90,9 @@ lib/chingu/rect.rb
 lib/chingu/require_all.rb
 lib/chingu/text.rb
 lib/chingu/traits/bounding_box.rb
+lib/chingu/traits/bounding_circle.rb
 lib/chingu/traits/collision_detection.rb
 lib/chingu/traits/effect.rb
-lib/chingu/traits/radius.rb
 lib/chingu/traits/retrofy.rb
 lib/chingu/traits/timer.rb
 lib/chingu/traits/velocity.rb

data/chingu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-22}
+  s.date = %q{2009-11-25}
   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.}
   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/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example13.rb", "examples/example14.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/game1.rb", "examples/high_score_list.yml", "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/bullet.png", "examples/media/bullet_hit.wav", "examples/media/city1.csv", "examples/media/city1.png", "examples/media/city2.png", "examples/media/droid.bmp", "examples/media/enemy_bullet.png", "examples/media/explosion.wav", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/laser.wav", "examples/media/particle.png", "examples/media/plane.csv", "examples/media/plane.png", "examples/media/ruby.png", "examples/media/saucer.csv", "examples/media/saucer.gal", "examples/media/saucer.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "examples/media/wood.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.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/edit.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/high_score_list.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/bounding_box.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/radius.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.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/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example13.rb", "examples/example14.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/game1.rb", "examples/high_score_list.yml", "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/bullet.png", "examples/media/bullet_hit.wav", "examples/media/circle.png", "examples/media/city1.csv", "examples/media/city1.png", "examples/media/city2.png", "examples/media/droid.bmp", "examples/media/enemy_bullet.png", "examples/media/explosion.wav", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/laser.wav", "examples/media/particle.png", "examples/media/plane.csv", "examples/media/plane.png", "examples/media/rect.png", "examples/media/ruby.png", "examples/media/saucer.csv", "examples/media/saucer.gal", "examples/media/saucer.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "examples/media/wood.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_ext/array.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/edit.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/gosu_ext/image.rb", "lib/chingu/helpers/class_inheritable_accessor.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/high_score_list.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/bounding_box.rb", "lib/chingu/traits/bounding_circle.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.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/example14.rb

@@ -4,121 +4,102 @@ include Gosu
 include Chingu
 
 #
-# Demonstrating Chingus HighScoreList-class
-# I couldn't keep myself from spicying it up some though  :P
+# Demonstrating Chingutrait radius, bounding_box and collision_detection.
 #
 class Game < Chingu::Window
   def initialize
     super(640,400)
-    self.input = {:esc => :exit, :space => :remote_high_score, :a => :add}
-    self.caption = "Example of Chingus HighScore class. Press Space to go to fetch high scores remotely!"
+    self.input = {:esc => :exit, :q => :decrease_size, :w => :increase_size, :a => :decrease_speed, :s => :increase_speed}
     
-    @title = PulsatingText.create("HIGH SCORES", :x => $window.width/2, :y => 50, :size => 70)
+    10.times { Circle.create(:x => width/2, :y => height/2) }
+    10.times { Box.create(:x => width/2, :y => height/2) }
+    @blue = Color.new(0xFF0000FF)
+    @white = Color.new(0xFFFFFFFF)
+  end
+  
+  def increase_size
+    game_objects.each { |go| go.factor += 1 }
+  end
+  def decrease_size
+    game_objects.each { |go| go.factor -= 1 if go.factor > 1  }
+  end
+  def increase_speed
+    game_objects.each { |go| go.velocity_x *= 1.2; go.velocity_y *= 1.2; }
+  end
+  def decrease_speed
+    game_objects.each { |go| go.velocity_x *= 0.8; go.velocity_y *= 0.8; }
+  end
+
+  def update
+    super
     
-    #
-    # Load a list from disk, defaults to "high_score_list.yml"
-    # Argument :size forces list to this size
-    #
-    @high_score_list = HighScoreList.load(:size => 10)
+    game_objects.each { |go| go.color = @white }
 
     #
-    # Add some new high scores to the list. :name and :score are required but you can put whatever.
-    # They will mix with the old scores, automatic default sorting on :score
+    # Collide Boxes/Circles, Boxes/Boxes and Circles/Circles (basicly all objects on screen)
     #
-    10.times do
-      data = {:name => "NEW", :score => rand(10000)}
-      
-      position = @high_score_list.add(data)
-      if position
-        puts "#{data[:name]} - #{data[:score]} got position #{position}"
-      else
-        puts "#{data[:name]} - #{data[:score]} didn't make it"
-      end
-    end
-    
-    create_text
-    
-    # @high_score_list.save_to_file  # Uncomment to save list to disk
-  end
-  
-  def remote_high_score
-    game_objects.destroy_all
-    
-    @title = PulsatingText.create("REMOTE WEBSERVICE HIGH SCORES", :x => $window.width/2, :y => 50, :size => 30)
+    [Box, Circle].each_collision(Box, Circle) { |o, o2| o.color, o2.color = @blue, @blue }
     
     #
-    # :game_id is the unique ID the game has on www.gamercv.com
-    # :user is the login for that specific game (set by owner)
-    # :password is the password for that specific game (set by owner)
+    # Only collide boxes with other boxes
     #
-    # To read a high score list only :game_id is required
-    # To write to a high score list :user and :password is required as well
+    ## Box.each_collision(Box) { |o, o2| o.color, o2.color = @blue, @blue }
+
     #
-    @high_score_list = HighScoreList.load_remote(:game_id => 1, :user => "chingu", :password => "chingu", :size => 10)
-    create_text
-  end
-  
-  def add
-    data = {:name => "NEW", :score => 1600}
-    position = @high_score_list.add(data)
-    puts "Got position: #{position.to_s}"
-    create_text
-  end
-  
-  def create_text
-    @score_texts ||= []
-    @score_texts.each { |text| text.destroy }
-    
+    # Only collide circles with other circles
     #
-    # Iterate through all high scores and create the visual represenation of it
+    ## Circle.each_collision(Circle) { |o, o2| o.color, o2.color = @blue, @blue }
+
     #
-    @high_score_list.each_with_index do |high_score, index|
-      y = index * 25 + 100
-      @score_texts << Text.create(high_score[:name], :x => 200, :y => y, :size => 20)
-      @score_texts << Text.create(high_score[:score], :x => 400, :y => y, :size => 20)
-    end
-    
-    5.times do
-      score = rand(20000)
-      puts "position for possible score #{score}: #{@high_score_list.position_by_score(score)}"
-    end
+    # Only collide Boxes with Boxes and Circles
+    #
+    ## Box.each_collision(Box,Circle) { |o, o2| o.color, o2.color = @blue, @blue }
+
+    self.caption = "traits bounding_box/circle & collision_detection. Q/W: Size. A/S: Speed. FPS: #{fps} Objects: #{game_objects.size}"
   end
-  
 end
 
-#
-# colorful pulsating text...
-#
-class PulsatingText < Text
-  has_traits :timer, :effect
-  @@red = Color.new(0xFFFF0000)
-  @@green = Color.new(0xFF00FF00)
-  @@blue = Color.new(0xFF0000FF)
+class Circle < GameObject
+  has_trait :bounding_circle, :debug => true
+  has_traits :velocity, :collision_detection
   
-  def initialize(text, options = {})
-    super(text, options)
+  def initialize(options)
+    super
+    @image = Image["circle.png"]
+    self.velocity_x = 3 - rand * 6
+    self.velocity_y = 3 - rand * 6
+    self.factor = 2
     
-    options = text  if text.is_a? Hash
-    @pulse = options[:pulse] || false
-    self.rotation_center(:center_center)
-    every(20) { create_pulse }   if @pulse == false
+    self.input = [:holding_left, :holding_right, :holding_down, :holding_up]
   end
   
-  def create_pulse
-    pulse = PulsatingText.create(@text, :x => @x, :y => @y, :height => @height, :pulse => true, :image => @image, :zorder => @zorder+1)
-    colors = [@@red, @@green, @@blue]
-    pulse.color = colors[rand(colors.size)].dup
-    pulse.mode = :additive
-    pulse.alpha -= 150
-    pulse.scale_rate = 0.002
-    pulse.fade_rate = -3 + rand(2)
-    pulse.rotation_rate = rand(2)==0 ? 0.05 : -0.05
-  end
-    
+  def holding_left; @x -= 1; end
+  def holding_right; @x += 1; end
+  def holding_down; @y += 1; end
+  def holding_up; @y -= 1; end
+  
   def update
-    destroy if self.alpha == 0
+    self.velocity_x = -self.velocity_x  if @x < 0 || @x > $window.width
+    self.velocity_y = -self.velocity_y  if @y < 0 || @y > $window.height
   end
+end
+
+class Box < GameObject
+  has_trait :bounding_box, :debug => true
+  has_traits :velocity, :collision_detection
   
+  def initialize(options)
+    super
+    @image = Image["rect.png"]
+    self.velocity_x = 3 - rand * 6
+    self.velocity_y = 3 - rand * 6
+    self.factor = 2
+  end
+  
+  def update
+    self.velocity_x = -self.velocity_x  if @x < 0 || @x > $window.width
+    self.velocity_y = -self.velocity_y  if @y < 0 || @y > $window.height
+  end
 end
 
-Game.new.show
+Game.new.show

data/examples/example7.rb

@@ -79,7 +79,7 @@ class Particles < Chingu::GameState
     @yellow = Color.new(0xFFF9F120)
     
     # Thanks jsb in #gosu of Encave-fame for fireball.png :)
-    @fireball_animation = Chingu::Animation.new(:file => media_path("fireball.png"), :width => 32, :height => 32)
+    @fireball_animation = Chingu::Animation.new(:file => media_path("fireball.png"), :size => [32,32])
     @ground_y = $window.height * 0.95
   end
   

data/examples/example8.rb

@@ -12,7 +12,6 @@ class Game < Chingu::Window
     self.input = {:esc => :exit}
     self.caption = "Example of game object traits 'velocity' and 'effect'"
     push_game_state(Particles)
-    puts RUBY_VERSION
   end
   
   def next_effect; pop_game_state; end

data/examples/game1.rb

@@ -131,7 +131,7 @@ end
 #
 class Player < GameObject
   has_traits :velocity, :collision_detection, :timer
-  has_trait :radius, :scale => 0.50, :debug => true
+  has_trait :bounding_circle, :scale => 0.50, :debug => true
   
   attr_accessor :score
   

data/lib/chingu.rb

@@ -25,10 +25,15 @@ ROOT = File.dirname(File.expand_path($0))
 require 'rubygems' unless RUBY_VERSION =~ /1\.9/
 require 'gosu'
 require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.com/tarcieri/require_all !
+
+# Seems like we need to include chingu/helpers first for BasicGameObject
+# and GameObject to get the correct class_inheritable_accssor
+require_all "#{CHINGU_ROOT}/chingu/helpers"
+require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/basic_game_object.rb

@@ -1,3 +1,4 @@
+require_rel 'helpers/class_inheritable_accessor'
 module Chingu
   #
   # BasicGameObject. Resonating with 1.9.1, this is our most basic class that all game objects ultimate should build on.
@@ -6,19 +7,23 @@ module Chingu
   # It will also acts as a container for the trait-system of chingu.
   #
   class BasicGameObject
+    include Chingu::ClassInheritableAccessor
+    
     attr_reader :options, :paused, :visible
     attr_accessor :parent
     
-    def self.trait_options; @trait_options; end
+    class_inheritable_accessor :trait_options
+    @trait_options = Hash.new
     def trait_options; self.class.trait_options; end
-    
+            
     #
     # Adds a trait or traits to a certain game class
     # Executes a standard ruby "include" the specified module
     #
     def self.has_trait(trait, options = {})
-      @trait_options ||= Hash.new
+      
       if trait.is_a?(::Symbol) || trait.is_a?(::String)
+        ## puts "has_trait #{trait}, #{options}"
         begin
           # Convert user-given symbol (eg. :timer) to a Module (eg. Chingu::Traits::Timer)
           mod = Chingu::Traits.const_get(Chingu::Inflector.camelize(trait))
@@ -26,14 +31,21 @@ module Chingu
           # Include the module, which will add the containing methods as instance methods
           include mod
                    
-          # Add possible classmethods defined in sub-module ClassMethods (eg: Chingu::Traits::Timer::ClassMethods)
-          mod2 = mod.const_get("ClassMethods")
-          extend mod2
+          # Does sub-module "ClessMethods" exists?
+          # (eg: Chingu::Traits::Timer::ClassMethods)
+          if mod.const_defined?("ClassMethods")
+            # Add methods in scope ClassMethods as.. class methods!
+            mod2 = mod.const_get("ClassMethods")
+            extend mod2
           
-          # If the newly included trait has a initialize_trait method...
-          # ... call it with the options provided with the has_trait-call
-          initialize_trait(options)  if mod2.method_defined?(:initialize_trait)
+            # If the newly included trait has a initialize_trait method in the ClassMethods-scope:
+            # ... call it with the options provided with the has_trait-line.
+            if mod2.method_defined?(:initialize_trait)
+              initialize_trait(options)
+            end
+          end
         rescue
+          puts $!
         end
       end
     end

data/lib/chingu/core_ext/array.rb

@@ -0,0 +1,12 @@
+class Array
+  def each_collision(*args)
+    list = (self + args).uniq
+    collide_pair = []
+    list.each_with_index { |nr, i| self[i..size].collect { |nr2| collide_pair << [nr,nr2] } }
+    collide_pair.each do |class1,class2|
+      class1.each_collision(class2) do |object1, object2|
+        yield object1, object2
+      end
+    end
+  end
+end

data/lib/chingu/game_object.rb

@@ -19,13 +19,17 @@
 #
 #++
 
-
+require_rel 'helpers/*'
 module Chingu
   #
-  # GameObject is our BasisGameObject (class with framespecific stuff)
+  # GameObject inherits from BasicGameObject to get traits and some class-methods like .all and .destroy
   #
   # On top of that, it encapsulates GOSUs Image#draw_rot and all its parameters.
   #
+  # In Chingu GameObject is a visual object, something to put on screen, centers around the .image-parameter.
+  #
+  # If you wan't a invisible object but with traits, use BasicGameObject.
+  #
   class GameObject < Chingu::BasicGameObject
     attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :color, :mode, :zorder
     attr_reader :factor, :center#, :rotation_center
@@ -71,8 +75,8 @@ module Chingu
       
       @mode = options[:mode] || :default # :additive is also available.
       @zorder = options[:zorder] || 100
-                              
-      setup_trait(options)  if respond_to?(:setup_trait)
+      
+      ## setup_trait(options)  if self.respond_to?(:setup_trait)
     end
     
     # Quick way of setting both factor_x and factor_y

data/lib/chingu/helpers/class_inheritable_accessor.rb

@@ -0,0 +1,31 @@
+#
+# This code is from http://railstips.org/2008/6/13/a-class-instance-variable-update
+# But we use the rails-name for it, class_inheritable_accessor, which should make ppl more @ home.
+#
+module Chingu
+module ClassInheritableAccessor
+  def self.included(base)
+    base.extend(ClassMethods)    
+  end
+
+  module ClassMethods
+    def class_inheritable_accessor(*args)
+      @cattr_inheritable_attrs ||= [:cattr_inheritable_attrs]
+      @cattr_inheritable_attrs += args
+      args.each do |arg|
+        class_eval %(
+          class << self; attr_accessor :#{arg} end
+        )
+      end
+      @cattr_inheritable_attrs
+    end
+
+    def inherited(subclass)
+      @cattr_inheritable_attrs.each do |inheritable_attribute|
+        instance_var = "@#{inheritable_attribute}" 
+        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      end
+    end
+  end
+end
+end

data/lib/chingu/input.rb

@@ -98,17 +98,18 @@ module Chingu
 
     #F-keys, F1-F12
     (1..12).each do |number|
-      CONSTANT_TO_SYMBOL[eval("KbF#{number.to_s}")] = ["f#{number.to_s}".to_sym]
-      CONSTANT_TO_SYMBOL[eval("KbF#{number.to_s}")] = ["F#{number.to_s}".to_sym]
+      CONSTANT_TO_SYMBOL[eval("KbF#{number.to_s}")] = ["f#{number.to_s}".to_sym, "F#{number.to_s}".to_sym]
     end
 
     # Gamepad-buttons 0-15
     (0..15).each do |number|
-      CONSTANT_TO_SYMBOL[eval("GpButton#{number.to_s}")] = ["gamepad_button_#{number.to_s}"]
-      CONSTANT_TO_SYMBOL[eval("GpButton#{number.to_s}")] = ["gamepad_#{number.to_s}"]
-      CONSTANT_TO_SYMBOL[eval("GpButton#{number.to_s}")] = ["pad_button_#{number.to_s}"]
-      CONSTANT_TO_SYMBOL[eval("GpButton#{number.to_s}")] = ["pad_#{number.to_s}"]
-      CONSTANT_TO_SYMBOL[eval("GpButton#{number.to_s}")] = ["gp_#{number.to_s}"]
+      CONSTANT_TO_SYMBOL[eval("GpButton#{number.to_s}")] = [
+        "gamepad_button_#{number.to_s}",
+        "gamepad_#{number.to_s}",
+        "pad_button_#{number.to_s}",
+        "pad_#{number.to_s}",
+        "gp_#{number.to_s}"
+      ]
     end
 
     #

data/lib/chingu/particle.rb

@@ -1,8 +1,9 @@
 #
 # Our basic particle class, basicly just a GameObject with trait "effect"
 # 
-# TODO: expand on this further, as it is now it doesn't add much.
+# TODO: expand on this further, as it is now it doesn't add enough to warrant a whole new class.
 #
+
 module Chingu
   class Particle < Chingu::GameObject
     has_trait :effect
@@ -13,8 +14,7 @@ module Chingu
     end
       
     def update
-      super
-      self.image = @animation.next!   if @animation
+      self.image = @animation.next   if @animation
     end
     
   end

data/lib/chingu/require_all.rb

@@ -1,133 +1,140 @@
-#--
-# Copyright (C)2009 Tony Arcieri
-# You can redistribute this under the terms of the MIT license
-# See file LICENSE for details
-#++
-
-module RequireAll
-  # A wonderfully simple way to load your code.
-  #
-  # The easiest way to use require_all is to just point it at a directory
-  # containing a bunch of .rb files.  These files can be nested under 
-  # subdirectories as well:
-  #
-  #  require_all 'lib'
-  #
-  # This will find all the .rb files under the lib directory and load them.
-  # The proper order to load them in will be determined automatically.
-  #
-  # If the dependencies between the matched files are unresolvable, it will 
-  # throw the first unresolvable NameError.
-  #
-  # You can also give it a glob, which will enumerate all the matching files: 
-  #
-  #  require_all 'lib/**/*.rb'
-  #
-  # It will also accept an array of files:
-  #
-  #  require_all Dir.glob("blah/**/*.rb").reject { |f| stupid_file(f) }
-  # 
-  # Or if you want, just list the files directly as arguments:
-  #
-  #  require_all 'lib/a.rb', 'lib/b.rb', 'lib/c.rb', 'lib/d.rb'
-  #
-  def require_all(*args)
-    # Handle passing an array as an argument
-    args.flatten!
-    
-    if args.size > 1
-      # If we got a list, those be are files!
-      files = args
-    else
-      arg = args.first
-      begin
-        # Try assuming we're doing plain ol' require compat
-        stat = File.stat(arg)
-        
-        if stat.file?
-          files = [arg]
-        elsif stat.directory?
-          files = Dir.glob File.join(arg, '**', '*.rb')
-        else
-          raise ArgumentError, "#{arg} isn't a file or directory"
-        end
-      rescue Errno::ENOENT
-        # If the stat failed, maybe we have a glob!
-        files = Dir.glob arg
-        
-        # Maybe it's an .rb file and the .rb was omitted
-        if File.file?(arg + '.rb')
-          require(arg + '.rb')
-          return true
-        end
-        
-        # If we ain't got no files, the glob failed
-        raise LoadError, "no such file to load -- #{arg}" if files.empty?
-      end
-    end
-
-    # If there's nothing to load, you're doing it wrong!
-    raise LoadError, "no files to load" if files.empty?
-    
-    files.map! { |file| File.expand_path file }
-            
-    begin
-      failed = []
-      first_name_error = nil
-      
-      # Attempt to load each file, rescuing which ones raise NameError for
-      # undefined constants.  Keep trying to successively reload files that 
-      # previously caused NameErrors until they've all been loaded or no new
-      # files can be loaded, indicating unresolvable dependencies.
-      files.each do |file|
-        begin
-          require file
-        rescue NameError => ex
-          failed << file
-          first_name_error ||= ex
-        rescue ArgumentError => ex
-          # Work around ActiveSuport freaking out... *sigh*
-          #
-          # ActiveSupport sometimes throws these exceptions and I really
-          # have no idea why.  Code loading will work successfully if these
-          # exceptions are swallowed, although I've run into strange 
-          # nondeterministic behaviors with constants mysteriously vanishing.
-          # I've gone spelunking through dependencies.rb looking for what 
-          # exactly is going on, but all I ended up doing was making my eyes 
-          # bleed.
-          #
-          # FIXME: If you can understand ActiveSupport's dependencies.rb 
-          # better than I do I would *love* to find a better solution
-          raise unless ex.message["is not missing constant"]
-          
-          STDERR.puts "Warning: require_all swallowed ActiveSupport 'is not missing constant' error"
-          STDERR.puts ex.backtrace[0..9]
-        end
-      end
-      
-      # If this pass didn't resolve any NameErrors, we've hit an unresolvable
-      # dependency, so raise one of the exceptions we encountered.
-      if failed.size == files.size
-        raise first_name_error
-      else
-        files = failed
-      end
-    end until failed.empty?
-    
-    true
-  end
-  
-  # Works like require_all, but paths are relative to the caller rather than 
-  # the current working directory
-  def require_rel(*paths)
-    # Handle passing an array as an argument
-    paths.flatten!
-    
-    source_directory = File.dirname caller.first.sub(/:\d+$/, '')
-    paths.each do |path|
-      require_all File.join(source_directory, path)
-    end
-  end
-end
-
+#--
+# Copyright (C)2009 Tony Arcieri
+# You can redistribute this under the terms of the MIT license
+# See file LICENSE for details
+#++
+
+module RequireAll
+  # A wonderfully simple way to load your code.
+  #
+  # The easiest way to use require_all is to just point it at a directory
+  # containing a bunch of .rb files.  These files can be nested under 
+  # subdirectories as well:
+  #
+  #  require_all 'lib'
+  #
+  # This will find all the .rb files under the lib directory and load them.
+  # The proper order to load them in will be determined automatically.
+  #
+  # If the dependencies between the matched files are unresolvable, it will 
+  # throw the first unresolvable NameError.
+  #
+  # You can also give it a glob, which will enumerate all the matching files: 
+  #
+  #  require_all 'lib/**/*.rb'
+  #
+  # It will also accept an array of files:
+  #
+  #  require_all Dir.glob("blah/**/*.rb").reject { |f| stupid_file(f) }
+  # 
+  # Or if you want, just list the files directly as arguments:
+  #
+  #  require_all 'lib/a.rb', 'lib/b.rb', 'lib/c.rb', 'lib/d.rb'
+  #
+  def require_all(*args)
+    # Handle passing an array as an argument
+    args.flatten!
+    
+    if args.size > 1
+      # Expand files below directories
+      files = args.map do |path|
+        if File.directory? path
+          Dir[File.join(path, '**', '*.rb')]
+        else
+          path
+        end
+      end.flatten
+    else
+      arg = args.first
+      begin
+        # Try assuming we're doing plain ol' require compat
+        stat = File.stat(arg)
+        
+        if stat.file?
+          files = [arg]
+        elsif stat.directory?
+          files = Dir.glob File.join(arg, '**', '*.rb')
+        else
+          raise ArgumentError, "#{arg} isn't a file or directory"
+        end
+      rescue Errno::ENOENT
+        # If the stat failed, maybe we have a glob!
+        files = Dir.glob arg
+        
+        # Maybe it's an .rb file and the .rb was omitted
+        if File.file?(arg + '.rb')
+          require(arg + '.rb')
+          return true
+        end
+        
+        # If we ain't got no files, the glob failed
+        raise LoadError, "no such file to load -- #{arg}" if files.empty?
+      end
+    end
+
+    # If there's nothing to load, you're doing it wrong!
+    raise LoadError, "no files to load" if files.empty?
+    
+    files.map! { |file| File.expand_path file }
+    files.sort!
+            
+    begin
+      failed = []
+      first_name_error = nil
+      
+      # Attempt to load each file, rescuing which ones raise NameError for
+      # undefined constants.  Keep trying to successively reload files that 
+      # previously caused NameErrors until they've all been loaded or no new
+      # files can be loaded, indicating unresolvable dependencies.
+      files.each do |file|
+        begin
+          require file
+        rescue NameError => ex
+          failed << file
+          first_name_error ||= ex
+        rescue ArgumentError => ex
+          # Work around ActiveSuport freaking out... *sigh*
+          #
+          # ActiveSupport sometimes throws these exceptions and I really
+          # have no idea why.  Code loading will work successfully if these
+          # exceptions are swallowed, although I've run into strange 
+          # nondeterministic behaviors with constants mysteriously vanishing.
+          # I've gone spelunking through dependencies.rb looking for what 
+          # exactly is going on, but all I ended up doing was making my eyes 
+          # bleed.
+          #
+          # FIXME: If you can understand ActiveSupport's dependencies.rb 
+          # better than I do I would *love* to find a better solution
+          raise unless ex.message["is not missing constant"]
+          
+          STDERR.puts "Warning: require_all swallowed ActiveSupport 'is not missing constant' error"
+          STDERR.puts ex.backtrace[0..9]
+        end
+      end
+      
+      # If this pass didn't resolve any NameErrors, we've hit an unresolvable
+      # dependency, so raise one of the exceptions we encountered.
+      if failed.size == files.size
+        raise first_name_error
+      else
+        files = failed
+      end
+    end until failed.empty?
+    
+    true
+  end
+  
+  # Works like require_all, but paths are relative to the caller rather than 
+  # the current working directory
+  def require_rel(*paths)
+    # Handle passing an array as an argument
+    paths.flatten!
+    
+    source_directory = File.dirname caller.first.sub(/:\d+$/, '')
+    paths.each do |path|
+      require_all File.join(source_directory, path)
+    end
+  end
+end
+
 include RequireAll

data/lib/chingu/traits/bounding_box.rb

@@ -29,8 +29,7 @@ module Chingu
     
       module ClassMethods
         def initialize_trait(options = {})
-          ## puts "bounding_box initialize_trait #{options}"
-          @trait_options[:bounding_box] = options
+          trait_options[:bounding_box] = options
         end
       end
             
@@ -50,11 +49,10 @@ module Chingu
       end
       alias :bb :bounding_box
       
-      def draw_trait
+      def draw_trait      
         if trait_options[:bounding_box][:debug]
           $window.draw_rect(self.bounding_box, Chingu::DEBUG_COLOR, Chingu::DEBUG_ZORDER)
         end
-        
         super
       end
       

data/lib/chingu/traits/{radius.rb → bounding_circle.rb}

@@ -22,27 +22,36 @@
 module Chingu
   module Traits
     #
-    # Providing a bounding_box and keeps it up to date by reading:
-    # image, factor_x, factor_y
+    # Providing a bounding circle in the form of 2 attributes, self.radius and self.diameter
+    # It creates these 2 attributes from reading image.height, image.width, factor_x and factor_y
     #
-    # ...only makes sense with rotation_center = :center
+    # ...this usually only makes sense with rotation_center = :center
     #
-    module Radius
+    module BoundingCircle
     
       module ClassMethods
         def initialize_trait(options = {})
-          @trait_options[:radius] = options
+          trait_options[:radius] = options
         end
       end
       
       def radius
         width = self.image.width * self.factor_x.abs
         height = self.image.height * self.factor_y.abs
-        radius = (width + height) / 2
+        radius = (width + height) / 4
         radius = radius * trait_options[:radius][:scale] if  trait_options[:radius][:scale]
         return radius
       end
       
+      def diameter
+        radius * 2
+      end
+      
+      def circle_left;    self.x - self.radius; end
+      def circle_right;   self.x + self.radius; end
+      def circle_top;     self.y - self.radius; end
+      def circle_bottom;  self.y + self.radius; end
+      
       def draw_trait
         if trait_options[:radius][:debug]
           $window.draw_circle(self.x, self.y, self.radius, Chingu::DEBUG_COLOR)

data/lib/chingu/traits/collision_detection.rb

@@ -36,7 +36,7 @@ module Chingu
       
       module ClassMethods
         def initialize_trait(options = {})
-          @trait_options[:collision_detection] = options
+          trait_options[:collision_detection] = options
         end
       end
       
@@ -46,8 +46,13 @@ module Chingu
       # two objects "bounding_box" attributs (a Chingu::Rect instance)
       #
       def collides?(object2)
-        bounding_box_collision?(object2)
-        #radius_collision?(object2)
+        if self.respond_to?(:bounding_box) && object2.respond_to?(:bounding_box)
+          bounding_box_collision?(object2)
+        elsif self.respond_to?(:radius) && object2.respond_to?(:radius)
+          radius_collision?(object2)
+        else
+          bounding_box_radius_collision?(object2)
+        end
       end
       
       #
@@ -66,12 +71,35 @@ module Chingu
         distance(self.x, self.y, object2.x, object2.y) < self.radius + object2.radius
       end
       
+      #
+      # BoundingBox vs Radius collision
+      #
+      # http://stackoverflow.com/questions/401847/circle-rectangle-collision-detection-intersection
+      #
+      def bounding_box_radius_collision?(object2)
+        rect = self.respond_to?(:bounding_box) ? self.bounding_box : object2.bounding_box
+        circle = self.respond_to?(:radius) ? self : object2
+        radius = circle.radius.to_i
+        
+        distance_x = (circle.x - rect.x - rect.width/2).abs
+        distance_y = (circle.y - rect.y - rect.height/2).abs
+        
+        return false if distance_x > (rect.width/2 + circle.radius)
+        return false if distance_y > (rect.height/2 + circle.radius)
+        
+        return true if distance_x <= (rect.width/2)
+        return true if distance_y <= (rect.height/2)
+          
+        cornerDistance_sq = (distance_x - rect.width/2) ** 2 + (distance_y - rect.height/2) ** 2
+        return (cornerDistance_sq <= (circle.radius ** 2))
+      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|        
+      def each_collision(*klasses)
+        Array(klasses).each do |klass|
           klass.all.each do |object|
             yield(self, object)   if collides?(object)
           end
@@ -147,11 +175,27 @@ module Chingu
         #   Enemy.each_collision(Bullet).each do |enemy, bullet| enemy.die!; end
         #
         #
-        def each_collision(klasses = [])
+        def each_collision(*klasses)
           # Make sure klasses is always an array.
           Array(klasses).each do |klass|
             object2_list = klass.all
             
+            #
+            # Possible optimization, look into later.
+            #
+            # type1 = self.instance_methods.include?(:bounding_box) ? :bb : :bc
+            # type2 = klass.instance_methods.include?(:bounding_box) ? :bb : :bc
+            # Pointless optmization-attempts?
+            #if type1 != type2
+            #  self.all.each do |object1|
+            #    object2_list.each do |object2|
+            #      next  if object1 == object2  # Don't collide objects with themselves
+            #      yield object1, object2  if object1.bounding_box_radius_collision?(object2)
+            #    end
+            #  end
+            #end
+              
+            
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves
@@ -160,9 +204,7 @@ module Chingu
             end
           end
         end
-        
       end
-      
     end
   end
 end

data/lib/chingu/traits/effect.rb

@@ -42,21 +42,18 @@ module Chingu
 
     module Effect
       attr_accessor :rotation_rate, :fade_rate, :scale_rate
-                        
+      
       #
       # Setup
       #
-      def setup_trait(options)        
+      def setup_trait(options)
+        ## puts "Effect#setup_trait(#{options})"
         @rotation_rate = options[:rotation_rate] || nil
         @scale_rate = options[:scale_rate] || nil
         @fade_rate = options[:fade_rate] || nil
         super
       end
-      
-      def draw_trait
-        super
-      end
-      
+            
       def update_trait        
         rotate(@rotation_rate)  if @rotation_rate
         fade(@fade_rate)        if @fade_rate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-22 00:00:00 +01:00
+date: 2009-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - examples/media/background1.png
 - examples/media/bullet.png
 - examples/media/bullet_hit.wav
+- examples/media/circle.png
 - examples/media/city1.csv
 - examples/media/city1.png
 - examples/media/city2.png
@@ -107,6 +108,7 @@ files:
 - examples/media/particle.png
 - examples/media/plane.csv
 - examples/media/plane.png
+- examples/media/rect.png
 - examples/media/ruby.png
 - examples/media/saucer.csv
 - examples/media/saucer.gal
@@ -120,7 +122,7 @@ files:
 - lib/chingu/animation.rb
 - lib/chingu/assets.rb
 - lib/chingu/basic_game_object.rb
-- lib/chingu/core_extensions.rb
+- lib/chingu/core_ext/array.rb
 - lib/chingu/fpscounter.rb
 - lib/chingu/game_object.rb
 - lib/chingu/game_object_list.rb
@@ -130,6 +132,8 @@ files:
 - lib/chingu/game_states/edit.rb
 - lib/chingu/game_states/fade_to.rb
 - lib/chingu/game_states/pause.rb
+- lib/chingu/gosu_ext/image.rb
+- lib/chingu/helpers/class_inheritable_accessor.rb
 - lib/chingu/helpers/game_object.rb
 - lib/chingu/helpers/game_state.rb
 - lib/chingu/helpers/gfx.rb
@@ -146,9 +150,9 @@ files:
 - lib/chingu/require_all.rb
 - lib/chingu/text.rb
 - lib/chingu/traits/bounding_box.rb
+- lib/chingu/traits/bounding_circle.rb
 - lib/chingu/traits/collision_detection.rb
 - lib/chingu/traits/effect.rb
-- lib/chingu/traits/radius.rb
 - lib/chingu/traits/retrofy.rb
 - lib/chingu/traits/timer.rb
 - lib/chingu/traits/velocity.rb