gamebox 0.0.6 → 0.0.7

data/History.txt

@@ -47,3 +47,17 @@
   * added ./script/generate to generate actors (ie ./script/generate actor Foo)
   * migrated all test to use rspec
   * changed clear_hooks to take a listener instance
+
+=== 0.0.7 / 2009-07-04
+
+* New Particle System code in roids
+* Changed license to MIT
+* Bug fixes
+  * added OpenGL option for screen (per jacius request)
+* reorganized code
+* changed :parts to :shapes in the physical behavior
+* merged in jacius' new event system
+* new physics playground example
+* new major ruby platformer example
+* merged Mode/Level into Stage
+* added curtain transitions

data/Manifest.txt

@@ -4,22 +4,28 @@ README.txt
 Rakefile
 TODO.txt
 bin/gamebox
-docs/gamebox04_big.png
 docs/getting_started.rdoc
 docs/logo.png
 lib/gamebox.rb
 lib/gamebox/actor.rb
 lib/gamebox/actor_factory.rb
 lib/gamebox/actor_view.rb
+lib/gamebox/actors/logo.rb
+lib/gamebox/actors/score.rb
+lib/gamebox/actors/svg_actor.rb
 lib/gamebox/ai/line_of_site.rb
 lib/gamebox/ai/polaris.rb
 lib/gamebox/ai/two_d_grid_location.rb
 lib/gamebox/ai/two_d_grid_map.rb
-lib/gamebox/aliasing.rb
-lib/gamebox/animated.rb
 lib/gamebox/behavior.rb
+lib/gamebox/behaviors/animated.rb
+lib/gamebox/behaviors/graphical.rb
+lib/gamebox/behaviors/layered.rb
+lib/gamebox/behaviors/physical.rb
+lib/gamebox/behaviors/updatable.rb
 lib/gamebox/config_manager.rb
 lib/gamebox/console_app.rb
+lib/gamebox/data/config/objects.yml
 lib/gamebox/data/fonts/Asimov.ttf
 lib/gamebox/data/fonts/GAMEBOX_FONTS_GO_HERE
 lib/gamebox/data/graphics/GAMEBOX_GRAPHICS_GO_HERE
@@ -27,68 +33,65 @@ lib/gamebox/data/graphics/logo.png
 lib/gamebox/data/music/GAMEBOX_MUSIC_GOES_HERE
 lib/gamebox/data/sounds/GAMEBOX_SOUND_FX_GO_HERE
 lib/gamebox/director.rb
+lib/gamebox/event_compat.rb
+lib/gamebox/ftor.rb
 lib/gamebox/gamebox_application.rb
 lib/gamebox/gamebox_generator.rb
 lib/gamebox/generators/actor_generator.rb
-lib/gamebox/graphical.rb
-lib/gamebox/graphical_actor_view.rb
-lib/gamebox/inflections.rb
-lib/gamebox/inflector.rb
+lib/gamebox/generators/view_generator.rb
 lib/gamebox/input_manager.rb
-lib/gamebox/layered.rb
-lib/gamebox/level.rb
-lib/gamebox/linked_list.rb
-lib/gamebox/logo.rb
-lib/gamebox/metaclass.rb
-lib/gamebox/mode.rb
-lib/gamebox/mode_manager.rb
-lib/gamebox/numbers_ext.rb
-lib/gamebox/physical.rb
+lib/gamebox/lib/aliasing.rb
+lib/gamebox/lib/diy.rb
+lib/gamebox/lib/inflections.rb
+lib/gamebox/lib/inflector.rb
+lib/gamebox/lib/linked_list.rb
+lib/gamebox/lib/metaclass.rb
+lib/gamebox/lib/numbers_ext.rb
+lib/gamebox/lib/platform.rb
+lib/gamebox/lib/publisher_ext.rb
+lib/gamebox/lib/sorted_list.rb
+lib/gamebox/lib/surface_ext.rb
+lib/gamebox/stage.rb
+lib/gamebox/stage_manager.rb
 lib/gamebox/physical_director.rb
