diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2005-08-13 12:05:48 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2005-08-13 12:05:48 +0400 |
| commit | 4d7089d19b22c17a18e23344db3dd23bdefc692f (patch) | |
| tree | 90983f59d94da4545feaa6d011d80ee5835f5bab /source/gameengine/Physics/Bullet/CcdPhysicsController.h | |
| parent | 74dc0e191dcbbe1ee08c27233e9b31a266e7bd4d (diff) | |
these files missed the cvs commt yesterday, this should fix compilation problems
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index faef3e6c7d2..728a439866d 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -8,13 +8,12 @@ /// It contains the IMotionState and IDeformableMesh Interfaces. #include "SimdVector3.h" #include "SimdScalar.h" -#include "SimdMatrix3x3.h" - class CollisionShape; extern float gDeactivationTime; extern float gLinearSleepingTreshold; extern float gAngularSleepingTreshold; +extern bool gDisableDeactivation; struct CcdConstructionInfo @@ -89,7 +88,7 @@ class CcdPhysicsController : public PHY_IPhysicsController // kinematic methods virtual void RelativeTranslate(float dlocX,float dlocY,float dlocZ,bool local); - virtual void RelativeRotate(const float rotval[12],bool local); + virtual void RelativeRotate(const float drot[9],bool local); virtual void getOrientation(float &quatImag0,float &quatImag1,float &quatImag2,float &quatReal); virtual void setOrientation(float quatImag0,float quatImag1,float quatImag2,float quatReal); virtual void setPosition(float posX,float posY,float posZ); @@ -132,8 +131,6 @@ class CcdPhysicsController : public PHY_IPhysicsController void SetAabb(const SimdVector3& aabbMin,const SimdVector3& aabbMax); - void GetWorldOrientation(SimdMatrix3x3& mat); - }; |