arcade 0.2.0 → 0.2.1

data/lib/arcade/base.rb

@@ -1,3 +1,9 @@
+module Arcade
+  module Errors
+    class NameError < StandardError;end
+  end
+end
+
 module Arcade
   module Keyboard
     Gosu::Button.constants.each do |cons|
@@ -15,7 +21,7 @@ end
 class Arcade::GameWindow < Gosu::Window
   def initialize width, height
     @current_time = Gosu::milliseconds
-    @objects      = []
+    @objects      = {}
 
     @keypress_listeners  = Hash.new { |h,k| h[k] = [] }
 
@@ -27,7 +33,7 @@ class Arcade::GameWindow < Gosu::Window
       self.add_listener key, game_object
     end
 
-    @objects << game_object
+    @objects.merge! game_object.name => game_object
   end
 
   def register game_object
@@ -35,6 +41,10 @@ class Arcade::GameWindow < Gosu::Window
     self.add_object(game_object)
   end
 
+  def get_object object_name
+    @objects[object_name]
+  end
+
   def add_listener key, object
     @keypress_listeners[key] << object
   end
@@ -48,7 +58,7 @@ class Arcade::GameWindow < Gosu::Window
   end
 
   def draw
-    @objects.each do |game_object|
+    each_object do |game_object|
       game_object.draw
     end
   end
@@ -63,8 +73,8 @@ class Arcade::GameWindow < Gosu::Window
       end
     end
 
-    @objects.each do |object|
-      (@objects - [object]).each do |other|
+    each_object do |object|
+      (@objects.values - [object]).each do |other|
         if object.collides_with?(other)
           object.collided_with(other)
         end
@@ -83,7 +93,7 @@ class Arcade::GameWindow < Gosu::Window
       object.hit_edge(edge) if edge
     end
 
-    @objects.each do |object|
+    each_object do |object|
       object._update(dt)
     end
   end
@@ -99,6 +109,13 @@ class Arcade::GameWindow < Gosu::Window
               x+width, y+height, color,
               x,       y+height,  color
   end
+
+  private
+  def each_object
+    @objects.each do |name, object|
+      yield object
+    end
+  end
 end
 
 class Arcade::GameObject
@@ -122,7 +139,9 @@ class Arcade::GameObject
     if prop = mname.scan(/^set_(.+)/).flatten.first
       @state.send(:"#{prop}=", *args)
     else
-      @state.send(method, *args)
+      @state.send(method, *args).tap do |val|
+        warn "WARNING: Called #{self.class}##{method}, but it returned nil. You should set a default value." if val.nil?
+      end
     end
   end
 
@@ -158,10 +177,13 @@ class Arcade::GameObject
 
     setup_defaults
     instance_exec &block
+
+    # Every GameObject must have a name
+    raise Arcade::Errors::NameError, "#{self.class}#name is nil" if self.name.nil?
   end
 
-  def config
-    self
+  def get_object object_name
+    window.get_object object_name
   end
 
   def draw
@@ -233,7 +255,6 @@ class Arcade::GameObject
 
   def collided_with other
     klass = other.class
-
     if self.can_collide_with?(klass)
       instance_exec other, &@collision_listeners[klass]
     end

data/lib/arcade/version.rb

@@ -1,4 +1,4 @@
 module Arcade
   # The current version of arcade
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arcade
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70248389339500 !ruby/object:Gem::Requirement
+  requirement: &70303611838520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248389339500
+  version_requirements: *70303611838520
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &70248389338680 !ruby/object:Gem::Requirement
+  requirement: &70303611837660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248389338680
+  version_requirements: *70303611837660
 description: ! 'Arcade is a simple Ruby-vased DSL for creating old-school arcade games
   like Pong.  The philosophy is similar to GameMaker, except expressed as a Ruby library
   instead of a crazy GUI.
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2415246944967182854
+      hash: 4028498995742475186
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2415246944967182854
+      hash: 4028498995742475186
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17