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-07-29 22:14:41 +0400
committerErwin Coumans <blender@erwincoumans.com>2005-07-29 22:14:41 +0400
commitdad6ef9045526b6b26f845151d3ea3b26edaf4a8 (patch)
tree16625df210f25bcf20efcc251722f28934161d38 /source/gameengine/Physics/Bullet/CcdPhysicsController.h
parent7d797797c8f6e3eb8fd91bd42cf8e488d14b1d40 (diff)
added physics-debugging
didn't check every single file, so might have broken some gameengine stuff, will fix it this weekend!
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsController.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 3a8590e261c..235931ebab4 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -15,7 +15,6 @@ struct CcdConstructionInfo
CcdConstructionInfo()
: m_gravity(0,0,0),
m_mass(0.f),
- m_friction(0.1f),
m_restitution(0.1f),
m_linearDamping(0.1f),
m_angularDamping(0.1f),
@@ -27,9 +26,8 @@ struct CcdConstructionInfo
SimdVector3 m_localInertiaTensor;
SimdVector3 m_gravity;
SimdScalar m_mass;
- SimdScalar m_friction;
SimdScalar m_restitution;
-
+ SimdScalar m_friction;
SimdScalar m_linearDamping;
SimdScalar m_angularDamping;
void* m_broadphaseHandle;
@@ -54,8 +52,6 @@ class CcdPhysicsController : public PHY_IPhysicsController
int m_collisionDelay;
- SimdScalar m_friction;
- SimdScalar m_restitution;
void* m_broadphaseHandle;
CcdPhysicsController (const CcdConstructionInfo& ci);