sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Removed a bzero from octree-filling, replaced with exact code what

Browse Source 
needs cleared. Timings go down nice:

octree new     2.33a

128    0:04.2  0:07.5
256    0:06.5  0:20.0
512    0:18.0  2.06.9

Time is including initialize renderfaces etc. 100k quads.
This commit is contained in:
Ton Roosendaal 2004-05-19 19:30:43 +00:00
parent 1ff3066a9a
commit e67713c113
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/render/intern/source/ray.c
View File

@ -500,8 +500,11 @@ void makeoctree()
if(g_oc.min[0] > g_oc.max[0]) return; /* empty octree */
g_oc.adrbranch[0]=(Branch *)MEM_callocN(4096*sizeof(Branch), "makeoctree");
ocvlak= MEM_callocN( 3*ocres2 + 8, "ocvlak");
/* the lookup table, per face, for which nodes to fill in */
ocvlak= MEM_callocN( 3*ocres2 + 8, "ocvlak");
memset(ocvlak, 0, 3*ocres2);
for(c=0;c<3;c++) { /* octree enlarge, still needed? */
g_oc.min[c]-= 0.01;
g_oc.max[c]+= 0.01;
@ -542,7 +545,7 @@ void makeoctree()
}
}
memset(ocvlak, 0, 3*ocres2);
for(c=0;c<3;c++) {
oc1= rts[0][c];
@ -591,14 +594,31 @@ void makeoctree()
for(x=ocmin[0];x<=ocmax[0];x++) {
a= g_oc.ocres*x;
for(y=ocmin[1];y<=ocmax[1];y++) {
b= g_oc.ocres*y;
if(ocvlak[a+y+ocres2]) {
b= g_oc.ocres*y+2*ocres2;
for(z=ocmin[2];z<=ocmax[2];z++) {
if(ocvlak[b+z+2*ocres2] && ocvlak[a+z]) ocwrite(vlr, x,y,z, rtf);
if(ocvlak[b+z] && ocvlak[a+z]) ocwrite(vlr, x,y,z, rtf);
}
}
}
}
/* same loops to clear octree, doubt it can be done smarter */
for(x=ocmin[0];x<=ocmax[0];x++) {
a= g_oc.ocres*x;
for(y=ocmin[1];y<=ocmax[1];y++) {
/* x-y */
ocvlak[a+y+ocres2]= 0;
b= g_oc.ocres*y + 2*ocres2;
for(z=ocmin[2];z<=ocmax[2];z++) {
/* y-z */
ocvlak[b+z]= 0;
/* x-z */
ocvlak[a+z]= 0;
}
}
}
}
}