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>2006-01-01 00:59:56 +0300
committerErwin Coumans <blender@erwincoumans.com>2006-01-01 00:59:56 +0300
commitbab1b90edc55251ceb5e3033d588347b48cceca4 (patch)
tree11a6863f68de3db92bbbfab77ca45c8603e5f5cf /source/gameengine/Physics/Bullet/CcdPhysicsController.h
parent9119b6e8a547303ce9a7ccd3a00636153b53cb0e (diff)
more game engine bug-fixes, hooked up 'formfactor' as inertia tensor tweaker, friction/restitution, more scaling related fixes.
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsController.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 87290f65fb4..3becd14028a 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -29,12 +29,15 @@ struct CcdConstructionInfo
m_angularDamping(0.1f),
m_MotionState(0),
m_collisionShape(0),
- m_physicsEnv(0)
-
+ m_physicsEnv(0),
+ m_inertiaFactor(1.f),
+ m_scaling(1.f,1.f,1.f)
{
}
+
SimdVector3 m_localInertiaTensor;
SimdVector3 m_gravity;
+ SimdVector3 m_scaling;
SimdScalar m_mass;
SimdScalar m_restitution;
SimdScalar m_friction;
@@ -45,6 +48,7 @@ struct CcdConstructionInfo
CollisionShape* m_collisionShape;
CcdPhysicsEnvironment* m_physicsEnv; //needed for self-replication
+ float m_inertiaFactor;//tweak the inertia (hooked up to Blender 'formfactor'
};