gamebox 0.1.1 → 0.2.1

data/lib/gamebox/stage_manager.rb

@@ -10,7 +10,7 @@ class StageManager
     @backstage = Backstage.new
 
     @actor_factory.stage_manager = self
-    stages = @resource_manager.load_config('stage_config')[:stages]
+    stages = @config_manager.load_config('stage_config')[:stages]
 
     @stage_names = []
     @stage_opts = []

data/lib/gamebox/svg_document.rb

@@ -1,5 +1,6 @@
 require 'rexml/document'
 require 'strscan'
+require 'rect'
 
 class SvgDocument
 

data/lib/gamebox/tasks/gamebox_tasks.rb

@@ -1,14 +1,10 @@
 require 'gamebox/lib/platform'
 
-task :default => :run
 desc "Run the game"
 task :run do |t|
-  if Platform.mac?                                               
-    sh "rsdl src/app.rb"                                          
-  else
-    sh "ruby src/app.rb"                                         
-  end
+  sh "ruby src/app.rb"
 end 
+task :default => :run
 
 desc "Report code statistics (KLOCs, etc) from the application"
 task :stats do
@@ -19,11 +15,7 @@ end
 
 desc "Run the game with debug server"
 task :debug do |t|
-  if Platform.mac?                                               
-    sh "rsdl src/app.rb -debug-server"                                          
-  else
-    sh "ruby src/app.rb -debug-server"                                         
-  end
+  sh "ruby src/app.rb -debug-server"                                         
 end
 
 desc "Bundle in all required gems"
@@ -46,4 +38,24 @@ rescue LoadError
   puts "install with gem install rspec"
 end
 
+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/.gitignore

@@ -4,3 +4,4 @@ fakeroot
 *.o
 *.swp
 crate_boot.h
+.bundle

data/lib/gamebox/templates/template_app/Gemfile

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 gem "gamebox"
 gem "publisher"
 gem "diy"
-gem "rubygame"
+gem "gosu"

data/lib/gamebox/templates/template_app/Rakefile

@@ -3,7 +3,6 @@ $: << libdir
 confdir = File.dirname(__FILE__)+"/config"
 $: << confdir
 
