gamebox 0.2.1 → 0.3.2

data/lib/gamebox/stage_manager.rb

@@ -1,5 +1,3 @@
-require 'inflector'
-require 'stage'
 class StageManager
 
   constructor :resource_manager, :actor_factory, :input_manager,
@@ -53,6 +51,10 @@ class StageManager
     stage_instance.when :restart_stage do |*args|
       restart_stage *args
     end
+    stage_instance.when :change_stage do |stage_name, *args|
+      switch_to_stage stage_name, *args
+    end
+
     
     stage_instance
   end
@@ -63,10 +65,8 @@ class StageManager
       puts "last stage, exiting"
       exit
     end
-    stage = @stages.delete @stage_names[index+1]
-    @input_manager.clear_hooks stage
 
-    change_stage_to @stage_names[index+1], *args
+    switch_to_stage @stage_names[index+1], *args
   end
 
   def prev_stage(*args)
@@ -75,33 +75,22 @@ class StageManager
       puts "first stage, exiting"
       exit
     end
-    stage = @stages.delete @stage_names[index-1]
-    @input_manager.clear_hooks stage
-    change_stage_to @stage_names[index-1], *args
+
+    switch_to_stage @stage_names[index-1], *args
   end
 
   def restart_stage(*args)
     current_stage.curtain_dropping *args
     index = @stage_names.index @stage
 
-    stage = @stages.delete @stage_names[index]
-    @input_manager.clear_hooks stage
-
-    change_stage_to @stage, *args
+    switch_to_stage @stage, *args
   end
 
-  def change_stage_to(stage, *args)
-    @prev_stage = @stages[@stage]
-    unless @prev_stage.nil?
-      @prev_stage.curtain_dropping *args
-    end
-    @stage = stage
-    @stage_args = args
-    unless @stages[@stage]
-      @stages[@stage] = create_stage(@stage, @stage_opts[@stage_names.index(@stage)])
-    end
-    @stages[@stage].curtain_raising *args
+  def switch_to_stage(stage_name, *args)
+    shutdown_current_stage *args
+    activate_new_stage stage_name, *args
   end
+  alias :change_stage_to :switch_to_stage
 
   def current_stage
     @stages[@stage]
@@ -114,4 +103,25 @@ class StageManager
   def draw(target)
     @stages[@stage].draw target unless @stages[@stage].nil?
   end
+
+  private
+
+  def activate_new_stage(stage_name, *args)
+    @stage = stage_name
+    @stage_args = args
+    @stages[@stage] = create_stage(@stage, @stage_opts[@stage_names.index(@stage)])
+    @stages[@stage].curtain_raising *args
+  end
+
+  def shutdown_current_stage(*args)
+    if @stage and @stages and @stages[@stage]
+      current_stage = @stages[@stage]
+      current_stage.curtain_dropping *args
+      @input_manager.clear_hooks(current_stage)
+      @stages.delete @stage
+      @stage = nil
+      @stage_args = nil
+    end
+  end
+
 end

data/lib/gamebox/stagehand.rb

@@ -8,4 +8,7 @@ class Stagehand
 
   def setup
   end
+
+  def update(time)
+  end
 end

data/lib/gamebox/svg_document.rb

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

data/lib/gamebox/tasks/gamebox_tasks.rake

