Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2005-08-04 23:07:39 +0400
committerErwin Coumans <blender@erwincoumans.com>2005-08-04 23:07:39 +0400
commit210ab537ce34a31714d5073ff2e539a67aaea9af (patch)
tree6303f916ed2fe5e214e10f7283ce11a3304b9b0b /source/gameengine/Physics/Bullet/CcdPhysicsController.h
parentb12f80168174623742ebe99186a89746a2646a97 (diff)
improved deactivation, exposed more tweakable parameters to python,
fixed some copy/paste bug in inertia/inverse inertia. colors in deactivation debug
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsController.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 53991e202e9..e0cba58cb53 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -52,7 +52,6 @@ class CcdPhysicsController : public PHY_IPhysicsController
class PHY_IMotionState* m_MotionState;
CollisionShape* m_collisionShape;
- int m_sleepingCounter;
public:
int m_collisionDelay;
@@ -126,6 +125,8 @@ class CcdPhysicsController : public PHY_IPhysicsController
bool wantsSleeping();
+ void UpdateDeactivation(float timeStep);
+
void SetAabb(const SimdVector3& aabbMin,const SimdVector3& aabbMax);