Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 17:53:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into shadowplay

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-21 11:29:16 -08:00
commit cb64103e05
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/voxels/src/VoxelNode.cpp
View file

@ -510,6 +510,7 @@ void VoxelNode::storeTwoChildren(VoxelNode* childOne, VoxelNode* childTwo) {
const int newChildCount = 2;
_externalChildrenMemoryUsage += newChildCount * sizeof(VoxelNode*);
_children.external = new VoxelNode*[newChildCount];
memset(_children.external, 0, sizeof(VoxelNode*) * newChildCount);
}
_children.external[0] = childOne;
_children.external[1] = childTwo;
@ -620,6 +621,7 @@ void VoxelNode::storeThreeChildren(VoxelNode* childOne, VoxelNode* childTwo, Vox
const int newChildCount = 3;
_externalChildrenMemoryUsage += newChildCount * sizeof(VoxelNode*);
_children.external = new VoxelNode*[newChildCount];
memset(_children.external, 0, sizeof(VoxelNode*) * newChildCount);
}
_children.external[0] = childOne;
_children.external[1] = childTwo;
@ -1004,6 +1006,8 @@ void VoxelNode::setChildAtIndex(int childIndex, VoxelNode* child) {
_childrenExternal = true;
const int newChildCount = 4;
_children.external = new VoxelNode*[newChildCount];
memset(_children.external, 0, sizeof(VoxelNode*) * newChildCount);
_externalChildrenMemoryUsage += newChildCount * sizeof(VoxelNode*);
_children.external[0] = childOne;
@ -1072,6 +1076,7 @@ void VoxelNode::setChildAtIndex(int childIndex, VoxelNode* child) {
// 4 or more children, one item being added, we know we're stored externally, we just figure out where to insert
// this child pointer into our external list
VoxelNode** newExternalList = new VoxelNode*[newChildCount];
memset(newExternalList, 0, sizeof(VoxelNode*) * newChildCount);
int copiedCount = 0;
for (int ordinal = 1; ordinal <= newChildCount; ordinal++) {