@@ -0,0 +1,133 @@
+require 'gamebox/lib/platform'
+
+desc "Run the game"
+task :run do |t|
+  sh "bundle exec ruby src/app.rb"
+end 
+task :default => :run
+
+desc "Report code statistics (KLOCs, etc) from the application"
+task :stats do
+  require 'gamebox/lib/code_statistics'
+  CodeStatistics.new(*STATS_DIRECTORIES).to_s
+end
+
+
+desc "Run the game with debug server"
+task :debug do |t|
+  sh "ruby src/app.rb -debug-server"                                         
+end
+
+desc "Bundle in all required gems"
+task :bundle do |t|
+  sh "bundle package"
+  sh "bundle install vendor/bundle --disable-shared-gems"
+end
+
+desc "Run specs"
+task :spec do
+  begin
+    require 'rspec/core/rake_task'
+
+    RSpec::Core::RakeTask.new(:specz) do |t|
+      # t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+      # Put spec opts in a file named .rspec in root
+    end
+    Rake::Task[:specz].execute
+  rescue LoadError
+    puts "warning: rspec not installed"
+    puts "install with gem install rspec"
+  end
+end
+
+
+namespace :dist do
+  desc "Build a .app for your gamebox game"
+  task :mac do
+    GAME_NAME = "UntitledGame" unless defined?(GAME_NAME)
+    # DL template os x app
+    remote_file = "gosu-mac-wrapper-#{Gosu::VERSION}.tar.gz"
+    mac_build = "build/mac"
+    local_file = "#{mac_build}/#{remote_file}"
+
+    require 'net/http'
+    mkdir_p mac_build
+    # if false
+      Net::HTTP.start("www.libgosu.org") do |http|
+        resp = http.get("/downloads/#{remote_file}")
+        open(local_file, "wb") { |file| file.write(resp.body) } 
+      end
+    # end
+
+    # Expand it
+    root = pwd
+    cd mac_build
+    `tar xzf #{remote_file}`
+    app_name = "#{GAME_NAME}.app"
+    contents = "#{app_name}/Contents"
+    resources = "#{contents}/Resources"
+    dot_app_lib = "#{resources}/lib"
+    gem_vendored = "#{mac_build}/#{resources}/gems"
+
+    mv 'RubyGosu App.app', app_name
+    %w(config data src).each do |src|
+      cp_r "../../#{src}", resources
+    end
+
+    # TODO remove chingu / chipmunk / etc
+    clean_em_out = %w(chingu chingu.rb).map{|it| "#{dot_app_lib}/#{it}"}
+    rm_rf clean_em_out#, :verbose => true, :noop => true
+
+    cd root
+    p `bundle --system package`
+    p `bundle package`
+    p `bundle --deployment` 
+    mkdir_p gem_vendored
+    rejects = %w(chipmunk gosu)
+    Dir["vendor/bundle/ruby/**/gems/**/lib"].each do |gemmy|
+      cp_r gemmy, gem_vendored unless rejects.any?{|exclude| gemmy.match exclude}
+    end
+
+    cd mac_build
+    File.open "#{resources}/Main.rb", "w+" do |main|
+      main.puts <<-EOS
+      $: << "\#{File.dirname(__FILE__)}/config"
+
+      $: << "\#{File.dirname(__FILE__)}/gems/lib"
+
+      rejects = %w(spec src/app.rb vendor Main.rb)
+      ok_dirs = %w(config gems src)
+      REQUIRE_ALLS = ok_dirs.map{|dir| Dir.glob("\#{dir}/*.rb").reject{ |f| rejects.any?{|exclude| f.match exclude}}}.flatten
+      
+      require 'environment'
+
+      GameboxApp.run ARGV, ENV
+      EOS
+    end
+
+    # modify plist file
+    # UntitledGame
+    cd "#{GAME_NAME}.app/Contents"
+    plist = File.open("Info.plist").read
+    File.open("Info.plist", 'w+') do |f|
+      f.puts plist.gsub "UntitledGame", GAME_NAME
+    end
+  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/actor.erb

@@ -1,5 +1,3 @@
-require 'actor'
-
 class <%= @actor_name %> < Actor
   <% if @behaviors %>
       has_baviors <%= @behaviors.join "," %> 

data/lib/gamebox/templates/actor_view.erb

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

data/lib/gamebox/templates/template_app/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
+gem 'chipmunk'
+gem 'require_all'
 gem "gamebox"
-gem "publisher"
 gem "diy"
-gem "gosu"
+gem "rspec"

data/lib/gamebox/templates/template_app/Rakefile

@@ -4,18 +4,13 @@ confdir = File.dirname(__FILE__)+"/config"
 $: << confdir
 
 require 'environment'
