--- ray/src/util/ranimove1.c 2012/09/28 22:20:49 3.18 +++ ray/src/util/ranimove1.c 2012/10/02 21:56:20 3.20 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: ranimove1.c,v 3.18 2012/09/28 22:20:49 greg Exp $"; +static const char RCSid[] = "$Id: ranimove1.c,v 3.20 2012/10/02 21:56:20 greg Exp $"; #endif /* * ranimove1.c @@ -48,14 +48,14 @@ double hlsmax; /* maximum high-level saliency this f static void next_frame(void); -static int sample_here(int x, int y); -static int offset_cmp(const void *p1, const void *p2); -static void setmotion(int n, FVECT wpos); +static int sample_here(int x, int y); +static int offset_cmp(const void *p1, const void *p2); +static void setmotion(int n, FVECT wpos); static void init_frame_sample(void); #if 0 -extern void +void write_map( /* write out float map (debugging) */ float *mp, char *fn @@ -145,8 +145,7 @@ next_frame(void) /* prepare next frame buffer */ error(SYSTEM, "out of memory in init_frame"); for (n = hres*vres; n--; ) { zprev[n] = -1.f; - xmbuffer[n] = ymbuffer[n] = MO_UNK; - oprev[n] = OVOID; + oprev[n] = OVOID; } frm_stop = getTime() + rtperfrm; } else { @@ -185,7 +184,7 @@ sample_here( /* 4x4 quincunx sample at this pixel? */ } -extern void +void sample_pos( /* compute jittered sample position */ double hv[2], int x, @@ -202,7 +201,7 @@ sample_pos( /* compute jittered sample position */ } -extern double +double sample_wt( /* compute interpolant sample weight */ int xo, int yo @@ -236,7 +235,7 @@ offset_cmp( /* compare offset distances */ } -extern int +int getclosest( /* get nc closest neighbors on same object */ int *iarr, int nc, @@ -363,8 +362,7 @@ init_frame_sample(void) /* sample our initial frame * for (x = hres; x--; ) { double hv[2]; n = fndx(x, y); - xmbuffer[n] = MO_UNK; - ymbuffer[n] = MO_UNK; + xmbuffer[n] = ymbuffer[n] = MO_UNK; sample_pos(hv, x, y, 0); ir.rmax = viewray(ir.rorg, ir.rdir, &vw, hv[0], hv[1]); if (ir.rmax < -FTINY) { @@ -452,7 +450,7 @@ init_frame_sample(void) /* sample our initial frame * } -extern int +int getambcolor( /* get ambient color for object if we can */ COLOR clr, int obj @@ -520,7 +518,7 @@ getambcolor( /* get ambient color for object if we ca } -extern double +double estimaterr( /* estimate relative error from samples */ COLOR cs, COLOR cs2, @@ -546,7 +544,7 @@ estimaterr( /* estimate relative error from samples * } -extern double +double comperr( /* estimate relative error in neighborhood */ int *neigh, int nc, @@ -582,7 +580,7 @@ comperr( /* estimate relative error in neighborhood * } -extern void +void comp_frame_error(void) /* initialize frame error values */ { uby8 *edone = NULL; @@ -610,9 +608,7 @@ comp_frame_error(void) /* initialize frame error valu * by the returned ray value -- we take half of this. */ edone = (uby8 *)calloc(hres*vres, sizeof(uby8)); - for (y = vres; y--; ) - for (x = hres; x--; ) { - n = fndx(x, y); + for (n = hres*vres; n--; ) { if ((abuffer[n] != ALOWQ) | (obuffer[n] == OVOID)) continue; if (!getambcolor(objamb, obuffer[n])) @@ -629,7 +625,7 @@ comp_frame_error(void) /* initialize frame error valu else if (i >= ADISTANT/2) i = ADISTANT/2-1; abuffer[n] = i; edone[n] = 1; - } + } } /* final statistical estimate */ for (y = vres; y--; ) @@ -661,7 +657,7 @@ comp_frame_error(void) /* initialize frame error valu } -extern void +void init_frame(void) /* render base (low quality) frame */ { int restart; @@ -718,16 +714,16 @@ init_frame(void) /* render base (low quality) frame } -extern void +void filter_frame(void) /* interpolation, motion-blur, and exposure */ { - double expval = expspec_val(getexp(fcur)); - int x, y; - int neigh[NPINTERP]; - int nc; - COLOR cval; - double w, wsum; - int n; + const double expval = expspec_val(getexp(fcur)); + int x, y; + int neigh[NPINTERP]; + int nc; + COLOR cval; + double w, wsum; + int n; #if 0 /* XXX TEMPORARY!! */ @@ -741,20 +737,17 @@ filter_frame(void) /* interpolation, motion-blur, an free((void *)ebuf); } #endif - if (!silent) { printf("\tFiltering frame\n"); fflush(stdout); } /* normalize samples */ - for (y = vres; y--; ) - for (x = hres; x--; ) { - n = fndx(x, y); + for (n = hres*vres; n--; ) { if (sbuffer[n] <= 1) continue; w = 1.0/(double)sbuffer[n]; scalecolor(cbuffer[n], w); - } + } /* interpolate samples */ for (y = vres; y--; ) for (x = hres; x--; ) { @@ -861,26 +854,22 @@ filter_frame(void) /* interpolation, motion-blur, an } } /* compute final results */ - for (y = vres; y--; ) - for (x = hres; x--; ) { - n = fndx(x, y); + for (n = hres*vres; n--; ) { if (wbuffer[n] <= FTINY) continue; - w = 1./wbuffer[n]; + w = expval/wbuffer[n]; scalecolor(outbuffer[n], w); - } - } else - for (n = hres*vres; n--; ) - copycolor(outbuffer[n], cbuffer[n]); + } + } else { /* no blur -- just exposure */ + memcpy(outbuffer, cbuffer, sizeof(COLOR)*hres*vres); + for (n = ((expval < 0.99) | (expval > 1.01))*hres*vres; n--; ) + scalecolor(outbuffer[n], expval); + } /* for (n = hres*vres; n--; ) if (!sbuffer[n]) setcolor(outbuffer[n], 0., 0., 0.); */ - /* adjust exposure */ - if ((expval < 0.99) | (expval > 1.01)) - for (n = hres*vres; n--; ) - scalecolor(outbuffer[n], expval); #if 0 { float *sbuf = (float *)malloc(sizeof(float)*hres*vres); @@ -896,7 +885,7 @@ filter_frame(void) /* interpolation, motion-blur, an } -extern void +void send_frame(void) /* send frame to destination */ { char fname[1024]; @@ -965,9 +954,9 @@ send_frame(void) /* send frame to destination */ if (vdef(MNAME)) { /* output motion buffer */ unsigned short *mbuffer = (unsigned short *)malloc( sizeof(unsigned short)*3*hres); - int x; + int x, n; if (mbuffer == NULL) - error(SYSTEM, "out of memory in send_frame()"); + error(SYSTEM, "out of memory in send_frame"); sprintf(fname, vval(MNAME), fcur); strcat(fname, ".mvo"); fp = fopen(fname, "w"); @@ -983,9 +972,10 @@ send_frame(void) /* send frame to destination */ } for (y = vres; y--; ) { for (x = hres; x--; ) { - mbuffer[3*x] = xmbuffer[fndx(x,y)] + 0x8000; - mbuffer[3*x+1] = ymbuffer[fndx(x,y)] + 0x8000; - mbuffer[3*x+2] = (oprev[fndx(x,y)]!=OVOID)*0x8000; + n = fndx(x,y); + mbuffer[3*x] = xmbuffer[n] + 0x8000; + mbuffer[3*x+1] = ymbuffer[n] + 0x8000; + mbuffer[3*x+2] = (oprev[n]!=OVOID)*0x8000; } if (fwrite(mbuffer, sizeof(*mbuffer), 3*hres, fp) != 3*hres) @@ -1002,7 +992,7 @@ writerr: } -extern void +void free_frame(void) /* free frame allocation */ { if (cbuffer == NULL)