shattered_pack 0.4.0.1 → 0.5.0.1

data/lib/shattered_model.rb

@@ -1,4 +1 @@
-%w(base fuzzy_logic linear_interpolator).each do |dependency|
-  dependency = "shattered_model/#{dependency}"
-  require dependency
-end
+require 'shattered_model/base'

data/lib/shattered_pack/base.rb

@@ -22,7 +22,7 @@ module ShatteredPack #:nodoc:
     
     # Retrieve the current state
     def state 
-      Configuration.environment[:state]
+      Shatter::GameLoader.instance.current_state
     end
     
     # TODO - is this called anymore?

data/lib/shattered_pack/keyboard_input/key_converter.rb

@@ -8,7 +8,7 @@ module ShatteredPack
 		end
 
 		def key_event?( type, key_symbol )
-		  ogre_key_method = "isKey#{type.to_s.capitalize}".to_sym
+		  ogre_key_method = "key_#{type.to_s}?".to_sym
 			return @ogre_input.send(ogre_key_method, self.class.convert(key_symbol))
 		end
 
@@ -26,8 +26,8 @@ module ShatteredPack
 			rescue NameError
 			end
 			@@conversions = {}
-			ShatteredOgre.constants.each do |constant|
-				kc_evaled = eval("ShatteredOgre::#{constant}")
+			OIS.constants.each do |constant|
+				kc_evaled = eval("OIS::#{constant}")
 				@@conversions[kc_evaled] = symbolize(constant[3..-1].downcase) if constant.to_s =~ /^KC_/
 			end
 			return @@conversions

data/lib/shattered_pack/keyboard_input/keyboard_input.rb

@@ -38,8 +38,10 @@ module ShatteredPack
 	  module InstanceMethods
 	    def pre_initialize(options)
 	      # update our keyboard input
+	      key_converter = Shatter::GameLoader.instance.key_converter
 	      timer.every(:frame) do |time_elapsed|
-	        update_input(time_elapsed, ShatteredState::Runner.environment[:input])
+	        #TODO: the environment needs to go away - and the input needs to be grabbed from OIS.
+	        update_input(time_elapsed, key_converter)
         end
 	      super
       end

data/lib/shattered_pack/pre_initialize/pre_initialize.rb

@@ -80,6 +80,7 @@ module ShatteredPack
         end
       end
   
+  		# TODO:  This is bad - this method needs to be refactored and/or nuked.
       def call_object_function(actor, action, params, evaluate_symbols=true)
         begin
           if params.is_a?(Symbol) && evaluate_symbols 
@@ -90,7 +91,11 @@ module ShatteredPack
           puts "  It will try to be evaluated.  Use a string instead."
         end
         begin
-          sendee = eval(actor.to_s)
+        	if(actor.is_a?(String) || actor.is_a?(Symbol))
+          	sendee = eval(actor.to_s)
+        	else
+        		sendee = actor
+      		end
           if(params.is_a? Array)
             sendee.send( action.to_sym, *params )
           else

data/lib/shattered_pack.rb

@@ -1,12 +1,9 @@
 $: << File.expand_path(File.dirname(__FILE__))
 
-%w( base runner ).each do |component|
-  dependency = "shattered_pack/#{component}"
-  require dependency
-end
+require "shattered_pack/base"
 
 require 'shattered_support'
-require 'shattered_ogre'
+require 'shattered_ogrerb'
 require 'shattered_model'
 require 'shattered_view'
 require 'shattered_state'

data/lib/shattered_state/actor/actor.rb

@@ -53,11 +53,15 @@ module ShatteredState
        unless created_by_meta_function
          raise Error, "Use #{name.to_s.camelize}.new instead of actor :#{name} at the instance level" 
        end
+       # Find our actor class using eval (yay)
        begin
-         actor = eval(name.to_s.camelize).new(options)
+       	 actor_class = eval(name.to_s.camelize)
        rescue NameError
          raise Error, "Actor #{name.to_s.camelize} is not defined."
        end
+       
+       # create a new instance of our actor class, and make it accessible to the creator
+       actor = actor_class.new(options)
        attr_reader(name.to_sym, actor)
        
        return actor

data/lib/shattered_state/base.rb

