From 9800dc0fde4cf7f3ae0a1db8501a096bc4d55072 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 15 Oct 2013 13:40:55 -0700 Subject: [PATCH] removed dead code --- .../voxel-server-library/src/VoxelPersistThread.cpp | 2 +- libraries/voxels/src/VoxelNode.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/libraries/voxel-server-library/src/VoxelPersistThread.cpp b/libraries/voxel-server-library/src/VoxelPersistThread.cpp index d63601e5be..7caa83c2d8 100644 --- a/libraries/voxel-server-library/src/VoxelPersistThread.cpp +++ b/libraries/voxel-server-library/src/VoxelPersistThread.cpp @@ -29,7 +29,7 @@ bool VoxelPersistThread::process() { _initialLoad = true; qDebug("loading voxels from file: %s...\n", _filename); - qDebug("sizeof(oldVoxelNode)=%d sizeof(VoxelNode)=%d sizeof(AABox)=%d sizeof(oldAABox)=%d\n", + qDebug("sizeof(oldVoxelNode)=%ld sizeof(VoxelNode)=%ld sizeof(AABox)=%ld sizeof(oldAABox)=%ld\n", sizeof(oldVoxelNode), sizeof(VoxelNode), sizeof(AABox), sizeof(oldAABox)); bool persistantFileRead = _tree->readFromSVOFile(_filename); diff --git a/libraries/voxels/src/VoxelNode.h b/libraries/voxels/src/VoxelNode.h index 8432b7b06b..884d79a632 100644 --- a/libraries/voxels/src/VoxelNode.h +++ b/libraries/voxels/src/VoxelNode.h @@ -93,22 +93,12 @@ public: void setShouldRender(bool shouldRender); bool getShouldRender() const { return _shouldRender; } -#ifndef NO_FALSE_COLOR // !NO_FALSE_COLOR means, does have false color void setFalseColor(colorPart red, colorPart green, colorPart blue); void setFalseColored(bool isFalseColored); bool getFalseColored() { return _falseColored; } void setColor(const nodeColor& color); const nodeColor& getTrueColor() const { return _trueColor; } const nodeColor& getColor() const { return _currentColor; } -#else - void setFalseColor(colorPart red, colorPart green, colorPart blue) { /* no op */ }; - void setFalseColored(bool isFalseColored) { /* no op */ }; - bool getFalseColored() { return false; }; - void setColor(const nodeColor& color) { memcpy(_trueColor,color,sizeof(nodeColor)); }; - void setDensity(const float density) { _density = density; }; - const nodeColor& getTrueColor() const { return _trueColor; }; - const nodeColor& getColor() const { return _trueColor; }; -#endif void setDensity(float density) { _density = density; } float getDensity() const { return _density; } @@ -147,10 +137,8 @@ private: int _childCount; /// Client and server, current child nodes set to non-null in _children, 4 bytes nodeColor _trueColor; /// Client and server, true color of this voxel, 4 bytes -#ifndef NO_FALSE_COLOR // !NO_FALSE_COLOR means, does have false color nodeColor _currentColor; /// Client only, false color of this voxel, 4 bytes bool _falseColored; /// Client only, is this voxel false colored, 1 bytes -#endif bool _isDirty; /// Client only, has this voxel changed since being rendered, 1 byte bool _shouldRender; /// Client only, should this voxel render at this time, 1 byte