gamebox 0.0.8 → 0.0.9

data/History.txt

@@ -67,3 +67,9 @@
 * Cleaning up APIs
 * Adding basic collision detection system
 * added timers to stage for calling blocks on an interval
+
+=== 0.0.9 / 2010-02-18
+
+* bug fixes for rspec requires
+* cleaning up docs
+* added support for stagehands

data/README.txt

@@ -19,7 +19,7 @@
 * Rubygame (its dependancies, SDL)
 * constructor gem
 * publisher gem
-* rsepec (for gamebox tests)
+* rspec (for gamebox tests)
 * algorithms gem (optional for line of site and A*)
 
 == INSTALL:

data/Rakefile

@@ -34,18 +34,23 @@ task :stats do
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end
 
-require 'spec/rake/spectask'
-desc "Run all rspecs"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-end
-task :default => :spec
+begin
+  require 'spec/rake/spectask'
+  desc "Run all rspecs"
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_files = FileList['spec/*_spec.rb']
+  end
+  task :default => :spec
 
-desc "Run rcov rspecs"
-Spec::Rake::SpecTask.new('rcov_rspec') do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'examples']
+  desc "Run rcov rspecs"
+  Spec::Rake::SpecTask.new('rcov_rspec') do |t|
+    t.spec_files = FileList['spec/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'examples']
+  end
+rescue LoadError
+  puts "please install rspec to run tests"
+  puts "install with gem install rspec"
 end
 
 # vim: syntax=Ruby

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bin/gamebox

@@ -2,6 +2,7 @@
 
 Signal.trap("INT") { puts; exit }
 
+require 'yaml'
 require File.dirname(__FILE__) + '/../lib/gamebox/version'
 
 def print_version

data/gamebox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gamebox}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   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-02-18}
+  s.date = %q{2010-04-10}
   s.default_executable = %q{gamebox}
   s.description = %q{Framework for building and distributing games using Rubygame}
   s.email = %q{shawn42@gmail.com}
@@ -38,10 +38,6 @@ Gem::Specification.new do |s|
      "lib/gamebox/actors/logo.rb",
      "lib/gamebox/actors/score.rb",
      "lib/gamebox/actors/svg_actor.rb",
-     "lib/gamebox/ai/line_of_site.rb",
-     "lib/gamebox/ai/polaris.rb",
-     "lib/gamebox/ai/two_d_grid_location.rb",
-     "lib/gamebox/ai/two_d_grid_map.rb",
      "lib/gamebox/arbiter.rb",
      "lib/gamebox/backstage.rb",
      "lib/gamebox/behavior.rb",
@@ -86,9 +82,11 @@ Gem::Specification.new do |s|
      "lib/gamebox/physics.rb",
      "lib/gamebox/resource_manager.rb",
      "lib/gamebox/sound_manager.rb",
+     "lib/gamebox/spatial_hash.rb",
      "lib/gamebox/spec/helper.rb",
      "lib/gamebox/stage.rb",
      "lib/gamebox/stage_manager.rb",
+     "lib/gamebox/stagehand.rb",
      "lib/gamebox/svg_document.rb",
      "lib/gamebox/tasks/gamebox_tasks.rb",
      "lib/gamebox/templates/actor.erb",
@@ -106,7 +104,6 @@ Gem::Specification.new do |s|
      "lib/gamebox/templates/template_app/data/graphics/GRAPHICS_GO_HERE",
      "lib/gamebox/templates/template_app/data/music/MUSIC_GOES_HERE",
      "lib/gamebox/templates/template_app/data/sounds/SOUND_FX_GO_HERE",
-     "lib/gamebox/templates/template_app/doc/README_FOR_APP",
      "lib/gamebox/templates/template_app/script/generate",
      "lib/gamebox/templates/template_app/spec/helper.rb",
      "lib/gamebox/templates/template_app/src/app.rb",
@@ -126,10 +123,9 @@ Gem::Specification.new do |s|
      "spec/collidable_spec.rb",
      "spec/helper.rb",
      "spec/label_spec.rb",
