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

Unify raycasting techniques for "on touch" magic

Browse Source 
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
This commit is contained in:
scrawl 2015-06-03 03:13:51 +02:00
parent cee1db532f
commit 292fa0b5e3
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2638,15 +2638,6 @@ namespace MWWorld
float distance = 192.f; // ?? float distance = 192.f; // ??
osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3(); osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
if (actor == getPlayerPtr())
{
// For the player, use camera to aim
target = getFacedObject(distance);
if (!target.isEmpty())
hitPosition = target.getRefData().getPosition().asVec3();
}
else
{
// For NPCs use facing direction from Head node // For NPCs use facing direction from Head node
osg::Vec3f origin(actor.getRefData().getPosition().asVec3()); osg::Vec3f origin(actor.getRefData().getPosition().asVec3());
@ -2673,7 +2664,6 @@ namespace MWWorld
MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(origin, dest, actor); MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(origin, dest, actor);
target = result.mHitObject; target = result.mHitObject;
hitPosition = result.mHitPos; hitPosition = result.mHitPos;
}
std::string selectedSpell = stats.getSpells().getSelectedSpell(); std::string selectedSpell = stats.getSpells().getSelectedSpell();