--- ray/src/rt/rpict.c 1992/09/08 20:56:20 2.13
+++ ray/src/rt/rpict.c 2003/02/22 02:07:29 2.52
@@ -1,62 +1,147 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: rpict.c,v 2.52 2003/02/22 02:07:29 greg Exp $";
#endif
-
/*
* rpict.c - routines and variables for picture generation.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
*
- * 8/14/85
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes Radiance software
+ * (http://radsite.lbl.gov/)
+ * developed by the Lawrence Berkeley National Laboratory
+ * (http://www.lbl.gov/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ * and "The Regents of the University of California" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ * nor may "Radiance" appear in their name, without prior written
+ * permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory. For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * .
*/
#include "ray.h"
+#include
+
+#ifndef NIX
#ifdef BSD
#include
#include
+#else
+#include
+#include
#endif
+#endif
+extern time_t time();
+
#include
-#include
#include "view.h"
-#include "resolu.h"
-
#include "random.h"
#include "paths.h"
+#define RFTEMPLATE "rfXXXXXX"
+
+#ifndef SIGCONT
+#define SIGCONT SIGIO
+#endif
+
+CUBE thescene; /* our scene */
+OBJECT nsceneobjs; /* number of objects in our scene */
+
int dimlist[MAXDIM]; /* sampling dimensions */
int ndims = 0; /* number of sampling dimensions */
int samplendx; /* sample index number */
+extern void ambnotify();
+void (*addobjnotify[])() = {ambnotify, NULL};
+
VIEW ourview = STDVIEW; /* view parameters */
int hresolu = 512; /* horizontal resolution */
int vresolu = 512; /* vertical resolution */
-double pixaspect = 1.0; /* pixel aspect ratio */
+double pixaspect = 1.0; /* pixel aspect ratio */
int psample = 4; /* pixel sample size */
-double maxdiff = .05; /* max. difference for interpolation */
-double dstrpix = 0.67; /* square pixel distribution */
+double maxdiff = .05; /* max. difference for interpolation */
+double dstrpix = 0.67; /* square pixel distribution */
-double dstrsrc = 0.0; /* square source distribution */
-double shadthresh = .05; /* shadow threshold */
-double shadcert = .5; /* shadow certainty */
+double mblur = 0.; /* motion blur parameter */
+
+void (*trace)() = NULL; /* trace call */
+
+int do_irrad = 0; /* compute irradiance? */
+
+double dstrsrc = 0.0; /* square source distribution */
+double shadthresh = .05; /* shadow threshold */
+double shadcert = .5; /* shadow certainty */
int directrelay = 1; /* number of source relays */
int vspretest = 512; /* virtual source pretest density */
-int directinvis = 0; /* sources invisible? */
-double srcsizerat = .25; /* maximum ratio source size/dist. */
+int directvis = 1; /* sources visible? */
+double srcsizerat = .25; /* maximum ratio source size/dist. */
-double specthresh = .15; /* specular sampling threshold */
-double specjitter = 1.; /* specular sampling jitter */
+COLOR cextinction = BLKCOLOR; /* global extinction coefficient */
+COLOR salbedo = BLKCOLOR; /* global scattering albedo */
+double seccg = 0.; /* global scattering eccentricity */
+double ssampdist = 0.; /* scatter sampling distance */
+double specthresh = .15; /* specular sampling threshold */
+double specjitter = 1.; /* specular sampling jitter */
+
+int backvis = 1; /* back face visibility */
+
int maxdepth = 6; /* maximum recursion depth */
-double minweight = 5e-3; /* minimum ray weight */
+double minweight = 5e-3; /* minimum ray weight */
+char *ambfile = NULL; /* ambient file name */
COLOR ambval = BLKCOLOR; /* ambient value */
-double ambacc = 0.2; /* ambient accuracy */
+int ambvwt = 0; /* initial weight for ambient value */
+double ambacc = 0.2; /* ambient accuracy */
int ambres = 32; /* ambient resolution */
int ambdiv = 128; /* ambient divisions */
int ambssamp = 0; /* ambient super-samples */
@@ -66,106 +151,108 @@ int ambincl = -1; /* include == 1, exclude == 0 */
int ralrm = 0; /* seconds between reports */
-double pctdone = 0.0; /* percentage done */
+double pctdone = 0.0; /* percentage done */
+time_t tlastrept = 0L; /* time at last report */
+time_t tstart; /* starting time */
-long tlastrept = 0L; /* time at last report */
+#define MAXDIV 16 /* maximum sample size */
-extern long time();
-extern long tstart; /* starting time */
+#define pixjitter() (.5+dstrpix*(.5-frandom()))
-extern long nrays; /* number of rays traced */
+int hres, vres; /* resolution for this frame */
-#define MAXDIV 16 /* maximum sample size */
+static VIEW lastview; /* the previous view input */
-#define pixjitter() (.5+dstrpix*(.5-frandom()))
+extern char *mktemp();
-#define RFTEMPLATE "rfXXXXXX"
-#define HFTEMPLATE TEMPLATE
+void report();
-static char *hfname = NULL; /* header file name */
-static FILE *hfp = NULL; /* header file pointer */
+double pixvalue();
-static int hres, vres; /* resolution for this frame */
+#ifdef NIX
+#define file_exists(f) (access(f,F_OK)==0)
+#else
+#include
+#include
+int
+file_exists(fname) /* ordinary file exists? */
+char *fname;
+{
+ struct stat sbuf;
+ if (stat(fname, &sbuf) < 0) return(0);
+ return((sbuf.st_mode & S_IFREG) != 0);
+}
+#endif
-extern char *mktemp();
-double pixvalue();
-
-
+void
quit(code) /* quit program */
int code;
{
if (code) /* report status */
report();
- if (hfname != NULL) { /* delete header file */
- if (hfp != NULL)
- fclose(hfp);
- unlink(hfname);
- }
+#ifndef NIX
+ headclean(); /* delete header file */
+ pfclean(); /* clean up persist files */
+#endif
exit(code);
}
-#ifdef BSD
+#ifndef NIX
+void
report() /* report progress */
{
+ extern char *myhostname();
+ double u, s;
+#ifdef BSD
struct rusage rubuf;
- double t;
+#else
+ struct tms tbuf;
+ double period;
+#endif
+ tlastrept = time((time_t *)NULL);
+#ifdef BSD
getrusage(RUSAGE_SELF, &rubuf);
- t = (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6;
- t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec;
+ u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6;
+ s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6;
getrusage(RUSAGE_CHILDREN, &rubuf);
- t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6;
- t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec;
+ u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6;
+ s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6;
+#else
+ times(&tbuf);
+#ifdef _SC_CLK_TCK
+ period = 1.0 / sysconf(_SC_CLK_TCK);
+#else
+ period = 1.0 / 60.0;
+#endif
+ u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period;
+ s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period;
+#endif
- sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f CPU hours\n",
- nrays, pctdone, t/3600.0);
+ sprintf(errmsg,
+ "%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n",
+ nrays, pctdone, u/3600., s/3600.,
+ (tlastrept-tstart)/3600., myhostname());
eputs(errmsg);
- tlastrept = time((long *)0);
+#ifndef BSD
+ signal(SIGCONT, report);
+#endif
}
#else
+void
report() /* report progress */
{
- tlastrept = time((long *)0);
- sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f hours\n",
+ tlastrept = time((time_t *)NULL);
+ sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n",
nrays, pctdone, (tlastrept-tstart)/3600.0);
eputs(errmsg);
- signal(SIGALRM, report);
}
#endif
-openheader() /* save standard output to header file */
-{
- hfname = mktemp(HFTEMPLATE);
- if (freopen(hfname, "w", stdout) == NULL) {
- sprintf(errmsg, "cannot open header file \"%s\"", hfname);
- error(SYSTEM, errmsg);
- }
-}
-
-
-closeheader() /* done with header output */
-{
- if (hfname == NULL)
- return;
- if (fflush(stdout) == EOF || (hfp = fopen(hfname, "r")) == NULL)
- error(SYSTEM, "error reopening header file");
-}
-
-
-dupheader() /* repeat header on standard output */
-{
- register int c;
-
- if (fseek(hfp, 0L, 0) < 0)
- error(SYSTEM, "seek error on header file");
- while ((c = getc(hfp)) != EOF)
- putchar(c);
-}
-
-
+void
rpict(seq, pout, zout, prvr) /* generate image(s) */
int seq;
char *pout, *zout, *prvr;
@@ -181,13 +268,12 @@ char *pout, *zout, *prvr;
* sequenced file naming.
*/
{
- extern char *rindex(), *strncpy(), *strcat();
+ extern char *rindex(), *strncpy(), *strcat(), *strcpy();
char fbuf[128], fbuf2[128];
+ int npicts;
register char *cp;
- RESOLU rs;
- double pa;
- /* finished writing header */
- closeheader();
+ RESOLU rs;
+ double pa;
/* check sampling */
if (psample < 1)
psample = 1;
@@ -209,41 +295,65 @@ char *pout, *zout, *prvr;
for ( ; seq < rn; seq++)
if (nextview(stdin) == EOF)
error(USER, "unexpected EOF on view input");
+ setview(&ourview);
prvr = fbuf; /* mark for renaming */
}
- if (pout != NULL) {
+ if (pout != NULL & prvr != NULL) {
sprintf(fbuf, pout, seq);
- if (prvr != NULL && !strcmp(prvr, fbuf)) { /* rename */
- fbuf2[0] = '\0';
- if ((cp = rindex(fbuf, '/')) != NULL)
- strncpy(fbuf2, fbuf, cp-fbuf+1);
- strcat(fbuf2, RFTEMPLATE);
+ if (!strcmp(prvr, fbuf)) { /* rename */
+ strcpy(fbuf2, fbuf);
+ for (cp = fbuf2; *cp; cp++)
+ ;
+ while (cp > fbuf2 && !ISDIRSEP(cp[-1]))
+ cp--;
+ strcpy(cp, RFTEMPLATE);
prvr = mktemp(fbuf2);
- if (rename(fbuf, prvr) < 0 && errno != ENOENT) {
- sprintf(errmsg,
+ if (rename(fbuf, prvr) < 0)
+ if (errno == ENOENT) { /* ghost file */
+ sprintf(errmsg,
+ "new output file \"%s\"",
+ fbuf);
+ error(WARNING, errmsg);
+ prvr = NULL;
+ } else { /* serious error */
+ sprintf(errmsg,
"cannot rename \"%s\" to \"%s\"",
fbuf, prvr);
- error(SYSTEM, errmsg);
- }
+ error(SYSTEM, errmsg);
+ }
}
}
- /* render sequence */
+ npicts = 0; /* render sequence */
do {
if (seq && nextview(stdin) == EOF)
break;
+ pctdone = 0.0;
if (pout != NULL) {
sprintf(fbuf, pout, seq);
+ if (file_exists(fbuf)) {
+ if (prvr != NULL || !strcmp(fbuf, pout)) {
+ sprintf(errmsg,
+ "output file \"%s\" exists",
+ fbuf);
+ error(USER, errmsg);
+ }
+ setview(&ourview);
+ continue; /* don't clobber */
+ }
if (freopen(fbuf, "w", stdout) == NULL) {
sprintf(errmsg,
"cannot open output file \"%s\"", fbuf);
error(SYSTEM, errmsg);
}
+#ifdef MSDOS
+ setmode(fileno(stdout), O_BINARY);
+#endif
dupheader();
}
hres = hresolu; vres = vresolu; pa = pixaspect;
if (prvr != NULL)
if (viewfile(prvr, &ourview, &rs) <= 0
- || rs.or != PIXSTANDARD) {
+ || rs.rt != PIXSTANDARD) {
sprintf(errmsg,
"cannot recover view parameters from \"%s\"", prvr);
error(WARNING, errmsg);
@@ -277,7 +387,11 @@ char *pout, *zout, *prvr;
cp = NULL;
render(cp, prvr);
prvr = NULL;
+ npicts++;
} while (seq++);
+ /* check that we did something */
+ if (npicts == 0)
+ error(WARNING, "no output produced");
}
@@ -286,6 +400,7 @@ FILE *fp;
{
char linebuf[256];
+ copystruct(&lastview, &ourview);
while (fgets(linebuf, sizeof(linebuf), fp) != NULL)
if (isview(linebuf) && sscanview(&ourview, linebuf) > 0)
return(0);
@@ -296,7 +411,6 @@ FILE *fp;
render(zfile, oldfile) /* render the scene */
char *zfile, *oldfile;
{
- extern long lseek();
COLOR *scanbar[MAXDIV+1]; /* scanline arrays of pixel values */
float *zbar[MAXDIV+1]; /* z values */
char *sampdens; /* previous sample density */
@@ -307,6 +421,12 @@ char *zfile, *oldfile;
COLOR *colptr;
float *zptr;
register int i;
+ /* check for empty image */
+ if (hres <= 0 || vres <= 0) {
+ error(WARNING, "empty output picture");
+ fprtresolu(0, 0, stdout);
+ return;
+ }
/* allocate scanlines */
for (i = 0; i <= psample; i++) {
scanbar[i] = (COLOR *)malloc(hres*sizeof(COLOR));
@@ -317,18 +437,21 @@ char *zfile, *oldfile;
ystep = (psample*99+70)/140;
if (hstep > 2) {
i = hres/hstep + 2;
- if ((sampdens = malloc(i)) == NULL)
+ if ((sampdens = (char *)malloc(i)) == NULL)
goto memerr;
while (i--)
sampdens[i] = hstep;
} else
sampdens = NULL;
- /* open z file */
+ /* open z-file */
if (zfile != NULL) {
if ((zfd = open(zfile, O_WRONLY|O_CREAT, 0666)) == -1) {
- sprintf(errmsg, "cannot open z file \"%s\"", zfile);
+ sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
error(SYSTEM, errmsg);
}
+#ifdef MSDOS
+ setmode(zfd, O_BINARY);
+#endif
for (i = 0; i <= psample; i++) {
zbar[i] = (float *)malloc(hres*sizeof(float));
if (zbar[i] == NULL)
@@ -343,17 +466,21 @@ char *zfile, *oldfile;
fprtresolu(hres, vres, stdout);
/* recover file and compute first */
i = salvage(oldfile);
+ if (i >= vres)
+ goto alldone;
if (zfd != -1 && i > 0 &&
- lseek(zfd, (long)i*hres*sizeof(float), 0) == -1)
- error(SYSTEM, "z file seek error in render");
+ lseek(zfd, (off_t)i*hres*sizeof(float), 0) < 0)
+ error(SYSTEM, "z-file seek error in render");
pctdone = 100.0*i/vres;
if (ralrm > 0) /* report init stats */
report();
-#ifndef BSD
+#ifndef BSD
else
#endif
- signal(SIGALRM, report);
- ypos = vres-1 - i;
+ signal(SIGCONT, report);
+ ypos = vres-1 - i; /* initialize sampling */
+ if (directvis)
+ init_drawsources(psample);
fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep);
/* compute scanlines */
for (ypos -= ystep; ypos > -ystep; ypos -= ystep) {
@@ -373,9 +500,11 @@ char *zfile, *oldfile;
hres, ypos, hstep);
/* fill bar */
fillscanbar(scanbar, zbar, hres, ypos, ystep);
+ if (directvis) /* add bitty sources */
+ drawsources(scanbar, zbar, 0, hres, ypos, ystep);
/* write it out */
-#ifndef BSD
- signal(SIGALRM, SIG_IGN); /* don't interrupt writes */
+#ifndef BSD
+ signal(SIGCONT, SIG_IGN); /* don't interrupt writes */
#endif
for (i = ystep; i > 0; i--) {
if (zfd != -1 && write(zfd, (char *)zbar[i],
@@ -389,34 +518,36 @@ char *zfile, *oldfile;
goto writerr;
/* record progress */
pctdone = 100.0*(vres-1-ypos)/vres;
- if (ralrm > 0 && time((long *)0) >= tlastrept+ralrm)
+ if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm)
report();
-#ifndef BSD
+#ifndef BSD
else
- signal(SIGALRM, report);
+ signal(SIGCONT, report);
#endif
}
/* clean up */
- signal(SIGALRM, SIG_IGN);
- if (zfd != -1) {
- if (write(zfd, (char *)zbar[0], hres*sizeof(float))
+ signal(SIGCONT, SIG_IGN);
+ if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float))
< hres*sizeof(float))
- goto writerr;
+ goto writerr;
+ fwritescan(scanbar[0], hres, stdout);
+ if (fflush(stdout) == EOF)
+ goto writerr;
+alldone:
+ if (zfd != -1) {
if (close(zfd) == -1)
goto writerr;
for (i = 0; i <= psample; i++)
- free((char *)zbar[i]);
+ free((void *)zbar[i]);
}
- fwritescan(scanbar[0], hres, stdout);
- if (fflush(stdout) == EOF)
- goto writerr;
for (i = 0; i <= psample; i++)
- free((char *)scanbar[i]);
+ free((void *)scanbar[i]);
if (sampdens != NULL)
free(sampdens);
pctdone = 100.0;
if (ralrm > 0)
report();
+ signal(SIGCONT, SIG_DFL);
return;
writerr:
error(SYSTEM, "write error in render");
@@ -426,16 +557,16 @@ memerr:
fillscanline(scanline, zline, sd, xres, y, xstep) /* fill scan at y */
-register COLOR *scanline;
-register float *zline;
+register COLOR *scanline;
+register float *zline;
register char *sd;
int xres, y, xstep;
{
static int nc = 0; /* number of calls */
int bl = xstep, b = xstep;
- double z;
+ double z;
register int i;
-
+
z = pixvalue(scanline[0], 0, y);
if (zline) zline[0] = z;
/* zig-zag start for quincunx pattern */
@@ -451,7 +582,7 @@ int xres, y, xstep;
b = fillsample(scanline, zline, 0, y, i, 0, b/2);
else
b = fillsample(scanline+i-xstep,
- zline ? zline+i-xstep : NULL,
+ zline ? zline+i-xstep : (float *)NULL,
i-xstep, y, xstep, 0, b/2);
if (sd) *sd++ = nc & 1 ? bl : b;
bl = b;
@@ -461,27 +592,25 @@ int xres, y, xstep;
fillscanbar(scanbar, zbar, xres, y, ysize) /* fill interior */
-register COLOR *scanbar[];
-register float *zbar[];
+register COLOR *scanbar[];
+register float *zbar[];
int xres, y, ysize;
{
COLOR vline[MAXDIV+1];
float zline[MAXDIV+1];
int b = ysize;
register int i, j;
-
+
for (i = 0; i < xres; i++) {
-
copycolor(vline[0], scanbar[0][i]);
copycolor(vline[ysize], scanbar[ysize][i]);
if (zbar[0]) {
zline[0] = zbar[0][i];
zline[ysize] = zbar[ysize][i];
}
-
- b = fillsample(vline, zbar[0] ? zline : NULL,
+ b = fillsample(vline, zbar[0] ? zline : (float *)NULL,
i, y, 0, ysize, b/2);
-
+
for (j = 1; j < ysize; j++)
copycolor(scanbar[j][i], vline[j]);
if (zbar[0])
@@ -492,38 +621,35 @@ int xres, y, ysize;
int
-fillsample(colline, zline, x, y, xlen, ylen, b) /* fill interior points */
-register COLOR *colline;
-register float *zline;
+fillsample(colline, zline, x, y, xlen, ylen, b) /* fill interior points */
+register COLOR *colline;
+register float *zline;
int x, y;
int xlen, ylen;
int b;
{
- extern double fabs();
- double ratio;
- double z;
+ double ratio;
+ double z;
COLOR ctmp;
int ncut;
register int len;
-
+
if (xlen > 0) /* x or y length is zero */
len = xlen;
else
len = ylen;
-
+
if (len <= 1) /* limit recursion */
return(0);
-
- if (b > 0
- || (zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len]))
+
+ if (b > 0 ||
+ (zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len]))
|| bigdiff(colline[0], colline[len], maxdiff)) {
-
+
z = pixvalue(colline[len>>1], x + (xlen>>1), y + (ylen>>1));
if (zline) zline[len>>1] = z;
ncut = 1;
-
} else { /* interpolate */
-
copycolor(colline[len>>1], colline[len]);
ratio = (double)(len>>1) / len;
scalecolor(colline[len>>1], ratio);
@@ -537,8 +663,9 @@ int b;
}
/* recurse */
ncut += fillsample(colline, zline, x, y, xlen>>1, ylen>>1, (b-1)/2);
-
- ncut += fillsample(colline+(len>>1), zline ? zline+(len>>1) : NULL,
+
+ ncut += fillsample(colline+(len>>1),
+ zline ? zline+(len>>1) : (float *)NULL,
x+(xlen>>1), y+(ylen>>1),
xlen-(xlen>>1), ylen-(ylen>>1), b/2);
@@ -551,22 +678,41 @@ pixvalue(col, x, y) /* compute pixel value */
COLOR col; /* returned color */
int x, y; /* pixel position */
{
- static RAY thisray;
-
- if (viewray(thisray.rorg, thisray.rdir, &ourview,
- (x+pixjitter())/hres, (y+pixjitter())/vres) < 0) {
+ RAY thisray;
+ FVECT lorg, ldir;
+ double hpos, vpos, lmax, d;
+ /* compute view ray */
+ hpos = (x+pixjitter())/hres;
+ vpos = (y+pixjitter())/vres;
+ if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
+ &ourview, hpos, vpos)) < -FTINY) {
setcolor(col, 0.0, 0.0, 0.0);
return(0.0);
}
- rayorigin(&thisray, NULL, PRIMARY, 1.0);
-
samplendx = pixnumber(x,y,hres,vres); /* set pixel index */
+ /* optional motion blur */
+ if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir,
+ &lastview, hpos, vpos)) >= -FTINY) {
+ register int i;
+ register double d = mblur*(.5-urand(281+samplendx));
+
+ thisray.rmax = (1.-d)*thisray.rmax + d*lmax;
+ for (i = 3; i--; ) {
+ thisray.rorg[i] = (1.-d)*thisray.rorg[i] + d*lorg[i];
+ thisray.rdir[i] = (1.-d)*thisray.rdir[i] + d*ldir[i];
+ }
+ if (normalize(thisray.rdir) == 0.0)
+ return(0.0);
+ }
+
+ rayorigin(&thisray, NULL, PRIMARY, 1.0);
+
rayvalue(&thisray); /* trace ray */
copycolor(col, thisray.rcol); /* return color */
-
+
return(thisray.rt); /* return distance */
}
@@ -580,21 +726,25 @@ char *oldfile;
int x, y;
if (oldfile == NULL)
- return(0);
-
+ goto gotzip;
+
if ((fp = fopen(oldfile, "r")) == NULL) {
sprintf(errmsg, "cannot open recover file \"%s\"", oldfile);
error(WARNING, errmsg);
- return(0);
+ goto gotzip;
}
+#ifdef MSDOS
+ setmode(fileno(fp), O_BINARY);
+#endif
/* discard header */
- getheader(fp, NULL);
+ getheader(fp, NULL, NULL);
/* get picture size */
if (!fscnresolu(&x, &y, fp)) {
- sprintf(errmsg, "bad recover file \"%s\"", oldfile);
+ sprintf(errmsg, "bad recover file \"%s\" - not removed",
+ oldfile);
error(WARNING, errmsg);
fclose(fp);
- return(0);
+ goto gotzip;
}
if (x != hres || y != vres) {
@@ -614,10 +764,14 @@ char *oldfile;
}
if (fflush(stdout) == EOF)
goto writerr;
- free((char *)scanline);
+ free((void *)scanline);
fclose(fp);
unlink(oldfile);
return(y);
+gotzip:
+ if (fflush(stdout) == EOF)
+ error(SYSTEM, "error writing picture header");
+ return(0);
writerr:
sprintf(errmsg, "write error during recovery of \"%s\"", oldfile);
error(SYSTEM, errmsg);