shattered 0.4.0.1 → 0.5.0.1

data/lib/game_loader.rb

@@ -10,6 +10,8 @@ module Shatter #:nodoc:all
 class GameLoader
 	include Singleton
 	attr_writer :environment
+	attr_reader :media_paths, :render_window, :input_manager, :key_manager, :key_converter
+	attr_accessor :current_state
 	
 	# This will recourse into the app/** directories and load all ruby files 
 	# inside those directories.
@@ -18,20 +20,99 @@ class GameLoader
       require(file)
     end
   end
+  
+  # start the game
 	def run
-		load_environment
 		load_all_sources(SHATTERED_ROOT)
+		load_environment
 		
-		eval("#{@environment[:start_state].to_s.camelize}State").new
+		# Create our initial state, as defined by the environment.
+		create_state(@environment[:start_state])
 
-		@control.start_game(@environment)
+		start_game
+	end
+	
+	# Create a state from the given name
+	# :sample creates a new SampleState object
+	def create_state(state_name)
+		state_class = eval("#{state_name.to_s.camelize}State")
+		raise Error, "#{state_class} is not a class" unless state_class.is_a? Class
+		state = state_class.new
+		unless state.is_a? ShatteredState::Base
+			raise Error, "#{state_class} is an invalid State object (not of ShatteredState::Base)" 
+		end
+		return state
 	end
+	
 	def load_environment
-	  view = ShatteredView::Runner.new @environment
-		view.add_to_environment @environment
-		@control = ShatteredState::Runner.new(@environment)
-		ShatteredPack::Configuration.environment=@environment
-		return @environment
+	  #Setup Ogre and the scene for the state
+    raise Error, "Ogre failed to initialize" if !setup_ogre
+		setup_input
+
+		load_resources(@environment[:media])
+	end
+
+	# Given ['app/media', 'media'], searches those directories, recursively, for OGRE media
+  def load_resources(paths)
+  	@media_paths = paths
+  	# setup our resource paths specified in environment.rb
+    Resources.instance.add_resource_paths(*paths)
+    Resources.instance.setup
+	end    
+	
+	#Load the root, setup the render window
+  #TODO: allow for the user to specify whether the window dialogue pops up
+  #further TODO: allow the user to skin the render window dialogue
+  def setup_ogre
+  	# TODO: create platform loader for other platforms
+  	plugins = SHATTERED_ROOT + "/config/ogre_plugins.windows.cfg"
+  	config_save=SHATTERED_ROOT + "/config/ogrerb_defaults.save"
+  	log=SHATTERED_ROOT + "/log/ogrerb.log"
+  	@root = ShatteredOgre.create_root(plugins, config_save, log)
+  	return false if !@root.show_config_dialog
+  	# TODO: allow application name to be set.
+  	@render_window = @root.initialise(true)
+  	
+  	return true
+  end  
+  
+  #Every time this exits, a game dies.
+  def start_game
+    each_frame do |time_elapsed|
+      current_state.update_timers(time_elapsed)
+      @keyboard.capture
+      #@@environment[:input].flush
+    end
+  end
+
+	# Main game loop
+  def each_frame
+  	timer = Ogre::Timer.new
+    while !@environment[:quit] && Ogre::Root::instance.render_one_frame
+    	seconds = timer.get_microseconds / 1000000.0
+	    yield seconds
+      timer.reset
+		end
+	end
+	
+	# Leave the game
+	def quit!
+		@environment[:quit]=true
+	end
+	
+	# load the input manager, the key manager, etc
+	# TODO: Consider how to make input non-exclusive, as well as mouse, etc.
+	# TODO: Investigate any use cases for non-buffered input
+	def setup_input
+		windowHnd = render_window.get_custom_attribute_unsigned_long("WINDOW")
+		@input_manager = OIS::InputManager.create_input_system(
+	{  "WINDOW" => "#{windowHnd}",
+		 "w32_mouse" => ["DISCL_FOREGROUND", "DISCL_NONEXCLUSIVE"],
+		 "w32_keyboard" => ["DISCL_FOREGROUND", "DISCL_NONEXCLUSIVE"]
+	})
+		@keyboard = @input_manager.create_input_object(OIS::OISKeyboard, true)
+		@key_manager = OIS::KeyManager.new(@keyboard)
+		@key_converter = ShatteredPack::KeyConverter.new(@key_manager)
 	end
 end
 end

