chingu 0.6.4 → 0.6.5

data/Manifest.txt

@@ -18,6 +18,8 @@ examples/example11.rb
 examples/example12.rb
 examples/example13.rb
 examples/example14.rb
+examples/example15.rb
+examples/example16.rb
 examples/example2.rb
 examples/example3.rb
 examples/example4.rb
@@ -84,6 +86,7 @@ lib/chingu/high_score_list.rb
 lib/chingu/inflector.rb
 lib/chingu/input.rb
 lib/chingu/named_resource.rb
+lib/chingu/online_high_score_list.rb
 lib/chingu/parallax.rb
 lib/chingu/particle.rb
 lib/chingu/rect.rb

data/chingu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-29}
+  s.date = %q{2009-12-08}
   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/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.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/example15.rb", "examples/example16.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/online_high_score_list.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/example13.rb

@@ -10,8 +10,8 @@ include Chingu
 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, :a => :add }
+    self.caption = "Example of Chingus HighScore class"
     
     @title = PulsatingText.create("HIGH SCORES", :x => $window.width/2, :y => 50, :size => 70)
     
@@ -37,53 +37,27 @@ class Game < Chingu::Window
     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)
-    
-    #
-    # :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)
-    #
-    # 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
-    #
-    @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}
+    data = {:name => "NEW", :score => @high_score_list.high_scores.first[:score] + 10, :text => "from example13.rb"}
     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 }
+    Text.destroy_if { |text| text.size == 20}
     
     #
     # Iterate through all high scores and create the visual represenation of it
     #
     @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
+      Text.create(high_score[:name], :x => 200, :y => y, :size => 20)
+      Text.create(high_score[:score], :x => 400, :y => y, :size => 20)
+    end    
   end
-  
 end
 
 #

data/examples/example15.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+
+class Game < Chingu::Window
+  def initialize
+    super(640,400)
+    self.input = {:esc => :exit}
+    switch_game_state(Stuff)
+  end
+end
+
+class Stuff < GameState
+  has_trait :timer
+  
+  def initialize(options = {})
+    super
+    
+    @thing = Thing.create(:x => $window.width/2, :y => $window.height / 2 )
+    #every(1000) { Thing.create(:x => 200)}
+    every(500){ @thing.visible? ? @thing.hide! : @thing.show!}
+  end
+  
+  def update
+    super
+    game_objects.destroy_if { |object| object.outside_window? }
+  end
+end
+
+class Thing < GameObject
+  def initialize(options = {})
+    super
+    @image = Image["circle.png"]
+  end
+  
+  def update
+    #@y += 1
+  end
+end
+
+Game.new.show

data/examples/example16.rb

@@ -0,0 +1,90 @@
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+
+#
+# Demonstrating Chingus OnlineHighScoreList-class
+# 
+# Syncs against http://www.gamercv.com/games/1-test
+#
+class Game < Chingu::Window
+  def initialize
+    super(640,400)
+    self.input = {:esc => :exit, :a => :add, :r => :add_random}
+    self.caption = "OnlineHighScoreList example. Press 'A' to add a top-score, 'R' to add a random."
+    
+    @title = PulsatingText.create("class OnlineHighScoreList & www.gamvercv.com", :x => $window.width/2, :y => 50, :size => 30)
+    
+    #
+    # Load a remote high score list
+    #
+    @high_score_list = OnlineHighScoreList.load(:game_id => 1, :login => "chingu", :password => "chingu", :limit => 10)
+
+    create_text
+  end  
+  
+  def add
+    data = {:name => "NEW", :score => (@high_score_list[0][:score].to_i + 10), :text => "Hello from Chingus example16.rb"}
+    position = @high_score_list.add(data)
+    puts "Got position: #{position.to_s}"
+    create_text
+  end
+
+  def add_random
+    data = {:name => "RND", :score => @high_score_list[0][:score]-rand(100), :text => "Random from Chingus example16.rb"}
+    position = @high_score_list.add(data)
+    puts "Got position: #{position.to_s}"
+    create_text
+  end
+
+  def create_text
+    Text.destroy_if { |text| text.size == 20 }
+    
+    #
+    # Iterate through all high scores and create the visual represenation of it
+    #
+    @high_score_list.each_with_index do |high_score, index|
+      y = index * 25 + 100
+      Text.create(high_score[:name], :x => 200, :y => y, :size => 20)
+      Text.create(high_score[:score], :x => 400, :y => y, :size => 20)
+    end
+  end
+end
+
+#
+# colorful pulsating text...
+#
+class PulsatingText < Text
+  has_traits :timer, :effect
+  @@red = Color.new(0xFFFF0000)
+  @@green = Color.new(0xFF00FF00)
+  @@blue = Color.new(0xFF0000FF)
+  
+  def initialize(text, options = {})
+    super(text, options)
+    
+    options = text  if text.is_a? Hash
+    @pulse = options[:pulse] || false
+    self.rotation_center(:center_center)
+    every(20) { create_pulse }   if @pulse == false
+  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 update
+    destroy if self.alpha == 0
+  end
+  
+end
+
+Game.new.show

