shattered_pack 0.4 → 0.4.0.1

data/lib/shattered_model/base.rb

@@ -100,6 +100,11 @@ module ShatteredModel #:nodoc:
         @fuzzy_logic.update(self)
       end
       
+      #Delegates to View if view exists
+      def method_missing(method, *args, &block)
+        raise NoMethodError, "#{self.class} has no method defined '#{method}'" if self.view.nil?
+        self.view.send(method, *args, &block)
+      end
     end
 end
 

data/lib/shattered_pack/keyboard_input/keyboard_input.rb

@@ -39,7 +39,7 @@ module ShatteredPack
 	    def pre_initialize(options)
 	      # update our keyboard input
 	      timer.every(:frame) do |time_elapsed|
-	        update_input(time_elapsed, ShatteredController::Runner.environment[:input])
+	        update_input(time_elapsed, ShatteredState::Runner.environment[:input])
         end
 	      super
       end

data/lib/shattered_pack.rb

@@ -9,4 +9,4 @@ require 'shattered_support'
 require 'shattered_ogre'
 require 'shattered_model'
 require 'shattered_view'
-require 'shattered_controller'
+require 'shattered_state'

data/lib/{shattered_controller → shattered_state}/actor/actor.rb

@@ -1,4 +1,4 @@
-module ShatteredController
+module ShatteredState
   module Actor #:nodoc:
 	  def self.append_features(base)
 	    super
@@ -34,9 +34,9 @@ module ShatteredController
      #
      # Works fine.
      #
-     # Actors delegate to ShatteredController::Base objects, and controllers delegate to Model and View.
+     # Actors delegate to ShatteredState::Base objects, and controllers delegate to Model and View.
      #
-     # See ShatteredController::Base for more detail.
+     # See ShatteredState::Base for more detail.
      def actor( name, options = {} )
        before_init_call( :actor, name, options, true )
      end
@@ -46,7 +46,7 @@ module ShatteredController
 
      private
 
-     # Same as ShatteredController::Actor::ClassMethods#actor
+     # Same as ShatteredState::Actor::ClassMethods#actor
      #
      # Returns a newly created actor
      def actor(name, options={}, created_by_meta_function=false )

data/lib/{shattered_controller/state.rb → shattered_state/base.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/actor/actor'
 
-module ShatteredController
+module ShatteredState
   def self.append_features(base)
     super
     base.extend(ClassMethods)
@@ -8,7 +8,7 @@ module ShatteredController
   module ClassMethods
     # In order to set the initial position of the camera, and any other attributes you would like,
     # use the following format.
-    #  class CameraTestState < ShatteredController::Base
+    #  class CameraTestState < ShatteredState::Base
     #    camera :position => v(10,0,0), :orientation => [0.5, 0.5, 0.5, 0.5]
     #  end
     #  
@@ -16,7 +16,7 @@ module ShatteredController
     # 
     # This allows for things such as:
     #
-    #   class CameraTestState < ShatteredController::Base
+    #   class CameraTestState < ShatteredState::Base
     #     camera :position => :camera_position
     #     def camera_position
     #       return [rand*10,0,0]
@@ -39,7 +39,7 @@ module ShatteredController
   #
   # States define the actors, communications between the actors, and control the camera.
   # You can choose your starting state in config/environment.rb
-  class State < ShatteredPack::Base      
+  class Base < ShatteredPack::Base      
     before_init_call :activate_state
     attr_reader :actors
     
@@ -56,12 +56,21 @@ module ShatteredController
       timer.update(time_elapsed)
     end
     
-    # Returns the camera used in the state. See ShatteredController::ClassMethods#camera
+    # Returns the camera used in the state. See ShatteredState::ClassMethods#camera
     def camera(*args)
       if args.length == 0
         return @camera ||= Runner.environment[:camera]
       end
-      call_object_function_for_each_key(:camera, args[0])
+
+			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)
+	
+			# Call the other methods
+      call_object_function_for_each_key(:camera, options)
     end
     
     def sky=(type, material) #:nodoc:
@@ -78,7 +87,7 @@ module ShatteredController
 end
 
 
-ShatteredController::State.class_eval do
-	include ShatteredController::Actor
+ShatteredState::Base.class_eval do
+	include ShatteredState::Actor
 end
 

data/lib/{shattered_controller → shattered_state}/runner.rb

@@ -1,5 +1,5 @@
 
-module ShatteredController
+module ShatteredState
   #The class Runner is present in model, view, and controller, and signifies the
   #main entry point into the program.  This is called by script/runner.rb
   class Runner #:nodoc:

data/lib/shattered_state.rb

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

data/lib/shattered_view/mesh/mesh.rb

@@ -35,7 +35,7 @@ module ShatteredView
         before_init_call( :mesh, file, options )
       end
 
-      # Note: The following is broken in 0.4
+      # Note: The following is broken in 0.4.0.1
       # Animations declare helper functions for mesh animations.
       #
       #   class AnimatedRubyView < ...

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: shattered_pack
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2006-09-10 00:00:00 -06:00
+  version: 0.4.0.1
+date: 2006-09-12 00:00:00 -06:00
 summary: "Shattered Pack: The combination of model/view/controllers and the domain specific language for each."
 require_paths: 
 - lib
@@ -29,9 +29,9 @@ authors: []
 
 files: 
 - lib/mock_objects.rb
-- lib/shattered_controller.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
@@ -40,9 +40,6 @@ files:
 - lib/mock_objects/shattered_ogre/renderer.rb
 - lib/mock_objects/shattered_ogre/resource_handler.rb
 - lib/mock_objects/shattered_ogre/scene.rb
-- lib/shattered_controller/runner.rb
-- lib/shattered_controller/state.rb
-- lib/shattered_controller/actor/actor.rb
 - lib/shattered_model/base.rb
 - lib/shattered_model/fuzzy_logic.rb
 - lib/shattered_model/linear_interpolator.rb
@@ -53,6 +50,9 @@ files:
 - 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_state/actor/actor.rb
 - lib/shattered_view/base.rb
 - lib/shattered_view/camera.rb
 - lib/shattered_view/extensions.rb

data/lib/shattered_controller.rb

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