Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 17:40:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some comments and debug messages

Browse source
This commit is contained in:
Atlante45 2014-02-28 15:14:01 -08:00
parent ea0f414c23
commit af691e1f75
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -1434,6 +1434,7 @@ void Application::pasteVoxelsToOctalCode(const unsigned char* octalCodeDestinati
args.newBaseOctCode = octalCodeDestination;
_sharedVoxelSystem.getTree()->recurseTreeWithOperation(sendVoxelsOperation, &args);
// Switch back to clipboard if it was an import
if (_sharedVoxelSystem.getTree() != &_clipboard) {
_sharedVoxelSystem.killLocalVoxels();
_sharedVoxelSystem.changeTree(&_clipboard);

23
libraries/script-engine/src/LocalVoxels.cpp
View file

@ -13,10 +13,6 @@ LocalVoxels::LocalVoxels(QString name) :
_name(name),
_tree(new VoxelTree(true))
{
if (_name == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
}
LocalVoxelsList::getInstance()->insert(_name, _tree);
}
@ -28,7 +24,6 @@ LocalVoxels::~LocalVoxels() {
VoxelDetail LocalVoxels::getVoxelAt(float x, float y, float z, float scale) {
// setup a VoxelDetail struct with the data
VoxelDetail result = {0,0,0,0,0,0,0};
if (_tree) {
_tree->lockForRead();
@ -54,10 +49,9 @@ VoxelDetail LocalVoxels::getVoxelAt(float x, float y, float z, float scale) {
void LocalVoxels::setVoxelNonDestructive(float x, float y, float z, float scale,
uchar red, uchar green, uchar blue) {
if (_name == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
qDebug() << "LocalVoxels::setVoxelNonDestructive(): Please use the \"Voxels\" interface to modify the domain tree.";
return;
}
if (_tree ) {
if (_tree->tryLockForWrite()) {
_tree->createVoxel(x, y, z, scale, red, green, blue, false);
@ -69,10 +63,9 @@ void LocalVoxels::setVoxelNonDestructive(float x, float y, float z, float scale,
void LocalVoxels::setVoxel(float x, float y, float z, float scale,
uchar red, uchar green, uchar blue) {
if (_name == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
qDebug() << "LocalVoxels::setVoxel(): Please use the \"Voxels\" interface to modify the domain tree.";
return;
}
if (_tree ) {
if (_tree->tryLockForWrite()) {
_tree->createVoxel(x, y, z, scale, red, green, blue, true);
@ -83,10 +76,9 @@ void LocalVoxels::setVoxel(float x, float y, float z, float scale,
void LocalVoxels::eraseVoxel(float x, float y, float z, float scale) {
if (_name == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
qDebug() << "LocalVoxels::eraseVoxel(): Please use the \"Voxels\" interface to modify the domain tree.";
return;
}
if (_tree ) {
if (_tree->tryLockForWrite()) {
_tree->deleteVoxelAt(x, y, z, scale);
@ -97,25 +89,20 @@ void LocalVoxels::eraseVoxel(float x, float y, float z, float scale) {
void LocalVoxels::copyTo(float x, float y, float z, float scale, const QString destination) {
if (destination == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
qDebug() << "LocalVoxels::copyTo(): Please use the \"Voxels\" interface to modify the domain tree.";
return;
}
StrongVoxelTreePointer destinationTree = LocalVoxelsList::getInstance()->getTree(destination);
VoxelTreeElement* destinationNode = destinationTree->getVoxelAt(x, y, z, scale);
destinationTree->copyFromTreeIntoSubTree(_tree.data(), destinationNode);
}
void LocalVoxels::pasteFrom(float x, float y, float z, float scale, const QString source) {
if (_name == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
qDebug() << "LocalVoxels::pasteFrom(): Please use the \"Voxels\" interface to modify the domain tree.";
return;
}
StrongVoxelTreePointer sourceTree = LocalVoxelsList::getInstance()->getTree(source);
VoxelTreeElement* sourceNode = _tree->getVoxelAt(x, y, z, scale);
_tree->copySubTreeIntoNewTree(sourceNode, sourceTree.data(), true);
}