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

fix conditional inclusion of voxel in vertices and color arrays

Browse source
This commit is contained in:
Stephen Birarda 2013-03-20 16:28:28 -07:00
parent f8485ab5da
commit f97932353b
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/src/VoxelSystem.cpp
View file

@ -78,22 +78,20 @@ int VoxelSystem::treeToArrays(VoxelNode *currentNode) {
// if we didn't get any voxels added then we're a leaf // if we didn't get any voxels added then we're a leaf
// add our vertex and color information to the interleaved array // add our vertex and color information to the interleaved array
if (voxelsAdded == 0) { if (voxelsAdded == 0 && currentNode->color[3] == 1) {
float * startVertex = firstVertexForCode(currentNode->octalCode); float * startVertex = firstVertexForCode(currentNode->octalCode);
float voxelScale = 1 / powf(2, *currentNode->octalCode); float voxelScale = 1 / powf(2, *currentNode->octalCode);
if (currentNode->color[3] == 1) { // populate the array with points for the 8 vertices
// populate the array with points for the 8 vertices // and RGB color for each added vertex
// and RGB color for each added vertex for (int j = 0; j < VERTEX_POINTS_PER_VOXEL; j++ ) {
for (int j = 0; j < VERTEX_POINTS_PER_VOXEL; j++ ) { *verticesEndPointer = startVertex[j % 3] + (identityVertices[j] * voxelScale);
*verticesEndPointer = startVertex[j % 3] + (identityVertices[j] * voxelScale); *(colorsArray + (verticesEndPointer - verticesArray)) = currentNode->color[j % 3];
*(colorsArray + (verticesEndPointer - verticesArray)) = currentNode->color[j % 3];
verticesEndPointer++;
}
voxelsAdded++; verticesEndPointer++;
} }
voxelsAdded++;
delete [] startVertex; delete [] startVertex;
} }