Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:51:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass usesFrustum down to EntityTreeElement

Browse source
This commit is contained in:
Stephen Birarda 2017-01-18 16:18:43 -08:00
parent ed41412d95
commit 5fbdc94c66
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -434,6 +434,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
nodeData->getLastTimeBagEmpty(), nodeData->getLastTimeBagEmpty(),
isFullScene, &nodeData->stats, _myServer->getJurisdiction(), isFullScene, &nodeData->stats, _myServer->getJurisdiction(),
&nodeData->extraEncodeData, &nodeData->extraEncodeData,
nodeData->getUsesFrustum(),
nodeData); nodeData);
nodeData->copyCurrentViewFrustum(params.viewFrustum); nodeData->copyCurrentViewFrustum(params.viewFrustum);
if (viewFrustumChanged) { if (viewFrustumChanged) {

2
libraries/entities/src/EntityTreeElement.cpp
View file

@ -329,7 +329,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
entityTreeElementExtraEncodeData->entities.contains(entity->getEntityItemID()); entityTreeElementExtraEncodeData->entities.contains(entity->getEntityItemID());
} }
if (includeThisEntity || params.recurseEverything) { if (params.usesFrustum && (includeThisEntity || params.recurseEverything)) {
// we want to use the maximum possible box for this, so that we don't have to worry about the nuance of // we want to use the maximum possible box for this, so that we don't have to worry about the nuance of
// simulation changing what's visible. consider the case where the entity contains an angular velocity // simulation changing what's visible. consider the case where the entity contains an angular velocity

3
libraries/octree/src/Octree.h
View file

@ -82,6 +82,7 @@ public:
OctreeSceneStats* stats; OctreeSceneStats* stats;
JurisdictionMap* jurisdictionMap; JurisdictionMap* jurisdictionMap;
OctreeElementExtraEncodeData* extraEncodeData; OctreeElementExtraEncodeData* extraEncodeData;
bool usesFrustum;
NodeData* nodeData; NodeData* nodeData;
// output hints from the encode process // output hints from the encode process
@ -111,6 +112,7 @@ public:
OctreeSceneStats* stats = IGNORE_SCENE_STATS, OctreeSceneStats* stats = IGNORE_SCENE_STATS,
JurisdictionMap* jurisdictionMap = IGNORE_JURISDICTION_MAP, JurisdictionMap* jurisdictionMap = IGNORE_JURISDICTION_MAP,
OctreeElementExtraEncodeData* extraEncodeData = nullptr, OctreeElementExtraEncodeData* extraEncodeData = nullptr,
bool usesFrustum = true,
NodeData* nodeData = nullptr) : NodeData* nodeData = nullptr) :
lastQuerySent(lastQuerySent), lastQuerySent(lastQuerySent),
maxEncodeLevel(maxEncodeLevel), maxEncodeLevel(maxEncodeLevel),
@ -124,6 +126,7 @@ public:
stats(stats), stats(stats),
jurisdictionMap(jurisdictionMap), jurisdictionMap(jurisdictionMap),
extraEncodeData(extraEncodeData), extraEncodeData(extraEncodeData),
usesFrustum(usesFrustum),
nodeData(nodeData), nodeData(nodeData),
stopReason(UNKNOWN) stopReason(UNKNOWN)
{ {