-lib/gamebox/physical_level.rb
+lib/gamebox/physical_stage.rb
 lib/gamebox/physics.rb
-lib/gamebox/platform.rb
-lib/gamebox/publisher_ext.rb
 lib/gamebox/resource_manager.rb
-lib/gamebox/score.rb
-lib/gamebox/sorted_list.rb
 lib/gamebox/sound_manager.rb
-lib/gamebox/surface_ext.rb
-lib/gamebox/svg_actor.rb
 lib/gamebox/svg_document.rb
 lib/gamebox/tasks/gamebox_tasks.rb
 lib/gamebox/templates/actor.erb
+lib/gamebox/templates/actor_spec.erb
+lib/gamebox/templates/actor_view.erb
+lib/gamebox/templates/actor_view_spec.erb
 lib/gamebox/templates/template_app/README
 lib/gamebox/templates/template_app/Rakefile
 lib/gamebox/templates/template_app/config/boot.rb
 lib/gamebox/templates/template_app/config/environment.rb
 lib/gamebox/templates/template_app/config/game.yml
-lib/gamebox/templates/template_app/config/mode_level_config.yml
-lib/gamebox/templates/template_app/config/objects.yml
+lib/gamebox/templates/template_app/config/stage_config.yml
 lib/gamebox/templates/template_app/data/fonts/FONTS_GO_HERE
 lib/gamebox/templates/template_app/data/graphics/GRAPHICS_GO_HERE
 lib/gamebox/templates/template_app/data/music/MUSIC_GOES_HERE
 lib/gamebox/templates/template_app/data/sounds/SOUND_FX_GO_HERE
 lib/gamebox/templates/template_app/doc/README_FOR_APP
 lib/gamebox/templates/template_app/lib/code_statistics.rb
-lib/gamebox/templates/template_app/lib/diy.rb
 lib/gamebox/templates/template_app/lib/platform.rb
 lib/gamebox/templates/template_app/script/generate
 lib/gamebox/templates/template_app/src/app.rb
-lib/gamebox/templates/template_app/src/demo_level.rb
+lib/gamebox/templates/template_app/src/demo_stage.rb
 lib/gamebox/templates/template_app/src/game.rb
 lib/gamebox/templates/template_app/src/my_actor.rb
-lib/gamebox/templates/template_app/test/helper.rb
-lib/gamebox/templates/test_actor.erb
-lib/gamebox/updatable.rb
+lib/gamebox/templates/template_app/spec/helper.rb
 lib/gamebox/version.rb
 lib/gamebox/viewport.rb
+lib/gamebox/views/graphical_actor_view.rb
 lib/gamebox/wrapped_screen.rb
 script/perf_polaris.rb
-test/helper.rb
-test/test_actor.rb
-test/test_animated.rb
-test/test_line_of_site.rb
-test/test_physical.rb
-test/test_polaris.rb
-test/test_viewport.rb
+spec/helper.rb
+spec/actor_spec.rb
+spec/animated_spec.rb
+spec/line_of_site_spec.rb
+spec/physical_spec.rb
+spec/polaris_spec.rb
+spec/viewport_spec.rb

data/README.txt

@@ -19,7 +19,7 @@
 * Rubygame (its dependancies, SDL)
 * constructor gem
 * publisher gem
-* bacon (for gamebox tests)
+* rsepec (for gamebox tests)
 * algorithms gem (optional for line of site and A*)
 
 == INSTALL:
@@ -28,6 +28,6 @@
 
 == LICENSE:
 
-(GPLv2)
+(MIT)
 
 Copyright (c) 2009 Shawn Anderson

data/Rakefile

@@ -3,22 +3,23 @@ gem 'hoe', '>= 2.3.0'
 require 'hoe'
 
 require File.dirname(__FILE__)+'/lib/gamebox/version'
