gamebox 0.2.1 → 0.3.2

data/lib/gamebox/lib/sorted_list.rb

@@ -1,4 +1,4 @@
-require 'linked_list'
+
 
 # Keeps a list of items sorted. Elements must be comparable
 class SortedList

data/lib/gamebox/lib/symbol_ext.rb

@@ -0,0 +1,8 @@
+unless Symbol.include? Comparable
+  class Symbol
+    include Comparable
+    def <=>(other)
+      self.to_i <=> other.to_i
+    end
+  end
+end

data/lib/gamebox/physical_director.rb

@@ -1,4 +1,4 @@
-require 'director'
+
 
 class PhysicalDirector < Director
   def find_physical_obj(shape)

data/lib/gamebox/physical_stage.rb

@@ -1,9 +1,9 @@
 # Stage represent on level of game play.  Some games will likely have only one
 # stage. Stage is responsible for loading its background, props, and directors.
 # PhysicalStage adds a physics space to the Stage
-require 'stage'
-require 'physics'
-require 'physical_director'
+
+
+
 class PhysicalStage < Stage
   
   attr_accessor :space

data/lib/gamebox/physics.rb

@@ -1,6 +1,3 @@
-require 'chipmunk'
-
-
 def vec2(*args)
   CP::Vec2.new *args
 end

data/lib/gamebox/resource_manager.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/env ruby
 $: << "#{File.dirname(__FILE__)}/../config"
 require "fileutils"
-require 'inflector'
-require 'svg_document'
 
 class ResourceManager
 
@@ -92,7 +89,7 @@ class ResourceManager
         end
         cached_img = Image.new(@window, full_name)
       rescue Exception => ex
-        puts "Cannot load image #{file_name}"
+        log "Cannot load image #{file_name}", :warn
       end
       @loaded_images[file_name] = cached_img
     end
@@ -103,8 +100,8 @@ class ResourceManager
     begin
       music = Song.new(@window, full_name)
       return music
-    rescue Excpetion => ex
-      puts "Cannot load music " + full_name + " : " + ex
+    rescue Exception => ex
+      log "Cannot load music " + full_name + " : " + ex, :warn
     end
   end
 
@@ -112,8 +109,8 @@ class ResourceManager
     begin
       sound = Sample.new(@window, full_name)
       return sound
-    rescue Excpetion => ex
-      puts "Cannot load sound " + full_name + " : " + ex
+    rescue Exception => ex
+      log "Cannot load sound " + full_name + " : " + ex.inspect, :warn
     end
   end
 
@@ -122,20 +119,23 @@ class ResourceManager
     @loaded_fonts[name] ||= {}
     return @loaded_fonts[name][size] if @loaded_fonts[name][size]
     begin
-      #full_name = File.expand_path(FONTS_PATH + name)
-      full_name = FONTS_PATH + name
-      if File.exist? full_name
-        font = Font.new(@window, full_name, size)
+      if name =~ /^\// and File.exists?(name)
+        font = Font.new(@window, name, size)
         @loaded_fonts[name][size] = font
       else
-        #full_name = File.expand_path(GAMEBOX_FONTS_PATH + name)
-        full_name = GAMEBOX_FONTS_PATH + name
-        font = Font.new(@window, full_name, size)
-        @loaded_fonts[name][size] = font
+        full_name = FONTS_PATH + name
+        if File.exist? full_name
+          font = Font.new(@window, full_name, size)
+          @loaded_fonts[name][size] = font
+        else
+          full_name = GAMEBOX_FONTS_PATH + name
+          font = Font.new(@window, full_name, size)
+          @loaded_fonts[name][size] = font
+        end
       end
       return font
     rescue Exception => ex
-      puts "Cannot load font #{full_name}:#{ex}"
+      debug "Cannot load font #{full_name}:#{ex}"
     end
     return nil
   end
@@ -151,4 +151,9 @@ class ResourceManager
     cached_svg
   end
 
+  def load_tiles(filename, tile_width, tile_height)
+    Image.load_tiles @window, GFX_PATH+filename, tile_width, tile_height, true
+  end
+
+
 end

data/lib/gamebox/sound_manager.rb

@@ -5,6 +5,7 @@ class SoundManager
   attr_accessor :sounds, :music
 
   constructor :resource_manager, :config_manager
+  SUPPORTED_AUDIO_EXTS = %w(wav ogg mp3 au aiff caf)
   
   # checks to see if sdl_mixer is availalbe and preloads the sounds and music directories. 
   def setup
