mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 12:36:42 +00:00
Code Issues Releases Wiki Activity

update MWWord::World to track distances while performing occlusion queries.

Browse source 
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
This commit is contained in:
Nathan Jeffords 2013-01-07 23:11:15 -08:00
parent 0108be2e4f
commit 05dad29005
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwworld/worldimp.cpp
View file

@ -587,6 +587,9 @@ namespace MWWorld
} }
else else
{ {
if (mFacedDistance > result.first>getStore().get<ESM::GameSetting>().find ("iMaxActivateDist")->getInt())
return "";
// updated every few frames in update() // updated every few frames in update()
return mFacedHandle; return mFacedHandle;
} }
@ -957,16 +960,19 @@ namespace MWWorld
if (mNumFacing == 0) if (mNumFacing == 0)
{ {
mFacedHandle = ""; mFacedHandle = "";
mFacedDistance = FLT_MAX;
} }
else if (mNumFacing == 1) else if (mNumFacing == 1)
{ {
bool result = query->getTestResult(); bool result = query->getTestResult();
mFacedHandle = result ? mFaced1Name : ""; mFacedHandle = result ? mFaced1Name : "";
mFacedDistance = result ? mFaced1Distance : FLT_MAX;
} }
else if (mNumFacing == 2) else if (mNumFacing == 2)
{ {
bool result = query->getTestResult(); bool result = query->getTestResult();
mFacedHandle = result ? mFaced2Name : mFaced1Name; mFacedHandle = result ? mFaced2Name : mFaced1Name;
mFacedDistance = result ? mFaced1Distance : mFaced1Distance;
} }
} }
@ -1017,6 +1023,7 @@ namespace MWWorld
{ {
mFaced1 = getPtrViaHandle(results.front().second); mFaced1 = getPtrViaHandle(results.front().second);
mFaced1Name = results.front().second; mFaced1Name = results.front().second;
mFaced1Distance = results.front().first;
mNumFacing = 1; mNumFacing = 1;
btVector3 p; btVector3 p;
@ -1041,6 +1048,8 @@ namespace MWWorld
{ {
mFaced1Name = results.at (0).second; mFaced1Name = results.at (0).second;
mFaced2Name = results.at (1).second; mFaced2Name = results.at (1).second;
mFaced1Distance = results.at (0).first;
mFaced2Distance = results.at (1).first;
mFaced1 = getPtrViaHandle(results.at (0).second); mFaced1 = getPtrViaHandle(results.at (0).second);
mFaced2 = getPtrViaHandle(results.at (1).second); mFaced2 = getPtrViaHandle(results.at (1).second);
mNumFacing = 2; mNumFacing = 2;
@ -1062,6 +1071,7 @@ namespace MWWorld
if (!query->isPotentialOccluder(node1) && (mFaced1.getTypeName().find("Static") == std::string::npos)) if (!query->isPotentialOccluder(node1) && (mFaced1.getTypeName().find("Static") == std::string::npos))
{ {
mFacedHandle = mFaced1Name; mFacedHandle = mFaced1Name;
mFacedDistance = mFaced1Distance;
//std::cout << "node1 Not an occluder" << std::endl; //std::cout << "node1 Not an occluder" << std::endl;
return; return;
} }
@ -1070,6 +1080,7 @@ namespace MWWorld
if (mFaced2.getTypeName().find("Static") != std::string::npos) if (mFaced2.getTypeName().find("Static") != std::string::npos)
{ {
mFacedHandle = mFaced1Name; mFacedHandle = mFaced1Name;
mFacedDistance = mFaced1Distance;
return; return;
} }
@ -1078,6 +1089,7 @@ namespace MWWorld
&& mFaced2.getTypeName().find("Door") != std::string::npos) && mFaced2.getTypeName().find("Door") != std::string::npos)
{ {
mFacedHandle = mFaced2Name; mFacedHandle = mFaced2Name;
mFacedDistance = mFaced2Distance;
return; return;
} }

3
apps/openmw/mwworld/worldimp.hpp
View file

@ -72,10 +72,13 @@ namespace MWWorld
Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore); Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore);
std::string mFacedHandle; std::string mFacedHandle;
float mFacedDistance;
Ptr mFaced1; Ptr mFaced1;
Ptr mFaced2; Ptr mFaced2;
std::string mFaced1Name; std::string mFaced1Name;
std::string mFaced2Name; std::string mFaced2Name;
float mFaced1Distance;
float mFaced2Distance;
int mNumFacing; int mNumFacing;
std::map<std::string,std::string> mFallback; std::map<std::string,std::string> mFallback;