data/lib/rails_generator.rb

@@ -25,7 +25,7 @@ $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.dirname(__FILE__) + "/../../shattered_support/lib")
 
 begin
-  require 'shattered_support'
+  require 'shattered_support'  
 rescue LoadError
   require 'rubygems'
   require_gem 'shattered_support'

data/lib/rails_generator/base.rb

@@ -14,7 +14,7 @@ require File.dirname(__FILE__) + '/spec'
 # generator and just replaces the code templates with its own.
 #
 # Now go forth and multiply^Wgenerate.
-module Rails #:nodoc:all
+module Rails
   module Generator
     class GeneratorError < StandardError; end
     class UsageError < GeneratorError; end
@@ -144,10 +144,9 @@ module Rails #:nodoc:all
     #
     # See Rails::Generator::Base for a discussion of Manifests and Commands.
     class NamedBase < Base
-      attr_reader   :name, :class_name, :singular_name, :plural_name
+      attr_reader   :name, :class_name, :singular_name, :plural_name, :table_name
       attr_reader   :class_path, :file_path, :class_nesting, :class_nesting_depth
       alias_method  :file_name,  :singular_name
-      alias_method  :table_name, :plural_name
       alias_method  :actions, :args
 
       def initialize(runtime_args, runtime_options = {})
@@ -172,6 +171,7 @@ module Rails #:nodoc:all
           @name = name
           base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name)
           @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
+          @table_name = singular_name
           if @class_nesting.empty?
             @class_name = @class_name_without_nesting
           else

data/lib/rails_generator/commands.rb

@@ -3,7 +3,7 @@ require 'optparse'
 require 'fileutils'
 require 'erb'
 
-module Rails #:nodoc:all
+module Rails
   module Generator
     module Commands
       # Here's a convenient way to get a handle on generator commands.
@@ -16,7 +16,7 @@ module Rails #:nodoc:all
       # Even more convenient access to commands.  Include Commands in
       # the generator Base class to get a nice #command instance method
       # which returns a delegate for the requested command.
-      def self.append_features(base)
+      def self.included(base)
         base.send(:define_method, :command) do |command|
           Commands.instance(command, self)
         end
@@ -55,6 +55,34 @@ module Rails #:nodoc:all
         def readme(*args)
         end
 
