griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

single tree (by default)

Browse Source 
now that build is nlogn (it should be worth to the tree of trees)
This commit is contained in:
Andre Susano Pinto
2009-08-03 23:25:38 +00:00
parent 29530beb90
commit eaf232cad9
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
View File

@@ -335,8 +335,8 @@ int rtbuild_heuristic_object_split(RTBuilder *b, int nchilds)
right_side= bb_area(sweep[i].bb, sweep[i].bb+3)*(sweep[i].cost+logf(size-i));
hcost = left_side+right_side;
assert(left_side > 0);
assert(right_side > 0);
assert(left_side >= 0);
assert(right_side >= 0);
if(left_side > bcost) break; //No way we can find a better heuristic in this axis

56
source/blender/render/intern/source/rayshade.c
View File

@@ -308,13 +308,18 @@ static void makeraytree_single(Render *re)
ObjectRen *obr = obi->obr;
obs++;
assert((obi->flag & R_TRANSFORMED) == 0); //Not suported
for(v=0;v<obr->totvlak;v++)
if(obi->flag & R_TRANSFORMED)
{
VlakRen *vlr = obr->vlaknodes[v>>8].vlak + (v&255);
if(is_raytraceable_vlr(re, vlr))
faces++;
faces++;
}
else
{
for(v=0;v<obr->totvlak;v++)
{
VlakRen *vlr = obr->vlaknodes[v>>8].vlak + (v&255);
if(is_raytraceable_vlr(re, vlr))
faces++;
}
}
}
@@ -329,22 +334,30 @@ static void makeraytree_single(Render *re)
for(obi=re->instancetable.first; obi; obi=obi->next)
if(is_raytraceable(re, obi))
{
int v;
ObjectRen *obr = obi->obr;
for(v=0;v<obr->totvlak;v++)
if(obi->flag & R_TRANSFORMED)
{
VlakRen *vlr = obr->vlaknodes[v>>8].vlak + (v&255);
face->v1 = vlr->v1->co;
face->v2 = vlr->v2->co;
face->v3 = vlr->v3->co;
face->v4 = vlr->v4 ? vlr->v4->co : NULL;
face->ob = obi;
face->face = vlr;
RE_rayobject_add( raytree, RayObject_unalignRayFace(face) );
face++;
RayObject *obj = makeraytree_object(re, obi);
RE_rayobject_add( re->raytree, obj );
}
else
{
int v;
ObjectRen *obr = obi->obr;
for(v=0;v<obr->totvlak;v++)
{
VlakRen *vlr = obr->vlaknodes[v>>8].vlak + (v&255);
face->v1 = vlr->v1->co;
face->v2 = vlr->v2->co;
face->v3 = vlr->v3->co;
face->v4 = vlr->v4 ? vlr->v4->co : NULL;
face->ob = obi;
face->face = vlr;
RE_rayobject_add( raytree, RayObject_unalignRayFace(face) );
face++;
}
}
}
RE_rayobject_done( raytree );
@@ -356,6 +369,7 @@ void makeraytree(Render *re)
int i;
const char *tree_type = "Tree(unknown)";
re->r.raytrace_tree_type = R_RAYSTRUCTURE_SINGLE_BVH;
#ifdef RE_RAYCOUNTER
if(re->r.raytrace_tree_type == R_RAYTRACE_TREE_BVH)
tree_type = "BVH";