AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-24 04:11:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Aim from center of attacker to center of target

Browse Source
This commit is contained in:
Andrei Kortunov 2018-05-09 11:35:51 +04:00
parent f5dc9f0162
commit 9e5d577a71
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwworld/worldimp.cpp
View File

@ -1083,7 +1083,7 @@ namespace MWWorld
// general case, compatible with all types of different creatures // general case, compatible with all types of different creatures
// note: we intentionally do *not* use the collision box offset here, this is required to make // note: we intentionally do *not* use the collision box offset here, this is required to make
// some flying creatures work that have their collision box offset in the air // some flying creatures work that have their collision box offset in the air
pos.z() += halfExtents.z() * 2 * 0.75; pos.z() += halfExtents.z();
} }
// the origin of hitbox is an actor's front, not center // the origin of hitbox is an actor's front, not center
@ -3468,7 +3468,7 @@ namespace MWWorld
osg::Vec3f World::aimToTarget(const ConstPtr &actor, const MWWorld::ConstPtr& target) osg::Vec3f World::aimToTarget(const ConstPtr &actor, const MWWorld::ConstPtr& target)
{ {
osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3(); osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
weaponPos.z() += mPhysics->getHalfExtents(actor).z() * 2 * 0.75; weaponPos.z() += mPhysics->getHalfExtents(actor).z();
osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target); osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target);
return (targetPos - weaponPos); return (targetPos - weaponPos);
} }
@ -3477,7 +3477,7 @@ namespace MWWorld
{ {
osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3(); osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
osg::Vec3f halfExtents = mPhysics->getHalfExtents(actor); osg::Vec3f halfExtents = mPhysics->getHalfExtents(actor);
weaponPos.z() += halfExtents.z() * 2 * 0.75; weaponPos.z() += halfExtents.z();
return mPhysics->getHitDistance(weaponPos, target) - halfExtents.y(); return mPhysics->getHitDistance(weaponPos, target) - halfExtents.y();
} }