data/examples/example9.rb

@@ -37,6 +37,10 @@ class FireCube < Chingu::GameObject
     @color = @blue
   end
   
+  def bounding_box
+    @box
+  end
+  
   def draw
     $window.fill_rect(@box, @color)
   end
@@ -80,7 +84,11 @@ class ParticleState < Chingu::GameState
     #
     # FireCube.each_bounding_circle_collision(FireCube) do |cube1, cube2|  # 30 FPS on my computer
     #
-    # Let's see if we can optimize each_collision, starts with 19 FPS
+    # Let's see if we can optimize each_collision, starts with 19 FPS with radius collision
+    # 30 FPS by checking for radius and automatically delegate to each_bounding_circle_collision
+    #
+    # For bounding_box collision we start out with 7 FPS
+    # Got 8 FPS, the bulk CPU consumtion is in the rect vs rect check, not in the loops.
     #
     FireCube.each_collision(FireCube) do |cube1, cube2|
       cube1.die!

data/examples/high_score_list.yml

@@ -1,23 +1,34 @@
 --- 
 - :name: NEW
-  :score: 9987
+  :score: 10197
+  :text: from example13.rb
 - :name: NEW
-  :score: 9971
+  :score: 10187
+  :text: from example13.rb
 - :name: NEW
-  :score: 9960
+  :score: 10177
+  :text: from example13.rb
 - :name: NEW
-  :score: 9912
+  :score: 10167
+  :text: from example13.rb
 - :name: NEW
-  :score: 9900
+  :score: 10157
+  :text: from example13.rb
 - :name: NEW
-  :score: 9886
+  :score: 10147
+  :text: from example13.rb
 - :name: NEW
-  :score: 9885
+  :score: 10137
+  :text: from example13.rb
 - :name: NEW
-  :score: 9840
+  :score: 10127
+  :text: from example13.rb
 - :name: NEW
-  :score: 9839
+  :score: 10117
+  :text: from example13.rb
 - :name: NEW
-  :score: 9746
+  :score: 10112
+  :text: from example13.rb
 - :name: NEW
-  :score: 9742
+  :score: 10107
+  :text: from example13.rb

data/lib/chingu.rb

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

data/lib/chingu/high_score_list.rb

@@ -27,12 +27,8 @@ module Chingu
   # - Add, delete, clear highscores
   # - Iterate through highscores with simple HighScores#each
   #
-  # Working with the high score list:
-  # ...as a local file requires gem 'yaml'
-  # ...as a remote gamercv.com resource requires gem 'crack' and 'rest_client'
-  #
   class HighScoreList
-    attr_reader :file
+    attr_reader :file, :high_scores
     
     #
     # Create a new high score list with 0 entries
@@ -41,13 +37,6 @@ module Chingu
       @file = options[:file] || "high_score_list.yml"
       @size = options[:size] || 100
       @sort_on = options[:sort_on] || :score
-      
-      @user = options[:user]
-      @password = options[:password]
-      @game_id = options[:game_id]
-      @server = "http://api.gamercv.com"
-      @resource = nil
-      
       @high_scores = Array.new
     end
     
@@ -62,12 +51,6 @@ module Chingu
       return high_score_list
     end
     
-    def self.load_remote(options = {})
-      high_score_list = HighScoreList.new(options)
-      high_score_list.load_remote
-      return high_score_list      
-    end
-        
     #
     # Adda a new high score to the local file
     # 'data' is a hash of key/value-pairs that needs to contain at least the keys :name and :score
@@ -76,35 +59,12 @@ module Chingu
     def add(data)
       raise "No :name value in high score!"   if data[:name].nil?
       raise "No :score value in high score!"  if data[:score].nil?
-      @resource ? add_remote(data) : add_local(data)
+      add_to_list(force_symbol_hash(data))
+      save_to_file
       position_by_score(data[:score])
     end
     alias << add
     
