ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/ranimove1.c

Comparing ray/src/util/ranimove1.c (file contents):
Revision 3.5 by schorsch, Mon Jul 21 22:30:19 2003 UTC vs.
Revision 3.6 by schorsch, Sun Jul 27 22:12:03 2003 UTC

#	Line 106 | Line 106 | next_frame()                   /* prepare next frame buffer */
106		pixaspect = 1.;
107		/* fall through */
108		case 3:
109	<	if ((hres > 0 & vres > 0))
109	>	if ((hres > 0) & (vres > 0))
110		break;
111		/* fall through */
112		default:
#	Line 125 | Line 125 | next_frame()                   /* prepare next frame buffer */
125		zprev = (float *)malloc(sizeof(float)*hres*vres);
126		oprev = (OBJECT *)malloc(sizeof(OBJECT)*hres*vres);
127		aprev = (BYTE *)malloc(sizeof(BYTE)*hres*vres);
128	<	if ((cbuffer==NULL | zbuffer==NULL | obuffer==NULL |
129	<	xmbuffer==NULL | ymbuffer==NULL |
130	<	abuffer==NULL | sbuffer==NULL |
131	<	cprev==NULL | zprev == NULL |
132	<	oprev==NULL | aprev==NULL))
128	>	if ((cbuffer==NULL) | (zbuffer==NULL) | (obuffer==NULL) |
129	>	(xmbuffer==NULL) | (ymbuffer==NULL) |
130	>	(abuffer==NULL) | (sbuffer==NULL) |
131	>	(cprev==NULL) | (zprev == NULL) |
132	>	(oprev==NULL) | (aprev==NULL))
133		error(SYSTEM, "out of memory in init_frame");
134		frm_stop = getTime() + rtperfrm;
135		} else {
#	Line 224 | Line 224 | int    x, y;
224		/* get our object number */
225		myobj = obuffer[fndx(x, y)];
226		/* special case for borders */
227	<	if ((x < SAMPDIST | x >= hres-SAMPDIST |
228	<	y < SAMPDIST | y >= vres-SAMPDIST)) {
227	>	if ((x < SAMPDIST) | (x >= hres-SAMPDIST) |
228	>	(y < SAMPDIST) | (y >= vres-SAMPDIST)) {
229		int     tndx[NSCHECK][2];
230		nf = 0;
231		for (j = y - SAMPDIST; j <= y + SAMPDIST; j++) {
#	Line 237 | Line 237 | int    x, y;
237		i0 = fndx(i, j);
238		if (!sbuffer[i0])
239		continue;
240	<	if ((myobj != OVOID & obuffer[i0] != myobj))
240	>	if ((myobj != OVOID) & (obuffer[i0] != myobj))
241		continue;
242		tndx[nf][0] = (i-x)*(i-x) + (j-y)*(j-y);
243		tndx[nf][1] = i0;
#	Line 252 | Line 252 | int    x, y;
252		return(nf);
253		}
254		/* initialize offset array */
255	<	if ((hres != hro | vres != vro)) {
255	>	if ((hres != hro) | (vres != vro)) {
256		int     toffs[NSCHECK][2];
257		i0 = fndx(SAMPDIST, SAMPDIST);
258		nf = 0;
#	Line 271 | Line 271 | int    x, y;
271		}
272		/* find up to nc neighbors */
273		i0 = fndx(x, y);
274	<	for (j = 0, nf = 0; (j < NSCHECK & nf < nc); j++) {
274	>	for (j = 0, nf = 0; (j < NSCHECK) & (nf < nc); j++) {
275		i = i0 + ioffs[j];
276	<	if (sbuffer[i] && (myobj == OVOID | obuffer[i] == myobj))
276	>	if (sbuffer[i] && (myobj == OVOID) | (obuffer[i] == myobj))
277		iarr[nf++] = i;
278		}
279		/* return number found */
#	Line 309 | Line 309 | FVECT  wpos;
309		yp = (int)(ovp[1]*vres);
310		xmbuffer[n] = xp - (n % hres);
311		ymbuffer[n] = yp - (n / hres);
312	<	if ((xp < 0 | xp >= hres))
312	>	if ((xp < 0) | (xp >= hres))
313		return;
314	<	if ((yp < 0 | yp >= vres))
314	>	if ((yp < 0) | (yp >= vres))
315		return;
316		n = fndx(xp, yp);
317	<	if ((zprev[n] < 0.97*ovp[2] | zprev[n] > 1.03*ovp[2]))
317	>	if ((zprev[n] < 0.97*ovp[2]) | (zprev[n] > 1.03*ovp[2]))
318		oprev[n] = OVOID;       /* assume it's a bad match */
319		}
320
#	Line 407 | Line 407 | init_frame_sample()            /* sample our initial frame */
407		n = fndx(x, y);
408		if ((obj = obuffer[n]) == OVOID)
409		continue;
410	<	if ((obuffer[n+1] != OVOID & obuffer[n+1] != obj)) {
410	>	if ((obuffer[n+1] != OVOID) & (obuffer[n+1] != obj)) {
411		obuffer[n] = OVOID;
412		obuffer[n+1] = OVOID;
413		}
414	<	if ((obuffer[n+hres] != OVOID & obuffer[n+hres] != obj)) {
414	>	if ((obuffer[n+hres] != OVOID) & (obuffer[n+hres] != obj)) {
415		obuffer[n] = OVOID;
416		obuffer[n+hres] = OVOID;
417		}
#	Line 432 | Line 432 | int    obj;
432		if (obj == OVOID)
433		return(0);
434		op = objptr(obj);
435	<	if ((op->otype == OBJ_INSTANCE & op->omod == OVOID))
435	>	if ((op->otype == OBJ_INSTANCE) & (op->omod == OVOID))
436		return(0);
437		/* search for material */
438		do {
#	Line 529 | Line 529 | int    ns0;
529		/* add together samples */
530		setcolor(csum, 0., 0., 0.);
531		setcolor(csum2, 0., 0., 0.);
532	<	for (i = 0, ns = 0; (i < nc & ns < NSAMPOK); i++) {
532	>	for (i = 0, ns = 0; (i < nc) & (ns < NSAMPOK); i++) {
533		n = neigh[i];
534		addcolor(csum, cbuffer[n]);
535		if (val2map != NULL) {
#	Line 581 | Line 581 | comp_frame_error()             /* initialize frame error values *
581		for (y = vres; y--; )
582		for (x = hres; x--; ) {
583		n = fndx(x, y);
584	<	if ((abuffer[n] != ALOWQ | obuffer[n] == OVOID))
584	>	if ((abuffer[n] != ALOWQ) | (obuffer[n] == OVOID))
585		continue;
586		if (!getambcolor(objamb, obuffer[n]))
587		continue;
#	Line 790 | Line 790 | write_map(cerrmap, "outcmap.pic");
790		scalecolor(cval, w);
791		while (cnt)
792		if (rise2 >= run2) {
793	<	if ((xl >= 0 & xl < hres &
794	<	yl >= 0 & yl < vres)) {
793	>	if ((xl >= 0) & (xl < hres) &
794	>	(yl >= 0) & (yl < vres)) {
795		n2 = fndx(xl, yl);
796		addcolor(outbuffer[n2],
797		cval);
#	Line 811 | Line 811 | write_map(cerrmap, "outcmap.pic");
811		scalecolor(cval, w);
812		while (cnt)
813		if (run2 >= rise2) {
814	<	if ((xl >= 0 & xl < hres &
815	<	yl >= 0 & yl < vres)) {
814	>	if ((xl >= 0) & (xl < hres) &
815	>	(yl >= 0) & (yl < vres)) {
816		n2 = fndx(xl, yl);
817		addcolor(outbuffer[n2],
818		cval);
#	Line 845 | Line 845 | for (n = hres*vres; n--; )
845		setcolor(outbuffer[n], 0., 0., 0.);
846		*/
847		/* adjust exposure */
848	<	if ((expval < 0.99 | expval > 1.01))
848	>	if ((expval < 0.99) | (expval > 1.01))
849		for (n = hres*vres; n--; )
850		scalecolor(outbuffer[n], expval);
851		return;
#	Line 890 | Line 890 | send_frame()                   /* send frame to destination */
890		fputnow(fp);
891		fputs(VIEWSTR, fp); fprintview(&vw, fp); fputc('\n', fp);
892		d = expspec_val(getexp(fcur));
893	<	if ((d < 0.99 | d > 1.01))
893	>	if ((d < 0.99) | (d > 1.01))
894		fputexpos(d, fp);
895		d = viewaspect(&vw) * hres / vres;
896	<	if ((d < 0.99 | d > 1.01))
896	>	if ((d < 0.99) | (d > 1.01))
897		fputaspect(d, fp);
898		fputformat(COLRFMT, fp);
899		fputc('\n', fp);                /* end header */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)