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

more VoxelSystem vs VoxelTree cleanup

Browse source
This commit is contained in:
ZappoMan 2014-03-02 16:51:40 -08:00
parent 63bebc9afc
commit 176270f639
4 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/VoxelImporter.cpp
View file

@ -143,11 +143,11 @@ void ImportTask::run() {
// Then we call the righ method for the job // Then we call the righ method for the job
if (_filename.endsWith(".png", Qt::CaseInsensitive)) { if (_filename.endsWith(".png", Qt::CaseInsensitive)) {
voxelSystem->readFromSquareARGB32Pixels(_filename.toLocal8Bit().data()); voxelSystem->getTree()->readFromSquareARGB32Pixels(_filename.toLocal8Bit().data());
} else if (_filename.endsWith(".svo", Qt::CaseInsensitive)) { } else if (_filename.endsWith(".svo", Qt::CaseInsensitive)) {
voxelSystem->readFromSVOFile(_filename.toLocal8Bit().data()); voxelSystem->getTree()->readFromSVOFile(_filename.toLocal8Bit().data());
} else if (_filename.endsWith(".schematic", Qt::CaseInsensitive)) { } else if (_filename.endsWith(".schematic", Qt::CaseInsensitive)) {
voxelSystem->readFromSchematicFile(_filename.toLocal8Bit().data()); voxelSystem->getTree()->readFromSchematicFile(_filename.toLocal8Bit().data());
} else { } else {
// We should never get here. // We should never get here.
qDebug() << "[ERROR] Invalid file extension." << endl; qDebug() << "[ERROR] Invalid file extension." << endl;

28
interface/src/VoxelSystem.cpp
View file

@ -524,34 +524,6 @@ void VoxelSystem::initVoxelMemory() {
_readArraysLock.unlock(); _readArraysLock.unlock();
} }
void VoxelSystem::writeToSVOFile(const char* filename, VoxelTreeElement* element) const {
_tree->writeToSVOFile(filename, element);
}
bool VoxelSystem::readFromSVOFile(const char* filename) {
bool result = _tree->readFromSVOFile(filename);
if (result) {
setupNewVoxelsForDrawing();
}
return result;
}
bool VoxelSystem::readFromSquareARGB32Pixels(const char *filename) {
bool result = _tree->readFromSquareARGB32Pixels(filename);
if (result) {
setupNewVoxelsForDrawing();
}
return result;
}
bool VoxelSystem::readFromSchematicFile(const char* filename) {
bool result = _tree->readFromSchematicFile(filename);
if (result) {
setupNewVoxelsForDrawing();
}
return result;
}
int VoxelSystem::parseData(const QByteArray& packet) { int VoxelSystem::parseData(const QByteArray& packet) {
bool showTimingDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); bool showTimingDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
PerformanceWarning warn(showTimingDetails, "VoxelSystem::parseData()",showTimingDetails); PerformanceWarning warn(showTimingDetails, "VoxelSystem::parseData()",showTimingDetails);

5
interface/src/VoxelSystem.h
View file

@ -67,11 +67,6 @@ public:
ViewFrustum* getLastCulledViewFrustum() { return &_lastCulledViewFrustum; } ViewFrustum* getLastCulledViewFrustum() { return &_lastCulledViewFrustum; }
void writeToSVOFile(const char* filename, VoxelTreeElement* element) const;
bool readFromSVOFile(const char* filename);
bool readFromSquareARGB32Pixels(const char* filename);
bool readFromSchematicFile(const char* filename);
void setMaxVoxels(int maxVoxels); void setMaxVoxels(int maxVoxels);
long int getMaxVoxels() const { return _maxVoxels; } long int getMaxVoxels() const { return _maxVoxels; }
unsigned long getVoxelMemoryUsageRAM() const { return _memoryUsageRAM; } unsigned long getVoxelMemoryUsageRAM() const { return _memoryUsageRAM; }

3
libraries/octree/src/Octree.h
View file

@ -235,9 +235,6 @@ public:
// these will read/write files that match the wireformat, excluding the 'V' leading // these will read/write files that match the wireformat, excluding the 'V' leading
void writeToSVOFile(const char* filename, OctreeElement* node = NULL); void writeToSVOFile(const char* filename, OctreeElement* node = NULL);
bool readFromSVOFile(const char* filename); bool readFromSVOFile(const char* filename);
// reads voxels from square image with alpha as a Y-axis
bool readFromSquareARGB32Pixels(const char *filename);
bool readFromSchematicFile(const char* filename);
// Octree does not currently handle its own locking, caller must use these to lock/unlock // Octree does not currently handle its own locking, caller must use these to lock/unlock
void lockForRead() { lock.lockForRead(); } void lockForRead() { lock.lockForRead(); }