Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 17:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review fixes

Browse source
This commit is contained in:
ZappoMan 2013-05-10 10:03:28 -07:00
parent 9dc09de75e
commit 3af8a1b8f4
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/VoxelSystem.cpp
View file

@ -232,7 +232,7 @@ int VoxelSystem::newTreeToArrays(VoxelNode* node) {
bool inChildBoundary = (distanceToNode <= childBoundary); bool inChildBoundary = (distanceToNode <= childBoundary);
shouldRender = (node->isLeaf() && inChildBoundary) || (inBoundary && !inChildBoundary); shouldRender = (node->isLeaf() && inChildBoundary) || (inBoundary && !inChildBoundary);
} }
node->setShouldRender(shouldRender && !node->deleteMe()); node->setShouldRender(shouldRender && !node->isStagedForDeletion());
// let children figure out their renderness // let children figure out their renderness
for (int i = 0; i < NUMBER_OF_CHILDREN; i++) { for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
if (node->getChildAtIndex(i)) { if (node->getChildAtIndex(i)) {
@ -249,7 +249,7 @@ int VoxelSystem::newTreeToArrays(VoxelNode* node) {
// then it means our VBOs are "clean" and our vertices have been removed or not added. So we can now // then it means our VBOs are "clean" and our vertices have been removed or not added. So we can now
// safely remove the node from the tree and actually delete it. // safely remove the node from the tree and actually delete it.
// otherwise honor our calculated shouldRender // otherwise honor our calculated shouldRender
if (node->deleteMe()) { if (node->isStagedForDeletion()) {
_tree->deleteVoxelCodeFromTree(node->getOctalCode()); _tree->deleteVoxelCodeFromTree(node->getOctalCode());
} }
@ -915,7 +915,7 @@ void VoxelSystem::deleteVoxelAt(float x, float y, float z, float s) {
VoxelNode* node = _tree->getVoxelAt(x, y, z, s); VoxelNode* node = _tree->getVoxelAt(x, y, z, s);
if (node) { if (node) {
// tell the node we want it deleted // tell the node we want it deleted
node->pleaseDeleteMe(); node->stageForDeletion();
// tree is now dirty // tree is now dirty
_tree->setDirtyBit(); _tree->setDirtyBit();

2
libraries/voxels/src/VoxelNode.cpp
View file

@ -44,7 +44,7 @@ void VoxelNode::init(unsigned char * octalCode) {
_glBufferIndex = GLBUFFER_INDEX_UNKNOWN; _glBufferIndex = GLBUFFER_INDEX_UNKNOWN;
_isDirty = true; _isDirty = true;
_shouldRender = false; _shouldRender = false;
_deleteMe = false; _isStagedForDeletion = false;
calculateAABox(); calculateAABox();
} }

6
libraries/voxels/src/VoxelNode.h
View file

@ -27,7 +27,7 @@ private:
glBufferIndex _glBufferIndex; glBufferIndex _glBufferIndex;
bool _isDirty; bool _isDirty;
bool _shouldRender; bool _shouldRender;
bool _deleteMe; bool _isStagedForDeletion;
AABox _box; AABox _box;
unsigned char* _octalCode; unsigned char* _octalCode;
VoxelNode* _children[8]; VoxelNode* _children[8];
@ -73,8 +73,8 @@ public:
bool getShouldRender() const { return _shouldRender; } bool getShouldRender() const { return _shouldRender; }
// Used by VoxelSystem to mark a node as to be deleted on next render pass // Used by VoxelSystem to mark a node as to be deleted on next render pass
void pleaseDeleteMe() { _deleteMe = true; }; void stageForDeletion() { _isStagedForDeletion = true; };
bool deleteMe() const { return _deleteMe; } bool isStagedForDeletion() const { return _isStagedForDeletion; }
#ifndef NO_FALSE_COLOR // !NO_FALSE_COLOR means, does have false color #ifndef NO_FALSE_COLOR // !NO_FALSE_COLOR means, does have false color
void setFalseColor(colorPart red, colorPart green, colorPart blue); void setFalseColor(colorPart red, colorPart green, colorPart blue);