gamebox 0.0.9 → 0.1.0

data/.gitignore

@@ -4,3 +4,4 @@ pkg
 doc
 coverage
 .DS_Store
+.yardoc

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/docs/gamebox.bat

@@ -0,0 +1,3 @@
+set RUBYOPT=
+bin\rubyw.exe src\src\app.rb
+

data/gamebox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gamebox}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   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-10}
+  s.date = %q{2010-04-24}
   s.default_executable = %q{gamebox}
   s.description = %q{Framework for building and distributing games using Rubygame}
   s.email = %q{shawn42@gmail.com}
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/gamebox",
      "docs/CODE_REVIEW",
+     "docs/gamebox.bat",
      "docs/getting_started.rdoc",
+     "docs/logo.ico",
      "docs/logo.png",
      "gamebox.gemspec",
      "lib/gamebox.rb",
@@ -34,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/gamebox/actor_factory.rb",
      "lib/gamebox/actor_view.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",
@@ -83,6 +86,7 @@ Gem::Specification.new do |s|
      "lib/gamebox/resource_manager.rb",
      "lib/gamebox/sound_manager.rb",
      "lib/gamebox/spatial_hash.rb",
+     "lib/gamebox/spatial_stagehand.rb",
      "lib/gamebox/spec/helper.rb",
      "lib/gamebox/stage.rb",
      "lib/gamebox/stage_manager.rb",
@@ -94,6 +98,7 @@ Gem::Specification.new do |s|
      "lib/gamebox/templates/actor_view.erb",
      "lib/gamebox/templates/actor_view_spec.erb",
      "lib/gamebox/templates/template_app/.gitignore",
+     "lib/gamebox/templates/template_app/Gemfile",
      "lib/gamebox/templates/template_app/README",
      "lib/gamebox/templates/template_app/Rakefile",
      "lib/gamebox/templates/template_app/config/boot.rb",
@@ -126,6 +131,7 @@ Gem::Specification.new do |s|
      "spec/physical_spec.rb",
      "spec/resource_manager_spec.rb",
      "spec/spatial_hash_spec.rb",
+     "spec/stage_manager_spec.rb",
      "spec/stage_spec.rb",
      "spec/viewport_spec.rb"
   ]
@@ -147,6 +153,7 @@ Gem::Specification.new do |s|
      "spec/physical_spec.rb",
      "spec/resource_manager_spec.rb",
      "spec/spatial_hash_spec.rb",
+     "spec/stage_manager_spec.rb",
      "spec/stage_spec.rb",
      "spec/viewport_spec.rb"
   ]

data/lib/gamebox/actors/fps.rb

@@ -0,0 +1,23 @@
+class FpsView < ActorView
+  def draw(target,x_off,y_off)
+    text = @actor.fps.to_s
+    text = '0'*(6-text.size)+text if text.size < 6
+
+    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]
+  end
+end
+class Fps < Actor
+
+  has_behavior :layered => {:layer => 999}
+
+  def fps
+    input_manager.current_framerate.round
+  end
+
+end

data/lib/gamebox/arbiter.rb

@@ -2,18 +2,21 @@
 module Arbiter
 
   def register_collidable(actor)
+    @spatial_hash = stagehand(:spatial)
     @collidable_actors ||= []
     unless @collidable_actors.include? actor
       actor.when :remove_me do 
         unregister_collidable actor
       end
       @collidable_actors << actor 
+      @spatial_hash.add(actor)
     end
   end
 
   def unregister_collidable(actor)
     @collidable_actors ||= []
     @collidable_actors.delete actor
+    @spatial_hash.remove(actor)
   end
 
   def on_collision_of(first_objs, second_objs, &block)
@@ -33,31 +36,46 @@ module Arbiter
     end
   end
 
+  def run_callbacks(collisions)
+    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?
+    end
+  end
+
   def find_collisions
     @collidable_actors ||= []
-    collisions = []
     tmp_collidable_actors = @collidable_actors.dup
+    collisions = {}
 
     @collidable_actors.each do |first|
-
-      tmp_collidable_actors.delete first
+      x = first.x - @spatial_hash.cell_size
+      y = first.y - @spatial_hash.cell_size
+      w = @spatial_hash.cell_size * 3
+      h = w
+      tmp_collidable_actors = @spatial_hash.items_in(x,y,w,h)
 
       tmp_collidable_actors.each do |second|
-        if collide?(first, second)
-          collisions << [first,second]
+        if first != second && collide?(first, second)
+          collisions[second] ||= []
+          if !collisions[second].include?(first)
+            collisions[first] ||= []
+            collisions[first] << second
+          end
         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?