-require 'gamebox/tasks/gamebox_tasks'
+$: << GAMEBOX_PATH
+load "tasks/gamebox_tasks.rake"
 STATS_DIRECTORIES = [
   %w(Source            src/), 
   %w(Config            config/), 
   %w(Maps              maps/), 
   %w(Unit\ tests       specs/),
   %w(Libraries         lib/),
-].collect { |name, dir| [ name, "#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  require 'code_statistics'
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
+].collect { |name, dir| [ name, "#{APP_ROOT}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 

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

@@ -1,29 +1,4 @@
-
-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
-
-
+APP_ROOT = "#{File.join(File.dirname(__FILE__),"..")}/"
 
 CONFIG_PATH = APP_ROOT + "config/"
 DATA_PATH =  APP_ROOT + "data/"
@@ -32,24 +7,17 @@ MUSIC_PATH =  APP_ROOT + "data/music/"
 GFX_PATH =  APP_ROOT + "data/graphics/"
 FONTS_PATH =  APP_ROOT + "data/fonts/"
 
-require 'rubygems'
+require 'gamebox'
 
-# 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)
+[GAMEBOX_PATH, APP_ROOT, File.join(APP_ROOT,'src')].each{|path| $: << path }
+require "gamebox_application"
 
-require 'gamebox'
+require_all Dir.glob("**/*.rb").reject{ |f| f.match("spec") || f.match("src/app.rb")}
 
 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/"
+
+GAME_NAME = "UntitledGame"

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

@@ -1,8 +1,7 @@
-require 'stage'
 class DemoStage < Stage
   def setup
     super
-    @my_actor = create_actor :my_actor, :x => 10, :y => 10
+    @my_actor = spawn :my_actor, :x => 10, :y => 10
   end
 
   def draw(target)

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

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

data/lib/gamebox/version.rb

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

data/lib/gamebox/viewport.rb

@@ -1,6 +1,3 @@
-require 'numbers_ext'
-require 'publisher'
-
 # Viewport represents the current "camera" location.  Essensially it translates from
 # world to screen coords and from screen coords to world coords.
 class Viewport
@@ -8,13 +5,16 @@ class Viewport
   can_fire :scrolled
   
   attr_accessor :x_offset, :y_offset, :follow_target, :width,
-    :height, :x_offset_range, :y_offset_range
+    :height, :x_offset_range, :y_offset_range, :boundary
+
+  attr_reader :speed
 
   def debug
     "xoff:#{@x_offset} yoff:#{@y_offset}"
   end
 
   def initialize(width, height)
+    @speed = 1
     @x_offset = 0
     @y_offset = 0
 
@@ -29,6 +29,16 @@ class Viewport
     fire :scrolled
   end
 
+  def speed=(new_speed)
+    if new_speed > 1
+      @speed = 1
+    elsif new_speed < 0
+      @speed = 0
+    else
+      @speed = new_speed
+    end
+  end
+
   def x_offset(layer=1)
     return 0 if layer == Float::INFINITY
     return @x_offset if layer == 1
@@ -58,10 +68,11 @@ class Viewport
       if x_diff.abs > @buffer_x
         # move screen 
         if x_diff > 0
-          @x_offset += x_diff - @buffer_x 
+          @x_offset += (x_diff - @buffer_x) * @speed
         else
-          @x_offset += x_diff + @buffer_x 
+          @x_offset += (x_diff + @buffer_x) * @speed
         end
+
         scrolled = true
       end
 
@@ -70,17 +81,36 @@ class Viewport
       if y_diff.abs > @buffer_y
         # move screen
         if y_diff > 0
-          @y_offset += y_diff - @buffer_y 
+          @y_offset += (y_diff - @buffer_y) * @speed
         else
-          @y_offset += y_diff + @buffer_y 
+          @y_offset += (y_diff + @buffer_y) * @speed
         end
         scrolled = true
       end
 
+      # constrain_x_offset
+      if @boundary
+        if @x_offset > 0 - @boundary[0] # Left-wall bump
+          @x_offset = @boundary[0]
+        elsif @x_offset < @width - @boundary[2] # right-wall bump
+          @x_offset = @width - @boundary[2]
+        end
+      end
+
+      # constrain_y_offset
+      if @boundary
+        if @y_offset > 0 - @boundary[1]
+          @y_offset = @boundary[1]
+        elsif @y_offset < @height - @boundary[3]
+          @y_offset = @height - @boundary[3]
+        end
+      end
+
       fire :scrolled if scrolled
     end
   end
 
+
   def follow(target, off=[0,0], buff=[0,0])
     @follow_target = target
     @follow_offset_x = off[0]
@@ -94,4 +124,10 @@ class Viewport
     fire :scrolled
   end
 
+  def bounds
+    left = -@x_offset
+    top = -@y_offset
+    [left, top, left + @width, top + @height]
+  end
+
 end