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

Added getVoxelAt for LocalVoxels + handle the case of the domain tree

Browse source
This commit is contained in:
Atlante45 2014-02-27 17:52:44 -08:00
parent 5986fcafae
commit 11e80e0aaa
1 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libraries/voxels/src/LocalVoxels.cpp
View file

@ -13,6 +13,13 @@ LocalVoxels::LocalVoxels(QString name) :
_name(name), _name(name),
_tree(new VoxelTree(true)) _tree(new VoxelTree(true))
{ {
// Don't allow creation of a local tree pointing to the domain tree.
if (_name == DOMAIN_TREE_NAME) {
qDebug() << "Please use the \"Voxels\" interface to modify the domain tree.";
_name.clear();
_tree.clear();
}
LocalVoxelsList::getInstance()->insert(_name, _tree); LocalVoxelsList::getInstance()->insert(_name, _tree);
} }
@ -21,13 +28,40 @@ LocalVoxels::~LocalVoxels() {
LocalVoxelsList::getInstance()->remove(_name); LocalVoxelsList::getInstance()->remove(_name);
} }
void LocalVoxels::setVoxelNonDestructive(float x, float y, float z, float scale, VoxelDetail LocalVoxels::getVoxelAt(float x, float y, float z, float scale) {
uchar red, uchar green, uchar blue) {if (_tree ) { // setup a VoxelDetail struct with the data
if (_tree->tryLockForWrite()) { VoxelDetail result = {0,0,0,0,0,0,0};
_tree->createVoxel(x, y, z, scale, red, green, blue, false);
if (_tree) {
_tree->lockForRead();
VoxelTreeElement* voxel = static_cast<VoxelTreeElement*>(_tree->getOctreeElementAt(x / (float)TREE_SCALE,
y / (float)TREE_SCALE,
z / (float)TREE_SCALE,
scale / (float)TREE_SCALE));
_tree->unlock(); _tree->unlock();
if (voxel) {
// Note: these need to be in voxel space because the VoxelDetail -> js converter will upscale
result.x = voxel->getCorner().x;
result.y = voxel->getCorner().y;
result.z = voxel->getCorner().z;
result.s = voxel->getScale();
result.red = voxel->getColor()[RED_INDEX];
result.green = voxel->getColor()[GREEN_INDEX];
result.blue = voxel->getColor()[BLUE_INDEX];
}
} }
return result;
} }
void LocalVoxels::setVoxelNonDestructive(float x, float y, float z, float scale,
uchar red, uchar green, uchar blue) {
if (_tree ) {
if (_tree->tryLockForWrite()) {
_tree->createVoxel(x, y, z, scale, red, green, blue, false);
_tree->unlock();
}
}
} }
void LocalVoxels::setVoxel(float x, float y, float z, float scale, void LocalVoxels::setVoxel(float x, float y, float z, float scale,