mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 16:06:44 +00:00
Code Issues Releases Wiki Activity

check if there is an object in the way

Browse source
This commit is contained in:
gus 2013-08-03 11:33:34 +02:00
parent 830762722d
commit 4c7dcdc8aa
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/openengine/bullet/physic.cpp
View file

@ -584,9 +584,12 @@ namespace Physic
broadphase->aabbTest(aabbMin,aabbMax,callback); broadphase->aabbTest(aabbMin,aabbMax,callback);
for(int i=0;i<callback.hits.size();i++) for(int i=0;i<callback.hits.size();i++)
{ {
if((callback.hits[i]->getWorldTransform().getOrigin()-pos).length()<radius) float d = (callback.hits[i]->getWorldTransform().getOrigin()-pos).length();
if(d<radius)
{ {
return std::make_pair(callback.hits[i]->mName,callback.hits[i]->getWorldTransform().getOrigin()); std::pair<std::string,float> rayResult = this->rayTest(pos,callback.hits[i]->getWorldTransform().getOrigin());
if(rayResult.second>d || rayResult.first == callback.hits[i]->mName)
return std::make_pair(callback.hits[i]->mName,callback.hits[i]->getWorldTransform().getOrigin());
} }
} }
//ContactTestResultCallback callback; //ContactTestResultCallback callback;