-Hoe.new 'gamebox' do |spec|
-  spec.developer('Shawn Anderson', 'shawn42@gmail.com')
-  spec.author = "Shawn Anderson"
-  spec.description = "Framework for building and distributing games using Rubygame"
-  spec.email = 'shawn42@gmail.com'
-  spec.summary = "Framework for building and distributing games using Rubygame"
-  spec.url = "http://shawn42.github.com/gamebox"
-  spec.version = Gamebox::VERSION::STRING
-  spec.changes = spec.paragraphs_of('History.txt', 10..11).join("\n\n")
-  spec.extra_deps << ['constructor']
-  spec.extra_deps << ['publisher']
-  spec.extra_deps << ['rspec']
-  if spec.extra_rdoc_files
-    spec.extra_rdoc_files << 'docs/getting_started.rdoc' 
+Hoe.spec 'gamebox' do
+  developer('Shawn Anderson', 'shawn42@gmail.com')
+  developer('Jason Roelofs', 'jameskilton@gmail.com')
+  developer('Karlin Fox', 'karlin.fox@gmail.com')
+  description = "Framework for building and distributing games using Rubygame"
+  email = 'shawn42@gmail.com'
+  summary = "Framework for building and distributing games using Rubygame"
+  url = "http://shawn42.github.com/gamebox"
+  self.version = Gamebox::VERSION::STRING
+  changes = paragraphs_of('History.txt', 12..13).join("\n\n")
+  extra_deps << ['constructor']
+  extra_deps << ['publisher']
+  extra_deps << ['rspec']
+  if extra_rdoc_files
+    extra_rdoc_files << 'docs/getting_started.rdoc' 
   end