+    unique_collisions = []
+    collisions.each do |first,seconds|
+      seconds.each do |second|
+        unique_collisions << [first,second]
+      end
     end
+    run_callbacks unique_collisions
   end
 
   def collide?(object, other)

data/lib/gamebox/input_manager.rb

@@ -74,6 +74,11 @@ class InputManager
     @clock.target_framerate
   end
 
+  # Returns the current framerate.
+  def current_framerate
+    @clock.framerate
+  end
+
   # This is where the queue gets pumped. This gets called from your game application.
   def main_loop(game)
     catch(:rubygame_quit) do

data/lib/gamebox/lib/publisher_ext.rb

@@ -1,5 +1,12 @@
 module Publisher
   module InstanceMethods
+    def can_fire?(event) 
+      events = self.class.class_eval { @published_events }
+      events = self.class.published_events
+      return true if events == :any_event_is_ok
+      return false unless events and events.include?(event)
+      return true
+    end
     def unsubscribe_all(listener)
       if @subscriptions
         for event in @subscriptions.keys

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].dup.play opts
+        @sounds[what].play opts
       end
     end
   end

data/lib/gamebox/spatial_hash.rb

@@ -1,6 +1,6 @@
 class SpatialHash
 
-  attr_accessor :cell_size
+  attr_reader :cell_size
 
   def initialize(cell_size)
     @cell_size = cell_size.to_f
@@ -8,6 +8,11 @@ class SpatialHash
     @items = []
   end
 
+  def cell_size=(new_size)
+    @cell_size = new_size
+    rehash
+  end
+
   def rehash
     items = @items
     @items = []
@@ -32,10 +37,12 @@ class SpatialHash
   end
 
   def lookup(item)
-    w = 1
-    h = 1
     w = item.width if item.respond_to? :width
     h = item.height if item.respond_to? :height
+
+    w ||= 1
+    h ||= 1
+
     x = item.x
     y = item.y
     min_x, min_y = bucket_for x, y
@@ -82,5 +89,29 @@ class SpatialHash
     end
   end
 
+  def items_in(x,y,w,h)
+    return items_at x, y if ((w.nil? || w == 1) && (h.nil? || w == 1))
+
+    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
+
+    items = []
+    (max_x-min_x+1).times do |i|
+      (max_y-min_y+1).times do |j|
+        bucket_x = min_x + i
+        bucket_y = min_y + j
+        unless @buckets[bucket_x].nil? || @buckets[bucket_x][bucket_y].nil?
+          items << @buckets[bucket_x][bucket_y]
+        end
+      end
+    end
+    items.flatten.uniq
+  end
+
 end
 

data/lib/gamebox/spatial_stagehand.rb

@@ -0,0 +1,37 @@
+require 'spatial_hash'
+
+class SpatialStagehand < Stagehand
+
+  DEFAULT_PARAMS = {
+    :cell_size = 50
+  }
+  def setup
+    merged_opts = DEFAULT_PARAMS.merge opts
+    @spatial_actors = SpatialHash.new merged_opts[:cell_size]
+  end
+
+  def cell_size
+    @spatial_actors.cell_size
+  end
+
+  def add(actor)
+    @spatial_actors.add actor
+  end
+
+  def remove(actor)
+    @spatial_actors.remove actor
+  end
+
+  def update(time)
+    @spatial_actors.rehash
+  end
+
+  def items_at(x,y)
+    @spatial_actors.items_at x, y
+  end
+
+  def items_in(x,y,w,h)
+    @spatial_actors.items_in x, y, w, h
+  end
+
+end

data/lib/gamebox/stage_manager.rb

@@ -63,7 +63,9 @@ class StageManager
       puts "last stage, exiting"
       exit
     end
-    @stages.delete @stage_names[index+1]
+    stage = @stages.delete @stage_names[index+1]
+    @input_manager.clear_hooks stage
+
     change_stage_to @stage_names[index+1], *args
   end
 
@@ -73,14 +75,18 @@ class StageManager
       puts "first stage, exiting"
       exit
     end
-    @stages.delete @stage_names[index-1]
+    stage = @stages.delete @stage_names[index-1]
+    @input_manager.clear_hooks stage
     change_stage_to @stage_names[index-1], *args
   end
 
   def restart_stage(*args)
     current_stage.curtain_dropping *args
     index = @stage_names.index @stage
-    @stages.delete @stage_names[index]
+
+    stage = @stages.delete @stage_names[index]
+    @input_manager.clear_hooks stage
+
     change_stage_to @stage, *args
   end
 

data/lib/gamebox/tasks/gamebox_tasks.rb

@@ -26,6 +26,12 @@ task :debug do |t|
   end
 end
 
