teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Change to btCylinderShape

Browse source
This commit is contained in:
scrawl 2014-06-22 03:05:10 +02:00
parent 33ed11d8e6
commit baf490a2b5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libs/openengine/bullet/physic.cpp
View file

@ -32,7 +32,8 @@ namespace Physic
// Use capsule shape only if base is square (nonuniform scaling apparently doesn't work on it) // Use capsule shape only if base is square (nonuniform scaling apparently doesn't work on it)
if (std::abs(mHalfExtents.x-mHalfExtents.y)<mHalfExtents.x*0.05 && mHalfExtents.z >= mHalfExtents.x) if (std::abs(mHalfExtents.x-mHalfExtents.y)<mHalfExtents.x*0.05 && mHalfExtents.z >= mHalfExtents.x)
{ {
mShape.reset(new btCapsuleShapeZ(mHalfExtents.x, mHalfExtents.z*2.f - mHalfExtents.x*2.f)); // Could also be btCapsuleShapeZ, but the movement solver seems to have issues with it (jumping on slopes doesn't work)
mShape.reset(new btCylinderShapeZ(BtOgre::Convert::toBullet(mHalfExtents)));
} }
else else
mShape.reset(new btBoxShape(BtOgre::Convert::toBullet(mHalfExtents))); mShape.reset(new btBoxShape(BtOgre::Convert::toBullet(mHalfExtents)));