shattered 0.3 → 0.3.1

data/lib/game_loader.rb

@@ -19,30 +19,27 @@ module Shatter
 class GameLoader
 	include Singleton
 	attr_writer :environment
-  def require_all_files
-    Dir.foreach("#{SHATTERED_ROOT}/app/") do |type|
-      next if File.file?("#{SHATTERED_ROOT}/app/#{type}")
-      next if type =~ /view/ or type =~ /state/
-      Dir.foreach("#{SHATTERED_ROOT}/app/#{type}") do |file|
-        require "#{SHATTERED_ROOT}/app/#{type}/#{file}" if file =~ /\.rb$/
-      end
+	
+	# This will recourse into the app/** directories and load all ruby files inside those directories.
+  def load_all_sources(shattered_root)
+    File.find_by_extension(shattered_root+"/app", "rb").each do |file|
+      require(file)
     end
   end
 	def run
 		view = ShatteredView::Runner.new @environment
 		view.add_to_environment @environment
-		control = ShatteredController::Runner.new @environment
+		control = ShatteredController::Runner.new(@environment)
 		ShatteredSupport::Configuration.environment=@environment
+		load_all_sources(SHATTERED_ROOT)
 		
-		puts "require '#{SHATTERED_ROOT}/app/states/#{@environment[:start_state].to_s}_state'"
     begin
-      eval "require '#{SHATTERED_ROOT}/app/states/#{@environment[:start_state].to_s}_state'"
+      require "#{SHATTERED_ROOT}/app/states/#{@environment[:start_state].to_s}_state"
     rescue StandardError => output
       puts output.message
     end
-		puts  "creating #{@environment[:start_state].to_s.camelize}State.new"
-    
-		eval "#{@environment[:start_state].to_s.camelize}State.new"
+		
+		eval("#{@environment[:start_state].to_s.camelize}State").new
 		control.start_game
 	end
 end

data/lib/rails_generator/generators/applications/shattered_app/shattered_app_generator.rb

@@ -25,11 +25,8 @@ class ShatteredAppGenerator < Rails::Generator::Base
       m.file "templates/Rakefile", "Rakefile"
       m.file "templates/README",         "README"
 
-      # ogre plugins and configuration
-      m.template "templates/configs/plugins.cfg", "config/plugins.cfg"
-      m.template "templates/configs/plugins.linux.cfg", "config/plugins.linux.cfg"
-      m.template "templates/configs/plugins.darwin.cfg", "config/plugins.darwin.cfg"
-      m.template "templates/configs/plugins.win32.cfg", "config/plugins.win32.cfg"
+      # ogre plugins and configuration
+      m.file "templates/configs/ogre_plugins.rcfg", "config/ogre_plugins.rcfg"
       m.template "templates/configs/ogre.cfg",    "config/ogre.cfg"
       m.template "templates/configs/boot.rb",    "config/boot.rb"
 

data/lib/rails_generator/generators/components/state/templates/state.rb

@@ -1,4 +1,3 @@
 class <%= class_name %>State < ShatteredController::State
-  def update(time_elapsed)
-  end
+  key :pressed => :escape, :action => :crash
 end

data/lib/shatter.rb

@@ -1,6 +1,5 @@
 ["shattered_model", "shattered_view","shattered_controller"].each do |component|
   begin
-#    require File.dirname(__FILE__) + "/../../#{component}/lib/#{component}"
     require component
   rescue MissingSourceFile
     require 'rubygems'

data/lib/templates/configs/ogre_plugins.rcfg

@@ -0,0 +1,18 @@
+// The PluginFolder tells Ogre where OgreMain.dll can be found.
+<% if PLATFORM =~ /mswin/ %>
+PluginFolder=<%= SHATTERED_OGRE_DLLS %>
+<% elsif PLATFORM =~ /darwin/ %>
+<% else %>
+PluginFolder=/usr/local/lib/OGRE
+<% end %>
+
+// Each of these plugins loads a seperate subsystem of Ogre.
+<% 
+plugins = %w( RenderSystem_GL RenderSystem_Direct3D9 
+                    Plugin_ParticleFX Plugin_BSPSceneManager 
+                    Plugin_OctreeSceneManager Plugin_CgProgramManager )
+plugins -= ["RenderSystem_Direct3D9"] unless PLATFORM =~ /mswin32/
+%>
+<% plugins.each do |plugin| %>
+Plugin=<%= plugin %>
+<% end %>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: shattered
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2006-04-23
+  version: 0.3.1
+date: 2006-05-16
 summary: "Shattered: The main package tieing together controller, view, and model"
 require_paths: 
   - lib
@@ -94,10 +94,7 @@ files:
   - lib/templates/configs/empty.log
   - lib/templates/configs/Mac
   - lib/templates/configs/ogre.cfg
-  - lib/templates/configs/plugins.cfg
-  - lib/templates/configs/plugins.darwin.cfg
-  - lib/templates/configs/plugins.linux.cfg
-  - lib/templates/configs/plugins.win32.cfg
+  - lib/templates/configs/ogre_plugins.rcfg
   - lib/templates/configs/runner.rb
   - lib/templates/configs/Mac/shattered.app
   - lib/templates/configs/Mac/shattered.app/config

data/lib/templates/configs/Mac/shattered.app/config

@@ -1 +0,0 @@
-link ../../

data/lib/templates/configs/plugins.cfg

@@ -1,16 +0,0 @@
-# Defines plugins to load
-
-# Define plugin folder
-# TODO: Define cross platform way of doing this
-PluginFolder=/usr/local/lib/OGRE
-#PluginFolder=view
-
-# Define D3D rendering implementation plugin
-Plugin=RenderSystem_GL
-#Plugin=RenderSystem_Direct3D7
-#Plugin=RenderSystem_Direct3D9
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
-

data/lib/templates/configs/plugins.darwin.cfg

@@ -1,13 +0,0 @@
-# Defines plugins to load
-    
-# Define plugin folder -- Plugin folder is ignored
-# in Project Builder build -- plugins are found in Resources/
-# in the Main (Application) bundle, then in the Framework bundle
-# PluginFolder=/usr/local/lib/OGRE
-
-# Define D3D rendering implementation plugin
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager

data/lib/templates/configs/plugins.linux.cfg

@@ -1,16 +0,0 @@
-# Defines plugins to load
-
-# Define plugin folder
-# TODO: Define cross platform way of doing this
-PluginFolder=/usr/local/lib/OGRE
-#PluginFolder=view
-
-# Define D3D rendering implementation plugin
-Plugin=RenderSystem_GL
-#Plugin=RenderSystem_Direct3D7
-#Plugin=RenderSystem_Direct3D9
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
-

data/lib/templates/configs/plugins.win32.cfg

@@ -1,9 +0,0 @@
-
-PluginFolder=C:\ruby\lib\ruby\gems\1.8\gems\shattered_ogre-0.3-i386-mswin32\lib\i386-mswin32
-
-Plugin=RenderSystem_GL
-Plugin=RenderSystem_Direct3D9
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager