shattered_pack 0.5.0.2 → 0.5.1

data/lib/shattered_model/base.rb

@@ -105,6 +105,10 @@ module ShatteredModel #:nodoc:
         raise NoMethodError, "#{self.class} has no method defined '#{method}'" if self.view.nil?
         self.view.send(method, *args, &block)
       end
+      
+      def inspect
+        "#{self.class}:#{self.object_id}"
+      end
     end
 end
 

data/lib/shattered_state/base.rb

@@ -6,27 +6,43 @@ module ShatteredState
     base.extend(ClassMethods)
   end
   module ClassMethods
+    # 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.
+    #
+    #
     # In order to set the initial position of the camera, and any other attributes you would like,
     # use the following format.
     #  class CameraTestState < ShatteredState::Base
-    #    camera :position => v(10,0,0), :orientation => [0.5, 0.5, 0.5, 0.5]
+    #    camera :position => v(10,0,0), :near_clip => 10, :far_clip => 100
     #  end
-    #  
-    # If you pass a symbol as a value, the symbol will be evaluated.
-    # 
-    # This allows for things such as:
     #
-    #   class CameraTestState < ShatteredState::Base
-    #     camera :position => :camera_position
-    #     def camera_position
-    #       return [rand*10,0,0]
-    #     end
-    #   end
-    #	
-    # The valid options are any public functions within camera that ends in =
-    # (such as position=, looking_at=)  See ShatteredView::Camera for more.
+    # Additional Options:
+    #  :position => v(0,0,0) # The initial position of the camera
+    #  :name => "StateName" # Internal name within Ogre, usually defaults to the state name.
+    #  :look_at => (none) # Looks at a given direction.  Will behave as expected with a :position passed in.
+    #  :near_clip => 1 # The clip distance when near objects begin to disappear.
+    #  :far_clip => 10000 # The clip distance when far objects begin to disappear.  
+    #                       Initially set to just a large number.
     def camera(options = {})
-      #before_init_call( 'camera', options )
+      before_init_call( 'create', :camera, options.delete(:name) || self.to_s, options )
+    end
+    
+    # The different types of scene managers provided by Ogre are:
+		# :general, :terrain, :nature, :paging, :indoor
+    def scene_manager(type)
+      before_init_call( 'create', :scene_manager, type)
+    end
+    
+
+    # Viewports are your windows into the world.  
+    # Cameras can have many viewports, but usually the relationship is 1-1.
+    # 
+    # TODO: There are many more viewport options to take care of, including :dimensions, etc.
+    # Options:
+    #   :color => rgb(0,0,0) # The background color of the viewport.
+    def viewport(options = {})
+      before_init_call( 'create', :viewport, options)
     end
     
   end
@@ -36,7 +52,7 @@ module ShatteredState
   # You can choose your starting state in config/environment.rb
   class Base < ShatteredPack::Base      
     before_init_call :activate_state
-    attr_reader :actors, :scene_manager
+    attr_reader :actors, :scene_manager, :camera, :viewport
     
     def activate_state #:nodoc:
       Shatter::GameLoader.instance.current_state = self
@@ -54,32 +70,17 @@ module ShatteredState
 		# 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)
+    	object = self.send(:"create_#{type}", *args)
   		return object
     end
     
     # Returns the camera used in the state. See ShatteredState::ClassMethods#camera
-    def camera(*args)
-      if args.length == 0
-      	# 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
-		# 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
-		# TODO: uncomment when camera is populated
-    #  call_object_function_for_each_key(:camera, options)
+    def create_camera(name, options)
+      @camera = scene_manager.create_camera(name)
+	 	  @camera.set_near_clip_distance(options[:near_clip] || 1)
+	 	  @camera.set_far_clip_distance(options[:far_clip] || 10000)
+   	  @camera.position = options[:position] if options[:position]
+   	  @camera.look_at(options[:look_at]) if options[:look_at]
     end
     
     # Creates a scene manager for Ogre to use.
@@ -88,8 +89,10 @@ module ShatteredState
   	  @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)
+    # Creates a viewport based off of the Camera.
+		def create_viewport(options)
+			@viewport = Shatter::GameLoader.instance.render_window.add_viewport(camera)
+			@viewport.set_background_colour(options[:color] || rgb(0,0,0))
 		end
     
     def quit

data/lib/shattered_view/base.rb

@@ -158,7 +158,9 @@ module ShatteredView #:nodoc:
     #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})")
+    	light_entity = scene_manager.create_light("#{self.to_s}.light(#{light_number})")
+    	light = Ogre::LightInstance.new(node, scene_manager, "", :entity => light_entity)
+    	
  			@lights << light
  			return light
   	end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: shattered_pack
 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 Pack: The combination of model/view/controllers and the domain specific language for each."
 require_paths: 
 - lib