@@ -26,14 +26,9 @@ module ShatteredState
     # The valid options are any public functions within camera that ends in =
     # (such as position=, looking_at=)  See ShatteredView::Camera for more.
     def camera(options = {})
-      before_init_call( 'camera', options )
+      #before_init_call( 'camera', options )
     end
     
-    # This blurs the lines between view and controller.
-    # Valid types are [:box]
-    def sky(type, options = {})
-      before_init_set( "self", { :sky => [type, options[:material]] })
-    end
   end
   # State is the entry point for your shattered game.
   #
@@ -41,10 +36,10 @@ module ShatteredState
   # You can choose your starting state in config/environment.rb
   class Base < ShatteredPack::Base      
     before_init_call :activate_state
-    attr_reader :actors
+    attr_reader :actors, :scene_manager
     
     def activate_state #:nodoc:
-      ShatteredPack::Configuration.environment[:state] = self
+      Shatter::GameLoader.instance.current_state = self
       @actors = []
     end
     
@@ -55,30 +50,50 @@ module ShatteredState
       self.time_elapsed = time_elapsed
       timer.update(time_elapsed)
     end
+  	
+		# The main method for creating new objects,
+		# IE: create(:light)
+    def create(type, *args)
+    	name = nil
+    	name = args[0] unless args.empty?
+    	
+    	object = self.send(:"create_#{type}", name)
+  		return object
+    end
     
     # Returns the camera used in the state. See ShatteredState::ClassMethods#camera
     def camera(*args)
       if args.length == 0
-        return @camera ||= Runner.environment[:camera]
+      	# TODO: We now need to create a camera using Ogre, and bind it
+        # return @camera ||= Runner.environment[:camera]
+        return {}
       end
 
 			options = args[0]
 
 			# Cameras are special, in that we have to have the position
 			# called before looking_at or the view matrix gets way messed up
-			call_object_function :camera, :position=, options.delete(:position) if options.has_key?(:position)
-			call_object_function :camera, :looking_at=, options.delete(:looking_at) if options.has_key?(:looking_at)
+		# TODO: replace with create(:camera)
+		#	call_object_function :camera, :position=, options.delete(:position) if options.has_key?(:position)
+		#	call_object_function :camera, :looking_at=, options.delete(:looking_at) if options.has_key?(:looking_at)
 	
 			# Call the other methods
-      call_object_function_for_each_key(:camera, options)
+		# TODO: uncomment when camera is populated
+    #  call_object_function_for_each_key(:camera, options)
     end
     
-    def sky=(type, material) #:nodoc:
-      Runner.environment[:scene].send("setSky#{type.to_s.capitalize}",material)
-    end
+    # Creates a scene manager for Ogre to use.
+    def create_scene_manager(type)
+    	root = Ogre::Root.instance
+  	  @scene_manager = root.create_scene_manager(ShatteredOgre.translate_to_scene_type(type), "#{root.to_s}.scene_manager(#{type})")
+  	end
+
+		def create_viewport(camera)
+			Shatter::GameLoader.instance.render_window.add_viewport(camera)
+		end
     
     def quit
-      Runner.environment[:quit]=true
+      Shatter::GameLoader.instance.quit!
     end
   end
   

data/lib/shattered_state.rb

@@ -1,4 +1 @@
-%w(runner base).each do |dependency|
-  dependency = "shattered_state/#{dependency}"
-  require dependency
-end
+require 'shattered_state/base'

data/lib/shattered_view/base.rb

@@ -2,8 +2,6 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
   
-require 'mesh/mesh'
-
 module ShatteredView #:nodoc:
 
   class Error < StandardError; end
@@ -18,17 +16,42 @@ module ShatteredView #:nodoc:
     # metafunction is called.
     #  
     # Example:
-    #   material :wall_material, :template => 'normal_map', :texture => 'wall.png', :normal => 'brick_normals.png', :tangent_space => true
+    #   material :wall_material, :template => 'normal_map', :texture => 'wall.png', :normal => 'brick_normals.png'
     #   mesh :wall, :material => :wall_material
     #
-    #  You must make sure that your material name is unique, or Ogre will fail.
+    #  Materials that share the same name will be the same references.
     #
-    #  All rmaterial files are included within media/templates, you can add your own there.
-    #  TODO:  ruby script/generate material (?)
+    #  All rmaterial files are included within a media path, you can add your own there.
     def material(name, options = {})