-    #
-    # POSTs a new high score to the remote web service
-    #
-    def add_remote(data)
-      begin
-        @res = @resource.post({:high_score => data})
-        data = Crack::XML.parse(@res)
-        add_to_list(force_symbol_hash(data["high_score"]))
-      rescue RestClient::RequestFailed
-        puts "RequestFailed: couldn't add high score"
-      rescue RestClient::Unauthorized
-        puts "Unauthorized to add high score (check :user and :password arguments)"
-      end
-    end
-      
-    #
-    # Adds a new high score to local file
-    # Returns the position it got in the list, with 1 beeing the first positions
-    #
-    def add_local(data)
-      add_to_list(force_symbol_hash(data))
-      save_to_file
-    end
-
     #
     # Returns the position of full data-hash data entry, used internally
     #
@@ -121,7 +81,7 @@ module Chingu
     def position_by_score(score)
       position = 1
       @high_scores.each do |high_score|
-        return position   if score > high_score[:score]
+        return position   if score >= high_score[:score]
         position += 1
       end
       return nil
@@ -135,37 +95,6 @@ module Chingu
       @high_scores = @high_scores[0..@size]
     end
 
-    #
-    # Load data from remove web service.
-    # Under the hood, this is accomplished through a simple REST-interface
-    # The returned XML-data is converted into a simple Hash (@high_scores), which is also returned from this method.
-    #
-    def load_remote
-      raise "You need to specify a Game_id to load a remote high score list"    unless defined?(@game_id)
-      raise "You need to specify a User to load a remote high score list"       unless defined?(@user)
-      raise "You need to specify a Password to load a remote high score list"   unless defined?(@password)
-      
-      require 'rest_client'
-      require 'crack/xml'
-      @resource = RestClient::Resource.new "#{@server}/games/#{@game_id}/high_scores", :user => @user, :password => @password, :timeout => 20, :open_timeout => 5
-      
-      @high_scores.clear
-      begin
-        res = @resource.get
-        data = Crack::XML.parse(res)
-        if data["high_scores"]
-          data["high_scores"].each do |high_score|
-            @high_scores.push(force_symbol_hash(high_score))
-          end
-        end
-      rescue RestClient::ResourceNotFound
-        puts "Couldn't find Resource, did you specify a correct :game_id ?"
-      end
-      
-      @high_scores = @high_scores[0..@size]
-      return @high_scores
-    end
-    
     #
     # Direct access to invidual high scores
     #

data/lib/chingu/online_high_score_list.rb