-  spec.remote_rdoc_dir = ' ' # Release to root
+  remote_rdoc_dir = ' ' # Release to root
 end
 
 STATS_DIRECTORIES = [
@@ -32,11 +33,17 @@ task :stats do
 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']
+desc "Run all rspecs"
+Spec::Rake::SpecTask.new('rspec') do |t|
+  t.spec_files = FileList['spec/*_spec.rb']
 end
-task :test => :specs
+
+desc "Run rcov rspecs"
+Spec::Rake::SpecTask.new('rcov_rspec') do |t|
+  t.spec_files = FileList['spec/*_spec.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'examples']
+end
+task :default => :rspec
 
 # vim: syntax=Ruby

data/TODO.txt

@@ -1,4 +1,7 @@
 planned features:
+add network manager stub
+highscore upload system (use from chingu)
+FIX:add some kind of fade in/out for actors w/ smooth interpolation
 add basic generator for things like actors/levels/etc with tests
 add while key down K_UP callback?
 
@@ -6,17 +9,17 @@ allow easy pausing of game and physics
   - fire :pause event w/ a new Director of actors? 
 change Polaris to return partial path when step max is reached
 update physical objects to use chipmunk_object.rb
-allow for repeating actors (tiles)
-allow overriding of animation timing
- make complex Phyiscal behaviors (made up by a group of shapes/bodies pinned together?)
-	physical objects should have bodies and shapes body/shape should be shorthand for bodies.first/shapes.first
+
+make complex Phyiscal behaviors 
+  - made up by a group of bodies pinned together
+  - easy joints
+physical objects should have bodies and shapes body/shape should be shorthand for bodies.first/shapes.first
   
   - solidify rdocs (including tutorial)
 SVGS
 	create a DynamicPhysicalActor that can be built from external verts
 add nice actor debugging
 add Extra; actor with a short time to live (TTL); useful for special effects (maybe as a behavior)
-add some kind of fade in/out for actors w/ smooth interpolation
 	
 static deployment bundles (crate, love-clone; custom C project)
 	ruby
@@ -27,7 +30,4 @@ AI
 	 state machine
 	 rule based
 optional GUI via rubygoo
-particle system? ParticleGroupActor?
-network manager
-highscore upload system
 gamebox server (content server?)

data/bin/gamebox

@@ -7,6 +7,7 @@ require File.dirname(__FILE__) + '/../lib/gamebox/version'
 def print_version
   puts "Gamebox #{Gamebox::VERSION::STRING}"
 end
+
 def print_usage
   print_version
   puts "Usage:"
@@ -42,7 +43,7 @@ PROJECT_NAME = ARGV[0]
 TARGET_DIR = File.expand_path(Dir.pwd + "/" + PROJECT_NAME)
 SOURCE_DIR = File.expand_path(File.dirname(__FILE__) + "/../lib/gamebox/templates")
 
-Dir.mkdir(TARGET_DIR)
+Dir.mkdir(TARGET_DIR) unless File.exist?(TARGET_DIR) && File.directory?(TARGET_DIR)
 
 # Generate the directory structure for the new application
 # Gems does not pull in empty directories so template_app only
@@ -71,3 +72,8 @@ Dir.glob("**/*").each do |file|
   end
 end
 
+new_file = TARGET_DIR + "/config/gamebox_generator_version.yml"
+File.open(new_file,"w+") do |f|
+  f.write Gamebox::VERSION::ARRAY.to_yaml
+end
+

data/docs/getting_started.rdoc

@@ -31,8 +31,7 @@ The reason I wrote Gamebox is twofold: first, to aid in 48 hour game writing com
 	|   |-- boot.rb
 	|   |-- environment.rb
 	|   |-- game.yml
-	|   |-- mode_level_config.yml
-	|   `-- objects.yml
+	|   `-- stage_config.yml
 	|-- data
 	|   |-- fonts
 	|   |   `-- FONTS_GO_HERE
@@ -40,14 +39,12 @@ The reason I wrote Gamebox is twofold: first, to aid in 48 hour game writing com
 	|   |   `-- GRAPHICS_GO_HERE
 	|   |-- music
 	|   |   `-- MUSIC_GOES_HERE
-	|   |-- sound
 	|   `-- sounds
 	|       `-- SOUND_FX_GO_HERE
 	|-- doc
 	|   `-- README_FOR_APP
 	|-- lib
 	|   |-- code_statistics.rb
-	|   |-- diy.rb
 	|   `-- platform.rb
 	|-- script
 	|-- src
@@ -135,6 +132,6 @@ The animation will cycle through all the numbered png files for the current acti
 Animated and Updatable are just two behaviors available in Gamebox. Other include	graphical, layered, and physical. You can easily add your own game specific behaviors by extending Behavior. (see Wanderer in rague example).
 
 == Levels
-== Modes
+== Stages
 == Physics
 == SVG Levels

data/lib/gamebox.rb

@@ -1,4 +1,15 @@
-$: << File.dirname(__FILE__)+"/gamebox"
+[
+"gamebox",
+"gamebox/actors", 
+"gamebox/ai", 
+"gamebox/behaviors", 
+"gamebox/generators", 
+"gamebox/lib", 
+"gamebox/tasks", 
+"gamebox/views"
+].each do |path|
+  $: << File.dirname(__FILE__)+"/"+path
+end
 
 GAMEBOX_PATH = File.join(File.dirname(__FILE__),"gamebox/")
 require 'gamebox_application'

data/lib/gamebox/actor.rb

@@ -1,12 +1,12 @@
 require 'publisher'
 # Actor represent a game object.
 # Actors can have behaviors added and removed from them. Such as :physical or :animated.
-# They are created and hooked up to their optional View class in Level#create_actor.
+# They are created and hooked up to their optional View class in Stage#create_actor.
 class Actor
   extend Publisher
   can_fire_anything
   
-  attr_accessor :behaviors, :x, :y, :level, :input_manager,
+  attr_accessor :behaviors, :x, :y, :stage, :input_manager,
     :resource_manager, :alive, :opts, :sound_manager, :visible,
     :director
 
@@ -17,7 +17,7 @@ class Actor
     @y = @opts[:y]
     @x ||= 0
     @y ||= 0
-    @level = opts[:level]
+    @stage = opts[:stage]
     @input_manager = opts[:input]
     @sound_manager = opts[:sound]
     @resource_manager = opts[:resources]
@@ -25,10 +25,31 @@ class Actor
     @alive = true
 
     @behaviors = {}
-    # add our classes behaviors
-    class_behaviors = self.class.behaviors.dup
-    for behavior in class_behaviors
-      is behavior
+
+    # add our classes behaviors and parents behaviors
+    klass = self.class
+    actor_klasses = []
+    while klass != Actor
+      actor_klasses << klass
+      klass = klass.superclass
+    end
+
+    behavior_defs = {}
+    ordered_behaviors = []
+    
+    actor_klasses.reverse.each do |actor_klass|
+      actor_behaviors = actor_klass.behaviors.dup
+      actor_behaviors.each do |behavior|
+
+        behavior_sym = behavior.is_a?(Hash) ? behavior.keys.first : behavior
+
+        ordered_behaviors << behavior_sym unless ordered_behaviors.include? behavior_sym
+        behavior_defs[behavior_sym] = behavior
+      end
+    end
+
+    ordered_behaviors.each do |behavior|
+      is behavior_defs[behavior]
     end
     setup
   end
@@ -75,7 +96,8 @@ class Actor
 
   # removed the behavior from the actor.
   def is_no_longer(behavior_sym)
-    @behaviors.delete behavior_sym
+    behavior = @behaviors.delete behavior_sym
+    behavior.removed if behavior
   end
 
   # Calls update on all the actor's behaviors.
@@ -87,7 +109,7 @@ class Actor
 
   # Creates a new actor and returns it. (This actor will automatically be added to the Director.
   def spawn(type, args={})
-    @level.create_actor type, args
+    @stage.create_actor type, args
   end
 
   # Plays a sound via the SoundManager.  See SoundManager for
@@ -141,5 +163,8 @@ class Actor
       end
       @behaviors
     end
+    define_method( :has_behavior ) do |*args|
+      has_behaviors *args
+    end
   end
 end

data/lib/gamebox/actor_factory.rb

@@ -1,31 +1,41 @@
 require 'actor'
 require 'graphical_actor_view'
+
+# ActorFactory is responsible for loading all Actors. It passes along required params such as 
+# stage, input_manager, sound_manager, director, resource_manager. It also creates the ActorView 
+# associated with the Actor and registers it to the Stage be drawn. 
 class ActorFactory
   constructor :input_manager, :sound_manager
 
-  attr_accessor :mode_manager, :director
+  attr_accessor :stage_manager, :director
   
-  # returns a hash of actor params
+  # Returns a hash of actor params {:model_klass=>k, :view_klass=>v}. This is for performance reasons.
   def cached_actor_def(actor)
     @actor_cache ||= {}
     cached_actor = @actor_cache[actor]
     return cached_actor if cached_actor
 
+    
+    model_klass_name = Inflector.camelize actor
     begin
-      require actor.to_s
-      require actor.to_s+"_view"
-    rescue LoadError => ex
-      # maybe its included somewhere else
+      model_klass = Object.const_get model_klass_name
+    rescue NameError
+      # not there yet
+      begin
+        require actor.to_s
+        require actor.to_s+"_view"
+      rescue LoadError => ex
+        # maybe its included somewhere else
+      ensure
+        model_klass = Object.const_get model_klass_name
+      end
     end
-    model_klass_name = Inflector.camelize actor
-    model_klass = Object.const_get model_klass_name
     
     begin
       view_klass = Object.const_get model_klass_name+"View"
     rescue Exception => ex
       # hrm...
     end
-    
     actor_def = {
       :model_klass => model_klass,
       :view_klass => view_klass
@@ -34,16 +44,16 @@ class ActorFactory
     actor_def
   end
 
-  
-  def build(actor, level, opts={})
+  # returns the newly created Actor after it and its ActorView has been created.
+  def build(actor, stage, opts={})
     actor_def = cached_actor_def actor
 
     basic_opts = {
-      :level => level,
+      :stage => stage,
       :input => @input_manager,
       :sound => @sound_manager,
       :director => @director,
-      :resources => level.resource_manager
+      :resources => stage.resource_manager
     }
     merged_opts = basic_opts.merge(opts)
 
@@ -55,7 +65,8 @@ class ActorFactory
     if model.is? :animated or model.is? :graphical or model.is? :physical
       view_klass ||= GraphicalActorView
     end
-    view_klass.new @mode_manager.current_mode, model if view_klass
+    
+    view_klass.new stage, model if view_klass
     
     model.show unless opts[:hide]