gamebox 0.1.1 → 0.2.1

data/.gitignore

@@ -5,3 +5,7 @@ doc
 coverage
 .DS_Store
 .yardoc
+tmp
+tags
+.bundle
+*.lock

data/Gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+gem "rake"
+gem "rspec"
+gem "jeweler"
+gem "constructor"
+gem "publisher"
+gem "gosu"
+gem "chipmunk"
+gem "polaris"

data/History.txt

@@ -73,3 +73,8 @@
 * bug fixes for rspec requires
 * cleaning up docs
 * added support for stagehands
+
+=== 0.1.2 / 2010-04-28
+
+* added dist tasks to package up windows executables
+* added spatial hash and updated collision detection

data/README.txt

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-  A game template for building and distributing Rubygame games. See docs/getting_started.rdoc for help getting started.
+  A game template for building and distributing Gosu games. See docs/getting_started.rdoc for help getting started.
 
 == FEATURES/PROBLEMS:
 
@@ -12,13 +12,14 @@
 
 == SYNOPSIS:
 
-  A game template for building and distributing Rubygame games.
+  A game template for building and distributing Gosu games.
 
 == REQUIREMENTS:
 
-* Rubygame (its dependancies, SDL)
+* Gosu
 * constructor gem
 * publisher gem
+* bundler
 * rspec (for gamebox tests)
 * algorithms gem (optional for line of site and A*)
 

data/Rakefile

@@ -5,14 +5,15 @@ begin
     gem.name = "gamebox"
     gem.executables = "gamebox"
     gem.rubyforge_project = "gamebox"
-    gem.summary = %Q{Framework for building and distributing games using Rubygame}
-    gem.description = %Q{Framework for building and distributing games using Rubygame}
+    gem.summary = %Q{Framework for building and distributing games using Gosu}
+    gem.description = %Q{Framework for building and distributing games using Gosu}
     gem.email = "shawn42@gmail.com"
     gem.homepage = "http://shawn42.github.com/gamebox"
     gem.authors = ["Shawn Anderson","Jason Roelofs","Karlin Fox"]
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "jeweler"
-    gem.add_dependency 'rubygame'
+    gem.add_dependency 'gosu'
+    gem.add_dependency 'bundler'
     gem.add_dependency 'constructor'
     gem.add_dependency 'publisher'
     gem.files.exclude 'examples'
