gamebox 0.0.6 → 0.0.7

data/lib/gamebox/svg_document.rb

@@ -42,7 +42,7 @@ class SvgDocument
       if transform and transform =~ /translate\(\s*(.+?)\s*,\s*(.+?\)\s*)/
         vec2($1.to_f, ty = $2.to_f)
       else
-        ZeroVec2
+        ZERO_VEC_2
       end
     end
   end

data/lib/gamebox/tasks/gamebox_tasks.rb

@@ -1,4 +1,4 @@
-require 'gamebox/platform'
+require 'gamebox/lib/platform'
 
 task :default => :run
 desc "Run the game"

data/lib/gamebox/templates/{test_actor.erb → actor_spec.erb}

@@ -3,8 +3,8 @@ require '<%= Inflector.underscore @actor_name %>'
 
 describe 'a new <%= @actor_name %>' do
   before do 
-    opts = {:level=>"level", :input=>"input", :resources=>"resource"}
-    @test_me = <%= @actor_name %>.new opts
+#    opts = {:stage=>"stage", :input=>"input", :resources=>"resource"}
+#    @test_me = <%= @actor_name %>.new opts
   end
 
   it 'should do something'

data/lib/gamebox/templates/actor_view.erb

@@ -0,0 +1,8 @@
+require 'actor_view'
+
+class <%= @actor_view_name %> < ActorView
+
+  def draw(target,x_off,y_off)
+    # put in custom draw code here using @actor as the model
+  end
+end

data/lib/gamebox/templates/actor_view_spec.erb

@@ -0,0 +1,10 @@
+require 'helper'
+require '<%= Inflector.underscore @actor_view_name %>'
+
+describe 'a new <%= @actor_view_name %>' do
+  before do 
+    #@test_me = <%= @actor_view_name %>.new "stage", "actor"
+  end
+
+  it 'should do something'
+end

data/lib/gamebox/templates/template_app/Rakefile

@@ -21,8 +21,8 @@ end
 
 require 'spec/rake/spectask'
 desc "Run all specs"
-Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_opts = ["-r", "./test/helper"]
-  t.spec_files = FileList['test//test_*.rb']
+Spec::Rake::SpecTask.new('rspec') do |t|
+  t.spec_opts = ["-r", "./spec/helper"]
+  t.spec_files = FileList['spec//*_spec.rb']
 end
-task :test => :specs
+task :test => :rspec

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

@@ -1,5 +1,6 @@
 --- 
 :sound: true
+:auto_quit: :escape
 :fullscreen: false
 :screen_resolution: 
 - 1024

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

@@ -0,0 +1,2 @@
+:stages: 
+  - :demo:

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

@@ -4,5 +4,6 @@ require 'rubygems'
 
 app_root = File.join(File.dirname(__FILE__),'..')
 $: << app_root
-require 'config/environment'
+$: << File.join(app_root,'config')
+require 'environment'
 require 'gamebox_generator'

data/lib/gamebox/templates/template_app/src/{demo_level.rb → demo_stage.rb}

@@ -1,7 +1,8 @@
-require 'level'
+require 'stage'
 require 'ftor'
-class DemoLevel < Level
+class DemoStage < Stage
   def setup
+    super
     @my_actor = create_actor :my_actor
     @my_actor.x = 10
     @my_actor.y = 10
@@ -10,11 +11,12 @@ class DemoLevel < Level
     20.times { @stars << Ftor.new(rand(viewport.width),rand(viewport.height)) }
   end
 
-  def draw(target, x_off, y_off)
+  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

@@ -1,21 +1,19 @@
 class Game
 
   constructor :wrapped_screen, :input_manager, :sound_manager,
-    :mode_manager
+    :stage_manager
 
   def setup
-#    @sound_manager.play :current_rider
-
-    @mode_manager.change_mode_to :default
+    @stage_manager.change_stage_to :demo
   end
 
   def update(time)
-    @mode_manager.update time
+    @stage_manager.update time
     draw
   end
 
   def draw
-    @mode_manager.draw @wrapped_screen
+    @stage_manager.draw @wrapped_screen
     @wrapped_screen.flip
   end
 

data/lib/gamebox/version.rb

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

data/lib/gamebox/viewport.rb

@@ -8,7 +8,7 @@ class Viewport
   can_fire :scrolled
   
   attr_accessor :x_offset, :y_offset, :follow_target, :width,
-    :height
+    :height, :x_offset_range, :y_offset_range
 
   def debug
     "xoff:#{@x_offset} yoff:#{@y_offset}"
@@ -23,13 +23,13 @@ class Viewport
   end
 
   def x_offset(layer=1)
-    return 0 if layer == Float::Infinity
+    return 0 if layer == Float::INFINITY
     return @x_offset if layer == 1
     @x_offset / layer
   end
 
   def y_offset(layer=1)
-    return 0 if layer == Float::Infinity
+    return 0 if layer == Float::INFINITY
     return @y_offset if layer == 1
     @y_offset / layer
   end