@@ -14,7 +15,7 @@ class SoundManager
 
     if @enabled
       @music = {}
-      files = Dir.glob "#{MUSIC_PATH}**"
+      files = Dir.glob "#{MUSIC_PATH}**.{#{SUPPORTED_AUDIO_EXTS.join(',')}}"
       for f in files
         name = File.basename(f)
         begin
@@ -27,7 +28,7 @@ class SoundManager
       end if files
 
       @sounds = {}
-      files = Dir.glob "#{SOUND_PATH}**"
+      files = Dir.glob "#{SOUND_PATH}**.{#{SUPPORTED_AUDIO_EXTS.join(',')}}"
       for f in files
         name = File.basename(f)
         begin

data/lib/gamebox/spatial_hash.rb

@@ -1,14 +1,19 @@
 class SpatialHash
 
-  attr_reader :cell_size, :buckets 
+  attr_reader :cell_size, :buckets, :items, :moved_items
   attr_accessor :auto_resize
 
   def initialize(cell_size, resize = false)
     @cell_size = cell_size.to_f
     @items = {}
-    @total_w = 0
-    @total_h = 0
     @auto_resize = resize
+
+    if @auto_resize
+      @total_w = 0
+      @total_h = 0
+    end
+    @items = {}
+    @buckets = {}
     rehash
   end
 
@@ -18,6 +23,8 @@ class SpatialHash
   end
 
   def rehash
+    @moved_items = {}
+    return
     items = @items
 
     if @auto_resize
@@ -28,10 +35,11 @@ class SpatialHash
 
         @cell_size = (avg_w+avg_h)
       end
+
+      @total_w = 0
+      @total_h = 0
     end
 
-    @total_w = 0
-    @total_h = 0
     @items = {}
     @buckets = {}
     items.values.each do |item|
@@ -39,24 +47,53 @@ class SpatialHash
     end
   end
 
+  # does not remove or add event handlers
+  def move(item)
+    @moved_items[item] = item
+    _remove item
+    _add item
+  end
+
   def add(item)
+    _add item
+  end
+
+  def _add(item)
     buckets = lookup item
+    @items[item] = buckets
     buckets.each do |bucket|
       x,y = *bucket
       @buckets[x] ||= {}
       @buckets[x][y] ||= []
       target_bucket = @buckets[x][y]
       target_bucket << item 
-      @items[item] = item
-      w = item.width if item.respond_to? :width
-      h = item.height if item.respond_to? :height
-      w ||= 1
-      h ||= 1
-      @total_w += w 
-      @total_h += h 
+
+      if @auto_resize
+        w = item.width if item.respond_to? :width
+        h = item.height if item.respond_to? :height
+        w ||= 1
+        h ||= 1
+        @total_w += w 
+        @total_h += h 
+      end
     end
   end
 