-     "spec/line_of_site_spec.rb",
      "spec/physical_spec.rb",
-     "spec/polaris_spec.rb",
      "spec/resource_manager_spec.rb",
+     "spec/spatial_hash_spec.rb",
      "spec/stage_spec.rb",
      "spec/viewport_spec.rb"
   ]
@@ -137,7 +133,7 @@ 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.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Framework for building and distributing games using Rubygame}
   s.test_files = [
     "spec/actor_spec.rb",
@@ -148,10 +144,9 @@ Gem::Specification.new do |s|
      "spec/collidable_spec.rb",
      "spec/helper.rb",
      "spec/label_spec.rb",
-     "spec/line_of_site_spec.rb",
      "spec/physical_spec.rb",
-     "spec/polaris_spec.rb",
      "spec/resource_manager_spec.rb",
+     "spec/spatial_hash_spec.rb",
      "spec/stage_spec.rb",
      "spec/viewport_spec.rb"
   ]

data/lib/gamebox/arbiter.rb

@@ -26,28 +26,34 @@ module Arbiter
       second_objs.each do |sobj|
 #        puts "registering #{fobj} and #{sobj}"
         @collision_handlers[fobj] ||= {}
+        @collision_handlers[sobj] ||= {}
         @collision_handlers[fobj][sobj] = block
+        @collision_handlers[sobj][fobj] = block
       end
     end
   end
 
-  # TODO how is this going to get called?, method chaining update?
   def find_collisions
+    @collidable_actors ||= []
     collisions = []
-    @collidable_actors.size.times do |i|
-      first = @collidable_actors[i]
-      (@collidable_actors.size).times do |j|
-        second = @collidable_actors[i-j]
+    tmp_collidable_actors = @collidable_actors.dup
+
+    @collidable_actors.each do |first|
+
+      tmp_collidable_actors.delete first
 
+      tmp_collidable_actors.each do |second|
         if collide?(first, second)
           collisions << [first,second]
         end
       end
+
     end
 
     collisions.each do |collision|
       first = collision.first
       second = collision.last
+
       colliders = @collision_handlers[first.actor_type]
       callback = colliders[second.actor_type] unless colliders.nil?
       callback.call first, second unless callback.nil?

data/lib/gamebox/behaviors/updatable.rb

@@ -5,4 +5,8 @@ class Updatable < Behavior
   def setup
     @actor.director.add_actor @actor
   end
+
+  def removed
+    @actor.director.remove_actor @actor
+  end
 end

data/lib/gamebox/gamebox_application.rb

@@ -20,6 +20,8 @@ require 'class_finder'
 require 'actor_factory'
 require 'input_manager'
 
+require 'stagehand'
+
 class GameboxApp
   attr_reader :context, :game
   def self.run(argv,env)

data/lib/gamebox/gamebox_generator.rb

@@ -2,6 +2,14 @@
 require 'inflector'
 $: << File.join(File.dirname(__FILE__),'generators')
 
+unless "".respond_to? :end_with?
+  class String
+    def end_with?(ending)
+      self[size-ending.size..-1] == ending
+    end
+  end
+end
+
 def print_usage
   puts "generate what *opts"
   puts "TODO list all generators here"

data/lib/gamebox/input_manager.rb

@@ -92,8 +92,6 @@ class InputManager
     case event
     when KeyPressed
       case event.key
-      when :f
-        puts "Framerate:#{@clock.framerate}"
       when @auto_quit
         throw :rubygame_quit 
       end
@@ -156,8 +154,10 @@ class InputManager
     if event_ids.empty?
       @non_id_hooks[event_class] << block
     end
-    listener.when :remove_me do
-      unregister_hook event_class, *event_ids, &block
+    if listener.respond_to?(:can_fire?) && listener.can_fire?(:remove_me)
+      listener.when :remove_me do
+        unregister_hook event_class, *event_ids, &block
+      end
     end
   end
 

data/lib/gamebox/sound_manager.rb