+desc "Bundle in all required gems"
+task :bundle do |t|
+  sh "bundle package"
+  sh "bundle install vendor/bundle --disable-shared-gems"
+end
+
 begin
   require 'spec/rake/spectask'
   desc "Run all specs"
@@ -39,3 +45,5 @@ rescue LoadError
   puts "warning: rspec not installed"
   puts "install with gem install rspec"
 end
+
+

data/lib/gamebox/templates/template_app/Gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+gem "gamebox"
+gem "publisher"
+gem "diy"
+gem "rubygame"

data/lib/gamebox/templates/template_app/Rakefile

@@ -14,3 +14,23 @@ STATS_DIRECTORIES = [
   %w(Libraries         lib/),
 ].collect { |name, dir| [ name, "#{APP_ROOT}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 
+namespace :dist do
+  task :vendor do
+    sh 'wget http://github.com/downloads/shawn42/gamebox/vendor.zip; unzip vendor.zip; rm vendor.zip'
+  end
+  task :win do
+    # create dist dir
+    FileUtils.mkdir "dist" unless File.exist? "dist"
+    # pull down windows app shell
+    # expand into place
+    sh 'cd dist; wget http://github.com/downloads/shawn42/gamebox/gamebox_app.zip; unzip gamebox_app.zip; mv gamebox_app/* .; rm gamebox_app.zip; rm -rf gamebox_app'
+
+    # copy config/src/lib/data into dist/src
+    %w{vendor config data }.each do |dir|
+      FileUtils.cp_r dir, File.join('dist','src', dir) if File.exist? dir
+    end
+    FileUtils.cp_r 'src', File.join('dist', 'src')
+
+    # create zip of dist?
+  end
+end

data/lib/gamebox/templates/template_app/config/environment.rb

@@ -1,29 +1,41 @@
-require 'rubygems'
-ADDITIONAL_LOAD_PATHS = []
-ADDITIONAL_LOAD_PATHS.concat %w(
-  src 
-  lib
-  config 
-  ../../lib
-).map { |dir| File.dirname(__FILE__) + "/../" + dir }.select { |dir| File.directory?(dir) }
-
-ADDITIONAL_LOAD_PATHS.each do |path|
-	$:.push path
-end
-
-APP_ROOT = File.dirname(__FILE__) + "/../"
-CONFIG_PATH = APP_ROOT + "config/"
-DATA_PATH =  APP_ROOT + "data/"
-SOUND_PATH =  APP_ROOT + "data/sounds/"
-MUSIC_PATH =  APP_ROOT + "data/music/"
-GFX_PATH =  APP_ROOT + "data/graphics/"
-FONTS_PATH =  APP_ROOT + "data/fonts/"
-
-require 'gamebox'
-
-GAMEBOX_DATA_PATH =  GAMEBOX_PATH + "data/"
-GAMEBOX_SOUND_PATH =  GAMEBOX_PATH + "data/sounds/"
-GAMEBOX_MUSIC_PATH =  GAMEBOX_PATH + "data/music/"
-GAMEBOX_GFX_PATH =  GAMEBOX_PATH + "data/graphics/"
-GAMEBOX_FONTS_PATH =  GAMEBOX_PATH + "data/fonts/"
-
+
+unless ENV['OCRA_EXECUTABLE'].nil?
+  APP_ROOT = "#{File.join(File.dirname($0),"..")}/"
+  Dir.chdir(File.join(File.dirname($0),"..",'src'))
+else
+  APP_ROOT = "#{File.join(File.dirname($0),"..")}/"
+end
+
+gems = Dir[APP_ROOT+"vendor/gems/*"]
+gems.each do |bundled_gem|
+  $:.unshift bundled_gem+"/lib"
+end
+
+ADDITIONAL_LOAD_PATHS = []
+ADDITIONAL_LOAD_PATHS.concat %w(
+  src
+  lib
+  config 
+  ../../lib
+).map { |dir| File.join(APP_ROOT,dir) }
+
+ADDITIONAL_LOAD_PATHS.each do |path|
+	$:.unshift path
+end
+
+
+
+CONFIG_PATH = APP_ROOT + "config/"
+DATA_PATH =  APP_ROOT + "data/"
+SOUND_PATH =  APP_ROOT + "data/sounds/"
+MUSIC_PATH =  APP_ROOT + "data/music/"
+GFX_PATH =  APP_ROOT + "data/graphics/"
+FONTS_PATH =  APP_ROOT + "data/fonts/"
+
+require 'gamebox'
+
+GAMEBOX_DATA_PATH =  GAMEBOX_PATH + "data/"
+GAMEBOX_SOUND_PATH =  GAMEBOX_PATH + "data/sounds/"
+GAMEBOX_MUSIC_PATH =  GAMEBOX_PATH + "data/music/"
+GAMEBOX_GFX_PATH =  GAMEBOX_PATH + "data/graphics/"
+GAMEBOX_FONTS_PATH =  GAMEBOX_PATH + "data/fonts/"

data/lib/gamebox/templates/template_app/src/app.rb

@@ -1,8 +1,6 @@
-#!/usr/bin/env ruby
-$: << "#{File.dirname(__FILE__)}/../config"
-
-require 'environment'
-
-if $0 == __FILE__
-  GameboxApp.run ARGV, ENV
-end
+#!/usr/bin/env ruby
+
+$: << File.join(File.dirname($0),"..","config")
+require 'environment'
+
+GameboxApp.run ARGV, ENV

data/lib/gamebox/version.rb

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

data/lib/gamebox/viewport.rb

@@ -22,6 +22,13 @@ class Viewport
     @height = height
   end
 
+  def scroll(x_delta,y_delta)
+    @x_offset += x_delta
+    @y_offset += y_delta
+
+    fire :scrolled
+  end
+
   def x_offset(layer=1)
     return 0 if layer == Float::INFINITY
     return @x_offset if layer == 1

data/spec/collidable_spec.rb

@@ -11,5 +11,5 @@ describe 'A new collidable behavior' do
 
   it 'should define methods on actor' do
     @actor.respond_to?(:shape).should be_true
- end
+  end
 end

data/spec/helper.rb

@@ -20,5 +20,6 @@ require 'spec'
 end
 
 require 'metaclass'
+require 'constructor'
 require 'actor'
 

data/spec/spatial_hash_spec.rb

@@ -82,6 +82,8 @@ describe 'a new SpacialHash' do
     buckets[1][0].first.should == box
     buckets[1][1].first.should == box
   end
+
+  it 'can find items in a box'
 end
 
 class Point

data/spec/stage_manager_spec.rb

@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__),'helper')
+require 'stage_manager'
+
+describe 'A new stage manager' do
+  before do
+#    opts = {:resource_manager => stub, :actor_factory => stub, :input_manager => stub, 
+#      :sound_manager => stub, :config_manager => stub}
+#    @stage_manager = StageManager.new opts
+  end
+
+  it 'should construct' #do
+#    @stage_manager.should_not be_nil
+#  end
+
+  describe '#prev_stage' do
+    it 'should exit on prev_stage of first stage'
+    it 'should go to prev stage'
+  end
+  describe '#next_stage' do
+    it 'should exit on next_stage of last stage'
+    it 'should go to next stage'
+  end
+  describe '#restart_stage' do
+    it 'should restart the current stage'
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Shawn Anderson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 -04:00
+date: 2010-04-24 00:00:00 -04:00
 default_executable: gamebox
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,9 @@ files:
 - VERSION
 - bin/gamebox
 - docs/CODE_REVIEW
