diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-15 14:34:55 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-15 14:34:55 +0300 |
| commit | 6f3e5931052727358201e6648bd6011d99085414 (patch) | |
| tree | b3893dc8bacb90a02dc9c9ed251b590a429496fe /source/gameengine/Physics/Dummy | |
| parent | e35f73cd00f878706cd953fc3514e0b68b1b6f65 (diff) | |
more graphics patches from Snailrose,
remove constraint fixed,
Bullet timestep now subdivides Blender game engine timestep, so it runs 60 hertz,
SphereShape reverted to old style, so no support for non-uniform scaled spheres for now,
Diffstat (limited to 'source/gameengine/Physics/Dummy')
| -rw-r--r-- | source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp index 0b6f8a4ded4..0532a9a8cf7 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp @@ -101,7 +101,7 @@ int DummyPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ct } -void DummyPhysicsEnvironment::removeConstraint(void * constraintid) +void DummyPhysicsEnvironment::removeConstraint(int constraintid) { if (constraintid) { diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h index 0a359feea6d..a400459afe6 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h @@ -61,7 +61,7 @@ public: float pivotX,float pivotY,float pivotZ, float axisX,float axisY,float axisZ); - virtual void removeConstraint(void * constraintid); + virtual void removeConstraint(int constraintid); virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ); |