mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 17:41:33 +00:00
Code Issues Releases Wiki Activity

Trace up to waterlevel + halfextent

Browse source
This commit is contained in:
Assumeru 2016-11-09 18:03:10 +01:00
parent 25d64989b3
commit 99bc4f733f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -1329,13 +1329,13 @@ namespace MWPhysics
else if (physicActor->getCollisionMode()) else if (physicActor->getCollisionMode())
{ {
const osg::Vec3f actorPosition = physicActor->getPosition(); const osg::Vec3f actorPosition = physicActor->getPosition();
const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel); const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + physicActor->getHalfExtents().z());
ActorTracer tracer; ActorTracer tracer;
tracer.doTrace(physicActor->getCollisionObject(), actorPosition, destinationPosition, mCollisionWorld); tracer.doTrace(physicActor->getCollisionObject(), actorPosition, destinationPosition, mCollisionWorld);
if (tracer.mFraction >= 1.0f) if (tracer.mFraction >= 1.0f)
{ {
waterCollision = true; waterCollision = true;
physicActor->setPosition(destinationPosition); physicActor->setPosition(osg::Vec3f(actorPosition.x(), actorPosition.y(), waterlevel));
} }
else else
{ {