Showing the changes to interface/src/VoxelSystem.cpp (1 of 12 files). Show all
Unified · Split
| @@ -65,6 +65,9 @@ VoxelSystem::VoxelSystem(float treeScale, int maxVoxels) : · 64 unmodified lines | |||
| 65 | _falseColorizeBySource = false; | 65 | _falseColorizeBySource = false; |
| 66 | _dataSourceID = UNKNOWN_NODE_ID; | 66 | _dataSourceID = UNKNOWN_NODE_ID; |
| 67 | _voxelServerCount = 0; | 67 | _voxelServerCount = 0; |
| 68 | |||
| 69 | connect(_tree, SIGNAL(importSize(float,float,float)), SIGNAL(importSize(float,float,float))); | ||
| 70 | connect(_tree, SIGNAL(importProgress(int)), SIGNAL(importProgress(int))); | ||
| 68 | } | 71 | } |
| 69 | 72 | ||
| 70 | void VoxelSystem::nodeDeleted(VoxelNode* node) { | 73 | void VoxelSystem::nodeDeleted(VoxelNode* node) { |
| @@ -994,6 +997,10 @@ public: · 923 unmodified lines | |||
| 994 | { } | 997 | { } |
| 995 | }; | 998 | }; |
| 996 | 999 | ||
| 1000 | void VoxelSystem::cancelImport() { | ||
| 1001 | _tree->cancelImport(); | ||
| 1002 | } | ||
| 1003 | |||
| 997 | // "Remove" voxels from the tree that are not in view. We don't actually delete them, | 1004 | // "Remove" voxels from the tree that are not in view. We don't actually delete them, |
| 998 | // we remove them from the tree and place them into a holding area for later deletion | 1005 | // we remove them from the tree and place them into a holding area for later deletion |
| 999 | bool VoxelSystem::removeOutOfViewOperation(VoxelNode* node, void* extraData) { | 1006 | bool VoxelSystem::removeOutOfViewOperation(VoxelNode* node, void* extraData) { |