@@ -24,8 +25,15 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
+begin
+  require 'metric_fu'
+rescue LoadError
+  puts "metric_fu (or a dependency) not available. Install it with: sudo gem install metric_fu"
+end
+
 STATS_DIRECTORIES = [
-  %w(Source         lib/)
+  %w(Source         lib/),
+  %w(Unit\ tests         spec/)
 ].collect { |name, dir| [ name, "#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 
 desc "Report code statistics (KLOCs, etc) from the application"

data/TODO.txt

@@ -7,9 +7,6 @@ on_update do |time|
   # do stuff?
 end
 
-allow easy pausing of game and physics
-  - fire :pause event w/ a new Director of actors? 
-change Polaris to return partial path when step max is reached
 update physical objects to use chipmunk_object.rb
 
 make complex Phyiscal behaviors 
@@ -25,8 +22,7 @@ add Extra; actor with a short time to live (TTL); useful for special effects (ma
 	
 static deployment bundles (crate, love-clone; custom C project)
 	ruby
-	SDL
-	rubygame
+	gosu
 possible features:
 AI
 	 state machine

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.1

data/docs/getting_started.rdoc

@@ -14,8 +14,8 @@ The reason I wrote Gamebox is twofold: first, to aid in 48 hour game writing com
 - or tar from http://shawn42.github.com/gamebox
 - or git pull from git://github.com/shawn42/gamebox.git
 - required gems
-  - hoe
-  - rubygame (all of its dependencies)
+  - bundler
+  - gosu 
   - constructor
   - publisher
   - rspec for unit tests

data/gamebox.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gamebox}
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shawn Anderson", "Jason Roelofs", "Karlin Fox"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-11-02}
   s.default_executable = %q{gamebox}
-  s.description = %q{Framework for building and distributing games using Rubygame}
+  s.description = %q{Framework for building and distributing games using Gosu}
   s.email = %q{shawn42@gmail.com}
   s.executables = ["gamebox"]
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "History.txt",
      "README.txt",
      "Rakefile",
@@ -35,11 +36,13 @@ Gem::Specification.new do |s|
      "lib/gamebox/actor.rb",
      "lib/gamebox/actor_factory.rb",
      "lib/gamebox/actor_view.rb",
+     "lib/gamebox/actors/collidable_debugger.rb",
      "lib/gamebox/actors/curtain.rb",
      "lib/gamebox/actors/fps.rb",
      "lib/gamebox/actors/label.rb",
      "lib/gamebox/actors/logo.rb",
      "lib/gamebox/actors/score.rb",
+     "lib/gamebox/actors/spatial_debugger.rb",
      "lib/gamebox/actors/svg_actor.rb",
      "lib/gamebox/arbiter.rb",
      "lib/gamebox/backstage.rb",
@@ -47,6 +50,10 @@ Gem::Specification.new do |s|
      "lib/gamebox/behaviors/animated.rb",
      "lib/gamebox/behaviors/audible.rb",
      "lib/gamebox/behaviors/collidable.rb",
+     "lib/gamebox/behaviors/collidable/aabb_collidable.rb",
+     "lib/gamebox/behaviors/collidable/circle_collidable.rb",
+     "lib/gamebox/behaviors/collidable/collidable_shape.rb",
+     "lib/gamebox/behaviors/collidable/polygon_collidable.rb",
      "lib/gamebox/behaviors/graphical.rb",
      "lib/gamebox/behaviors/layered.rb",
      "lib/gamebox/behaviors/physical.rb",
@@ -63,10 +70,12 @@ Gem::Specification.new do |s|
      "lib/gamebox/data/sounds/GAMEBOX_SOUND_FX_GO_HERE",
      "lib/gamebox/director.rb",
      "lib/gamebox/event_compat.rb",
+     "lib/gamebox/ftor.rb",
      "lib/gamebox/gamebox_application.rb",
      "lib/gamebox/gamebox_generator.rb",
      "lib/gamebox/generators/actor_generator.rb",
      "lib/gamebox/generators/view_generator.rb",
+     "lib/gamebox/hooked_gosu_window.rb",
      "lib/gamebox/input_manager.rb",
      "lib/gamebox/lib/aliasing.rb",
      "lib/gamebox/lib/code_statistics.rb",
@@ -78,8 +87,8 @@ Gem::Specification.new do |s|
      "lib/gamebox/lib/numbers_ext.rb",
      "lib/gamebox/lib/platform.rb",
      "lib/gamebox/lib/publisher_ext.rb",
+     "lib/gamebox/lib/rect.rb",
      "lib/gamebox/lib/sorted_list.rb",
-     "lib/gamebox/lib/surface_ext.rb",
      "lib/gamebox/physical_director.rb",
      "lib/gamebox/physical_stage.rb",
      "lib/gamebox/physics.rb",
@@ -119,10 +128,13 @@ Gem::Specification.new do |s|
      "lib/gamebox/viewport.rb",
      "lib/gamebox/views/graphical_actor_view.rb",
      "lib/gamebox/wrapped_screen.rb",
+     "load_paths.rb",
      "script/perf_polaris.rb",
+     "script/perf_spatial_hash.rb",
      "spec/actor_spec.rb",
      "spec/actor_view_spec.rb",
      "spec/animated_spec.rb",
+     "spec/arbiter_spec.rb",
      "spec/backstage_spec.rb",
      "spec/behavior_spec.rb",
      "spec/collidable_spec.rb",
@@ -139,12 +151,13 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{gamebox}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Framework for building and distributing games using Rubygame}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Framework for building and distributing games using Gosu}
   s.test_files = [
     "spec/actor_spec.rb",
      "spec/actor_view_spec.rb",
      "spec/animated_spec.rb",
+     "spec/arbiter_spec.rb",
      "spec/backstage_spec.rb",
      "spec/behavior_spec.rb",
      "spec/collidable_spec.rb",
@@ -162,23 +175,26 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rubygame>, [">= 0"])
+      s.add_runtime_dependency(%q<gosu>, [">= 0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_runtime_dependency(%q<constructor>, [">= 0"])
       s.add_runtime_dependency(%q<publisher>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rubygame>, [">= 0"])
+      s.add_dependency(%q<gosu>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<constructor>, [">= 0"])
       s.add_dependency(%q<publisher>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rubygame>, [">= 0"])
+    s.add_dependency(%q<gosu>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<constructor>, [">= 0"])
     s.add_dependency(%q<publisher>, [">= 0"])
   end

data/lib/gamebox/actor.rb

@@ -1,4 +1,6 @@
 require 'publisher'
+require 'inflector'
+
 # Actor represent a game object.
 # Actors can have behaviors added and removed from them. Such as :physical or :animated.
 # They are created and hooked up to their optional View class in Stage#create_actor.
@@ -48,7 +50,7 @@ class Actor
     end
 
     ordered_behaviors.each do |behavior|
-      is behavior_defs[behavior]
+      is behavior_defs[behavior] unless is? behavior
     end
     setup
   end
@@ -82,8 +84,13 @@ class Actor
   #  :range=>3 to it
   #  Actor#is does try to require 'shootable' but will not throw an error if shootable cannot be required.
   def is(behavior_def)
-    behavior_sym = behavior_def.is_a?(Hash) ? behavior_def.keys.first : behavior_def
-    behavior_opts = behavior_def.is_a?(Hash) ? behavior_def.values.first : {}
+    if behavior_def.is_a?(Hash)
+      behavior_sym = behavior_def.keys.first
+      behavior_opts = behavior_def.values.first
+    else
+      behavior_sym = behavior_def
+      behavior_opts = {}
+    end
     begin
       require behavior_sym.to_s;
     rescue LoadError

data/lib/gamebox/actor_factory.rb

@@ -5,7 +5,7 @@ require 'graphical_actor_view'
 # stage, input_manager, director, resource_manager. It also creates the ActorView 
 # associated with the Actor and registers it to the Stage be drawn. 
 class ActorFactory
-  constructor :input_manager
+  constructor :input_manager, :wrapped_screen
 
   attr_accessor :stage_manager, :director
   
@@ -49,7 +49,7 @@ class ActorFactory
       view_klass ||= GraphicalActorView
     end
     
-    view_klass.new stage, model if view_klass
+    view_klass.new stage, model, @wrapped_screen if view_klass
     
     model.show unless opts[:hide]
 

data/lib/gamebox/actor_view.rb

@@ -1,8 +1,9 @@
 class ActorView
-  attr_accessor :actor, :stage, :layer, :parallax
-  def initialize(stage, actor)
+  attr_accessor :actor, :stage, :layer, :parallax, :wrapped_screen
+  def initialize(stage, actor, wrapped_screen)
     @stage = stage
     @actor = actor
+    @wrapped_screen = wrapped_screen
 
     @layer = 0
     @parallax = 1
@@ -11,20 +12,22 @@ class ActorView
       @parallax = @actor.parallax
     end
 
-    actor.when :remove_me do
-      @stage.unregister_drawable self
-    end
+    actor.when :remove_me do unregister end
     
-    actor.when :hide_me do
-      @stage.unregister_drawable self
-    end
+    actor.when :hide_me do unregister  end
     
-    actor.when :show_me do
-      @stage.register_drawable self
-    end
+    actor.when :show_me do register end
     
     setup
   end
+  
+  def register
+    @stage.register_drawable self
+  end
+  
+  def unregister
+    @stage.unregister_drawable self
+  end
 
   def setup
   end

data/lib/gamebox/actors/collidable_debugger.rb

@@ -0,0 +1,35 @@
+require 'actor'
+require 'actor_view'
+
+class CollidableDebugger < Actor
+  
+  attr_reader :actor
+  def setup
+    @actor = opts[:collider]
+    @actor.when :remove_me do
+      remove_self
+    end
+
+  end
+end
+
+class CollidableDebuggerView < ActorView
+
+  def setup
+    @color = Color[:white]
+  end
+
+  def draw(target,x_off,y_off)
+    collider = @actor.actor
+    case collider.collidable_shape
+    when :circle
+      target.draw_circle [x_off+collider.center_x, y_off+collider.center_y], collider.radius, @color
+    else
+      collider.cw_world_lines.each do |line|
+        f = line.first
+        l = line.last
+        target.draw_line [x_off+f[0],y_off+f[1]],[x_off+l[0],y_off+l[1]], @color
+      end
+    end
+  end
+end

data/lib/gamebox/actors/curtain.rb

@@ -3,8 +3,8 @@ require 'publisher'
 require 'actor_view'
 
 class CurtainView < ActorView
-  def draw(target,x_off,y_off)
-    target.draw_box_s [0,0],[1024,800], [0,0,0,@actor.height]
+  def draw(target,x_off,y_off,z)
+    target.fill 0,0,1024,800, [0,0,0,@actor.height]
   end
 end
 

data/lib/gamebox/actors/logo.rb

@@ -1,10 +1,4 @@
 require 'actor'
-require 'graphical_actor_view'
-class LogoView < GraphicalActorView
-  def draw(target,xoff,yoff)
-    super target, 0, 0
-  end
-end
 class Logo < Actor
   has_behaviors :graphical, 
   :layered => {:layer => 999}

data/lib/gamebox/actors/score.rb

@@ -1,15 +1,12 @@
 class ScoreView < ActorView
-  def draw(target,x_off,y_off)
+  def draw(target,x_off,y_off,z)
     text = @actor.score.to_s
     text = '0'*(6-text.size)+text
 
     font = @stage.resource_manager.load_font 'Asimov.ttf', 30
-    text_image = font.render text, true, [250,250,250,255]
-
     x = @actor.x
     y = @actor.y
-
-    text_image.blit target.screen, [x,y]
+    font.draw text, x,y,z#, 1,1,target.convert_color([250,250,250,255])
   end
 end
 class Score < Actor

data/lib/gamebox/actors/spatial_debugger.rb

@@ -0,0 +1,47 @@
+require 'actor'
+require 'actor_view'
+
+class SpatialDebugger < Actor
+  
+  has_behavior :updatable
+
+  attr_reader :spatial, :ratio
+  def setup
+    @spatial = stage.stagehand(:spatial)
+  end
+
+  def update(time)
+    super
+    if stage.checks && stage.checks > 0
+      @ratio = "size:#{@spatial.cell_size} #{stage.collisions} / #{stage.checks} ("
+      @ratio += "#{stage.collisions / stage.checks.to_f})"
+    else
+      @ratio = "N/A"
+    end
+  end
+  
+end
+
+class SpatialDebuggerView < ActorView
+  def setup
+    size = 30
+    font = "Asimov.ttf"
+    @font = @actor.resource_manager.load_font font, size
+  end
+
+  def draw(target,x_off,y_off)
+    cell_size = @actor.spatial.cell_size
+    max = 0
+    @actor.spatial.buckets.each do |x_bucket,stuff|
+      stuff.each do |y_bucket,items|
+        max = items.size if items.size > max
+        x = x_bucket * cell_size + x_off
+        y = y_bucket * cell_size + y_off
+        target.draw_box [x,y], [x+cell_size,y+cell_size], Color[:white]
+      end
+    end
+
+    @text_image = @font.render "#{@actor.ratio} [#{max}]", true, Color[:white]
+    @text_image.blit target.screen, [@actor.x, @actor.y]
+  end
+end