@@ -37,28 +37,37 @@ class Viewport
   def update(time)
     scrolled = false
     if @follow_target
-      x_diff = @width/2 + @follow_offset_x - @follow_target.x - @x_offset
+      x = @follow_target.x
+      y = @follow_target.y
+      if @x_offset_range
+        x = @x_offset_range.min if @x_offset_range.min > x 
+        x = @x_offset_range.max if @x_offset_range.max < x 
+      end
+      if @y_offset_range
+        y = @y_offset_range.min if @y_offset_range.min > y 
+        y = @y_offset_range.max if @y_offset_range.max < y 
+      end
+      x_diff = @width/2 + @follow_offset_x - x - @x_offset
       if x_diff.abs > @buffer_x
         # move screen 
         if x_diff > 0
           @x_offset += x_diff - @buffer_x 
-          scrolled = true
         else
           @x_offset += x_diff + @buffer_x 
-          scrolled = true
         end
+        scrolled = true
       end
 
-      y_diff = @height/2 + @follow_offset_y - @follow_target.y - @y_offset
+
+      y_diff = @height/2 + @follow_offset_y - y - @y_offset
       if y_diff.abs > @buffer_y
         # move screen
         if y_diff > 0
           @y_offset += y_diff - @buffer_y 
-          scrolled = true
         else
           @y_offset += y_diff + @buffer_y 
-          scrolled = true
         end
+        scrolled = true
       end
 
       fire :scrolled if scrolled

data/lib/gamebox/{graphical_actor_view.rb → views/graphical_actor_view.rb}

@@ -27,7 +27,19 @@ class GraphicalActorView < ActorView
       end
       
     else
-      img.blit target.screen, [x+x_off,y+y_off]
+      if @actor.is?(:graphical) && @actor.graphical.tiled?
+        x_tiles = @actor.graphical.num_x_tiles
+        y_tiles = @actor.graphical.num_y_tiles
+        img_w, img_h = *img.size
+        x_tiles.times do |col|
+          y_tiles.times do |row|
+            img.blit target.screen, [x+x_off+col*img_w,y+y_off+row*img_h]
+          end
+        end
+      else
+        img.blit target.screen, [x+x_off,y+y_off]
+      end
+
     end
   end
 end

data/lib/gamebox/wrapped_screen.rb

@@ -7,7 +7,8 @@ class WrappedScreen
     flags << HWSURFACE
     flags << DOUBLEBUF
     flags << FULLSCREEN if @config_manager[:fullscreen]
-    @screen = Screen.set_mode [w,h], 0, flags
+    flags << OPENGL if @config_manager[:opengl]
+    @screen = Screen.open [w,h], 0, flags
   end
   def method_missing(name,*args)
     @screen.send name, *args

data/spec/actor_spec.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__),'helper')
+require 'actor'
+require 'behavior'
+
+describe 'A new actor' do
+  before do
+    opts = {:stage=>"stage", :input=>"input", :resources=>"resource"}
+    @actor = Actor.new opts
+  end
+
+  it 'should be alive' do
+    @actor.alive?.should be_true
+  end
+
+  it 'should be at (0,0)' do
+    @actor.x.should equal(0)
+    @actor.y.should equal(0)
+  end
+
+  it 'should have atts set' do
+    @actor.stage.should == "stage" 
+    @actor.input_manager.should == "input" 
+    @actor.resource_manager.should == "resource" 
+    @actor.behaviors.size.should equal(0)
+  end
+
+  it 'should fire anything' do
+    Proc.new {
+      @actor.when :foofoo_bar do
+        "blah"
+      end
+    }.should_not raise_error
+  end
+
+  it 'should inherit parents behaviors' do
+    @shawn = Shawn.new {}
+    @shawn.is?(:smart).should be_true
+  end
+
+  it 'should be able to override parents behaviors' do
+    @james = JamesKilton.new {}
+    @james.is?(:smart).should be_true
+    @james.instance_variable_get('@behaviors')[:smart].instance_variable_get('@opts').should == {:really=>true}
+  end
+
+  it 'should maintain order of behaviors'
+
+end
+class Cool < Behavior; end
+class Smart < Behavior; end
+class Coder < Actor
+  has_behavior :smart, :cool
+end
+class Shawn < Coder; end
+class JamesKilton < Coder
+  has_behavior :smart => {:really => true}
+end

data/{test/test_animated.rb → spec/animated_spec.rb}

@@ -1,12 +1,11 @@
-require 'helper'
+require File.join(File.dirname(__FILE__),'helper')
 require 'animated'
-require 'mocha'
 
 describe 'A new animated behavior' do
   before do
     @rm = stub(:load_animation_set => ['1.png_img_obj','2.png_img_obj'])
 
-    opts = {:level=>"level", :input=>"input", :resources=>@rm}
+    opts = {:stage=>"stage", :input=>"input", :resources=>@rm}
     @actor = Actor.new opts
     @animated = Animated.new @actor
   end