+- docs/gamebox.bat
 - docs/getting_started.rdoc
+- docs/logo.ico
 - docs/logo.png
 - gamebox.gemspec
 - lib/gamebox.rb
@@ -104,6 +106,7 @@ files:
 - lib/gamebox/actor_factory.rb
 - lib/gamebox/actor_view.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
@@ -153,6 +156,7 @@ files:
 - lib/gamebox/resource_manager.rb
 - lib/gamebox/sound_manager.rb
 - lib/gamebox/spatial_hash.rb
+- lib/gamebox/spatial_stagehand.rb
 - lib/gamebox/spec/helper.rb
 - lib/gamebox/stage.rb
 - lib/gamebox/stage_manager.rb
@@ -164,6 +168,7 @@ files:
 - lib/gamebox/templates/actor_view.erb
 - lib/gamebox/templates/actor_view_spec.erb
 - lib/gamebox/templates/template_app/.gitignore
+- lib/gamebox/templates/template_app/Gemfile
 - lib/gamebox/templates/template_app/README
 - lib/gamebox/templates/template_app/Rakefile
 - lib/gamebox/templates/template_app/config/boot.rb
@@ -196,6 +201,7 @@ files:
 - spec/physical_spec.rb
 - spec/resource_manager_spec.rb
 - spec/spatial_hash_spec.rb
+- spec/stage_manager_spec.rb
 - spec/stage_spec.rb
 - spec/viewport_spec.rb
 has_rdoc: true
@@ -240,5 +246,6 @@ test_files:
 - spec/physical_spec.rb
 - spec/resource_manager_spec.rb
 - spec/spatial_hash_spec.rb
+- spec/stage_manager_spec.rb
 - spec/stage_spec.rb
 - spec/viewport_spec.rb