-      before_init_set "self", {:new_material => [name]}
-      before_init_set name, options
-      before_init_set name, {:create_ogre_material => []}
+      # This is a two step process - first the rmaterials are created.
+      before_init_call :dsl_create, :material, name, options
+      # Secondly, the rmaterials become Ogre::Materials, and are accessed as such.
+    	before_init_call :dsl_create, :material_from_rmaterial, name, {}
+    end
+
+    # Meshes are the foundation for your world.
+    #
+    # They tie in to Ogre's .mesh file format, and display a 3d object onto the screen.
+    #
+    # Shattered has support for loading meshes, creating materials for those meshes (using RMaterials)
+    # and skeletal animation support.
+    #
+    #    class DirtyRubyView
+    #      mesh "dirty_ruby", :position => v(0,0,1)
+    #    end
+    #
+    # When a Mesh is created, all animations found in that mesh are loaded, and added
+    # as functions to that mesh.
+    #
+    # example:  Tim.mesh has animations kick and punch
+    #
+    # after loading Tim.mesh,  View has the Mesh object tim
+    #    tim.kick.play
+    #    tim.animation(:kick).play
+    #
+    # See Rmaterials and Animation for more details.
+    def mesh(name, options = {})
+    	before_init_call :dsl_create, :mesh, name, options
     end
 
 
@@ -61,8 +84,7 @@ module ShatteredView #:nodoc:
     #   Example:  light :flashlight...
 
     def light(name, options = {})
-      before_init_set "self", {:new_light => [name]}
-      before_init_set name, options
+      before_init_call :dsl_create, :light, name, options
     end
 
     #  The following is not yet implemented:
@@ -80,8 +102,16 @@ module ShatteredView #:nodoc:
 
   class Base < ShatteredPack::Base
     attr_accessor :controller, :model
-    attr_reader :lights
-    
+    attr_reader :lights, :children, :meshes
+
+		before_init_call "setup_variables"
+		
+		def setup_variables
+			@children = []
+			@lights = []
+			@meshes = []
+		end
+		    
     def visible=(visible)
       node.visible=(visible)
     end
@@ -90,16 +120,6 @@ module ShatteredView #:nodoc:
       node.rotate(vector, amount)
     end
     
-    def new_material=(name)
-      @materials ||= {}
-      name = name.to_sym
-      @materials[name] = RMaterial.new
-      @materials[name].name=name
-      self.class.send(:define_method, name) do
-        @materials[name]
-      end
-    end
-    
     def define_accessor(array, new_obj, name)
       instance_eval("#{array} ||= {}")
       instance_eval("#{array}[\"#{name}\"] = new_obj")
@@ -111,26 +131,74 @@ module ShatteredView #:nodoc:
       EOF
     end
 
-    def new_light=(name)
-      #define_accessor("@lights", ShatteredView::Light.new, name)
-      @lights ||= {}
-      name = name.to_sym 
-      @lights[name] = Light.new 
+		def scene_manager
+			return state.scene_manager
+		end
+
+		def dsl_create(type, *args)
+			name, options = args
+			create(type, *args) 
+			
+			index = @children.length-1
+      # Create an accessor for the light
       self.class.send(:define_method, name) do 
-        @lights[name] 
+      	@children[index]
       end
+   		call_object_function_for_each_key(@children[index], options)   
+		end
+		
+		# The main method for creating new view objects,
+		# IE: create(:light)
+    def create(type, *args)
+    	object = self.send(:"create_#{type}", *args)
+  		@children << object
+  		return object
     end
+    
+    #Create a light and add it to the lights array
+    def create_light(name, options)
+    	light_number = @lights.length
+    	light = scene_manager.create_light("#{self.to_s}.light(#{light_number})")
+ 			@lights << light
+ 			return light
+  	end
+
+		#Creates a mesh and adds it to the mesh array
+    def create_mesh(name, options)
+    	mesh = Ogre::MeshInstance.new(node, scene_manager, name.to_s+".mesh")
+  		@meshes << mesh
+  		return mesh
+  	end
+
+		#Create a node using the view's node as a parent
+		def create_node(name, options)
+			node.create_child_scene_node
+		end
+		
+		#Create a material and add it to the materials array
+		def create_material(name, options)
+	    @materials ||= {}
+	    #pull the rmaterial from any resource path
+	    file = Resources.instance.find_file("#{options[:template]}.rmaterial")
+      name = name.to_sym
+      
+      @materials[name] = Ogre::RMaterial.new(file)
+      @materials[name].name = name
+    	return @materials[name]
+		end
+		
+		# Changes an RMaterial into a Ogre::Material
+		def create_material_from_rmaterial(name, options)
+			name = name.to_sym
+			@materials[name].parse!
+			@materials[name] = @materials[name].create_ogre_material!
+			return @materials[name]
+		end
 
     def new_particle_system=(name, template) 
       define_accessor("@particle_systems", ShatteredView::ParticleSystem.new(template), name)
     end
