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

Fix incorrect uses of PhysicsSystem::getHalfExtents

Browse source 
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
This commit is contained in:
scrawl 2015-11-03 19:05:36 +01:00
parent 46e07e4b19
commit 682f30ef9c
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,6 +240,8 @@ namespace MWPhysics
const ESM::Position& refpos = ptr.getRefData().getPosition(); const ESM::Position& refpos = ptr.getRefData().getPosition();
osg::Vec3f position(refpos.asVec3()); osg::Vec3f position(refpos.asVec3());
float collisionShapeOffset = physicActor->getPosition().z() - position.z();
// Early-out for totally static creatures // Early-out for totally static creatures
// (Not sure if gravity should still apply?) // (Not sure if gravity should still apply?)
if (!ptr.getClass().isMobile(ptr)) if (!ptr.getClass().isMobile(ptr))
@ -256,12 +258,11 @@ namespace MWPhysics
} }
btCollisionObject *colobj = physicActor->getCollisionObject(); btCollisionObject *colobj = physicActor->getCollisionObject();
osg::Vec3f halfExtents = physicActor->getHalfExtents(); position.z() += collisionShapeOffset;
position.z() += halfExtents.z();
static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>() static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
.find("fSwimHeightScale")->getFloat(); .find("fSwimHeightScale")->getFloat();
float swimlevel = waterlevel + halfExtents.z() - (physicActor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale); float swimlevel = waterlevel + collisionShapeOffset - (physicActor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
ActorTracer tracer; ActorTracer tracer;
osg::Vec3f inertia = physicActor->getInertialForce(); osg::Vec3f inertia = physicActor->getInertialForce();
@ -369,7 +370,7 @@ namespace MWPhysics
{ {
// don't let pure water creatures move out of water after stepMove // don't let pure water creatures move out of water after stepMove
if (ptr.getClass().isPureWaterCreature(ptr) if (ptr.getClass().isPureWaterCreature(ptr)
&& newPosition.z() + halfExtents.z() > waterlevel) && newPosition.z() + physicActor->getHalfExtents().z() > waterlevel)
newPosition = oldPosition; newPosition = oldPosition;
} }
else else
@ -450,7 +451,7 @@ namespace MWPhysics
} }
physicActor->setOnGround(isOnGround); physicActor->setOnGround(isOnGround);
newPosition.z() -= halfExtents.z(); // remove what was added at the beginning newPosition.z() -= collisionShapeOffset; // remove what was added at the beginning
return newPosition; return newPosition;
} }
}; };
@ -820,12 +821,8 @@ namespace MWPhysics
if (!physactor1 || !physactor2) if (!physactor1 || !physactor2)
return false; return false;
osg::Vec3f halfExt1 = physactor1->getHalfExtents(); osg::Vec3f pos1 (physactor1->getPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.8)); // eye level
osg::Vec3f pos1 (actor1.getRefData().getPosition().asVec3()); osg::Vec3f pos2 (physactor2->getPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.8));
pos1.z() += halfExt1.z()*2*0.9f; // eye level
osg::Vec3f halfExt2 = physactor2->getHalfExtents();
osg::Vec3f pos2 (actor2.getRefData().getPosition().asVec3());
pos2.z() += halfExt2.z()*2*0.9f;
RayResult result = castRay(pos1, pos2, MWWorld::Ptr(), CollisionType_World|CollisionType_HeightMap); RayResult result = castRay(pos1, pos2, MWWorld::Ptr(), CollisionType_World|CollisionType_HeightMap);

7
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -68,12 +68,7 @@ namespace MWWorld
const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName, const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
const osg::Vec3f& fallbackDirection) const osg::Vec3f& fallbackDirection)
{ {
float height = 0; osg::Vec3f pos = mPhysics->getPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
height += mPhysics->getHalfExtents(caster).z() * 2.f * 0.75f; // Spawn at 0.75 * ActorHeight
osg::Vec3f pos(caster.getRefData().getPosition().asVec3());
pos.z() += height;
if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
return; return;