manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- removed compile time errors

This commit is contained in:
granzuglia 2012-07-23 12:16:17 +00:00
parent 15665c15ef
commit 0448e15f5b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vcg/space/index/octree.h
View File

@ -288,7 +288,7 @@ public:
{ {
int placeholder_index = int(placeholders.size()); int placeholder_index = int(placeholders.size());
placeholders.push_back( ObjectPlaceholder< NodeType >() ); placeholders.push_back( ObjectPlaceholder< NodeType >() );
placeholders[placeholder_index].z_order = BuildRoute(hit_leaf, route); placeholders[placeholder_index].z_order = TemplatedOctree::BuildRoute(hit_leaf, route);
placeholders[placeholder_index].leaf_pointer = route[depth]; placeholders[placeholder_index].leaf_pointer = route[depth];
placeholders[placeholder_index].object_index = i; placeholders[placeholder_index].object_index = i;
@ -631,7 +631,7 @@ OBJECT_RETRIEVER:
query_bb.Offset(TemplatedOctree::leafDiagonal); query_bb.Offset(TemplatedOctree::leafDiagonal);
sphere_radius+= TemplatedOctree::leafDiagonal; sphere_radius+= TemplatedOctree::leafDiagonal;
ContainedLeaves(query_bb, leaves, TemplatedOctree::Root(), TemplatedOctree::boundingBox); TemplatedOctree::ContainedLeaves(query_bb, leaves, TemplatedOctree::Root(), TemplatedOctree::boundingBox);
leaves_count = int(leaves.size()); leaves_count = int(leaves.size());
object_count = 0; object_count = 0;
@ -724,10 +724,10 @@ OBJECT_RETRIEVER:
VoxelPointer son_voxel; VoxelPointer son_voxel;
for (int s=0; s<8; s++) for (int s=0; s<8; s++)
{ {
NodePointer son_index = Son(n, s); NodePointer son_index = TemplatedOctree::Son(n, s);
if (son_index!=NULL) if (son_index!=NULL)
{ {
if (Level(son_index)!=TemplatedOctree::maximumDepth) if (TemplatedOctree::Level(son_index)!=TemplatedOctree::maximumDepth)
IndexInnerNodes(son_index); IndexInnerNodes(son_index);
son_voxel = TemplatedOctree::Voxel(son_index); son_voxel = TemplatedOctree::Voxel(son_index);