archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix point-hint

Browse Source
This commit is contained in:
Andre Susano Pinto
2009-08-04 18:03:04 +00:00
parent 7e9dc51cd1
commit 2160f36fea
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/render/intern/raytrace/rayobject_vbvh.cpp
View File

@@ -345,24 +345,32 @@ void bvh_dfs_make_hint_push_siblings(Node *node, LCTSHint *hint, int reserve_spa
bvh_dfs_make_hint_push_siblings(node->sibling, hint, reserve_space+1, min, max); bvh_dfs_make_hint_push_siblings(node->sibling, hint, reserve_space+1, min, max);
bvh_dfs_make_hint(node, hint, reserve_space, min, max); bvh_dfs_make_hint(node, hint, reserve_space, min, max);
} }
} }
template<class Node> template<class Node>
void bvh_dfs_make_hint(Node *node, LCTSHint *hint, int reserve_space, float *min, float *max) void bvh_dfs_make_hint(Node *node, LCTSHint *hint, int reserve_space, float *min, float *max)
{ {
assert( hint->size - reserve_space + 1 <= RE_RAY_LCTS_MAX_SIZE ); assert( hint->size + reserve_space + 1 <= RE_RAY_LCTS_MAX_SIZE );
if(hint->size - reserve_space + 1 == RE_RAY_LCTS_MAX_SIZE || !RayObject_isAligned(node)) if(!RayObject_isAligned(node))
{
hint->stack[hint->size++] = (RayObject*)node; hint->stack[hint->size++] = (RayObject*)node;
}
else else
{ {
/* We are 100% sure the ray will be pass inside this node */ int childs = count_childs(node);
if(bb_fits_inside(node->bb, node->bb+3, min, max) ) if(hint->size + reserve_space + childs <= RE_RAY_LCTS_MAX_SIZE)
{ {
bvh_dfs_make_hint_push_siblings(node->child, hint, reserve_space, min, max); /* We are 100% sure the ray will be pass inside this node */
if(bb_fits_inside(node->bb, node->bb+3, min, max) )
{
bvh_dfs_make_hint_push_siblings(node->child, hint, reserve_space, min, max);
}
else
{
hint->stack[hint->size++] = (RayObject*)node;
}
} }
else else
{ {