History

more VoxelSystem vs VoxelTree cleanup

ZappoMan committed 12 years ago

Commit 176270f1 parent 63bebc94 files · +3 −39Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 4 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+0−28
@@ -524,34 +524,6 @@ void VoxelSystem::initVoxelMemory() { · 523 unmodified lines
524 _readArraysLock.unlock();524 _readArraysLock.unlock();
525}525}
526 526
527void VoxelSystem::writeToSVOFile(const char* filename, VoxelTreeElement* element) const {
528 _tree->writeToSVOFile(filename, element);
529}
530
531bool VoxelSystem::readFromSVOFile(const char* filename) {
532 bool result = _tree->readFromSVOFile(filename);
533 if (result) {
534 setupNewVoxelsForDrawing();
535 }
536 return result;
537}
538
539bool VoxelSystem::readFromSquareARGB32Pixels(const char *filename) {
540 bool result = _tree->readFromSquareARGB32Pixels(filename);
541 if (result) {
542 setupNewVoxelsForDrawing();
543 }
544 return result;
545}
546
547bool VoxelSystem::readFromSchematicFile(const char* filename) {
548 bool result = _tree->readFromSchematicFile(filename);
549 if (result) {
550 setupNewVoxelsForDrawing();
551 }
552 return result;
553}
554
555int VoxelSystem::parseData(const QByteArray& packet) {527int VoxelSystem::parseData(const QByteArray& packet) {
556 bool showTimingDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);528 bool showTimingDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
557 PerformanceWarning warn(showTimingDetails, "VoxelSystem::parseData()",showTimingDetails);529 PerformanceWarning warn(showTimingDetails, "VoxelSystem::parseData()",showTimingDetails);