@@ -53,7 +53,7 @@ class SoundManager
       volume = opts.delete :volume
       @sound_thread = Thread.new do
         @sounds[what].volume = volume if volume
-        @sounds[what].play opts
+        @sounds[what].dup.play opts
       end
     end
   end

data/lib/gamebox/spatial_hash.rb

@@ -0,0 +1,86 @@
+class SpatialHash
+
+  attr_accessor :cell_size
+
+  def initialize(cell_size)
+    @cell_size = cell_size.to_f
+    @buckets = {}
+    @items = []
+  end
+
+  def rehash
+    items = @items
+    @items = []
+    @buckets = {}
+    items.each do |item|
+      add item
+    end
+  end
+
+  def add(item)
+    buckets = lookup item
+    buckets.each do |bucket|
+      x,y = *bucket
+      @buckets[x] ||= {}
+      @buckets[x][y] ||= []
+      target_bucket = @buckets[x][y]
+      unless target_bucket.include? item
+        target_bucket << item 
+        @items << item
+      end
+    end
+  end
+
+  def lookup(item)
+    w = 1
+    h = 1
+    w = item.width if item.respond_to? :width
+    h = item.height if item.respond_to? :height
+    x = item.x
+    y = item.y
+    min_x, min_y = bucket_for x, y
+    if w == 1 && h == 1
+      max_x = min_x
+      max_y = min_y
+    else
+      max_x, max_y = bucket_for x+w-1, y+h-1
+    end
+
+    buckets = []
+    (max_x-min_x+1).times do |i|
+      (max_y-min_y+1).times do |j|
+        buckets << [min_x+i,min_y+j] 
+      end
+    end
+
+    buckets
+  end
+
+  def bucket_for(x,y)
+    bucket_x = (x/cell_size).floor
+    bucket_y = (y/cell_size).floor
+    return [bucket_x, bucket_y]
+  end
+
+  def remove(item)
+    buckets = lookup item
+    buckets.each do |bucket|
+      x,y = *bucket
+      return if @buckets[x].nil? || @buckets[x][y].nil?
+      @buckets[x][y].delete item
+    end
+    @items.delete item
+  end
+  
+  def items_at(x,y)
+    bucket_x = (x/@cell_size).floor
+    bucket_y = (y/@cell_size).floor
+    if @buckets[bucket_x].nil? || @buckets[bucket_x][bucket_y].nil?
+      return []
+    else
+      @buckets[bucket_x][bucket_y]
+    end
+  end
+
+end
+

data/lib/gamebox/stage.rb

@@ -30,6 +30,7 @@ class Stage
     @actor_factory.director = @director
     @backstage = backstage
 
+    @stagehands = {}
     @opts = opts
 
     setup
@@ -77,6 +78,10 @@ class Stage
   def update(time)
     @director.update time
     @viewport.update time
+    @stagehands.each do |name, stagehand|
+      stagehand.update time if stagehand.respond_to? :update
+    end
+    # TODO can we change collisions to be a stagehand
     find_collisions unless @collidable_actors.nil?
     update_timers time
   end
@@ -206,5 +211,20 @@ class Stage
       listener.call
     end
   end
+
+  def stagehand(stagehand_sym, opts={})
+    @stagehands[stagehand_sym] ||= create_stagehand(stagehand_sym, opts)
+  end
+
+  def create_stagehand(name, opts)
+    underscored_class = "#{name}_stagehand"
+    begin
+      require underscored_class
+    rescue LoadError
+      # TODO log this?
+    end
+    klass = ClassFinder.find underscored_class
+    klass.new self, opts
+  end
 end
 

data/lib/gamebox/stagehand.rb

@@ -0,0 +1,11 @@
+class Stagehand
+  attr_accessor :opts, :stage
+  def initialize(stage, opts)
+    @stage = stage
+    @opts = opts
+    setup
+  end
+
+  def setup
+  end
+end

data/lib/gamebox/tasks/gamebox_tasks.rb

@@ -1,5 +1,4 @@
 require 'gamebox/lib/platform'
