History

move hydra finger painting from c++ to js

ZappoMan committed 12 years ago

Commit d8d61c71 parent 2c7d9d73 files · +49 −27Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+0−6
@@ -82,9 +82,6 @@ VoxelSystem::VoxelSystem(float treeScale, int maxVoxels) · 81 unmodified lines
82 82
83 _viewFrustum = Application::getInstance()->getViewFrustum();83 _viewFrustum = Application::getInstance()->getViewFrustum();
84 84
85 connect(_tree, SIGNAL(importSize(float,float,float)), SIGNAL(importSize(float,float,float)));
86 connect(_tree, SIGNAL(importProgress(int)), SIGNAL(importProgress(int)));
87
88 _useVoxelShader = false;85 _useVoxelShader = false;
89 _voxelsAsPoints = false;86 _voxelsAsPoints = false;
90 _voxelShaderModeWhenVoxelsAsPointsEnabled = false;87 _voxelShaderModeWhenVoxelsAsPointsEnabled = false;
@@ -1185,9 +1182,6 @@ void VoxelSystem::changeTree(VoxelTree* newTree) { · 1094 unmodified lines
1185 _tree->setDirtyBit();1182 _tree->setDirtyBit();
1186 _tree->getRoot()->setVoxelSystem(this);1183 _tree->getRoot()->setVoxelSystem(this);
1187 1184
1188 connect(_tree, SIGNAL(importSize(float,float,float)), SIGNAL(importSize(float,float,float)));
1189 connect(_tree, SIGNAL(importProgress(int)), SIGNAL(importProgress(int)));
1190
1191 setupNewVoxelsForDrawing();1185 setupNewVoxelsForDrawing();
1192}1186}
1193 1187