Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate primitive index with buffer index.

Browse source 
Removed the extra space associated with primitive index and use buffer
index for both the VBO and primitive renderers since they are exclusive.
This commit is contained in:
matsukaze 2014-02-20 08:48:40 -05:00
parent 75ecdbd1f0
commit b813438307
3 changed files with 15 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
interface/src/VoxelSystem.cpp
View file

@ -681,7 +681,7 @@ void VoxelSystem::setupNewVoxelsForDrawing() {
if (_writeRenderFullVBO) {
if (_usePrimitiveRenderer) {
_renderer->release();
clearAllNodesPrimitiveIndex();
clearAllNodesBufferIndex();
}
clearFreeBufferIndexes();
}
@ -1076,10 +1076,10 @@ int VoxelSystem::forceRemoveNodeFromArrays(VoxelTreeElement* node) {
}
if (_usePrimitiveRenderer) {
int primitiveIndex = node->getPrimitiveIndex();
if (primitiveIndex) {
if (node->isKnownBufferIndex()) {
int primitiveIndex = node->getBufferIndex();
_renderer->remove(primitiveIndex);
node->setPrimitiveIndex(0);
node->setBufferIndex(GLBUFFER_INDEX_UNKNOWN);
return 1;
}
} else {
@ -1123,10 +1123,10 @@ int VoxelSystem::updateNodeInArrays(VoxelTreeElement* node, bool reuseIndex, boo
nodeColor const & color = node->getColor();
if (_usePrimitiveRenderer) {
int primitiveIndex = node->getPrimitiveIndex();
if (primitiveIndex) {
if (node->isKnownBufferIndex()) {
int primitiveIndex = node->getBufferIndex();
_renderer->remove(primitiveIndex);
node->setPrimitiveIndex(0);
node->setBufferIndex(GLBUFFER_INDEX_UNKNOWN);
} else {
node->setVoxelSystem(this);
}
@ -1142,8 +1142,8 @@ int VoxelSystem::updateNodeInArrays(VoxelTreeElement* node, bool reuseIndex, boo
color[RED_INDEX], color[GREEN_INDEX], color[BLUE_INDEX],
occlusions);
if (cube) {
primitiveIndex = _renderer->add(cube);
node->setPrimitiveIndex(primitiveIndex);
int primitiveIndex = _renderer->add(cube);
node->setBufferIndex(primitiveIndex);
}
}
} else {
@ -1589,7 +1589,7 @@ void VoxelSystem::killLocalVoxels() {
if (_renderer) {
_renderer->release();
}
clearAllNodesPrimitiveIndex();
clearAllNodesBufferIndex();
}
_voxelsInReadArrays = 0; // do we need to do this?
setupNewVoxelsForDrawing();
@ -1618,28 +1618,6 @@ void VoxelSystem::clearAllNodesBufferIndex() {
}
}
// only called on main thread
bool VoxelSystem::clearAllNodesPrimitiveIndexOperation(OctreeElement* element, void* extraData) {
_nodeCount++;
VoxelTreeElement* voxel = (VoxelTreeElement*)element;
voxel->setPrimitiveIndex(0);
return true;
}
// only called on main thread, and also always followed by a call to cleanupVoxelMemory()
// you shouldn't be calling this on any other thread or without also cleaning up voxel memory
void VoxelSystem::clearAllNodesPrimitiveIndex() {
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
"VoxelSystem::clearAllNodesPrimitiveIndex()");
_nodeCount = 0;
_tree->lockForRead(); // we won't change the tree so it's ok to treat this as a read
_tree->recurseTreeWithOperation(clearAllNodesPrimitiveIndexOperation);
_tree->unlock();
if (Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings)) {
qDebug("clearing primitive index of %d nodes", _nodeCount);
}
}
bool VoxelSystem::inspectForInteriorOcclusionsOperation(OctreeElement* element, void* extraData) {
_nodeCount++;
VoxelTreeElement* voxel = (VoxelTreeElement*)element;
@ -2421,7 +2399,7 @@ bool VoxelSystem::hideAllSubTreeOperation(OctreeElement* element, void* extraDat
}
args->nodesOutside++;
if (voxel->isKnownBufferIndex() || voxel->getPrimitiveIndex()) {
if (voxel->isKnownBufferIndex()) {
args->nodesRemoved++;
bool falseColorize = false;
if (falseColorize) {
@ -2463,7 +2441,7 @@ bool VoxelSystem::showAllSubTreeOperation(OctreeElement* element, void* extraDat
bool shouldRender = voxel->calculateShouldRender(&args->thisViewFrustum, voxelSizeScale, boundaryLevelAdjust);
voxel->setShouldRender(shouldRender);
if (shouldRender && !(voxel->isKnownBufferIndex() || voxel->getPrimitiveIndex())) {
if (shouldRender && !voxel->isKnownBufferIndex()) {
bool falseColorize = false;
if (falseColorize) {
voxel->setFalseColor(0,0,255); // false colorize
@ -2558,7 +2536,7 @@ bool VoxelSystem::hideOutOfViewOperation(OctreeElement* element, void* extraData
// if the child node INTERSECTs the view, then we want to check to see if it thinks it should render
// if it should render but is missing it's VBO index, then we want to flip it on, and we can stop recursing from
// here because we know will block any children anyway
if (voxel->getShouldRender() && !(voxel->isKnownBufferIndex() || voxel->getPrimitiveIndex())) {
if (voxel->getShouldRender() && !voxel->isKnownBufferIndex()) {
voxel->setDirtyBit(); // will this make it draw?
args->nodesShown++;
return false;
@ -2722,9 +2700,9 @@ bool VoxelSystem::collectStatsForTreesAndVBOsOperation(OctreeElement* element, v
}
unsigned long nodeIndex = 0;
if (voxel->getPrimitiveIndex()) {
if (voxel->getBufferIndex()) {
args->nodesInPrimitiveRenderer++;
nodeIndex = voxel->getPrimitiveIndex();
nodeIndex = voxel->getBufferIndex();
const bool extraDebugging = false; // enable for extra debugging
if (extraDebugging) {

2
interface/src/VoxelSystem.h
View file

@ -137,7 +137,6 @@ public slots:
void falseColorizeBySource();
void forceRedrawEntireTree();
void clearAllNodesBufferIndex();
void clearAllNodesPrimitiveIndex();
void cullSharedFaces();
void showCulledSharedFaces();
@ -195,7 +194,6 @@ private:
static bool killSourceVoxelsOperation(OctreeElement* element, void* extraData);
static bool forceRedrawEntireTreeOperation(OctreeElement* element, void* extraData);
static bool clearAllNodesBufferIndexOperation(OctreeElement* element, void* extraData);
static bool clearAllNodesPrimitiveIndexOperation(OctreeElement* element, void* extraData);
static bool inspectForExteriorOcclusionsOperation(OctreeElement* element, void* extraData);
static bool inspectForInteriorOcclusionsOperation(OctreeElement* element, void* extraData);
static bool hideOutOfViewOperation(OctreeElement* element, void* extraData);

3
libraries/voxels/src/VoxelTreeElement.h
View file

@ -49,8 +49,6 @@ public:
int getPrimitiveIndex() const { return _primitiveIndex; }
void setPrimitiveIndex(int index) { _primitiveIndex = index; }
glBufferIndex getBufferIndex() const { return _glBufferIndex; }
bool isKnownBufferIndex() const { return !_unknownBufferIndex; }
void setBufferIndex(glBufferIndex index) { _glBufferIndex = index; _unknownBufferIndex =(index == GLBUFFER_INDEX_UNKNOWN);}
@ -98,7 +96,6 @@ protected:
nodeColor _currentColor; /// Client only, false color of this voxel, 4 bytes
private:
int _primitiveIndex; ///< Unique identifier given by PrimitiveRenderer
unsigned char _exteriorOcclusions; ///< Exterior shared partition boundaries that are completely occupied
unsigned char _interiorOcclusions; ///< Interior shared partition boundaries with siblings
};