1 |
< |
/* Copyright (c) 1992 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1994 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
12 |
|
|
13 |
|
#include "ray.h" |
14 |
|
|
15 |
+ |
#include <sys/types.h> |
16 |
+ |
|
17 |
|
#ifndef NIX |
18 |
|
#ifdef BSD |
19 |
|
#include <sys/time.h> |
20 |
|
#include <sys/resource.h> |
21 |
|
#else |
20 |
– |
#include <sys/types.h> |
22 |
|
#include <sys/times.h> |
23 |
< |
#include <limits.h> |
24 |
< |
extern time_t time(); |
23 |
> |
#include <sys/utsname.h> |
24 |
> |
#include <unistd.h> |
25 |
|
#endif |
25 |
– |
#else |
26 |
– |
extern unsigned long time(); |
26 |
|
#endif |
27 |
|
|
28 |
+ |
extern time_t time(); |
29 |
+ |
|
30 |
|
#include <signal.h> |
31 |
|
|
32 |
|
#include "view.h" |
67 |
|
double specthresh = .15; /* specular sampling threshold */ |
68 |
|
double specjitter = 1.; /* specular sampling jitter */ |
69 |
|
|
70 |
+ |
int backvis = 1; /* back face visibility */ |
71 |
+ |
|
72 |
|
int maxdepth = 6; /* maximum recursion depth */ |
73 |
|
double minweight = 5e-3; /* minimum ray weight */ |
74 |
|
|
89 |
|
|
90 |
|
double pctdone = 0.0; /* percentage done */ |
91 |
|
|
92 |
< |
unsigned long tlastrept = 0L; /* time at last report */ |
92 |
> |
time_t tlastrept = 0L; /* time at last report */ |
93 |
|
|
94 |
< |
extern unsigned long tstart; /* starting time */ |
94 |
> |
extern time_t tstart; /* starting time */ |
95 |
|
|
96 |
|
extern unsigned long nrays; /* number of rays traced */ |
97 |
|
|
135 |
|
#ifndef NIX |
136 |
|
report() /* report progress */ |
137 |
|
{ |
135 |
– |
char hostname[128]; |
138 |
|
double u, s; |
139 |
|
#ifdef BSD |
140 |
+ |
char hostname[257]; |
141 |
|
struct rusage rubuf; |
142 |
|
#else |
143 |
|
struct tms tbuf; |
144 |
+ |
struct utsname nambuf; |
145 |
+ |
double period; |
146 |
+ |
#define hostname nambuf.nodename |
147 |
|
#endif |
148 |
|
|
149 |
< |
tlastrept = time((unsigned long *)NULL); |
149 |
> |
tlastrept = time((time_t *)NULL); |
150 |
|
#ifdef BSD |
151 |
|
getrusage(RUSAGE_SELF, &rubuf); |
152 |
|
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
154 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
155 |
|
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
156 |
|
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
157 |
+ |
gethostname(hostname, sizeof(hostname)); |
158 |
|
#else |
159 |
|
times(&tbuf); |
160 |
< |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) / CLK_TCK; |
161 |
< |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) / CLK_TCK; |
160 |
> |
#ifdef _SC_CLK_TCK |
161 |
> |
period = 1.0 / sysconf(_SC_CLK_TCK); |
162 |
> |
#else |
163 |
> |
period = 1.0 / 60.0; |
164 |
|
#endif |
165 |
< |
gethostname(hostname, sizeof(hostname)); |
165 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; |
166 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; |
167 |
> |
uname(&nambuf); |
168 |
> |
#endif |
169 |
|
|
170 |
|
sprintf(errmsg, |
171 |
|
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
172 |
|
nrays, pctdone, u/3600., s/3600., |
173 |
|
(tlastrept-tstart)/3600., hostname); |
174 |
|
eputs(errmsg); |
175 |
+ |
#ifndef BSD |
176 |
+ |
signal(SIGCONT, report); |
177 |
+ |
#undef hostname |
178 |
+ |
#endif |
179 |
|
} |
180 |
|
#else |
181 |
|
report() /* report progress */ |
182 |
|
{ |
183 |
< |
tlastrept = time((unsigned long *)NULL); |
183 |
> |
tlastrept = time((time_t *)NULL); |
184 |
|
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
185 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
186 |
|
eputs(errmsg); |
171 |
– |
signal(SIGCONT, report); |
187 |
|
} |
188 |
|
#endif |
189 |
|
|
439 |
|
goto writerr; |
440 |
|
/* record progress */ |
441 |
|
pctdone = 100.0*(vres-1-ypos)/vres; |
442 |
< |
if (ralrm > 0 && time((unsigned long *)NULL) >= tlastrept+ralrm) |
442 |
> |
if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm) |
443 |
|
report(); |
444 |
|
#ifndef BSD |
445 |
|
else |
502 |
|
b = fillsample(scanline, zline, 0, y, i, 0, b/2); |
503 |
|
else |
504 |
|
b = fillsample(scanline+i-xstep, |
505 |
< |
zline ? zline+i-xstep : NULL, |
505 |
> |
zline ? zline+i-xstep : (float *)NULL, |
506 |
|
i-xstep, y, xstep, 0, b/2); |
507 |
|
if (sd) *sd++ = nc & 1 ? bl : b; |
508 |
|
bl = b; |
530 |
|
zline[ysize] = zbar[ysize][i]; |
531 |
|
} |
532 |
|
|
533 |
< |
b = fillsample(vline, zbar[0] ? zline : NULL, |
533 |
> |
b = fillsample(vline, zbar[0] ? zline : (float *)NULL, |
534 |
|
i, y, 0, ysize, b/2); |
535 |
|
|
536 |
|
for (j = 1; j < ysize; j++) |
588 |
|
/* recurse */ |
589 |
|
ncut += fillsample(colline, zline, x, y, xlen>>1, ylen>>1, (b-1)/2); |
590 |
|
|
591 |
< |
ncut += fillsample(colline+(len>>1), zline ? zline+(len>>1) : NULL, |
591 |
> |
ncut += fillsample(colline+(len>>1), |
592 |
> |
zline ? zline+(len>>1) : (float *)NULL, |
593 |
|
x+(xlen>>1), y+(ylen>>1), |
594 |
|
xlen-(xlen>>1), ylen-(ylen>>1), b/2); |
595 |
|
|
604 |
|
{ |
605 |
|
static RAY thisray; |
606 |
|
|
607 |
< |
if (viewray(thisray.rorg, thisray.rdir, &ourview, |
608 |
< |
(x+pixjitter())/hres, (y+pixjitter())/vres) < 0) { |
607 |
> |
if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview, |
608 |
> |
(x+pixjitter())/hres, (y+pixjitter())/vres)) < -FTINY) { |
609 |
|
setcolor(col, 0.0, 0.0, 0.0); |
610 |
|
return(0.0); |
611 |
|
} |
631 |
|
int x, y; |
632 |
|
|
633 |
|
if (oldfile == NULL) |
634 |
< |
return(0); |
635 |
< |
|
634 |
> |
goto gotzip; |
635 |
> |
|
636 |
|
if ((fp = fopen(oldfile, "r")) == NULL) { |
637 |
|
sprintf(errmsg, "cannot open recover file \"%s\"", oldfile); |
638 |
|
error(WARNING, errmsg); |
639 |
< |
return(0); |
639 |
> |
goto gotzip; |
640 |
|
} |
641 |
|
#ifdef MSDOS |
642 |
|
setmode(fileno(fp), O_BINARY); |
649 |
|
oldfile); |
650 |
|
error(WARNING, errmsg); |
651 |
|
fclose(fp); |
652 |
< |
return(0); |
652 |
> |
goto gotzip; |
653 |
|
} |
654 |
|
|
655 |
|
if (x != hres || y != vres) { |
673 |
|
fclose(fp); |
674 |
|
unlink(oldfile); |
675 |
|
return(y); |
676 |
+ |
gotzip: |
677 |
+ |
if (fflush(stdout) == EOF) |
678 |
+ |
error(SYSTEM, "error writing picture header"); |
679 |
+ |
return(0); |
680 |
|
writerr: |
681 |
|
sprintf(errmsg, "write error during recovery of \"%s\"", oldfile); |
682 |
|
error(SYSTEM, errmsg); |