@@ -22,14 +21,14 @@ describe 'A new animated behavior' do
   it 'shouldn\'t update frame for non-animating' do
     @animated.stop_animating
 
-    @animated.update Animated::FRAME_UPDATE_TIME+1
+    @animated.update @animated.frame_update_time+1
 
     @animated.frame_time.should equal(0)
     @animated.frame_num.should equal(0)
   end
 
   it 'should update frame for animating' do
-    time_passed = Animated::FRAME_UPDATE_TIME-1
+    time_passed = @animated.frame_update_time-1
     @animated.update time_passed
     @animated.frame_time.should equal(time_passed)
     @animated.frame_num.should equal(0)
@@ -40,7 +39,7 @@ describe 'A new animated behavior' do
     @animated.frame_time.should equal(1)
     @animated.frame_num.should equal(1)
 
-    time_passed_again = Animated::FRAME_UPDATE_TIME
+    time_passed_again = @animated.frame_update_time
     @animated.update time_passed_again
     # we rolled over the time
     @animated.frame_time.should equal(1)

data/spec/helper.rb

@@ -0,0 +1,24 @@
+here = File.dirname(__FILE__)
+gamebox_root = File.expand_path(File.join(here, '..', 'lib'))
+
+#$LOAD_PATH.unshift File.expand_path(gamebox_root, 'gamebox')
+require 'rubygems'
+require 'spec'
+
+# TODO this lives in both gamebox.rb and here... seems strange
+[
+"gamebox",
+"gamebox/actors", 
+"gamebox/ai", 
+"gamebox/behaviors", 
+"gamebox/generators", 
+"gamebox/lib", 
+"gamebox/tasks", 
+"gamebox/views"
+].each do |path|
+  $LOAD_PATH.unshift File.join(gamebox_root,path)
+end
+
+require 'metaclass'
+require 'actor'
+

data/{test/test_line_of_site.rb → spec/line_of_site_spec.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require File.join(File.dirname(__FILE__),'helper')
 require 'ai/line_of_site'
 require 'ai/two_d_grid_map'
 

data/{test/test_physical.rb → spec/physical_spec.rb}

@@ -1,7 +1,6 @@
-require 'helper'
+require File.join(File.dirname(__FILE__),'helper')
 require 'physical'
 require 'actor'
-require 'mocha'
 
 class CircleActor < Actor
   has_behaviors :physical => {:shape => :circle, 
@@ -11,9 +10,9 @@ end
 
 describe 'A new physical behavior' do
   before do
-    @level = stub(:load_animation_set => ['1.png_img_obj','2.png_img_obj'],:register_physical_object => true)
+    @stage = stub(:load_animation_set => ['1.png_img_obj','2.png_img_obj'],:register_physical_object => true)
 
-    opts = {:level=>@level, :input=>"input", :resources=>"rm"}
+    opts = {:stage=>@stage, :input=>"input", :resources=>"rm"}
     @actor = CircleActor.new opts
     @physical = @actor.physical
   end

data/{test/test_polaris.rb → spec/polaris_spec.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require File.join(File.dirname(__FILE__),'helper')
 require 'ai/polaris'
 require 'ai/two_d_grid_map'
 

data/{test/test_viewport.rb → spec/viewport_spec.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require File.join(File.dirname(__FILE__),'helper')
 require 'viewport'
 
 class Vec
@@ -47,12 +47,12 @@ describe 'A new viewport' do
     @viewport.y_offset(2).should equal(-150)
   end
 
-  it 'should return a zero offset on Infinity' do
+  it 'should return a zero offset on INFINITY' do
     @viewport.x_offset = -200
     @viewport.y_offset = -300
     
-    @viewport.x_offset(Float::Infinity).should equal(0)
-    @viewport.y_offset(Float::Infinity).should equal(0)
+    @viewport.x_offset(Float::INFINITY).should equal(0)
+    @viewport.y_offset(Float::INFINITY).should equal(0)
   end
   
   it 'shouldn\'t update anything unless following a target' do
@@ -87,12 +87,13 @@ describe 'A new viewport' do
   
   it 'should follow a target if target has gone left;up of its buffer' do
     actor = Vec.new 900, 200
+    @viewport.should_receive(:fire).with(:scrolled).twice
     @viewport.follow actor, [0,0], [100,200] 
     
     @viewport.update 100
     actor.x = 810
     actor.y = 10
-    
+
     @viewport.update 100
     @viewport.x_offset.should equal(-500)
     @viewport.y_offset.should equal(100)
@@ -105,8 +106,10 @@ describe 'A new viewport' do
     @viewport.y_offset.should equal(101)
   end
   
-  it 'should fire :scrolled event when targeting an actor' 
+  it 'should fire :scrolled event when targeting an actor' do
+    actor = Vec.new 900, 200
+    @viewport.should_receive(:fire).with(:scrolled)
+    @viewport.follow actor, [0,0], [100,200] 
+  end
   
-  it 'should fire :scrolled event from update when the actor moves'
-
 end