@@ -0,0 +1,167 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# 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
+  #
+  # Online high score list, remotely synced to www.gamvercv.com's RESTful web api.
+  #
+  # - fetch high scores, add new ones
+  # - Iterate through highscores with each and each_with_index
+  #
+  # Requires gems 'crack' and 'rest_client', included on initialize.
+  #
+  class OnlineHighScoreList
+    attr_reader :resource, :high_scores
+    
+    def initialize(options = {})
+      @limit = options[:limit] || 100
+      @sort_on = options[:sort_on] || :score
+      @login = options[:login] || options[:user]
+      @password = options[:password]
+      @game_id = options[:game_id]
+
+      require 'rest_client'
+      require 'crack/xml'
+      @resource = RestClient::Resource.new("http://api.gamercv.com/games/#{@game_id}/high_scores", 
+                                              :user => @login, :password => @password, :timeout => 20, :open_timeout => 5)
+                                              
+      @high_scores = Array.new  # Keeping a local copy in a ruby array
+    end
+    
+    #
+    # Create a new high score list and try to load content from :file-parameter
+    # If no :file is given, HighScoreList tries to load from file "high_score_list.yml"
+    #
+    def self.load(options = {})
+      high_score_list = OnlineHighScoreList.new(options)
+      high_score_list.load
+      return high_score_list     
+    end
+            
+    #
+    # POSTs a new high score to the remote web service
+    #
+    # 'data' is a hash of key/value-pairs that can contain
+    # :name - player-name, could be "AAA" or "Aaron Avocado"
+    # :score - the score 
+    # :text - free text, up to 255 chars, 
+    #
+    # Returns the position the new score got in the high score list.
+    # return 1 for number one spot. returns -1 if it didn't quallify as a high scores.
+    #
+    def add(data)
+      raise "No :name value in high score!"   if data[:name].nil?
+      raise "No :score value in high score!"  if data[:score].nil?
+      begin
+        @res = @resource.post({:high_score => data})
+        data = Crack::XML.parse(@res)
+        add_to_list(force_symbol_hash(data["high_score"]))
+      rescue RestClient::RequestFailed
+        puts "RequestFailed: couldn't add high score"
+      rescue RestClient::ResourceNotFound
+        return -1
+      rescue RestClient::Unauthorized
+        puts "Unauthorized to add high score (check :login and :password arguments)"
+      end
+      return data["high_score"]["position"]
+    end
+    alias << add
+    
+    #
+    # Returns the position 'score' would get in among the high scores:
+    #   @high_score_list.position_by_score(999999999) # most likely returns 1 for the number one spot
+    #   @high_score_list.position_by_score(1)         # most likely returns nil since no placement is found (didn't make it to the high scores)
+    #
+    def position_by_score(score)
+      position = 1
+      @high_scores.each do |high_score|
+        return position   if score > high_score[:score]
+        position += 1
+      end
+      return nil
+    end
+    
+    #
+    # Load data from remove web service.
+    # Under the hood, this is accomplished through a simple REST-interface
+    # The returned XML-data is converted into a simple Hash (@high_scores), which is also returned from this method.
+    #
+    def load
+      raise "You need to specify a Game_id to load a remote high score list"    unless defined?(@game_id)
+      raise "You need to specify a Login to load a remote high score list"      unless defined?(@login)
+      raise "You need to specify a Password to load a remote high score list"   unless defined?(@password)
+      
+      @high_scores.clear
+      begin
+        res = @resource.get
+        data = Crack::XML.parse(res)
+        if data["high_scores"]
+          data["high_scores"].each do |high_score|
+            @high_scores.push(force_symbol_hash(high_score))
+          end
+        end
+      rescue RestClient::ResourceNotFound
+        puts "Couldn't find Resource, did you specify a correct :game_id ?"
+      end
+      
+      @high_scores = @high_scores[0..@limit-1] unless @high_scores.empty?
+      return @high_scores
+    end
+    
+    #
+    # Direct access to @high_scores-array
+    #
+    def [](index)
+      @high_scores[index]
+    end
+    
+    #
+    # Iterate through @high_scores-array with each
+    #
+    def each
+      @high_scores.each { |high_score| yield high_score }
+    end
+
+    #
+    # Iterate through @high_scores-array with each_with_index
+    #
+    def each_with_index
+      @high_scores.each_with_index { |high_score, index| yield high_score, index }
+    end
+    
+    private
+    
+    def add_to_list(data)
+      @high_scores.push(data)
+      @high_scores.sort! { |a, b| b[@sort_on] <=> a[@sort_on] }
+      @high_scores = @high_scores[0..@limit-1]
+    end
+    
+    def force_symbol_hash(hash)
+      symbol_hash = {}
+      hash.each_pair do |key, value|
+        symbol_hash[key.to_sym] = value
+      end
+      return symbol_hash
+    end
+        
+  end
+end

data/lib/chingu/traits/collision_detection.rb

@@ -179,8 +179,21 @@ module Chingu
         def each_collision(*klasses)
           # Make sure klasses is always an array.
           Array(klasses).each do |klass|
-            object2_list = klass.all
             
+            if self.instance_methods.include?(:radius) && klass.instance_methods.include?(:radius)
+              self.each_bounding_circle_collision(klass) do |o1, o2|
+                yield o1, o2
+              end
+              next
+            end
+                
+            if self.instance_methods.include?(:bounding_box) && klass.instance_methods.include?(:bounding_box)
+              self.each_bounding_box_collision(klass) do |o1, o2|
+                yield o1, o2
+              end
+              next
+            end
+              
             #
             # Possible optimization, look into later.
             #
@@ -195,8 +208,7 @@ module Chingu
             #    end
             #  end
             #end
-              
-            
+            object2_list = klass.all
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-29 00:00:00 +01:00
+date: 2009-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,8 @@ files:
 - examples/example12.rb
 - examples/example13.rb
 - examples/example14.rb
+- examples/example15.rb
+- examples/example16.rb
 - examples/example2.rb
 - examples/example3.rb
 - examples/example4.rb
@@ -144,6 +146,7 @@ files:
 - lib/chingu/inflector.rb
 - lib/chingu/input.rb
 - lib/chingu/named_resource.rb
+- lib/chingu/online_high_score_list.rb
 - lib/chingu/parallax.rb
 - lib/chingu/particle.rb
 - lib/chingu/rect.rb