-require 'spec/rake/spectask'
 
 task :default => :run
 desc "Run the game"
@@ -27,11 +26,16 @@ task :debug do |t|
   end
 end
 
-require 'spec/rake/spectask'
-desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ["-r", "./spec/helper"]
-  t.spec_files = FileList['spec//*_spec.rb']
+begin
+  require 'spec/rake/spectask'
+  desc "Run all specs"
+  Spec::Rake::SpecTask.new('spec') do |t|
+    t.spec_opts = ["-r", "./spec/helper"]
+    t.spec_files = FileList['spec//*_spec.rb']
+  end
+  task :rspec => :spec
+  task :test => :spec
+rescue LoadError
+  puts "warning: rspec not installed"
+  puts "install with gem install rspec"
 end
-task :rspec => :spec
-task :test => :spec

data/lib/gamebox/templates/template_app/Rakefile

@@ -3,6 +3,7 @@ $: << libdir
 confdir = File.dirname(__FILE__)+"/config"
 $: << confdir
 
+ENV["RUBYGAME_NOINIT"]="1"
 require 'environment'
 require 'gamebox/tasks/gamebox_tasks'
 STATS_DIRECTORIES = [

data/lib/gamebox/version.rb

@@ -2,7 +2,7 @@ module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
 
     ARRAY = [MAJOR, MINOR, TINY]
     STRING = ARRAY.join('.')

data/spec/spatial_hash_spec.rb

@@ -0,0 +1,96 @@
+require 'helper'
+require 'spatial_hash'
+
+describe 'a new SpacialHash' do
+  before do
+    @hash = SpatialHash.new 10
+  end
+  it 'should be constructable' do
+    @hash.cell_size.should == 10
+  end
+
+  it 'can add a point' do
+    pt = Point.new 2, 3
+    @hash.add pt
+    @hash.instance_variable_get('@buckets')[0][0].first.should == pt
+  end
+
+  it 'can add a neg point' do
+    pt = Point.new -2, 3
+    @hash.add pt
+    @hash.instance_variable_get('@buckets')[-1][0].first.should == pt
+  end
+
+  it 'can add a square' do
+    box = Item.new 2, 3, 12, 13
+    @hash.add box
+
+    buckets = @hash.instance_variable_get('@buckets')
+    buckets[0][0].first.should == box
+    buckets[0][1].first.should == box
+    buckets[1][0].first.should == box
+    buckets[1][1].first.should == box
+  end
+
+  it 'can add a box' do
+    box = Item.new 3, 3, 12, 2
+    @hash.add box
+
+    buckets = @hash.instance_variable_get('@buckets')
+    buckets[0][0].first.should == box
+    buckets[1][0].first.should == box
+
+    buckets[1][1].should be_nil
+    buckets[0][1].should be_nil
+  end
+
+  it 'can remove points' do
+    pt = Point.new -2, 3
+    @hash.add pt
+    @hash.remove pt
+
+    @hash.instance_variable_get('@buckets')[-1][0].should be_empty
+  end
+
+  it 'can remove boxes' do
+    box = Item.new 2, 3, 12, 13
+    @hash.add box
+
+    @hash.remove box
+
+    @hash.instance_variable_get('@buckets')[0][0].should be_empty
+    @hash.instance_variable_get('@buckets')[0][1].should be_empty
+    @hash.instance_variable_get('@buckets')[1][0].should be_empty
+    @hash.instance_variable_get('@buckets')[1][1].should be_empty
+  end
+
+  it 'can lookup objects for an x,y location' do
+    box = Item.new 2, 3, 12, 13
+    @hash.add box
+
+    @hash.items_at(5, 7).include?(box).should be_true
+  end
+
+  it 'can rehash all the items' do
+    box = Item.new 2, 3, 12, 13
+    @hash.add box
+    @hash.rehash
+
+    buckets = @hash.instance_variable_get('@buckets')
+    buckets[0][0].first.should == box
+    buckets[0][1].first.should == box
+    buckets[1][0].first.should == box
+    buckets[1][1].first.should == box
+  end
+end
+
+class Point
+  attr_accessor :x,:y
+  def initialize(x,y);@x=x;@y=y;end
+end
+
+class Item < Point
+  def initialize(x,y,w=1,h=1);@x=x;@y=y;@w=w;@h=h;end
+  def width;@w;end
+  def height;@h;end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gamebox
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Shawn Anderson
@@ -11,59 +16,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-04-10 00:00:00 -04:00
 default_executable: gamebox
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubygame
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: constructor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: publisher
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: Framework for building and distributing games using Rubygame
 email: shawn42@gmail.com
 executables: 
@@ -93,10 +108,6 @@ files:
 - lib/gamebox/actors/logo.rb
 - lib/gamebox/actors/score.rb
 - lib/gamebox/actors/svg_actor.rb
-- lib/gamebox/ai/line_of_site.rb
-- lib/gamebox/ai/polaris.rb
-- lib/gamebox/ai/two_d_grid_location.rb
-- lib/gamebox/ai/two_d_grid_map.rb
 - lib/gamebox/arbiter.rb
 - lib/gamebox/backstage.rb
 - lib/gamebox/behavior.rb
@@ -141,9 +152,11 @@ files:
 - lib/gamebox/physics.rb
 - lib/gamebox/resource_manager.rb
 - lib/gamebox/sound_manager.rb
+- lib/gamebox/spatial_hash.rb
 - lib/gamebox/spec/helper.rb
 - lib/gamebox/stage.rb
 - lib/gamebox/stage_manager.rb
+- lib/gamebox/stagehand.rb
 - lib/gamebox/svg_document.rb
 - lib/gamebox/tasks/gamebox_tasks.rb
 - lib/gamebox/templates/actor.erb
@@ -161,7 +174,6 @@ files:
 - lib/gamebox/templates/template_app/data/graphics/GRAPHICS_GO_HERE
 - lib/gamebox/templates/template_app/data/music/MUSIC_GOES_HERE
 - lib/gamebox/templates/template_app/data/sounds/SOUND_FX_GO_HERE
-- lib/gamebox/templates/template_app/doc/README_FOR_APP
 - lib/gamebox/templates/template_app/script/generate
 - lib/gamebox/templates/template_app/spec/helper.rb
 - lib/gamebox/templates/template_app/src/app.rb
@@ -181,10 +193,9 @@ files:
 - spec/collidable_spec.rb
 - spec/helper.rb
 - spec/label_spec.rb
-- spec/line_of_site_spec.rb
 - spec/physical_spec.rb
-- spec/polaris_spec.rb
 - spec/resource_manager_spec.rb
+- spec/spatial_hash_spec.rb
 - spec/stage_spec.rb
 - spec/viewport_spec.rb
 has_rdoc: true
@@ -200,18 +211,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: gamebox
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Framework for building and distributing games using Rubygame
@@ -224,9 +237,8 @@ test_files:
 - spec/collidable_spec.rb
 - spec/helper.rb
 - spec/label_spec.rb
-- spec/line_of_site_spec.rb
 - spec/physical_spec.rb
-- spec/polaris_spec.rb
 - spec/resource_manager_spec.rb
+- spec/spatial_hash_spec.rb
 - spec/stage_spec.rb
 - spec/viewport_spec.rb

data/lib/gamebox/ai/line_of_site.rb

@@ -1,61 +0,0 @@
-# LineOfSite is a class for finding neighbors in a map that are visible
-class LineOfSite
-  def initialize(map)
-    @map = map
-  end
-  
-  def losline(x, y, x2, y2)
-    brensenham_line(x, y, x2, y2).each do |i|
-      iterx, itery = *i
-      occ = @map.occupant(loc2(iterx,itery))
-      return unless occ
-      occ.lit = true
-      occ.seen = true
-      
-      return if occ.solid?      
-    end
-  end            
-  
-  # Brensenham line algorithm
-  def brensenham_line(x,y,x2,y2)
-    steep = false
-    coords = []
-    dx = (x2 - x).abs
-    if (x2 - x) > 0
-      sx = 1
-    else 
-      sx = -1
-    end
-    dy = (y2 - y).abs
-    if (y2 - y) > 0
-      sy = 1
-    else
-      sy = -1
-    end
-    if dy > dx
-      steep = true
-      x,y = y,x
-      dx,dy = dy,dx
-      sx,sy = sy,sx
-    end
-    d = (2 * dy) - dx
-
-    dx.times do
-      if steep 
-        coords << [y,x]
-      else
-        coords << [x,y]
-      end
-      while d >= 0
-        y = y + sy
-        d = d - (2 * dx)
-      end
-      x = x + sx
-      d = d + (2 * dy)
-    end
-    coords << [x2,y2]
-    
-    coords             
-  end  
-
-end

data/lib/gamebox/ai/polaris.rb

@@ -1,109 +0,0 @@
-require 'algorithms'
-include Containers
-
-# Polaris is a star that guides, aka "The North Star".  It implements the A* algorithm.
-class Polaris
-  attr_reader :nodes_considered
-  
-  def initialize(map)
-    @map = map
-    @nodes_considered = 0
-  end
-  
-  # Returns the path without the from location. 
-  # Returns nil if max_depth is hit or if no path exists.
-  def guide(from, to, unit_type=nil, max_depth=400)
-    return nil if @map.blocked?(from, unit_type) || @map.blocked?(to, unit_type)
-    from_element = PathElement.new(from)
-    from_element.dist_from = @map.distance(from,to)
-    open = PriorityQueue.new { |x, y| (x <=> y) == -1 }
-    open.push from_element, from_element.rating
-    closed = SplayTreeMap.new
-    step = 0
-    
-    until open.empty? || step > max_depth
-      step += 1
-      
-      current_element = open.pop
-      @nodes_considered += 1
-      
-      loc = current_element.location
-      if @map.cost(loc,to) == 0
-        path = []
-        until current_element.parent.nil?
-          path.unshift current_element
-          current_element = current_element.parent
-        end
-
-        return path
-      else
-        closed.push current_element.location, current_element
-        @map.neighbors(loc).each do |next_door|
-          el = PathElement.new(next_door,current_element)
-          next if closed.has_key? next_door
-          
-          if @map.blocked? next_door, unit_type
-            #closed.push el.location, el
-          else
-            current_rating = current_element.cost_to + @map.cost(loc, next_door)
-            
-            # add to open
-            el.cost_to = current_rating
-            el.dist_from = @map.distance(next_door,to)
-            
-            open.push el, el.rating
-          end
-        end
-      end
-    end
-    nil
-  end
-end
-
-class PathElement
-  include Comparable
-  
-  attr_accessor :location, :parent
-  attr_reader :cost_to, :dist_from, :rating
-  def initialize(location=nil,parent=nil)
-    @location = location
-    @parent = parent
-    @cost_to = 0
-    @dist_from = 0
-    @rating = 99_999
-  end
-  
-  def cost_to=(new_cost)
-    @cost_to = new_cost
-    reset_rating
-  end
-  
-  def dist_from=(new_dist_from)
-    @dist_from = new_dist_from
-    reset_rating
-  end
-  
-  def reset_rating
-    @rating = @cost_to + @dist_from
-  end
-  
-  def to_s
-    "#{@location} at cost of #{@cost_to} and rating of #{@rating}"
-  end
-  
-  def <=>(b)
-    a = self
-    if a.rating < b.rating
-      return -1
-    elsif a.rating > b.rating
-      return 1
-    else
-      0
-    end
-  end
-  
-  def ==(other)
-    return false if other.nil?
-    @location == other.location
-  end
-end

data/lib/gamebox/ai/two_d_grid_location.rb

@@ -1,21 +0,0 @@
-# TwoDGridLocation exibits an x,y,cost location
-class TwoDGridLocation
-  attr_accessor :x,:y
-  def initialize(x,y);@x=x;@y=y;end
-  def ==(other)
-    @x == other.x and @y == other.y
-  end
-  
-  def <=>(b)
-    ret = 1
-    if @x == b.x && @y == b.y  
-      ret = 0
-    end
-    ret = -1 if @x <= b.x && @y < b.y
-    return ret
-  end
-  
-  def to_s
-    "#{@x},#{@y}"
-  end
-end

data/lib/gamebox/ai/two_d_grid_map.rb

@@ -1,81 +0,0 @@
-require 'ai/two_d_grid_location'
-
-# TwoDGridMap exibits the contract that the map requires. 
-# Works on an X,Y grid that uses Ftors for 2D vectors
-class TwoDGridMap
-  attr_accessor :w, :h
-  TRAVEL_COST_DIAG = 14
-  TRAVEL_COST_STRAIGHT = 10
-  
-  def initialize(w,h)
-    @w = w
-    @h = h
-    @grid = {}
-  end
-  
-  def size
-    [@w,@h]
-  end
-  
-  # place thing at location. If thing is nil, location will be placed in the map
-  def place(location, thing=nil)
-    thing ||= location
-    @grid[location.x] ||= {}
-    @grid[location.x][location.y] = thing
-  end
-  
-  def occupant(location)
-    @grid[location.x][location.y] if @grid[location.x]
-  end
-  
-  def clear(location)
-    @grid[location.x] ||= {}
-    @grid[location.x][location.y] = nil
-  end
-  
-  # is the location available for the specified type
-  def blocked?(location, type=nil)
-    return true if type == :blocked
-    return true if location.x >= @w || location.y >= @h || location.x < 0 || location.y < 0
-    if @grid[location.x] and @grid[location.x][location.y]
-      return true
-    else
-      return false
-    end
-  end
-  
-  # returns a list of neighbors and their distance
-  def neighbors(location)
-    x = location.x
-    y = location.y
-    [
-      TwoDGridLocation.new(x-1, y-1),
-      TwoDGridLocation.new(x-1, y+1),
-      TwoDGridLocation.new(x+1, y-1),
-      TwoDGridLocation.new(x+1, y+1),
-      TwoDGridLocation.new(x-1, y),
-      TwoDGridLocation.new(x+1, y),
-      TwoDGridLocation.new(x, y-1),
-      TwoDGridLocation.new(x, y+1)
-    ]
-  end
-  
-  def distance(from,to)
-    h_diagonal = [(from.x-to.x).abs, (from.y-to.y).abs].min
-    h_straight = ((from.x-to.x).abs + (from.y-to.y).abs)
-    return TRAVEL_COST_DIAG * h_diagonal + TRAVEL_COST_STRAIGHT * (h_straight - 2*h_diagonal)
-  end
-  
-  # return the cost to go from => to (assuming from and to are neighbors)
-  def cost(from, to)
-    if from.x == to.x or from.y == to.y
-      if from.x == to.x and from.y == to.y
-        0
-      else
-        TRAVEL_COST_STRAIGHT
-      end
-    else
-      TRAVEL_COST_DIAG
-    end
-  end
-end

data/spec/line_of_site_spec.rb

@@ -1,12 +0,0 @@
-require File.join(File.dirname(__FILE__),'helper')
-require 'ai/line_of_site'
-require 'ai/two_d_grid_map'
-
-describe 'A new LineOfSite' do
-  before do
-    @map = TwoDGridMap.new 10, 20
-    @los = LineOfSite.new @map
-  end
-
-  it 'should be sane'
-end

data/spec/polaris_spec.rb

@@ -1,193 +0,0 @@
-require File.join(File.dirname(__FILE__),'helper')
-require 'ai/polaris'
-require 'ai/two_d_grid_map'
-
-describe 'A new polaris' do
-  before do
-    @map = TwoDGridMap.new 10, 20
-    @pather = Polaris.new @map
-  end
-
-  it 'should return an empty path if destination is not valid' do
-    from = TwoDGridLocation.new @map.w-1, @map.h-1
-    to = TwoDGridLocation.new @map.w, @map.h
-    @pather.guide(from,to).should be_nil
-
-    to = TwoDGridLocation.new(-1, -1)
-    @pather.guide(from,to).should be_nil
-  end
-
-  it 'should return an empty path if start is not valid' do
-    from = TwoDGridLocation.new @map.w, @map.h
-    to = TwoDGridLocation.new @map.w-1, @map.h-1
-    @pather.guide(from,to).should be_nil
-    
-    from = TwoDGridLocation.new -1, -1
-    @pather.guide(from,to).should be_nil
-  end
-  
-  it 'should return the path of "to" for accessible neighbor' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 1, 0
-    
-    path = @pather.guide(from,to)
-    path.should_not be_nil
-    path.size.should equal(1)
-    
-    path.first.cost_to.should equal(TwoDGridMap::TRAVEL_COST_STRAIGHT)
-    path.first.dist_from.should equal(0)
-    path.first.location.x.should equal(to.x)
-    path.first.location.y.should equal(to.y)
-  end
-  
-  it 'should return the right horizontal path of length 2' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 2, 0
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(1)
-    path.first.location.y.should equal(0)
-    path.last.location.should == to
-  end
-
-  it 'should return the left horizontal path of length 2' do
-    from = TwoDGridLocation.new 2, 0
-    to = TwoDGridLocation.new 0, 0
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(1)
-    path.first.location.y.should equal(0)
-    path.last.location.should == to
-  end  
-  
-
-  it 'should return the left up diag path of length 2' do
-    from = TwoDGridLocation.new 2, 2
-    to = TwoDGridLocation.new 0, 0
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(1)
-    path.first.location.y.should equal(1)
-    path.last.location.should == to
-  end  
-  
-  it 'should return the right up diag path of length 2' do
-    from = TwoDGridLocation.new 2, 2
-    to = TwoDGridLocation.new 4, 0
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(3)
-    path.first.location.y.should equal(1)
-    path.last.location.should == to
-  end
-  
-  it 'should return the right down diag path of length 2' do
-    from = TwoDGridLocation.new 2, 2
-    to = TwoDGridLocation.new 4, 4
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(3)
-    path.first.location.y.should equal(3)
-    path.last.location.should == to
-  end   
-  
-  it 'should return the left down diag path of length 2' do
-    from = TwoDGridLocation.new 2, 2
-    to = TwoDGridLocation.new 0, 4
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(1)
-    path.first.location.y.should equal(3)
-    path.last.location.should == to
-  end  
-  
-  it 'should return go around an obstacle' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 2, 0
-    
-    in_the_way = TwoDGridLocation.new 1, 0
-    @map.place in_the_way, "ME"
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(2)
-    
-    path.first.location.x.should equal(1)
-    path.first.location.y.should equal(1)
-    path.last.location.should == to
-  end
-  
-  it 'should return shortest path of horizontal and diag length 5' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 5, 4
-    
-    path = @pather.guide(from,to)
-    
-    path.should_not be_nil
-    path.size.should equal(5)
-    
-    # make sure that all elements of the path are neighbors
-    prev_el = PathElement.new from, nil
-    path.each do |path_el|
-      @map.neighbors(prev_el.location).include?(path_el.location).should be_true
-      prev_el = path_el
-    end
-    
-    path.last.location.should == to
-  end
-  
-  it 'should return nil when the shortest path is longer than the max step passed in' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 5, 4
-    
-    path = @pather.guide(from,to,nil,4)
-    path.should == nil
-  end  
-
-  it 'should return nil when the path does not exist for unit type' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 2, 0
-    
-    path = @pather.guide(from,to,:blocked)
-    path.should == nil
-  end  
-
-  it 'should return nil when the path does not exist' do
-    from = TwoDGridLocation.new 0, 0
-    to = TwoDGridLocation.new 2, 0
-    
-    # put up a wall
-    @map.h.times do |i|
-      @map.place TwoDGridLocation.new(1, i), "ME"
-    end
-    
-    path = @pather.guide(from,to)
-    path.should == nil
-    @pather.nodes_considered.should == @map.h
-  end
-end