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

Removed duplicate pathway to updateNodeInArrays from showAllSubTreeOperation

Browse source
This commit is contained in:
matsukaze 2014-02-10 01:44:27 -05:00
parent 616ccd9172
commit a3ce69bcbb
2 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
interface/src/VoxelSystem.cpp
View file

@ -60,6 +60,7 @@ VoxelSystem::VoxelSystem(float treeScale, int maxVoxels)
_treeScale(treeScale),
_maxVoxels(maxVoxels),
_initialized(false),
_inInspectForOcclusions(false),
_showCulledSharedFaces(false),
_usePrimitiveRenderer(false),
_renderer(0) {
@ -1028,7 +1029,6 @@ int VoxelSystem::updateNodeInArrays(VoxelTreeElement* node, bool reuseIndex, boo
} else {
node->setVoxelSystem(this);
}
inspectForInteriorOcclusionsOperation(node, 0);
unsigned char occlusions;
if (_showCulledSharedFaces) {
occlusions = ~node->getInteriorOcclusions();
@ -1675,15 +1675,7 @@ void VoxelSystem::cullSharedFaces() {
_usePrimitiveRenderer = true;
_renderer->release();
clearAllNodesBufferIndex();
lockTree();
_tree->recurseTreeWithPostOperation(inspectForExteriorOcclusionsOperation);
_tree->recurseTreeWithPostOperation(inspectForExteriorOcclusionsOperation);
unlockTree();
_nodeCount = 0;
lockTree();
_tree->recurseTreeWithOperation(inspectForInteriorOcclusionsOperation);
unlockTree();
inspectForOcclusions();
qDebug("culling shared faces in %d nodes", _nodeCount);
} else {
_usePrimitiveRenderer = false;
@ -1710,10 +1702,32 @@ void VoxelSystem::showCulledSharedFaces() {
_showCulledSharedFaces = false;
}
if (Menu::getInstance()->isOptionChecked(MenuOption::CullSharedFaces)) {
cullSharedFaces();
_writeRenderFullVBO = true;
_tree->setDirtyBit();
setupNewVoxelsForDrawing();
}
}
void VoxelSystem::inspectForOcclusions() {
// don't re-enter...
if (_inInspectForOcclusions) {
return;
}
_inInspectForOcclusions = true;
bool showDebugDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
PerformanceWarning warn(showDebugDetails, "inspectForOcclusions()");
lockTree();
_tree->recurseTreeWithPostOperation(inspectForExteriorOcclusionsOperation);
_tree->recurseTreeWithOperation(inspectForInteriorOcclusionsOperation);
unlockTree();
_inInspectForOcclusions = false;
}
bool VoxelSystem::forceRedrawEntireTreeOperation(OctreeElement* element, void* extraData) {
_nodeCount++;
element->setDirtyBit();
@ -2338,11 +2352,12 @@ bool VoxelSystem::showAllSubTreeOperation(OctreeElement* element, void* extraDat
voxel->setDirtyBit();
voxel->markWithChangedTime();
// and this?
{
VoxelSystem* thisVoxelSystem = args->thisVoxelSystem;
thisVoxelSystem->_voxelsUpdated += thisVoxelSystem->updateNodeInArrays(voxel, true, true);
thisVoxelSystem->setupNewVoxelsForDrawingSingleNode();
}
// no, not needed, because markWithChangedTime notifies hooks, which calls elementUpdated, which calls updateNodeInArrays
// {
// VoxelSystem* thisVoxelSystem = args->thisVoxelSystem;
// thisVoxelSystem->_voxelsUpdated += thisVoxelSystem->updateNodeInArrays(voxel, true, true);
// thisVoxelSystem->setupNewVoxelsForDrawingSingleNode();
// }
args->nodesShown++;
}
@ -2386,7 +2401,6 @@ bool VoxelSystem::hideOutOfViewOperation(OctreeElement* element, void* extraData
// we need to hide it. Additionally we know that ALL of it's children are also fully OUTSIDE so we can recurse
// the children and simply mark them as hidden
args->tree->recurseNodeWithOperation(voxel, hideAllSubTreeOperation, args );
return false;
} break;
@ -2576,25 +2590,29 @@ bool VoxelSystem::collectStatsForTreesAndVBOsOperation(OctreeElement* element, v
}
unsigned long nodeIndex = 0;
if (voxel->isKnownBufferIndex()) {
args->nodesInVBO++;
nodeIndex = voxel->getBufferIndex();
}
if (voxel->getPrimitiveIndex()) {
args->nodesInPrimitiveRenderer++;
nodeIndex = voxel->getPrimitiveIndex();
}
if (voxel->isKnownBufferIndex() || (voxel->getPrimitiveIndex() != 0)) {
const bool extraDebugging = false; // enable for extra debugging
if (extraDebugging) {
qDebug("node In VBO... [%f,%f,%f] %f ... index=%ld, isDirty=%s, shouldRender=%s, culledFaces=0x%02x \n",
qDebug("node In Renderer... [%f,%f,%f] %f ... index=%ld, isDirty=%s, shouldRender=%s, culledFaces=0x%02x \n",
voxel->getCorner().x, voxel->getCorner().y, voxel->getCorner().z, voxel->getScale(),
nodeIndex, debug::valueOf(voxel->isDirty()), debug::valueOf(voxel->getShouldRender()),
voxel->getInteriorOcclusions());
}
}
if (voxel->isKnownBufferIndex()) {
args->nodesInVBO++;
nodeIndex = voxel->getBufferIndex();
const bool extraDebugging = false; // enable for extra debugging
if (extraDebugging) {
qDebug("node In VBO... [%f,%f,%f] %f ... index=%ld, isDirty=%s, shouldRender=%s \n",
voxel->getCorner().x, voxel->getCorner().y, voxel->getCorner().z, voxel->getScale(),
nodeIndex, debug::valueOf(voxel->isDirty()), debug::valueOf(voxel->getShouldRender()));
}
if (args->hasIndexFound[nodeIndex]) {
args->duplicateVBOIndex++;

8
interface/src/VoxelSystem.h
View file

@ -85,6 +85,7 @@ public:
virtual void removeOutOfView();
virtual void hideOutOfView(bool forceFullFrustum = false);
void inspectForOcclusions();
bool hasViewChanged();
bool isViewChanging();
@ -317,11 +318,12 @@ private:
void unlockTree();
bool _showCulledSharedFaces; ///< Flag visibility of culled faces
bool _usePrimitiveRenderer; ///< Flag primitive renderer for use
PrimitiveRenderer* _renderer; ///< Voxel renderer
bool _inInspectForOcclusions; ///< Flag occupancy of inspectForOcclusions method
bool _usePrimitiveRenderer; ///< Flag primitive renderer for use
PrimitiveRenderer* _renderer; ///< Voxel renderer
static const int _sNumOctantsPerHemiVoxel = 4;
static unsigned char _sOctantIndexToBitMask[8]; ///< Map octant index to partition mask
static unsigned char _sOctantIndexToBitMask[8]; ///< Map octant index to partition mask
static unsigned char _sOctantIndexToSharedBitMask[8][8]; ///< Map octant indices to shared partition mask
};