-    
-    
-    #Return all of the children attached to this view's scene node
-    def children
-      node.children
-    end
-    
+        
     def position
       node.position
     end
@@ -144,7 +212,7 @@ module ShatteredView #:nodoc:
     end
     
     def node
-      @scene_node ||= Node.new(Node.root)
+      @scene_node ||= scene_manager.root_scene_node.create_child_scene_node
     end
     
   private
@@ -157,7 +225,4 @@ module ShatteredView #:nodoc:
 end
 
 
-ShatteredView::Base.class_eval do
-	include ShatteredView::Mesh
-end
-
+ 

data/lib/shattered_view/camera.rb

@@ -1,7 +1,7 @@
-module ShatteredView
-  class Camera < Node
-    def initialize( scene )
-      @scene_node = scene.getCamera
-    end
-  end
-end
+#module ShatteredView
+#  class Camera < Node
+#    def initialize( scene )
+#      @scene_node = scene.getCamera
+#    end
+#  end
+# end

data/lib/shattered_view/resources.rb

@@ -14,14 +14,24 @@ module ShatteredView
     
     def add_resource_paths(*paths)
       paths.each do |path|
+      	next if path.nil?
         path = SHATTERED_ROOT + "/"+path
         @resource_paths << path
-        each_directory_in_path(path) do |sub_path|
-          ShatteredOgre::ResourceHandler.getSingleton.addResourcePath(sub_path) unless defined? TESTING
+        each_directory_in_path(path) do |sub_path|  
+        	Ogre::ResourceGroupManager.instance.add_resource_location(sub_path, "FileSystem", "General")
         end
       end
     end
     
+    # Called once all resource groups have been added
+    def setup
+    	begin
+				Ogre::ResourceGroupManager::instance.initialise_all_resource_groups
+  		rescue StandardError => bang
+  			puts "WARNING #{bang.message}"
+			end
+  	end
+    
     def destroy_paths
       @resource_paths = []
     end
@@ -43,5 +53,11 @@ module ShatteredView
     def each_directory_in_path(path,&block)
       Dir.each_in_path(path, &block)
     end
+    
+    # find a particular file in the resource paths
+    def find_file(filename)
+      File.find(@resource_paths, filename)
+    end
+
   end
 end

data/lib/shattered_view.rb

@@ -1,8 +1,6 @@
-require 'shattered_ogre'
+require 'shattered_ogrerb'
 require 'shattered_pack'
-raise( ShatteredPack::Error, "Could not find ShatteredOgre (a ShatteredView dependency)" ) unless defined? ShatteredOgre
 
-%w(vector utilities node camera overlay light extensions runner rmaterial base resources).each do |dependency|
-  dependency = "shattered_view/#{dependency}"
-  require dependency
+Dir[File.dirname(__FILE__)+"/shattered_view/**/*.rb"].each do |dependency|
+	require dependency
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: shattered_pack
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.1
-date: 2006-09-12 00:00:00 -06:00
+  version: 0.5.0.1
+date: 2007-06-22 00:00:00 -06:00
 summary: "Shattered Pack: The combination of model/view/controllers and the domain specific language for each."
 require_paths: 
 - lib
@@ -25,47 +25,28 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: []
 
 files: 
 - lib/mock_objects.rb
-- lib/shattered_model.rb
-- lib/shattered_pack.rb
-- lib/shattered_state.rb
-- lib/shattered_view.rb
-- lib/mock_objects/shattered_ogre/input.rb
-- lib/mock_objects/shattered_ogre/light.rb
-- lib/mock_objects/shattered_ogre/mesh.rb
-- lib/mock_objects/shattered_ogre/node.rb
-- lib/mock_objects/shattered_ogre/renderer.rb
-- lib/mock_objects/shattered_ogre/resource_handler.rb
-- lib/mock_objects/shattered_ogre/scene.rb
 - lib/shattered_model/base.rb
