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

removed dead code

Browse source
This commit is contained in:
ZappoMan 2013-10-15 13:40:55 -07:00
parent 05c9d4febc
commit 9800dc0fde
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/voxel-server-library/src/VoxelPersistThread.cpp
View file

@ -29,7 +29,7 @@ bool VoxelPersistThread::process() {
_initialLoad = true; _initialLoad = true;
qDebug("loading voxels from file: %s...\n", _filename); 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)); sizeof(oldVoxelNode), sizeof(VoxelNode), sizeof(AABox), sizeof(oldAABox));
bool persistantFileRead = _tree->readFromSVOFile(_filename); bool persistantFileRead = _tree->readFromSVOFile(_filename);

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

@ -93,22 +93,12 @@ public:
void setShouldRender(bool shouldRender); void setShouldRender(bool shouldRender);
bool getShouldRender() const { return _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 setFalseColor(colorPart red, colorPart green, colorPart blue);
void setFalseColored(bool isFalseColored); void setFalseColored(bool isFalseColored);
bool getFalseColored() { return _falseColored; } bool getFalseColored() { return _falseColored; }
void setColor(const nodeColor& color); void setColor(const nodeColor& color);
const nodeColor& getTrueColor() const { return _trueColor; } const nodeColor& getTrueColor() const { return _trueColor; }
const nodeColor& getColor() const { return _currentColor; } 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; } void setDensity(float density) { _density = density; }
float getDensity() const { return _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 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 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 nodeColor _currentColor; /// Client only, false color of this voxel, 4 bytes
bool _falseColored; /// Client only, is this voxel false colored, 1 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 _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 bool _shouldRender; /// Client only, should this voxel render at this time, 1 byte