diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2005-12-31 10:20:08 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2005-12-31 10:20:08 +0300 |
commit | 9119b6e8a547303ce9a7ccd3a00636153b53cb0e (patch) | |
tree | 1816973e2baf4888d571e87cfb548cafafe46d41 /source/gameengine/Physics/Bullet/CcdPhysicsController.h | |
parent | 625c553e2077ec0a252ddd934d4267c61011d61f (diff) |
Fixed several bugs: python refcounting related and Bullet related (basic add/remove object support, bounding volume hierarchy). Added a few files, updated the Bullet scons. Vc6/7 Bullet projectfiles need to add a couple of files: 'Bullet/CollisionShapes/BvhTriangleMeshShape.cpp',
'Bullet/CollisionShapes/ConvexTriangleCallback.cpp',
'Bullet/CollisionShapes/EmptyShape.cpp',
'Bullet/CollisionShapes/OptimizedBvh.cpp',
'Bullet/CollisionShapes/TriangleCallback.cpp',
'Bullet/CollisionShapes/TriangleIndexVertexArray.cpp',
'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp'.
Sorry, no armatures fix yet.
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index 4f189b7f324..87290f65fb4 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -16,6 +16,7 @@ extern float gDeactivationTime; extern float gLinearSleepingTreshold; extern float gAngularSleepingTreshold; extern bool gDisableDeactivation; +class CcdPhysicsEnvironment; struct CcdConstructionInfo @@ -27,7 +28,8 @@ struct CcdConstructionInfo m_linearDamping(0.1f), m_angularDamping(0.1f), m_MotionState(0), - m_collisionShape(0) + m_collisionShape(0), + m_physicsEnv(0) { } @@ -42,7 +44,7 @@ struct CcdConstructionInfo class PHY_IMotionState* m_MotionState; CollisionShape* m_collisionShape; - + CcdPhysicsEnvironment* m_physicsEnv; //needed for self-replication }; @@ -56,8 +58,11 @@ class CcdPhysicsController : public PHY_IPhysicsController CollisionShape* m_collisionShape; void* m_newClientInfo; + CcdConstructionInfo m_cci;//needed for replication void GetWorldOrientation(SimdMatrix3x3& mat); + void CreateRigidbody(); + public: int m_collisionDelay; @@ -110,6 +115,7 @@ class CcdPhysicsController : public PHY_IPhysicsController // reading out information from physics virtual void GetLinearVelocity(float& linvX,float& linvY,float& linvZ); + virtual void GetAngularVelocity(float& angVelX,float& angVelY,float& angVelZ); virtual void GetVelocity(const float posX,const float posY,const float posZ,float& linvX,float& linvY,float& linvZ); virtual void getReactionForce(float& forceX,float& forceY,float& forceZ); |