-- lib/shattered_model/fuzzy_logic.rb
-- lib/shattered_model/linear_interpolator.rb
+- lib/shattered_model.rb
 - lib/shattered_pack/base.rb
-- lib/shattered_pack/runner.rb
-- lib/shattered_pack/keyboard_input/key_converter.rb
 - lib/shattered_pack/keyboard_input/keyboard_input.rb
+- lib/shattered_pack/keyboard_input/key_converter.rb
 - lib/shattered_pack/pre_initialize/pre_initialize.rb
 - lib/shattered_pack/timer/timed_event.rb
 - lib/shattered_pack/timer/timer.rb
-- lib/shattered_state/base.rb
-- lib/shattered_state/runner.rb
+- lib/shattered_pack.rb
 - lib/shattered_state/actor/actor.rb
+- lib/shattered_state/base.rb
+- lib/shattered_state.rb
 - lib/shattered_view/base.rb
 - lib/shattered_view/camera.rb
-- lib/shattered_view/extensions.rb
-- lib/shattered_view/light.rb
-- lib/shattered_view/node.rb
-- lib/shattered_view/overlay.rb
 - lib/shattered_view/resources.rb
-- lib/shattered_view/rmaterial.rb
-- lib/shattered_view/runner.rb
 - lib/shattered_view/utilities.rb
-- lib/shattered_view/vector.rb
-- lib/shattered_view/mesh/animation.rb
-- lib/shattered_view/mesh/mesh.rb
+- lib/shattered_view.rb
 test_files: []
 
 rdoc_options: []

data/lib/mock_objects/shattered_ogre/input.rb

@@ -1,6 +0,0 @@
-module ShatteredOgre
-  class Input
-    def initialize
-    end
-  end
-end

data/lib/mock_objects/shattered_ogre/light.rb

@@ -1,4 +0,0 @@
-module ShatteredOgre
-  class Light
-  end
-end

data/lib/mock_objects/shattered_ogre/mesh.rb

@@ -1,17 +0,0 @@
-module ShatteredOgre # :nodoc:all
-  class Mesh
-    def initialize(file_name)
-    end
-    def getPosition
-      v(0,0,0)
-    end
-    def setPosition(x)
-    end
-    def getNumberOfAnimations
-      0
-    end
-    def setMaterial(material)
-    end
-    
-  end
-end

data/lib/mock_objects/shattered_ogre/node.rb

@@ -1,17 +0,0 @@
-module ShatteredOgre #:nodoc:all
-  class Node
-    def attachTo(object)
-    end
-    def createChildNode()
-    end
-    def setPosition(v)
-    end
-    def scale(amount)
-    end
-    def setVisible(vis)
-    end
-    def rotate(axis, amount)
-    end
-    
-  end
-end

data/lib/mock_objects/shattered_ogre/renderer.rb

@@ -1,11 +0,0 @@
-module ShatteredOgre
-  class Renderer
-    def initialize
-    end
-    def failed
-      false
-    end
-    def nextFrame
-    end
-  end
-end

data/lib/mock_objects/shattered_ogre/resource_handler.rb

@@ -1,9 +0,0 @@
-module ShatteredOgre
-  class ResourceHandler
-    def self.getSingleton
-      @@resource_handler ||= ResourceHandler.new
-    end
-    def addCustomMaterial(name, material)
-    end
-  end
-end

data/lib/mock_objects/shattered_ogre/scene.rb

@@ -1,28 +0,0 @@
-module ShatteredOgre
-  class Scene
-    def initialize(*args)
-    end
-    def createMesh(*args)
-      Mesh.new("fake")
-    end
-    def self.getSingleton
-      new
-    end
-    def createSceneNode
-      Node.new
-    end
-    def getRootSceneNode
-      Node.new
-    end
-    def createLight
-      ShatteredOgre::Light.new
-    end
-    def hideOverlay(name)
-    end
-    def showOverlay(name)
-    end
-    def getCamera
-      Node.new
-    end
-  end
-end