bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

- Autosmooth now calculates smoothing based on original object-space

Browse Source 
vertex locations, not global coordinates. This ensures consistant
  autosmoothing for each frame. Also fixes missing vectorblur for parts.

  Nice task for a dev: put autosmooth code in end of modifier stack... then
  it also shows in 3D window

- BUG FIX! I noticed the last tile rendered quite slow, and even did not
  update scanlines. Found out that the main tiles processor didn't go
  to sleep when the last tile was rendered, because it detected a free
  possible thread. This caused the main thread to go into a very tight
  loop, eating up a lot of cpu and blocking the other thread.
This commit is contained in:
Ton Roosendaal 2006-02-08 10:57:48 +00:00
parent be5429dcf4
commit f5a22bc937
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/render/intern/source/convertblender.c
View File

@ -536,7 +536,8 @@ static VertRen *as_findvertex(VlakRen *vlr, VertRen *ver, ASvert *asv, float thr
return NULL;
}
static void autosmooth(Render *re, int startvert, int startvlak, int degr)
/* note; autosmooth happens in object space still, after applying autosmooth we rotate */
static void autosmooth(Render *re, float mat[][4], int startvert, int startvlak, int degr)
{
ASvert *asv, *asverts, *asvertoffs;
ASface *asf;
@ -549,7 +550,7 @@ static void autosmooth(Render *re, int startvert, int startvlak, int degr)
asverts= MEM_callocN(sizeof(ASvert)*(re->totvert-startvert), "all smooth verts");
asvertoffs= asverts-startvert; /* se we can use indices */
thresh= cos( M_PI*(0.1f+(float)degr)/180.0 );
thresh= cos( M_PI*(0.5f+(float)degr)/180.0 );
/* step one: construct listbase of all vertices and pointers to faces */
for(a=startvlak; a<re->totvlak; a++) {
@ -599,6 +600,19 @@ static void autosmooth(Render *re, int startvert, int startvlak, int degr)
BLI_freelistN(&asverts[a].faces);
}
MEM_freeN(asverts);
/* rotate vertices and calculate normal of faces */
for(a=startvert; a<re->totvert; a++) {
ver= RE_findOrAddVert(re, a);
MTC_Mat4MulVecfl(mat, ver->co);
}
for(a=startvlak; a<re->totvlak; a++) {
vlr= RE_findOrAddVlak(re, a);
if(vlr->v4)
CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
else
CalcNormFloat(vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
}
}
/* ------------------------------------------------------------------------- */
@ -1492,7 +1506,8 @@ static void init_render_mesh(Render *re, Object *ob, int only_verts)
for(a=0; a<totvert; a++, mvert++) {
ver= RE_findOrAddVert(re, re->totvert++);
VECCOPY(ver->co, mvert->co);
MTC_Mat4MulVecfl(mat, ver->co);
if(do_autosmooth==0) /* autosmooth on original unrotated data to prevent differences between frames */
MTC_Mat4MulVecfl(mat, ver->co);
if(orco) {
ver->orco= orco;
@ -1581,10 +1596,10 @@ static void init_render_mesh(Render *re, Object *ob, int only_verts)
else vlr->v4= 0;
/* render normals are inverted in render */
if(vlr->v4) len= CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co,
vlr->v1->co, vlr->n);
else len= CalcNormFloat(vlr->v3->co, vlr->v2->co, vlr->v1->co,
vlr->n);
if(vlr->v4)
len= CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
else
len= CalcNormFloat(vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
vlr->mat= ma;
vlr->flag= flag;
@ -1682,7 +1697,7 @@ static void init_render_mesh(Render *re, Object *ob, int only_verts)
}
if(do_autosmooth) {
autosmooth(re, totverto, totvlako, me->smoothresh);
autosmooth(re, mat, totverto, totvlako, me->smoothresh);
}
calc_vertexnormals(re, totverto, totvlako, need_tangent);
@ -3130,6 +3145,9 @@ void RE_Database_FromScene_Vectors(Render *re, Scene *sce)
int oldvertnodeslen, oldtotvert, newvertnodeslen, newtotvert;
int step;
re->i.infostr= "Calculating previous vectors";
re->stats_draw(&re->i);
printf("creating speed vectors \n");
re->r.mode |= R_SPEED;
@ -3151,6 +3169,9 @@ void RE_Database_FromScene_Vectors(Render *re, Scene *sce)
RE_Database_Free(re);
/* creates entire dbase */
re->i.infostr= "Calculating next frame vectors";
re->stats_draw(&re->i);
database_fromscene_vectors(re, sce, +1);
/* copy away vertex info */
@ -3195,9 +3216,10 @@ void RE_Database_FromScene_Vectors(Render *re, Scene *sce)
else
ok= 1;
}
if(ok==0)
if(ok==0) {
printf("speed table: missing object %s\n", obren->ob->id.name+2);
continue;
}
/* check if both have same amounts of vertices */
if(obren->endvert-obren->startvert != oldobren->endvert-oldobren->startvert) {
printf("Warning: object %s has different amount of vertices on other frame\n", obren->ob->id.name+2);
@ -3212,6 +3234,9 @@ void RE_Database_FromScene_Vectors(Render *re, Scene *sce)
BLI_freelistN(&oldtable);
free_renderdata_vertnodes(newvertnodes);
BLI_freelistN(&newtable);
re->i.infostr= NULL;
re->stats_draw(&re->i);
}

22
source/blender/render/intern/source/pipeline.c
View File

@ -107,7 +107,7 @@ Render R;
/* ********* alloc and free ******** */
static SDL_mutex *malloc_lock= NULL;
SDL_mutex *malloc_lock= NULL;
void *RE_mallocN(int len, char *name)
{
@ -699,7 +699,7 @@ static void render_tile_processor(Render *re)
freeparts(re);
}
static RenderPart *find_nicest_part(Render *re)
static RenderPart *find_next_part(Render *re)
{
RenderPart *pa, *best= NULL;
int centx=re->winx/2, centy=re->winy/2, tot=1;
@ -735,7 +735,7 @@ static RenderPart *find_nicest_part(Render *re)
static void threaded_tile_processor(Render *re)
{
ListBase threads;
RenderPart *pa;
RenderPart *pa, *nextpa;
int maxthreads, rendering=1, counter= 1, hasdrawn, drawtimer=0;
if(re->result==NULL)
@ -756,15 +756,17 @@ static void threaded_tile_processor(Render *re)
R.test_break= thread_break;
malloc_lock = SDL_CreateMutex();
/* timer loop demands to sleep when no parts are left */
nextpa= find_next_part(re);
while(rendering) {
if(BLI_available_threads(&threads) && !re->test_break()) {
pa= find_nicest_part(re);
if(pa) {
pa->nr= counter++; /* for nicest part, and for stats */
pa->thread= BLI_available_thread_index(&threads); /* sample index */
BLI_insert_thread(&threads, pa);
}
if(nextpa && BLI_available_threads(&threads) && !re->test_break()) {
nextpa->nr= counter++; /* for nicest part, and for stats */
nextpa->thread= BLI_available_thread_index(&threads); /* sample index */
BLI_insert_thread(&threads, nextpa);
nextpa= find_next_part(re);
}
else {
PIL_sleep_ms(50);