shattered_ruby 0.5.0.2 → 0.5.1

data/lib/game_loader.rb

@@ -5,114 +5,149 @@ include ShatteredView
 include ShatteredModel
 
 module Shatter #:nodoc:all
-#This class is loads the view, controller, and model.  It then loads
-#and starts the game based on these.
-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.
-  def load_all_sources(shattered_root)
-    File.find_by_extension(shattered_root+"/app", "rb").each do |file|
-      require(file)
+  #This class is loads the view, controller, and model.  It then loads
+  #and starts the game based on these.
+  class GameLoader
+  	include Singleton
+  	attr_writer :environment
+  	attr_reader :media_paths, :input_manager, :key_manager, :key_converter
+  	attr_accessor :current_state, :render_window
+  	
+  	# 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
-  end
+    
+    # start the game
+  	def run
+  		load_all_sources(SHATTERED_ROOT)
+  		load_environment
+  		
+  		# Create our initial state, as defined by the environment.
+  		create_state(@environment[:start_state])
   
-  # start the game
-	def run
-		load_all_sources(SHATTERED_ROOT)
-		load_environment
-		
-		# Create our initial state, as defined by the environment.
-		create_state(@environment[:start_state])
-
-		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
-	  #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)
+  		start_game
+  	end
   	
-  	return true
-  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
+  	  #Setup Ogre and the scene for the state
+      raise Error, "Ogre failed to initialize" if !setup_ogre
+  		setup_input
+  
+  		load_resources(@environment[:media])
+  	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
+  	# 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|
+  		  Ogre::WindowEventUtilities::message_pump
+        current_state.update_timers(time_elapsed)
+    	  @key_manager.flush
+  		  @keyboard.capture
+      end
+      shutdown!  
     end
+  
+  	# Main game loop
+    def each_frame
+    	timer = Ogre::Timer.new
+      while !@environment[:quit] && Ogre::Root::instance.render_one_frame
+			  return false if @render_window.closed?
+      	seconds = timer.get_microseconds / 1000000.0
+  	    timer.reset
+  		  yield seconds
+      end
+  	end
+  	
+  	# Shutdown Ogre / OIS / Navi
+  	def shutdown!
+	    #@input_manager.destroy_input_object(@mouse)
+			@input_manager.destroy_input_object(@keyboard)
+			#@input_manager.destroy_input_object(@joy_stick)
+    
+    	OIS::InputManager.destroy_input_system(@input_manager)
+			
+		  #NEED TO UNREGISTER THE WINDOW LISTENER HERE!!!!!!!!!!!!
+			
+			@input_manager = nil
+	  end
+  	
+  	# Leave the game
+  	def quit!
+  	  @environment[:quit]=true
+  	end
+  	
+  	# load the input manager, the key manager, etc
+  	# TODO: Investigate any use cases for non-buffered input
+  	def setup_input
+  	  setup_window
+  		@input_manager = OIS::InputManager.create_input_system(@environment[:window])
+  		setup_keyboard
+  	end
+  	
+  	# Creates our window and our window event listener.
+  	def setup_window
+  	  windowHnd = render_window.get_custom_attribute_unsigned_long("WINDOW")
+  		@environment[:window]["WINDOW"] = windowHnd.to_s
+  		#@window_listener = WindowEventsListener.new(@render_window)
+	  end
+	  
+	  # Sets up our keyboard object in buffered mode.
+	  def setup_keyboard
+	    @keyboard = @input_manager.create_input_object(OIS::OISKeyboard, true)
+  		@key_manager = OIS::KeyManager.new(@keyboard)
+  		@key_converter = ShatteredPack::KeyConverter.new(@key_manager)
+    end
+  end
+  
+  # Handle window events - closed and resized
+  # TODO: This class belongs elsewhere...
+  class WindowEventsListener < Ogre::WindowEventListenerProxy
+  	def window_resized(rw)
+  	  # GameLoader.instance.resize(rw)
+  	end
+  	def window_closed(rw)
+  		GameLoader.instance.current_state.quit
+  	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/generators/applications/shattered_app/shattered_app_generator.rb

@@ -27,6 +27,7 @@ class ShatteredAppGenerator < Rails::Generator::Base #:nodoc:all
 
       # ogre plugins and configuration
       m.file "templates/configs/ogre_plugins.windows.cfg", "config/ogre_plugins.windows.cfg"
+      m.file "templates/configs/ogre_plugins.mac.cfg", "config/ogre_plugins.mac.cfg"
       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,31 +1,12 @@
 class <%= class_name %>State < ShatteredState::Base
-  key :pressed => :escape, :action => :quit
-
+  scene_manager :general
+  camera :position => :z*300, :look_at => :zero
+  viewport :color => rgb(0.2, 0.2, 0.2)
+  
+  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
-   	
-   	setup_camera
-   	setup_viewport
+   	# Create scene and actors
 	end
-
-	# Cameras are the renderers of the world.
-	# Scene managers can have many cameras - for example, in a first person racing game you could have
-	# a camera facing forward, and a camera facing backwards, rendering to the rear view window.
-	def setup_camera
-	 	@camera = scene_manager.create_camera("camera")
-	 	@camera.set_near_clip_distance 1
-	 	@camera.set_far_clip_distance 10000
-   	@camera.position = v(0,0,-10)
-   	@camera.look_at v(0,0,0) 
-  end
-  
-  # Viewports are your windows into the world.  
-  # Cameras can have many viewports, but usually the relationship is 1-1.
-  def setup_viewport
-		@viewport = create_viewport(@camera)
-  	@viewport.set_background_colour Ogre::ColourValue.new(0.2, 0.2, 0.2)  
-  end
-
+	
 end

data/lib/tasks/framework.rake

@@ -26,8 +26,7 @@ namespace :shattered do
         end
         mv(Dir.glob("shattered_ruby").first, "shatter")
       end
-    end
-
+    end 
     desc "Lock to latest Shattered Edge or a specific revision with REVISION=X (ex: REVISION=4021) or a tag with TAG=Y (ex: TAG=rel_1-1-0)"
     task :edge do
       $verbose = false

data/lib/templates/configs/ogre_plugins.mac.cfg

@@ -0,0 +1,12 @@
+# Defines plugins to load
+
+# Define plugin folder, not needed for mac
+#PluginFolder=.
+
+# Define D3D rendering implementation plugin
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
+

data/lib/templates/environments/environment.rb

@@ -7,4 +7,11 @@ game[:start_state] = :main_menu
 
 game[:media] = ["app/media"]
 
+# Here you can setup how you would like the window to act.
+# DISCL_NONEXCLUSIVE means the mouse and keyboard are not bound to your program.
+game[:window] = {
+  "w32_mouse" => ["DISCL_FOREGROUND", "DISCL_NONEXCLUSIVE"],
+  "w32_keyboard" => ["DISCL_FOREGROUND", "DISCL_NONEXCLUSIVE"]
+}
+
 Shatter::GameLoader.instance.environment=game

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: shattered_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.2
-date: 2007-07-14 00:00:00 -05:00
+  version: 0.5.1
+date: 2007-08-20 00:00:00 -06:00
 summary: "Shattered: The main package tieing together controller, view, and model"
 require_paths: 
 - lib
@@ -94,6 +94,7 @@ files:
 - lib/templates/configs/boot.rb
 - lib/templates/configs/empty.log
 - lib/templates/configs/ogre.cfg
+- lib/templates/configs/ogre_plugins.mac.cfg
 - lib/templates/configs/ogre_plugins.windows.cfg
 - lib/templates/configs/runner.rb
 - lib/templates/doc