-ENV["RUBYGAME_NOINIT"]="1"
 require 'environment'
 require 'gamebox/tasks/gamebox_tasks'
 STATS_DIRECTORIES = [
@@ -12,25 +11,11 @@ STATS_DIRECTORIES = [
   %w(Maps              maps/), 
   %w(Unit\ tests       specs/),
   %w(Libraries         lib/),
-].collect { |name, dir| [ name, "#{APP_ROOT}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
+].collect { |name, dir| [ name, "#{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
+desc "Report code statistics (KLOCs, etc) from the application"
+task :stats do
+  require 'code_statistics'
+  CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end
+

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

@@ -32,6 +32,20 @@ MUSIC_PATH =  APP_ROOT + "data/music/"
 GFX_PATH =  APP_ROOT + "data/graphics/"
 FONTS_PATH =  APP_ROOT + "data/fonts/"
 
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)
+
 require 'gamebox'
 
 GAMEBOX_DATA_PATH =  GAMEBOX_PATH + "data/"

data/lib/gamebox/templates/template_app/config/game.yml

@@ -1,6 +1,7 @@
 --- 
+:title: My Gamebox Game!
 :sound: true
-:auto_quit: :escape
+:auto_quit: KbEscape
 :fullscreen: false
 :screen_resolution: 
 - 1024

data/lib/gamebox/templates/template_app/script/generate

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-
-ENV["RUBYGAME_NOINIT"]="1"
 app_root = File.join(File.dirname(__FILE__),'..')
 $: << app_root
 $: << File.join(app_root,'config')

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

@@ -1,21 +1,11 @@
 require 'stage'
-require 'rubygame/ftor'
 class DemoStage < Stage
   def setup
     super
-    @my_actor = create_actor :my_actor
-    @my_actor.x = 10
-    @my_actor.y = 10
-
-    @stars = []
-    20.times { @stars << Ftor.new(rand(viewport.width),rand(viewport.height)) }
+    @my_actor = create_actor :my_actor, :x => 10, :y => 10
   end
 
   def draw(target)
-    target.fill [25,25,25,255]
-    for star in @stars
-      target.draw_circle_s([star.x,star.y],1,[255,255,255,255])
-    end
     super
   end
 end

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

@@ -14,7 +14,6 @@ class Game
 
   def draw
     @stage_manager.draw @wrapped_screen
-    @wrapped_screen.flip
   end
 
 end

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

@@ -2,8 +2,8 @@ require 'actor'
 require 'actor_view'
 
 class MyActorView < ActorView
-  def draw(target, x_off, y_off)
-    target.draw_box [@actor.x,@actor.y], [20,20], [240,45,45,255]
+  def draw(target, x_off, y_off, z)
+    target.draw_box @actor.x,@actor.y, 20, 20, [240,45,45,255], 1
   end
 end
 

data/lib/gamebox/version.rb

@@ -1,7 +1,7 @@
 module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     TINY  = 1
 
     ARRAY = [MAJOR, MINOR, TINY]

data/lib/gamebox/views/graphical_actor_view.rb

@@ -1,7 +1,7 @@
 require 'actor_view'
 
 class GraphicalActorView < ActorView
-  def draw(target, x_off, y_off)
+  def draw(target, x_off, y_off, z)
     x = @actor.x
     y = @actor.y
 
@@ -13,25 +13,31 @@ class GraphicalActorView < ActorView
 
     #if @actor.is? :animated or 
     if @actor.is? :physical
-      w,h = *img.size
-      offset_x = x-w/2 + x_off
-      offset_y = y-h/2 + y_off
-      img.blit target.screen, [offset_x,offset_y]
+      img_w = img.width
+      img_h = img.height
+
+      offset_x = x-img_w/2 + x_off
+      offset_y = y-img_h/2 + y_off
+      img.draw_rot offset_x, offset_y, z, @actor.rotation
     else
       graphical_behavior = @actor.graphical if @actor.is? :graphical
       if graphical_behavior && graphical_behavior.tiled?
         x_tiles = graphical_behavior.num_x_tiles
         y_tiles = graphical_behavior.num_y_tiles
-        img_w, img_h = *img.size
+#        img_w, img_h = *img.size
+        img_w = img.width
+        img_h = img.height
         x_tiles.times do |col|
           y_tiles.times do |row|
-            img.blit target.screen, [offset_x+col*img_w,offset_y+row*img_h]
+#            img.blit target.screen, [offset_x+col*img_w,offset_y+row*img_h]
+            img.draw offset_x+col*img_w, offset_y+row*img_h, z
           end
         end
       else
-        img.blit target.screen, [offset_x,offset_y]
+#        img.blit target.screen, [offset_x,offset_y]
+        img.draw offset_x, offset_y, z
       end
-
     end
+    target.draw_line(offset_x,offset_y,offset_x+1,offset_y+1,[255,10,10],z)
   end
 end

data/lib/gamebox/wrapped_screen.rb

@@ -2,15 +2,122 @@ class WrappedScreen
   constructor :config_manager
   attr_accessor :screen
   def setup
-    w,h = @config_manager[:screen_resolution]
-    flags = []
-    flags << HWSURFACE
-    flags << DOUBLEBUF
-    flags << FULLSCREEN if @config_manager[:fullscreen]
-    flags << OPENGL if @config_manager[:opengl]
-    @screen = Screen.open [w,h], 0, flags
+    width, height = *@config_manager[:screen_resolution]
+    fullscreen = @config_manager[:fullscreen]
+    @screen = HookedGosuWindow.new width, height, fullscreen
+    @screen.caption = @config_manager[:title]
   end
+
   def method_missing(name,*args)
     @screen.send name, *args
   end
+
+  def draw_box(x1,y1,x2,y2,color, z)
+    c = convert_color(color)
+    @screen.draw_line x1, y1, c, x2, y1, c, z
+    @screen.draw_line x2, y1, c, x2, y2, c, z
+    @screen.draw_line x2, y2, c, x1, y2, c, z
+    @screen.draw_line x1, y2, c, x1, y1, c, z
+  end
+
+  def draw_line(x1,y1,x2,y2,color, z)
+    c = convert_color(color)
+    @screen.draw_line x1, y1, c, x2, y2, c, z
+  end
+
+  CIRCLE_STEP = 10
+  # is very expensive
+  # cache it if you can somehow
+  def draw_circle(cx,cy,r,color, z)
+    c_color = convert_color(color)
+    
+    x1, y1 = 0, -r
+    circ = 2 * Math::PI * r
+    step = 360 / circ
+    step.step(45, step) { |a|
+      x2, y2 = offset_x(a, r), offset_y(a, r)
+      @screen.draw_line cx + x1, cy + y1, c_color, cx + x2, cy + y2, c_color, z
+      @screen.draw_line cx - x1, cy + y1, c_color, cx - x2, cy + y2, c_color, z
+      @screen.draw_line cx - x1, cy - y1, c_color, cx - x2, cy - y2, c_color, z
+      @screen.draw_line cx + x1, cy - y1, c_color, cx + x2, cy - y2, c_color, z
+      @screen.draw_line cx + y1, cy + x1, c_color, cx + y2, cy + x2, c_color, z
+      @screen.draw_line cx - y1, cy + x1, c_color, cx - y2, cy + x2, c_color, z
+      @screen.draw_line cx - y1, cy - x1, c_color, cx - y2, cy - x2, c_color, z
+      @screen.draw_line cx + y1, cy - x1, c_color, cx + y2, cy - x2, c_color, z
+      x1, y1 = x2, y2
+    }
+    @screen.draw_line cx + x1, cy + y1, c_color, cx - y1, cy - x1, c_color, z
+    @screen.draw_line cx - x1, cy + y1, c_color, cx + y1, cy - x1, c_color, z
+    @screen.draw_line cx - x1, cy - y1, c_color, cx + y1, cy + x1, c_color, z
+    @screen.draw_line cx + x1, cy - y1, c_color, cx - y1, cy + x1, c_color, z
+  end
+
+  # is very expensive
+  # cache it if you can somehow
+  def draw_circle_filled(cx,cy,r,color, z)
+    c_color = convert_color(color)
+
+    x1, y1 = 0, -r
+    circ = 2 * Math::PI * r
+    step = 360 / circ
+    step.step(45, step) { |a|
+      x2, y2 = offset_x(a, r), offset_y(a, r)
+      @screen.draw_quad \
+        cx + x1, cy + y1, c_color, cx + x2, cy + y2, c_color,
+        cx - x2, cy + y2, c_color, cx - x1, cy + y1, c_color, z
+      @screen.draw_quad \
+        cx - x1, cy - y1, c_color, cx - x2, cy - y2, c_color,
+        cx + x2, cy - y2, c_color, cx + x1, cy - y1, c_color, z
+      @screen.draw_quad \
+        cx + y1, cy + x1, c_color, cx + y2, cy + x2, c_color,
+        cx - y2, cy + x2, c_color, cx - y1, cy + x1, c_color, z
+      @screen.draw_quad \
+        cx - y1, cy - x1, c_color, cx - y2, cy - x2, c_color,
+        cx + y2, cy - x2, c_color, cx + y1, cy - x1, c_color, z
+      x1, y1 = x2, y2
+    }
+    @screen.draw_quad \
+      cx + x1, cy + y1, c_color, cx - y1, cy - x1, c_color,
+      cx + y1, cy - x1, c_color, cx - x1, cy + y1, c_color, z
+    @screen.draw_quad \
+      cx - x1, cy - y1, c_color, cx + y1, cy + x1, c_color,
+      cx - y1, cy + x1, c_color, cx + x1, cy - y1, c_color, z
+  end
+
+  def fill_screen(color, z)
+    c = convert_color(color)
+    @screen.draw_quad 0, 0, c, @screen.width, 0, c, 0, @screen.height, c, @screen.width, @screen.height, c, z
+  end
+
+  def fill(x1,y1,x2,y2,color, z)
+    c = convert_color(color)
+    @screen.draw_quad x1, y1, c, x2, y1, c, x1, y2, c, x2, y2, c, z
+  end
+
+  def convert_color(color)
+    @colors ||= {}
+    c = @colors[color]
+    if c.nil?
+      a = color.size == 4 ? color[3] : 255
+      c = Gosu::Color.new a.round, *color[0..2].map{|value|value.round}
+      @colors[color] = c
+    end
+    c
+  end
+
+  def size_text(text, font_file, font_size)
+    @font_cache ||= {}
+    @font_cache[font_file] ||= {}
+    font = @font_cache[font_file][font_size] ||= Font.new(@screen, font_file, font_size)
+
+    return [font.text_width(text),font.height]
+  end
+
+  def render_text(text, font_file, font_size, color)
+    @font_cache ||= {}
+    @font_cache[font_file] ||= {}
+    font = @font_cache[font_file][font_size] ||= Font.new(@screen, font_file, font_size)
+
+    DelayedText.new font, text
+  end
 end

data/load_paths.rb

@@ -0,0 +1,20 @@
+begin
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  begin
+    # bust gem prelude
+    if defined? Gem
+      Gem.cache
+      gem 'bundler'
+    else
+      require 'rubygems'
+    end
+    require 'bundler'
+    Bundler.setup
+  rescue LoadError
+    module Bundler
+      def self.require(*args, &block); end
+      def self.method_missing(*args, &block); end
+    end
+  end
+end

data/script/perf_spatial_hash.rb

@@ -0,0 +1,73 @@
+$: << File.dirname(__FILE__)+"/../lib/gamebox"
+
+require 'spatial_hash'
+require 'new_spatial_hash'
+require 'benchmark'
+
+Shape = Struct.new(:x,:y,:width,:height)
+
+def do_it(hash, num_times, obj_size)
+  num_times.times do |i|
+    hash.add(Shape.new(i,i,obj_size,obj_size))
+  end
+
+  num_times.times do |i|
+    hash.items_at i, i
+  end
+
+  hash.rehash
+  hash.rehash
+  hash.rehash
+  hash.rehash
+
+  num_times.times do |i|
+    hash.items_at i, i
+  end
+end
+
+OldSpatialHash = SpatialHash
+
+Benchmark.bm(60) do|b|
+  
+  @lots = 1_000
+  @small_grid = 5
+  @medium_grid = 80
+
+  @small_object = 2
+  @medium_object = 20
+  @large_object = 100
+
+  impls = %w{old new}
+  impls.each do |impl|
+    klass = ObjectSpace.const_get "#{impl.capitalize}SpatialHash"
+    b.report("#{impl} w/ lots of small objects in small size grid") do
+      hash = klass.new @small_grid, true
+      do_it(hash,@lots, @small_object)
+    end
+
+    b.report("#{impl} w/ lots of medium objects in small size grid") do
+      hash = klass.new @small_grid, true
+      do_it(hash,@lots, @medium_object)
+    end
+
+    b.report("#{impl} w/ lots of small objects in medium size grid") do
+      hash = klass.new @medium_grid, true
+      do_it(hash,@lots, @small_object)
+    end
+
+    b.report("#{impl} w/ lots of medium objects in medium size grid") do
+      hash = klass.new @medium_grid, true
+      do_it(hash,@lots, @medium_object)
+    end
+
+    b.report("#{impl} w/ lots of large objects in small size grid") do
+      hash = klass.new @small_grid, true
+      do_it(hash,@lots, @large_object)
+    end
+    b.report("#{impl} w/ lots of large objects in small size grid no resize") do
+      hash = klass.new @small_grid, false
+      do_it(hash,@lots, @large_object)
+    end
+  end
+
+end