mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 03:40:49 +00:00
Code Issues Projects Releases Wiki Activity

Constifications

Browse Source
This commit is contained in:
wareya 2021-11-02 15:17:26 +00:00
parent 8c0102e1ee
commit 940e338453
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/openmw/mwphysics/trace.cpp
View File

@ -58,7 +58,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
doing_short_trace = true; doing_short_trace = true;
} }
auto traceCallback = sweepHelper(actor, btstart, btend, world, false); const auto traceCallback = sweepHelper(actor, btstart, btend, world, false);
// Copy the hit data over to our trace results struct: // Copy the hit data over to our trace results struct:
if(traceCallback.hasHit()) if(traceCallback.hasHit())
@ -77,7 +77,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
if(doing_short_trace) if(doing_short_trace)
{ {
btend = Misc::Convert::toBullet(end); btend = Misc::Convert::toBullet(end);
auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false); const auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
if(newTraceCallback.hasHit()) if(newTraceCallback.hasHit())
{ {
@ -100,11 +100,11 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world) void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
{ {
auto newTraceCallback = sweepHelper(actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true); const auto traceCallback = sweepHelper(actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true);
if(newTraceCallback.hasHit()) if(traceCallback.hasHit())
{ {
mFraction = newTraceCallback.m_closestHitFraction; mFraction = traceCallback.m_closestHitFraction;
mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld); mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
mEndPos = (end-start)*mFraction + start; mEndPos = (end-start)*mFraction + start;
} }
else else