Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28347
Modified Files:
Tag: projectx
fpscontroller.h
Log Message:
merge from HEAD
Index: fpscontroller.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -C2 -d -r1.1.2.1 -r1.1.2.1.2.1
*** fpscontroller.h 25 Feb 2007 16:27:45 -0000 1.1.2.1
--- fpscontroller.h 17 Jun 2007 08:02:47 -0000 1.1.2.1.2.1
***************
*** 80,84 ****
--- 80,100 ----
float GetAcceleration() const;
+ /** updates the managed body statically, i.e. without using the
+ dynamics engine; this is useful to move an associated camera
+ when the simulation is paused
+ */
+ void UpdateStatic(float deltaTime);
+
+ /** returns true if a call to UpdateStatic will alter the state of
+ the managed body
+ */
+ bool NeedStaticUpdate() const;
+
protected:
+ /** sets up the rotation matrix and directio vector used to update
+ the managed body
+ */
+ void PrepareUpdate(salt::Matrix& matrix, salt::Matrix& fwd, salt::Vector3f& vec);
+
/** calculates and applies the force needed to perfom the
* activated movements */
***************
*** 95,101 ****
--- 111,123 ----
float mHAngle;
+ /** applied horizontal delta since last update */
+ float mHAngleDelta;
+
/** the current vertical angle in degrees */
float mVAngle;
+ /** applied horizontal delta since last update */
+ float mVAngleDelta;
+
// event states
|