+        protected
+          def migration_directory(relative_path)
+            directory(@migration_directory = relative_path)
+          end
+
+          def existing_migrations(file_name)
+            Dir.glob("#{@migration_directory}/[0-9]*_*.rb").grep(/[0-9]+_#{file_name}.rb$/)
+          end
+
+          def migration_exists?(file_name)
+            not existing_migrations(file_name).empty?
+          end
+
+          def current_migration_number
+            Dir.glob("#{@migration_directory}/[0-9]*.rb").inject(0) do |max, file_path|
+              n = File.basename(file_path).split('_', 2).first.to_i
+              if n > max then n else max end
+            end
+          end
+
+          def next_migration_number
+            current_migration_number + 1
+          end
+
+          def next_migration_string(padding = 3)
+            "%.#{padding}d" % next_migration_number
+          end
+
         private
           # Ask the user interactively whether to force collision.
           def force_file_collision?(destination)
@@ -84,10 +112,10 @@ module Rails #:nodoc:all
             begin_mark = template_part_mark(template_options[:begin_mark], template_options[:mark_id])
             end_mark = template_part_mark(template_options[:end_mark], template_options[:mark_id])
             begin_mark + rendered_part + end_mark
-         end
+          end
 
-         def template_part_mark(name, id)
-           "<!--[#{name}:#{id}]-->\n"
+          def template_part_mark(name, id)
+            "<!--[#{name}:#{id}]-->\n"
           end
       end
 
@@ -135,26 +163,34 @@ module Rails #:nodoc:all
 
         # Copy a file from source to destination with collision checking.
         #
-        # The file_options hash accepts :chmod and :shebang options.
+        # The file_options hash accepts :chmod and :shebang and :collision options.
         # :chmod sets the permissions of the destination file:
         #   file 'config/empty.log', 'log/test.log', :chmod => 0664
         # :shebang sets the #!/usr/bin/ruby line for scripts
         #   file 'bin/generate.rb', 'script/generate', :chmod => 0755, :shebang => '/usr/bin/env ruby'
+        # :collision sets the collision option only for the destination file: 
+        #   file 'settings/server.yml', 'config/server.yml', :collision => :skip
         #
         # Collisions are handled by checking whether the destination file
         # exists and either skipping the file, forcing overwrite, or asking
         # the user what to do.
-        def file(relative_source, relative_destination, file_options = {})
+        def file(relative_source, relative_destination, file_options = {}, &block)
           # Determine full paths for source and destination files.
-          source      = source_path(relative_source)
-          destination = destination_path(relative_destination)
+          source              = source_path(relative_source)
+          destination         = destination_path(relative_destination)
+          destination_exists  = File.exists?(destination)
+
+          # If source and destination are identical then we're done.
+          if destination_exists and identical?(source, destination, &block)
+            return logger.identical(relative_destination) 
+          end
 
           # Check for and resolve file collisions.
-          if File.exists?(destination)
+          if destination_exists
 
             # Make a choice whether to overwrite the file.  :force and
             # :skip already have their mind made up, but give :ask a shot.
-            choice = case options[:collision].to_sym #|| :ask
+            choice = case (file_options[:collision] || options[:collision]).to_sym #|| :ask
               when :ask   then force_file_collision?(relative_destination)
               when :force then :force
               when :skip  then :skip
@@ -181,17 +217,16 @@ module Rails #:nodoc:all
           # if block given so templaters may render the source file.  If a
           # shebang is requested, replace the existing shebang or insert a
           # new one.
-          File.open(destination, 'w') do |df|
-            File.open(source) do |sf|
+          File.open(destination, 'wb') do |df|
+            File.open(source, 'rb') do |sf|
               if block_given?
                 df.write(yield(sf))
               else
-                line = sf.gets
                 if file_options[:shebang]
                   df.puts("#!#{file_options[:shebang]}")
-                  df.puts(line) if line !~ /^#!/
-                else
-                  df.puts(line)
+                  if line = sf.gets
+                    df.puts(line) if line !~ /^#!/
+                  end
                 end
                 df.write(sf.read)
               end
@@ -207,6 +242,16 @@ module Rails #:nodoc:all
           system("svn add #{destination}") if options[:svn]
         end
 
+        # Checks if the source and the destination file are identical. If
+        # passed a block then the source file is a template that needs to first
+        # be evaluated before being compared to the destination.
+        def identical?(source, destination, &block)
+          return false if File.directory? destination
+          source      = block_given? ? File.open(source) {|sf| yield(sf)} : IO.read(source)
+          destination = IO.read(destination)
+          source == destination
+        end
+
         # Generate a file for a Rails application using an ERuby template.
         # Looks up and evalutes a template by name and writes the result.
         #
@@ -263,6 +308,14 @@ module Rails #:nodoc:all
           end
         end
 
+        # When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template.
+        def migration_template(relative_source, relative_destination, template_options = {})
+          migration_directory relative_destination
+          migration_file_name = template_options[:migration_file_name] || file_name
+          raise "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}" if migration_exists?(migration_file_name)
+          template(relative_source, "#{relative_destination}/#{next_migration_string}_#{migration_file_name}.rb", template_options)
+        end
+
         private
           # Raise a usage error with an informative WordNet suggestion.
           # Thanks to Florian Gross (flgr).
@@ -369,6 +422,22 @@ end_message
         def complex_template(*args)
           # nothing should be done here
         end
+
+        # When deleting a migration, it knows to delete every file named "[0-9]*_#{file_name}".
+        def migration_template(relative_source, relative_destination, template_options = {})
+          migration_directory relative_destination
+
+          migration_file_name = template_options[:migration_file_name] || file_name
+          unless migration_exists?(migration_file_name)
+            puts "There is no migration named #{migration_file_name}"
+            return
+          end
+
+
+          existing_migrations(migration_file_name).each do |file_path|
+            file(relative_source, file_path, template_options)
+          end
+        end
       end
 
 
@@ -401,6 +470,11 @@ end_message
         def readme(*args)
           logger.readme args.join(', ')
         end
+        
+        def migration_template(relative_source, relative_destination, options = {})
+          migration_directory relative_destination
+          logger.migration_template file_name
+        end
       end
 
       # Update generator's action manifest.

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

@@ -26,7 +26,7 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
       m.file "templates/README",         "README"
 
       # ogre plugins and configuration
-      m.file "templates/configs/ogre_plugins.rcfg", "config/ogre_plugins.rcfg"
+      m.file "templates/configs/ogre_plugins.windows.cfg", "config/ogre_plugins.windows.cfg"
       m.template "templates/configs/ogre.cfg",    "config/ogre.cfg"
       m.template "templates/configs/boot.rb",    "config/boot.rb"
 
@@ -37,15 +37,16 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
       m.file "templates/test/test_helper.rb", "test/test_helper.rb"
       
       # Mac OSX
-      m.file "templates/configs/Mac/shattered.app/Contents/Info.plist", "config/Mac/shattered.app/Contents/Info.plist"
-      m.file "templates/configs/Mac/shattered.app/Contents/MacOS/shattered_mac", "config/Mac/shattered.app/Contents/MacOS/shattered_mac"
-      m.file "templates/configs/Mac/shattered.app/Contents/pbdevelopment.plist", "config/Mac/shattered.app/Contents/pbdevelopment.plist"
-      m.file "templates/configs/Mac/shattered.app/Contents/PkgInfo", "config/Mac/shattered.app/Contents/PkgInfo"
-      m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/InfoPlist.strings", "config/Mac/shattered.app/Contents/Resources/English.lproj/InfoPlist.strings"
-      m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib"
-      m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib"
-      m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib"
-      m.file "templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb", "config/Mac/shattered.app/Contents/Resources/rb_main.rb"
+      # TODO: OSX support needs to be revisited.
+      #m.file "templates/configs/Mac/shattered.app/Contents/Info.plist", "config/Mac/shattered.app/Contents/Info.plist"
+      #m.file "templates/configs/Mac/shattered.app/Contents/MacOS/shattered_mac", "config/Mac/shattered.app/Contents/MacOS/shattered_mac"
+      #m.file "templates/configs/Mac/shattered.app/Contents/pbdevelopment.plist", "config/Mac/shattered.app/Contents/pbdevelopment.plist"
+      #m.file "templates/configs/Mac/shattered.app/Contents/PkgInfo", "config/Mac/shattered.app/Contents/PkgInfo"
+      #m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/InfoPlist.strings", "config/Mac/shattered.app/Contents/Resources/English.lproj/InfoPlist.strings"
+      #m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib"
+      #m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib"
+      #m.file "templates/configs/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib", "config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib"
+      #m.file "templates/configs/Mac/shattered.app/Contents/Resources/rb_main.rb", "config/Mac/shattered.app/Contents/Resources/rb_main.rb"
       
       # Scripts
       %w( generate runner console destroy ).each do |file|
@@ -91,9 +92,8 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
     app/views
     app/media/common/programs
     app/media/common/templates
-    config/Mac/shattered.app/Contents/MacOS
-    config/Mac/shattered.app/Contents/Resources/English.lproj/MainMenu.nib
     doc
+    config
     log
     script
     test/unit

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

@@ -1,3 +1,20 @@
 class <%= class_name %>State < ShatteredState::Base
   key :pressed => :escape, :action => :quit
+
+	def initialize
+		# The different types of scene managers provided by Ogre are:
+		# :general
+		# :terrain
+		# :nature
+		# :paging
+		# :indoor
+  	scene_manager = create_scene_manager :general
+   	
+  	camera = scene_manager.create_camera("camera")
+   	camera.position = v(0,0,-200)
+   	camera.look_at v(0,0,0)
+   
+		viewport = create_viewport(camera)
+  	viewport.set_background_colour Ogre::ColourValue.new(0.8, 0.5, 0.5)
+ end
 end

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

@@ -1,4 +1,7 @@
 class <%= class_name %>View < ShatteredView::Base
-  material "<%= file_name %>_material", :template => "basic", :texture => "<%= file_name %>.png"
-  mesh "<%= file_name %>", :material => :<%= file_name %>_material
+	# View works by executing after any model event
+	# This initialize will work after the model's initialize
+	def initialize
+		mesh = create(:mesh, "<%= class_name %>")
+	end
 end

data/lib/rails_generator/lookup.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec'
 
-class Object #:nodoc:all
+class Object
   class << self
     # Lookup missing generators using const_missing.  This allows any
     # generator to reference another without having to know its location:
@@ -21,23 +21,21 @@ class Object #:nodoc:all
   end
 end
 
-class Dir #:nodoc:all
-  # User home directory lookup adapted from RubyGems.
-  def self.user_home 
-    if ENV['HOME']
-      ENV['HOME']
-    elsif ENV['USERPROFILE']
-      ENV['USERPROFILE']
-    elsif ENV['HOMEDRIVE'] and ENV['HOMEPATH']
-      "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
-    else
-      File.expand_path '~'
-    end
+# User home directory lookup adapted from RubyGems.
+def Dir.user_home
+  if ENV['HOME']
+    ENV['HOME']
+  elsif ENV['USERPROFILE']
+    ENV['USERPROFILE']
+  elsif ENV['HOMEDRIVE'] and ENV['HOMEPATH']
+    "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
+  else
+    File.expand_path '~'
   end
 end
 
 
-module Rails #:nodoc:all
+module Rails
   module Generator
 
     # Generator lookup is managed by a list of sources which return specs
@@ -50,8 +48,7 @@ module Rails #:nodoc:all
     # the generator and how to create it.  A source is anything that
     # yields generators from #each.  PathSource and GemSource are provided.
     module Lookup
-      def self.append_features(base)
-        super
+      def self.included(base)
         base.extend(ClassMethods)
         base.use_component_sources!
       end
@@ -100,7 +97,11 @@ module Rails #:nodoc:all
         # 4.  Builtins.  Model, controller, mailer, scaffold.
         def use_component_sources!
           reset_sources
-          sources << PathSource.new(:app, "#{::SHATTERED_ROOT}/generators") if defined? ::SHATTERED_ROOT
+          if defined? ::SHATTERED_ROOT
+            sources << PathSource.new(:lib, "#{::SHATTERED_ROOT}/lib/generators")
+            sources << PathSource.new(:vendor, "#{::SHATTERED_ROOT}/vendor/generators")
+            sources << PathSource.new(:plugins, "#{::SHATTERED_ROOT}/vendor/plugins/**/generators")
+          end
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
           sources << GemSource.new if Object.const_defined?(:Gem)
           sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")