+  def remove(item)
+    @moved_items.delete item
+    _remove item
+  end
+
+  def _remove(item)
+    buckets = @items[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 lookup(item)
     w = item.width if item.respond_to? :width
     h = item.height if item.respond_to? :height
@@ -90,16 +127,6 @@ class SpatialHash
     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
@@ -126,20 +153,22 @@ class SpatialHash
   end
 
   def items_in_bucket_range(min_x,min_y,max_x,max_y)
-    items = []
-    (max_x-min_x+1).times do |i|
-      bucket_x = min_x + i
+    items = {}
+    (min_x+1..(max_x+1)).each do |bucket_x|
       x_bucket = @buckets[bucket_x]
-      have_bucket_x = x_bucket.nil?
 
-      (max_y-min_y+1).times do |j|
-        bucket_y = min_y + j
-        unless have_bucket_x || x_bucket[bucket_y].nil?
-          items << x_bucket[bucket_y]
+      if x_bucket
+        (min_y+1..(max_y+1)).each do |bucket_y|
+          objects = x_bucket[bucket_y]
+          if objects
+            objects.each do |item|
+              items[item] = item
+            end
+          end
         end
       end
     end
-    items.flatten.uniq
+    items.values
   end
 
   # will look dist number of cells around all the cells

data/lib/gamebox/spatial_stagehand.rb

@@ -1,4 +1,4 @@
-require 'spatial_hash'
+
 
 class SpatialStagehand < Stagehand
 
@@ -8,6 +8,8 @@ class SpatialStagehand < Stagehand
   def setup
     merged_opts = DEFAULT_PARAMS.merge opts
     @spatial_actors = SpatialHash.new merged_opts[:cell_size]
+    # TODO
+    # delegate :items, :cell_size, :to => @spatial_actors
   end
 
   def cell_size
@@ -22,23 +24,45 @@ class SpatialStagehand < Stagehand
     @spatial_actors.auto_resize = val
   end
 
+  def auto_resize
+    @spatial_actors.auto_resize
+  end
+  
+  def moved_items
+    @spatial_actors.moved_items.values
+  end
+
+  def items
+    @spatial_actors.items.values
+  end
+
   def buckets
     @spatial_actors.buckets
   end
 
   def add(actor)
-    @spatial_actors.add actor
-    actor.when :remove_me do 
-      @spatial_actors.remove actor
+    # TODO change these to one event? position_changed?
+    # item.when :width_changed do |old_w, new_w|
+    # item.when :height_changed do |old_h, new_h|
+
+    actor.when :x_changed do |old_x, new_x|
+      move actor
+    end
+    actor.when :y_changed do |old_y, new_y|
+      move actor
     end
+    actor.when :remove_me do
+      remove actor
+    end
+    @spatial_actors.add actor
   end
 
   def remove(actor)
     @spatial_actors.remove actor
   end
 
-  def update(time)
-    @spatial_actors.rehash
+  def move(actor)
+    @spatial_actors.move actor
   end
 
   def items_at(x,y)

data/lib/gamebox/spec/helper.rb

@@ -2,13 +2,13 @@
 module GameboxSpecHelpers
 
   def create_actor(type, args = {})
-    InputManager.stub :setup
+    InputManager.any_instance.stubs :setup
     basic_opts = {
-      :stage => @stage = stub.as_null_object,
-      :input => @input_manager = InputManager.new(:config_manager => "config_manager"),
-      :sound => @sound_manager = stub.as_null_object,
-      :director => @director = stub.as_null_object,
-      :resources => @resource_manager = stub.as_null_object
+      stage: @stage = stub_everything,
+      input: @input_manager = InputManager.new(wrapped_screen: 'wrapped_screen', config_manager: 'config_manager'),
+      sound: @sound_manager = stub_everything,
+      director: @director = stub_everything,
+      resources: @resource_manager = stub_everything,
     }.merge(args)
 
     klass = ClassFinder.find(type)
@@ -20,6 +20,6 @@ module GameboxSpecHelpers
 
 end
 
-Spec::Runner.configure do |configuration|
+RSpec.configure do |configuration|
   configuration.include GameboxSpecHelpers
 end

data/lib/gamebox/stage.rb

@@ -1,10 +1,3 @@
-require 'inflector'
-require 'publisher'
-require 'director'
-require 'viewport'
-require 'backstage'
-require 'arbiter'
-
 # Stage is a state that the game is in.  (ie intro stage, multiplayer stage,
 # single player stage).
 class Stage
@@ -79,10 +72,9 @@ class Stage
     @director.update time
     @viewport.update time
     @stagehands.each do |name, stagehand|
-      stagehand.update time if stagehand.respond_to? :update
+      stagehand.update time 
     end
-    # TODO can we change collisions to be a stagehand
-    find_collisions unless @collidable_actors.nil?
+    find_collisions
     update_timers time
   end
 
@@ -119,6 +111,7 @@ class Stage
             rescue Exception => ex
               p drawable.class
               p ex
+              p ex.backtrace
             end
           end
         end
@@ -170,21 +163,27 @@ class Stage
   end
 
   # add block to be executed every interval_ms millis
+  # TODO make this hash based on object => name => block
+  # to clean up the timed behavior
   def add_timer(name, interval_ms, &block)
-    @timers ||= {}
-    @timers[name] = {:count => 0,
+    @new_timers ||= {}
+    @new_timers[name] = {:count => 0,
       :interval_ms => interval_ms, :callback => block}
   end
 
   # update each timers counts, call any blocks that are over their interval
   def update_timers(time_delta)
-    unless @timers.nil?
-      @timers.each do |name, timer_hash|
-        timer_hash[:count] += time_delta
-        if timer_hash[:count] > timer_hash[:interval_ms]
-          timer_hash[:count] -= timer_hash[:interval_ms]
-          timer_hash[:callback].call
-        end
+    # TODO handle overwriting the same timer name...
+    @timers ||= {}
+    if @new_timers
+      @timers.merge!(@new_timers) 
+      @new_timers = nil
+    end
+    @timers.each do |name, timer_hash|
+      timer_hash[:count] += time_delta
+      if timer_hash[:count] > timer_hash[:interval_ms]
+        timer_hash[:count] -= timer_hash[:interval_ms]
+        timer_hash[:callback].call
       end
     end
   end