1 |
< |
/* Copyright (c) 1993 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1995 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
10 |
|
|
11 |
|
#include "standard.h" |
12 |
|
#include "paths.h" |
13 |
+ |
#include "vars.h" |
14 |
|
#include <ctype.h> |
15 |
+ |
#include <sys/types.h> |
16 |
|
|
15 |
– |
|
16 |
– |
typedef struct { |
17 |
– |
char *name; /* variable name */ |
18 |
– |
short nick; /* # characters required for nickname */ |
19 |
– |
short nass; /* # assignments made */ |
20 |
– |
char *value; /* assigned value(s) */ |
21 |
– |
int (*fixval)(); /* assignment checking function */ |
22 |
– |
} VARIABLE; |
23 |
– |
|
24 |
– |
int onevalue(), catvalues(); |
25 |
– |
|
17 |
|
/* variables */ |
18 |
|
#define OBJECT 0 /* object files */ |
19 |
|
#define SCENE 1 /* scene files */ |
20 |
|
#define MATERIAL 2 /* material files */ |
21 |
< |
#define RENDER 3 /* rendering options */ |
22 |
< |
#define OCONV 4 /* oconv options */ |
23 |
< |
#define PFILT 5 /* pfilt options */ |
24 |
< |
#define VIEW 6 /* view(s) for picture(s) */ |
25 |
< |
#define ZONE 7 /* simulation zone */ |
26 |
< |
#define QUALITY 8 /* desired rendering quality */ |
27 |
< |
#define OCTREE 9 /* octree file name */ |
28 |
< |
#define PICTURE 10 /* picture file name */ |
29 |
< |
#define AMBFILE 11 /* ambient file name */ |
30 |
< |
#define OPTFILE 12 /* rendering options file */ |
31 |
< |
#define EXPOSURE 13 /* picture exposure setting */ |
32 |
< |
#define RESOLUTION 14 /* maximum picture resolution */ |
33 |
< |
#define UP 15 /* view up (X, Y or Z) */ |
34 |
< |
#define INDIRECT 16 /* indirection in lighting */ |
35 |
< |
#define DETAIL 17 /* level of scene detail */ |
36 |
< |
#define PENUMBRAS 18 /* shadow penumbras are desired */ |
37 |
< |
#define VARIABILITY 19 /* level of light variability */ |
38 |
< |
#define REPORT 20 /* report frequency and errfile */ |
21 |
> |
#define ILLUM 3 /* mkillum input files */ |
22 |
> |
#define MKILLUM 4 /* mkillum options */ |
23 |
> |
#define RENDER 5 /* rendering options */ |
24 |
> |
#define OCONV 6 /* oconv options */ |
25 |
> |
#define PFILT 7 /* pfilt options */ |
26 |
> |
#define VIEW 8 /* view(s) for picture(s) */ |
27 |
> |
#define ZONE 9 /* simulation zone */ |
28 |
> |
#define QUALITY 10 /* desired rendering quality */ |
29 |
> |
#define OCTREE 11 /* octree file name */ |
30 |
> |
#define PICTURE 12 /* picture file root name */ |
31 |
> |
#define AMBFILE 13 /* ambient file name */ |
32 |
> |
#define OPTFILE 14 /* rendering options file */ |
33 |
> |
#define EXPOSURE 15 /* picture exposure setting */ |
34 |
> |
#define RESOLUTION 16 /* maximum picture resolution */ |
35 |
> |
#define UP 17 /* view up (X, Y or Z) */ |
36 |
> |
#define INDIRECT 18 /* indirection in lighting */ |
37 |
> |
#define DETAIL 19 /* level of scene detail */ |
38 |
> |
#define PENUMBRAS 20 /* shadow penumbras are desired */ |
39 |
> |
#define VARIABILITY 21 /* level of light variability */ |
40 |
> |
#define REPORT 22 /* report frequency and errfile */ |
41 |
> |
#define RAWFILE 23 /* raw picture file root name */ |
42 |
> |
#define ZFILE 24 /* distance file root name */ |
43 |
|
/* total number of variables */ |
44 |
< |
#define NVARS 21 |
44 |
> |
int NVARS = 25; |
45 |
|
|
46 |
< |
VARIABLE vv[NVARS] = { /* variable-value pairs */ |
46 |
> |
VARIABLE vv[] = { /* variable-value pairs */ |
47 |
|
{"objects", 3, 0, NULL, catvalues}, |
48 |
|
{"scene", 3, 0, NULL, catvalues}, |
49 |
|
{"materials", 3, 0, NULL, catvalues}, |
50 |
+ |
{"illum", 3, 0, NULL, catvalues}, |
51 |
+ |
{"mkillum", 3, 0, NULL, catvalues}, |
52 |
|
{"render", 3, 0, NULL, catvalues}, |
53 |
|
{"oconv", 3, 0, NULL, catvalues}, |
54 |
|
{"pfilt", 2, 0, NULL, catvalues}, |
55 |
|
{"view", 2, 0, NULL, NULL}, |
56 |
|
{"ZONE", 2, 0, NULL, onevalue}, |
57 |
< |
{"QUALITY", 3, 0, NULL, onevalue}, |
57 |
> |
{"QUALITY", 3, 0, NULL, qualvalue}, |
58 |
|
{"OCTREE", 3, 0, NULL, onevalue}, |
59 |
|
{"PICTURE", 3, 0, NULL, onevalue}, |
60 |
|
{"AMBFILE", 3, 0, NULL, onevalue}, |
61 |
|
{"OPTFILE", 3, 0, NULL, onevalue}, |
62 |
< |
{"EXPOSURE", 3, 0, NULL, onevalue}, |
62 |
> |
{"EXPOSURE", 3, 0, NULL, fltvalue}, |
63 |
|
{"RESOLUTION", 3, 0, NULL, onevalue}, |
64 |
|
{"UP", 2, 0, NULL, onevalue}, |
65 |
< |
{"INDIRECT", 3, 0, NULL, onevalue}, |
66 |
< |
{"DETAIL", 3, 0, NULL, onevalue}, |
67 |
< |
{"PENUMBRAS", 3, 0, NULL, onevalue}, |
68 |
< |
{"VARIABILITY", 3, 0, NULL, onevalue}, |
65 |
> |
{"INDIRECT", 3, 0, NULL, intvalue}, |
66 |
> |
{"DETAIL", 3, 0, NULL, qualvalue}, |
67 |
> |
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
68 |
> |
{"VARIABILITY", 3, 0, NULL, qualvalue}, |
69 |
|
{"REPORT", 3, 0, NULL, onevalue}, |
70 |
+ |
{"RAWFILE", 3, 0, NULL, onevalue}, |
71 |
+ |
{"ZFILE", 2, 0, NULL, onevalue}, |
72 |
|
}; |
73 |
|
|
75 |
– |
VARIABLE *matchvar(); |
76 |
– |
char *nvalue(); |
77 |
– |
int vscale(); |
78 |
– |
|
79 |
– |
#define UPPER(c) ((c)&~0x20) /* ASCII trick */ |
80 |
– |
|
81 |
– |
#define vnam(vc) (vv[vc].name) |
82 |
– |
#define vdef(vc) (vv[vc].nass) |
83 |
– |
#define vval(vc) (vv[vc].value) |
84 |
– |
#define vint(vc) atoi(vval(vc)) |
85 |
– |
#define vlet(vc) UPPER(vval(vc)[0]) |
86 |
– |
#define vbool(vc) (vlet(vc)=='T') |
87 |
– |
|
88 |
– |
#define HIGH 2 |
89 |
– |
#define MEDIUM 1 |
90 |
– |
#define LOW 0 |
91 |
– |
|
92 |
– |
int lowqopts(), medqopts(), hiqopts(); |
93 |
– |
int (*setqopts[3])() = {lowqopts, medqopts, hiqopts}; |
94 |
– |
|
95 |
– |
#define renderopts (*setqopts[vscale(QUALITY)]) |
96 |
– |
|
74 |
|
/* overture calculation file */ |
75 |
|
#ifdef NIX |
76 |
< |
char overfile[] = "overture.raw"; |
76 |
> |
char overfile[] = "overture.unf"; |
77 |
|
#else |
78 |
|
char overfile[] = "/dev/null"; |
79 |
|
#endif |
80 |
|
|
81 |
< |
extern long fdate(), time(); |
81 |
> |
extern time_t fdate(), time(); |
82 |
|
|
83 |
< |
long scenedate; /* date of latest scene or object file */ |
84 |
< |
long octreedate; /* date of octree */ |
85 |
< |
long matdate; /* date of latest material file */ |
83 |
> |
time_t scenedate; /* date of latest scene or object file */ |
84 |
> |
time_t octreedate; /* date of octree */ |
85 |
> |
time_t matdate; /* date of latest material file */ |
86 |
> |
time_t illumdate; /* date of last illum file */ |
87 |
|
|
88 |
+ |
char *oct0name; /* name of pre-mkillum octree */ |
89 |
+ |
time_t oct0date; /* date of pre-mkillum octree */ |
90 |
+ |
char *oct1name; /* name of post-mkillum octree */ |
91 |
+ |
time_t oct1date; /* date of post-mkillum octree (>= matdate) */ |
92 |
+ |
|
93 |
+ |
int nowarn = 0; /* no warnings */ |
94 |
|
int explicate = 0; /* explicate variables */ |
95 |
|
int silent = 0; /* do work silently */ |
96 |
+ |
int touchonly = 0; /* touch files only */ |
97 |
|
int noaction = 0; /* don't do anything */ |
98 |
+ |
int sayview = 0; /* print view out */ |
99 |
|
char *rvdevice = NULL; /* rview output device */ |
100 |
|
char *viewselect = NULL; /* specific view only */ |
101 |
|
|
102 |
|
int overture = 0; /* overture calculation needed */ |
103 |
|
|
104 |
|
char *progname; /* global argv[0] */ |
105 |
+ |
char *rifname; /* global rad input file name */ |
106 |
|
|
107 |
|
char radname[MAXPATH]; /* root Radiance file name */ |
108 |
|
|
112 |
|
char *argv[]; |
113 |
|
{ |
114 |
|
char ropts[512]; |
115 |
+ |
char popts[64]; |
116 |
|
int i; |
117 |
|
|
118 |
|
progname = argv[0]; |
125 |
|
case 'n': |
126 |
|
noaction++; |
127 |
|
break; |
128 |
+ |
case 't': |
129 |
+ |
touchonly++; |
130 |
+ |
break; |
131 |
|
case 'e': |
132 |
|
explicate++; |
133 |
|
break; |
134 |
|
case 'o': |
135 |
|
rvdevice = argv[++i]; |
136 |
|
break; |
137 |
+ |
case 'V': |
138 |
+ |
sayview++; |
139 |
+ |
break; |
140 |
|
case 'v': |
141 |
|
viewselect = argv[++i]; |
142 |
|
break; |
143 |
+ |
case 'w': |
144 |
+ |
nowarn++; |
145 |
+ |
break; |
146 |
|
default: |
147 |
|
goto userr; |
148 |
|
} |
149 |
|
if (i >= argc) |
150 |
|
goto userr; |
151 |
+ |
rifname = argv[i]; |
152 |
|
/* assign Radiance root file name */ |
153 |
< |
rootname(radname, argv[i]); |
153 |
> |
rootname(radname, rifname); |
154 |
|
/* load variable values */ |
155 |
< |
load(argv[i]); |
155 |
> |
loadvars(rifname); |
156 |
|
/* get any additional assignments */ |
157 |
|
for (i++; i < argc; i++) |
158 |
< |
setvariable(argv[i]); |
158 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
159 |
> |
fprintf(stderr, "%s: unknown variable: %s\n", |
160 |
> |
progname, argv[i]); |
161 |
> |
quit(1); |
162 |
> |
} |
163 |
|
/* check assignments */ |
164 |
|
checkvalues(); |
165 |
|
/* check files and dates */ |
168 |
|
setdefaults(); |
169 |
|
/* print all values if requested */ |
170 |
|
if (explicate) |
171 |
< |
printvals(); |
172 |
< |
/* build octree */ |
171 |
> |
printvars(stdout); |
172 |
> |
/* build octree (and run mkillum) */ |
173 |
|
oconv(); |
174 |
|
/* check date on ambient file */ |
175 |
|
checkambfile(); |
176 |
|
/* run simulation */ |
177 |
< |
renderopts(ropts); |
177 |
> |
renderopts(ropts, popts); |
178 |
|
xferopts(ropts); |
179 |
|
if (rvdevice != NULL) |
180 |
< |
rview(ropts); |
180 |
> |
rview(ropts, popts); |
181 |
|
else |
182 |
< |
rpict(ropts); |
183 |
< |
exit(0); |
182 |
> |
rpict(ropts, popts); |
183 |
> |
quit(0); |
184 |
|
userr: |
185 |
|
fprintf(stderr, |
186 |
< |
"Usage: %s [-s][-n][-e][-v view][-o dev] rfile [VAR=value ..]\n", |
186 |
> |
"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
187 |
|
progname); |
188 |
< |
exit(1); |
188 |
> |
quit(1); |
189 |
|
} |
190 |
|
|
191 |
|
|
204 |
|
} |
205 |
|
|
206 |
|
|
207 |
< |
load(rfname) /* load Radiance simulation file */ |
206 |
< |
char *rfname; |
207 |
< |
{ |
208 |
< |
FILE *fp; |
209 |
< |
char buf[512]; |
210 |
< |
register char *cp; |
211 |
< |
|
212 |
< |
if (rfname == NULL) |
213 |
< |
fp = stdin; |
214 |
< |
else if ((fp = fopen(rfname, "r")) == NULL) |
215 |
< |
syserr(rfname); |
216 |
< |
while (fgetline(buf, sizeof(buf), fp) != NULL) { |
217 |
< |
for (cp = buf; *cp; cp++) { |
218 |
< |
switch (*cp) { |
219 |
< |
case '\\': |
220 |
< |
case '\n': |
221 |
< |
*cp = ' '; |
222 |
< |
continue; |
223 |
< |
case '#': |
224 |
< |
*cp = '\0'; |
225 |
< |
break; |
226 |
< |
default: |
227 |
< |
continue; |
228 |
< |
} |
229 |
< |
break; |
230 |
< |
} |
231 |
< |
setvariable(buf); |
232 |
< |
} |
233 |
< |
fclose(fp); |
234 |
< |
} |
235 |
< |
|
236 |
< |
|
237 |
< |
setvariable(ass) /* assign variable according to string */ |
238 |
< |
register char *ass; |
239 |
< |
{ |
240 |
< |
char varname[32]; |
241 |
< |
register char *cp; |
242 |
< |
register VARIABLE *vp; |
243 |
< |
register int i; |
244 |
< |
int n; |
245 |
< |
|
246 |
< |
while (isspace(*ass)) /* skip leading space */ |
247 |
< |
ass++; |
248 |
< |
cp = varname; /* extract name */ |
249 |
< |
while (cp < varname+sizeof(varname)-1 |
250 |
< |
&& *ass && !isspace(*ass) && *ass != '=') |
251 |
< |
*cp++ = *ass++; |
252 |
< |
*cp = '\0'; |
253 |
< |
if (!varname[0]) |
254 |
< |
return; /* no variable name! */ |
255 |
< |
/* trim value */ |
256 |
< |
while (isspace(*ass) || *ass == '=') |
257 |
< |
ass++; |
258 |
< |
cp = ass + strlen(ass); |
259 |
< |
do |
260 |
< |
*cp-- = '\0'; |
261 |
< |
while (cp >= ass && isspace(*cp)); |
262 |
< |
n = cp - ass + 1; |
263 |
< |
if (!n) { |
264 |
< |
fprintf(stderr, "%s: warning - missing value for variable '%s'\n", |
265 |
< |
progname, varname); |
266 |
< |
return; |
267 |
< |
} |
268 |
< |
/* match variable from list */ |
269 |
< |
vp = matchvar(varname); |
270 |
< |
if (vp == NULL) { |
271 |
< |
fprintf(stderr, "%s: unknown variable '%s'\n", |
272 |
< |
progname, varname); |
273 |
< |
exit(1); |
274 |
< |
} |
275 |
< |
/* assign new value */ |
276 |
< |
if (i = vp->nass) { |
277 |
< |
cp = vp->value; |
278 |
< |
while (i--) |
279 |
< |
while (*cp++) |
280 |
< |
; |
281 |
< |
i = cp - vp->value; |
282 |
< |
vp->value = realloc(vp->value, i+n+1); |
283 |
< |
} else |
284 |
< |
vp->value = malloc(n+1); |
285 |
< |
if (vp->value == NULL) |
286 |
< |
syserr(progname); |
287 |
< |
strcpy(vp->value+i, ass); |
288 |
< |
vp->nass++; |
289 |
< |
} |
290 |
< |
|
291 |
< |
|
292 |
< |
VARIABLE * |
293 |
< |
matchvar(nam) /* match a variable by its name */ |
294 |
< |
char *nam; |
295 |
< |
{ |
296 |
< |
int n = strlen(nam); |
297 |
< |
register int i; |
298 |
< |
|
299 |
< |
for (i = 0; i < NVARS; i++) |
300 |
< |
if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n)) |
301 |
< |
return(vv+i); |
302 |
< |
return(NULL); |
303 |
< |
} |
304 |
< |
|
305 |
< |
|
306 |
< |
char * |
307 |
< |
nvalue(vp, n) /* return nth variable value */ |
308 |
< |
VARIABLE *vp; |
309 |
< |
register int n; |
310 |
< |
{ |
311 |
< |
register char *cp; |
312 |
< |
|
313 |
< |
if (vp == NULL || n < 0 || n >= vp->nass) |
314 |
< |
return(NULL); |
315 |
< |
cp = vp->value; |
316 |
< |
while (n--) |
317 |
< |
while (*cp++) |
318 |
< |
; |
319 |
< |
return(cp); |
320 |
< |
} |
321 |
< |
|
322 |
< |
|
323 |
< |
int |
324 |
< |
vscale(vc) /* return scale for variable vc */ |
325 |
< |
int vc; |
326 |
< |
{ |
327 |
< |
switch(vlet(vc)) { |
328 |
< |
case 'H': |
329 |
< |
return(HIGH); |
330 |
< |
case 'M': |
331 |
< |
return(MEDIUM); |
332 |
< |
case 'L': |
333 |
< |
return(LOW); |
334 |
< |
} |
335 |
< |
badvalue(vc); |
336 |
< |
} |
337 |
< |
|
338 |
< |
|
339 |
< |
checkvalues() /* check assignments */ |
340 |
< |
{ |
341 |
< |
register int i; |
342 |
< |
|
343 |
< |
for (i = 0; i < NVARS; i++) |
344 |
< |
if (vv[i].fixval != NULL) |
345 |
< |
(*vv[i].fixval)(vv+i); |
346 |
< |
} |
347 |
< |
|
348 |
< |
|
349 |
< |
onevalue(vp) /* only one assignment for this variable */ |
350 |
< |
register VARIABLE *vp; |
351 |
< |
{ |
352 |
< |
if (vp->nass < 2) |
353 |
< |
return; |
354 |
< |
fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n", |
355 |
< |
progname, vp->name); |
356 |
< |
do |
357 |
< |
vp->value += strlen(vp->value)+1; |
358 |
< |
while (--vp->nass > 1); |
359 |
< |
} |
360 |
< |
|
361 |
< |
|
362 |
< |
catvalues(vp) /* concatenate variable values */ |
363 |
< |
register VARIABLE *vp; |
364 |
< |
{ |
365 |
< |
register char *cp; |
366 |
< |
|
367 |
< |
if (vp->nass < 2) |
368 |
< |
return; |
369 |
< |
for (cp = vp->value; vp->nass > 1; vp->nass--) { |
370 |
< |
while (*cp) |
371 |
< |
cp++; |
372 |
< |
*cp++ = ' '; |
373 |
< |
} |
374 |
< |
} |
375 |
< |
|
376 |
< |
|
377 |
< |
long |
207 |
> |
time_t |
208 |
|
checklast(fnames) /* check files and find most recent */ |
209 |
|
register char *fnames; |
210 |
|
{ |
211 |
|
char thisfile[MAXPATH]; |
212 |
< |
long thisdate, lastdate = -1; |
212 |
> |
time_t thisdate, lastdate = 0; |
213 |
|
register char *cp; |
214 |
|
|
215 |
+ |
if (fnames == NULL) |
216 |
+ |
return(0); |
217 |
|
while (*fnames) { |
218 |
|
while (isspace(*fnames)) fnames++; |
219 |
|
cp = thisfile; |
220 |
|
while (*fnames && !isspace(*fnames)) |
221 |
|
*cp++ = *fnames++; |
222 |
|
*cp = '\0'; |
223 |
< |
if ((thisdate = fdate(thisfile)) < 0) |
223 |
> |
if (!(thisdate = fdate(thisfile))) |
224 |
|
syserr(thisfile); |
225 |
|
if (thisdate > lastdate) |
226 |
|
lastdate = thisdate; |
229 |
|
} |
230 |
|
|
231 |
|
|
232 |
+ |
char * |
233 |
+ |
newfname(orig, pred) /* create modified file name */ |
234 |
+ |
char *orig; |
235 |
+ |
int pred; |
236 |
+ |
{ |
237 |
+ |
extern char *rindex(); |
238 |
+ |
register char *cp; |
239 |
+ |
register int n; |
240 |
+ |
int suffix; |
241 |
+ |
|
242 |
+ |
n = 0; cp = orig; suffix = -1; /* suffix position, length */ |
243 |
+ |
while (*cp) { |
244 |
+ |
if (*cp == '.') suffix = n; |
245 |
+ |
else if (ISDIRSEP(*cp)) suffix = -1; |
246 |
+ |
cp++; n++; |
247 |
+ |
} |
248 |
+ |
if (suffix == -1) suffix = n; |
249 |
+ |
if ((cp = bmalloc(n+2)) == NULL) |
250 |
+ |
syserr(progname); |
251 |
+ |
strncpy(cp, orig, suffix); |
252 |
+ |
cp[suffix] = pred; /* root name + pred + suffix */ |
253 |
+ |
strcpy(cp+suffix+1, orig+suffix); |
254 |
+ |
return(cp); |
255 |
+ |
} |
256 |
+ |
|
257 |
+ |
|
258 |
|
checkfiles() /* check for existence and modified times */ |
259 |
|
{ |
260 |
< |
char *cp; |
403 |
< |
long objdate; |
260 |
> |
time_t objdate; |
261 |
|
|
262 |
|
if (!vdef(OCTREE)) { |
263 |
< |
if ((cp = bmalloc(strlen(radname)+5)) == NULL) |
263 |
> |
if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL) |
264 |
|
syserr(progname); |
265 |
< |
sprintf(cp, "%s.oct", radname); |
409 |
< |
vval(OCTREE) = cp; |
265 |
> |
sprintf(vval(OCTREE), "%s.oct", radname); |
266 |
|
vdef(OCTREE)++; |
267 |
|
} |
268 |
|
octreedate = fdate(vval(OCTREE)); |
269 |
< |
scenedate = -1; |
270 |
< |
if (vdef(SCENE)) { |
271 |
< |
scenedate = checklast(vval(SCENE)); |
272 |
< |
if (vdef(OBJECT)) { |
273 |
< |
objdate = checklast(vval(OBJECT)); |
274 |
< |
if (objdate > scenedate) |
275 |
< |
scenedate = objdate; |
276 |
< |
} |
269 |
> |
if (vdef(ILLUM)) { /* illum requires secondary octrees */ |
270 |
> |
oct0name = newfname(vval(OCTREE), '0'); |
271 |
> |
oct1name = newfname(vval(OCTREE), '1'); |
272 |
> |
oct0date = fdate(oct0name); |
273 |
> |
oct1date = fdate(oct1name); |
274 |
> |
} else |
275 |
> |
oct0name = oct1name = vval(OCTREE); |
276 |
> |
if ((scenedate = checklast(vval(SCENE))) && |
277 |
> |
(objdate = checklast(vval(OBJECT))) > scenedate) |
278 |
> |
scenedate = objdate; |
279 |
> |
illumdate = checklast(vval(ILLUM)); |
280 |
> |
if (!octreedate & !scenedate & !illumdate) { |
281 |
> |
fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname, |
282 |
> |
vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); |
283 |
> |
quit(1); |
284 |
|
} |
285 |
< |
if (octreedate < 0 & scenedate < 0) { |
423 |
< |
fprintf(stderr, "%s: need '%s' or '%s'\n", progname, |
424 |
< |
vnam(OCTREE), vnam(SCENE)); |
425 |
< |
exit(1); |
426 |
< |
} |
427 |
< |
matdate = -1; |
428 |
< |
if (vdef(MATERIAL)) |
429 |
< |
matdate = checklast(vval(MATERIAL)); |
285 |
> |
matdate = checklast(vval(MATERIAL)); |
286 |
|
} |
287 |
|
|
288 |
|
|
291 |
|
{ |
292 |
|
extern FILE *popen(); |
293 |
|
static double oorg[3], osiz = 0.; |
294 |
< |
char buf[MAXPATH+16]; |
294 |
> |
double min[3], max[3]; |
295 |
> |
char buf[1024]; |
296 |
|
FILE *fp; |
297 |
+ |
register int i; |
298 |
|
|
299 |
< |
if (osiz <= FTINY) { |
300 |
< |
oconv(); /* does nothing if done already */ |
301 |
< |
sprintf(buf, "getinfo -d < %s", vval(OCTREE)); |
302 |
< |
if ((fp = popen(buf, "r")) == NULL) |
303 |
< |
syserr("getinfo"); |
304 |
< |
if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1], |
305 |
< |
&oorg[2], &osiz) != 4) { |
306 |
< |
fprintf(stderr, |
299 |
> |
if (osiz <= FTINY) |
300 |
> |
if (noaction && fdate(oct1name) < |
301 |
> |
(scenedate>illumdate?scenedate:illumdate)) { |
302 |
> |
/* run getbbox */ |
303 |
> |
sprintf(buf, "getbbox -w -h %s", |
304 |
> |
vdef(SCENE) ? vval(SCENE) : vval(ILLUM)); |
305 |
> |
if ((fp = popen(buf, "r")) == NULL) |
306 |
> |
syserr("getbbox"); |
307 |
> |
if (fscanf(fp, "%lf %lf %lf %lf %lf %lf", |
308 |
> |
&min[0], &max[0], &min[1], &max[1], |
309 |
> |
&min[2], &max[2]) != 6) { |
310 |
> |
fprintf(stderr, |
311 |
> |
"%s: error reading bounding box from getbbox\n", |
312 |
> |
progname); |
313 |
> |
quit(1); |
314 |
> |
} |
315 |
> |
for (i = 0; i < 3; i++) |
316 |
> |
if (max[i] - min[i] > osiz) |
317 |
> |
osiz = max[i] - min[i]; |
318 |
> |
for (i = 0; i < 3; i++) |
319 |
> |
oorg[i] = (max[i]+min[i]-osiz)*.5; |
320 |
> |
pclose(fp); |
321 |
> |
} else { /* from octree */ |
322 |
> |
oconv(); /* does nothing if done already */ |
323 |
> |
sprintf(buf, "getinfo -d < %s", oct1name); |
324 |
> |
if ((fp = popen(buf, "r")) == NULL) |
325 |
> |
syserr("getinfo"); |
326 |
> |
if (fscanf(fp, "%lf %lf %lf %lf", &oorg[0], &oorg[1], |
327 |
> |
&oorg[2], &osiz) != 4) { |
328 |
> |
fprintf(stderr, |
329 |
|
"%s: error reading bounding cube from getinfo\n", |
330 |
< |
progname); |
331 |
< |
exit(1); |
330 |
> |
progname); |
331 |
> |
quit(1); |
332 |
> |
} |
333 |
> |
pclose(fp); |
334 |
|
} |
453 |
– |
pclose(fp); |
454 |
– |
} |
335 |
|
org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz; |
336 |
|
} |
337 |
|
|
383 |
|
} |
384 |
|
|
385 |
|
|
386 |
< |
printvals() /* print variable values */ |
386 |
> |
oconv() /* run oconv and mkillum if necessary */ |
387 |
|
{ |
388 |
< |
register int i, j; |
388 |
> |
static char illumtmp[] = "ilXXXXXX"; |
389 |
> |
char combuf[1024], ocopts[64], mkopts[64]; |
390 |
|
|
391 |
< |
for (i = 0; i < NVARS; i++) |
392 |
< |
for (j = 0; j < vdef(i); j++) |
393 |
< |
printf("%s= %s\n", vnam(i), nvalue(vv+i, j)); |
394 |
< |
fflush(stdout); |
395 |
< |
} |
396 |
< |
|
397 |
< |
|
398 |
< |
oconv() /* run oconv if necessary */ |
399 |
< |
{ |
400 |
< |
char combuf[512], ocopts[64]; |
401 |
< |
|
402 |
< |
if (octreedate >= scenedate) /* check dates */ |
391 |
> |
oconvopts(ocopts); /* get options */ |
392 |
> |
if (octreedate < scenedate) { /* check date on original octree */ |
393 |
> |
if (touchonly && octreedate) |
394 |
> |
touch(vval(OCTREE)); |
395 |
> |
else { /* build command */ |
396 |
> |
if (vdef(MATERIAL)) |
397 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
398 |
> |
vval(MATERIAL), vval(SCENE), |
399 |
> |
vval(OCTREE)); |
400 |
> |
else |
401 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
402 |
> |
vval(SCENE), vval(OCTREE)); |
403 |
> |
|
404 |
> |
if (runcom(combuf)) { /* run it */ |
405 |
> |
fprintf(stderr, |
406 |
> |
"%s: error generating octree\n\t%s removed\n", |
407 |
> |
progname, vval(OCTREE)); |
408 |
> |
unlink(vval(OCTREE)); |
409 |
> |
quit(1); |
410 |
> |
} |
411 |
> |
} |
412 |
> |
octreedate = time((time_t *)NULL); |
413 |
> |
if (octreedate < scenedate) /* in case clock is off */ |
414 |
> |
octreedate = scenedate; |
415 |
> |
} |
416 |
> |
if (oct1name == vval(OCTREE)) /* no mkillum? */ |
417 |
> |
oct1date = octreedate > matdate ? octreedate : matdate; |
418 |
> |
if (oct1date >= octreedate & oct1date >= matdate |
419 |
> |
& oct1date >= illumdate) /* all done */ |
420 |
|
return; |
421 |
< |
/* build command */ |
422 |
< |
oconvopts(ocopts); |
423 |
< |
if (vdef(MATERIAL)) |
424 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
425 |
< |
vval(MATERIAL), vval(SCENE), vval(OCTREE)); |
426 |
< |
else |
427 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
428 |
< |
vval(SCENE), vval(OCTREE)); |
429 |
< |
|
430 |
< |
if (runcom(combuf)) { /* run it */ |
431 |
< |
fprintf(stderr, "%s: error generating octree\n\t%s removed\n", |
432 |
< |
progname, vval(OCTREE)); |
433 |
< |
unlink(vval(OCTREE)); |
434 |
< |
exit(1); |
421 |
> |
/* make octree0 */ |
422 |
> |
if (oct0date < scenedate | oct0date < illumdate) { |
423 |
> |
if (touchonly && oct0date) |
424 |
> |
touch(oct0name); |
425 |
> |
else { /* build command */ |
426 |
> |
if (octreedate) |
427 |
> |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
428 |
> |
vval(OCTREE), vval(ILLUM), oct0name); |
429 |
> |
else if (vdef(MATERIAL)) |
430 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
431 |
> |
vval(MATERIAL), vval(ILLUM), oct0name); |
432 |
> |
else |
433 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
434 |
> |
vval(ILLUM), oct0name); |
435 |
> |
if (runcom(combuf)) { /* run it */ |
436 |
> |
fprintf(stderr, |
437 |
> |
"%s: error generating octree\n\t%s removed\n", |
438 |
> |
progname, oct0name); |
439 |
> |
unlink(oct0name); |
440 |
> |
quit(1); |
441 |
> |
} |
442 |
> |
} |
443 |
> |
oct0date = time((time_t *)NULL); |
444 |
> |
if (oct0date < octreedate) /* in case clock is off */ |
445 |
> |
oct0date = octreedate; |
446 |
> |
if (oct0date < illumdate) /* ditto */ |
447 |
> |
oct0date = illumdate; |
448 |
> |
} |
449 |
> |
if (touchonly && oct1date) |
450 |
> |
touch(oct1name); |
451 |
> |
else { |
452 |
> |
mkillumopts(mkopts); /* build mkillum command */ |
453 |
> |
mktemp(illumtmp); |
454 |
> |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
455 |
> |
oct0name, vval(ILLUM), illumtmp); |
456 |
> |
if (runcom(combuf)) { /* run it */ |
457 |
> |
fprintf(stderr, "%s: error running mkillum\n", |
458 |
> |
progname); |
459 |
> |
unlink(illumtmp); |
460 |
> |
quit(1); |
461 |
> |
} |
462 |
> |
/* make octree1 (frozen) */ |
463 |
> |
if (octreedate) |
464 |
> |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
465 |
> |
vval(OCTREE), illumtmp, oct1name); |
466 |
> |
else if (vdef(MATERIAL)) |
467 |
> |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
468 |
> |
vval(MATERIAL), illumtmp, oct1name); |
469 |
> |
else |
470 |
> |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
471 |
> |
illumtmp, oct1name); |
472 |
> |
if (runcom(combuf)) { /* run it */ |
473 |
> |
fprintf(stderr, |
474 |
> |
"%s: error generating octree\n\t%s removed\n", |
475 |
> |
progname, oct1name); |
476 |
> |
unlink(oct1name); |
477 |
> |
unlink(illumtmp); |
478 |
> |
quit(1); |
479 |
> |
} |
480 |
> |
rmfile(illumtmp); |
481 |
|
} |
482 |
< |
octreedate = time(0); |
482 |
> |
oct1date = time((time_t *)NULL); |
483 |
> |
if (oct1date < oct0date) /* in case clock is off */ |
484 |
> |
oct1date = oct0date; |
485 |
|
} |
486 |
|
|
487 |
|
|
507 |
|
} |
508 |
|
|
509 |
|
|
510 |
+ |
mkillumopts(mo) /* get mkillum options */ |
511 |
+ |
register char *mo; |
512 |
+ |
{ |
513 |
+ |
/* BEWARE: This may be called via setdefaults(), so no assumptions */ |
514 |
+ |
|
515 |
+ |
*mo = '\0'; |
516 |
+ |
if (vdef(MKILLUM)) |
517 |
+ |
addarg(mo, vval(MKILLUM)); |
518 |
+ |
} |
519 |
+ |
|
520 |
+ |
|
521 |
|
checkambfile() /* check date on ambient file */ |
522 |
|
{ |
523 |
< |
long afdate; |
523 |
> |
time_t afdate; |
524 |
|
|
525 |
|
if (!vdef(AMBFILE)) |
526 |
|
return; |
527 |
< |
if ((afdate = fdate(vval(AMBFILE))) < 0) |
527 |
> |
if (!(afdate = fdate(vval(AMBFILE)))) |
528 |
|
return; |
529 |
< |
if (octreedate > afdate | matdate > afdate) |
530 |
< |
rmfile(vval(AMBFILE)); |
529 |
> |
if (oct1date > afdate) |
530 |
> |
if (touchonly) |
531 |
> |
touch(vval(AMBFILE)); |
532 |
> |
else |
533 |
> |
rmfile(vval(AMBFILE)); |
534 |
|
} |
535 |
|
|
536 |
|
|
539 |
|
{ |
540 |
|
if (vdef(EXPOSURE)) { |
541 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
542 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
543 |
< |
if (isdigit(vval(EXPOSURE)[0]) || vval(EXPOSURE)[0] == '.') |
584 |
< |
return(.5/atof(vval(EXPOSURE))); |
585 |
< |
badvalue(EXPOSURE); |
542 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
543 |
> |
return(.5/vflt(EXPOSURE)); |
544 |
|
} |
545 |
|
if (vlet(ZONE) == 'E') |
546 |
|
return(10.); |
550 |
|
} |
551 |
|
|
552 |
|
|
553 |
< |
lowqopts(op) /* low quality rendering options */ |
553 |
> |
renderopts(op, po) /* set rendering options */ |
554 |
> |
char *op, *po; |
555 |
> |
{ |
556 |
> |
switch(vscale(QUALITY)) { |
557 |
> |
case LOW: |
558 |
> |
lowqopts(op, po); |
559 |
> |
break; |
560 |
> |
case MEDIUM: |
561 |
> |
medqopts(op, po); |
562 |
> |
break; |
563 |
> |
case HIGH: |
564 |
> |
hiqopts(op, po); |
565 |
> |
break; |
566 |
> |
} |
567 |
> |
} |
568 |
> |
|
569 |
> |
|
570 |
> |
lowqopts(op, po) /* low quality rendering options */ |
571 |
|
register char *op; |
572 |
+ |
char *po; |
573 |
|
{ |
574 |
|
double d, org[3], siz[3]; |
575 |
|
|
576 |
|
*op = '\0'; |
577 |
+ |
*po = '\0'; |
578 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
579 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
580 |
|
badvalue(ZONE); |
581 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
582 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
583 |
+ |
badvalue(ZONE); |
584 |
|
getoctcube(org, &d); |
585 |
|
d *= 3./(siz[0]+siz[1]+siz[2]); |
586 |
|
switch (vscale(DETAIL)) { |
587 |
|
case LOW: |
588 |
< |
op = addarg(op, "-ps 16 -dp 16"); |
588 |
> |
po = addarg(po, "-ps 16"); |
589 |
> |
op = addarg(op, "-dp 64"); |
590 |
|
sprintf(op, " -ar %d", (int)(4*d)); |
591 |
|
op += strlen(op); |
592 |
|
break; |
593 |
|
case MEDIUM: |
594 |
< |
op = addarg(op, "-ps 8 -dp 32"); |
594 |
> |
po = addarg(po, "-ps 8"); |
595 |
> |
op = addarg(op, "-dp 128"); |
596 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
597 |
|
op += strlen(op); |
598 |
|
break; |
599 |
|
case HIGH: |
600 |
< |
op = addarg(op, "-ps 4 -dp 64"); |
600 |
> |
po = addarg(po, "-ps 4"); |
601 |
> |
op = addarg(op, "-dp 256"); |
602 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
603 |
|
op += strlen(op); |
604 |
|
break; |
605 |
|
} |
606 |
< |
op = addarg(op, "-pt .16"); |
606 |
> |
po = addarg(po, "-pt .16"); |
607 |
|
if (vbool(PENUMBRAS)) |
608 |
|
op = addarg(op, "-ds .4"); |
609 |
|
else |
610 |
|
op = addarg(op, "-ds 0"); |
611 |
< |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7"); |
611 |
> |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5"); |
612 |
|
if (vdef(AMBFILE)) { |
613 |
|
sprintf(op, " -af %s", vval(AMBFILE)); |
614 |
|
op += strlen(op); |
616 |
|
overture = 0; |
617 |
|
switch (vscale(VARIABILITY)) { |
618 |
|
case LOW: |
619 |
< |
op = addarg(op, "-aa .4 -ad 32"); |
619 |
> |
op = addarg(op, "-aa .4 -ad 64"); |
620 |
|
break; |
621 |
|
case MEDIUM: |
622 |
< |
op = addarg(op, "-aa .3 -ad 64"); |
622 |
> |
op = addarg(op, "-aa .3 -ad 128"); |
623 |
|
break; |
624 |
|
case HIGH: |
625 |
< |
op = addarg(op, "-aa .25 -ad 128"); |
625 |
> |
op = addarg(op, "-aa .25 -ad 256"); |
626 |
|
break; |
627 |
|
} |
628 |
|
op = addarg(op, "-as 0"); |
635 |
|
} |
636 |
|
|
637 |
|
|
638 |
< |
medqopts(op) /* medium quality rendering options */ |
638 |
> |
medqopts(op, po) /* medium quality rendering options */ |
639 |
|
register char *op; |
640 |
+ |
char *po; |
641 |
|
{ |
642 |
< |
double d, org[3], siz[3]; |
642 |
> |
double d, org[3], siz[3], asz; |
643 |
|
|
644 |
|
*op = '\0'; |
645 |
+ |
*po = '\0'; |
646 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
647 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
648 |
|
badvalue(ZONE); |
649 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
650 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
651 |
+ |
badvalue(ZONE); |
652 |
|
getoctcube(org, &d); |
653 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
653 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
654 |
> |
d /= asz; |
655 |
|
switch (vscale(DETAIL)) { |
656 |
|
case LOW: |
657 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
658 |
< |
op = addarg(op, "-dp 64"); |
657 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
658 |
> |
op = addarg(op, "-dp 256"); |
659 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
660 |
|
op += strlen(op); |
661 |
+ |
sprintf(op, " -ms %.2g", asz/20.); |
662 |
+ |
op += strlen(op); |
663 |
|
break; |
664 |
|
case MEDIUM: |
665 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
666 |
< |
op = addarg(op, "-dp 128"); |
665 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
666 |
> |
op = addarg(op, "-dp 512"); |
667 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
668 |
|
op += strlen(op); |
669 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
670 |
+ |
op += strlen(op); |
671 |
|
break; |
672 |
|
case HIGH: |
673 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
674 |
< |
op = addarg(op, "-dp 256"); |
673 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
674 |
> |
op = addarg(op, "-dp 1024"); |
675 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
676 |
|
op += strlen(op); |
677 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
678 |
+ |
op += strlen(op); |
679 |
|
break; |
680 |
|
} |
681 |
< |
op = addarg(op, "-pt .08"); |
681 |
> |
po = addarg(po, "-pt .08"); |
682 |
|
if (vbool(PENUMBRAS)) |
683 |
< |
op = addarg(op, "-ds .2 -dj .35"); |
683 |
> |
op = addarg(op, "-ds .2 -dj .5"); |
684 |
|
else |
685 |
|
op = addarg(op, "-ds .3"); |
686 |
< |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15"); |
686 |
> |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); |
687 |
|
if (overture = vint(INDIRECT)) { |
688 |
|
sprintf(op, " -ab %d", overture); |
689 |
|
op += strlen(op); |
695 |
|
overture = 0; |
696 |
|
switch (vscale(VARIABILITY)) { |
697 |
|
case LOW: |
698 |
< |
op = addarg(op, "-aa .25 -ad 128 -as 0"); |
698 |
> |
op = addarg(op, "-aa .25 -ad 196 -as 0"); |
699 |
|
break; |
700 |
|
case MEDIUM: |
701 |
< |
op = addarg(op, "-aa .2 -ad 300 -as 64"); |
701 |
> |
op = addarg(op, "-aa .2 -ad 400 -as 64"); |
702 |
|
break; |
703 |
|
case HIGH: |
704 |
< |
op = addarg(op, "-aa .15 -ad 500 -as 128"); |
704 |
> |
op = addarg(op, "-aa .15 -ad 768 -as 196"); |
705 |
|
break; |
706 |
|
} |
707 |
|
d = ambval(); |
713 |
|
} |
714 |
|
|
715 |
|
|
716 |
< |
hiqopts(op) /* high quality rendering options */ |
716 |
> |
hiqopts(op, po) /* high quality rendering options */ |
717 |
|
register char *op; |
718 |
+ |
char *po; |
719 |
|
{ |
720 |
< |
double d, org[3], siz[3]; |
720 |
> |
double d, org[3], siz[3], asz; |
721 |
|
|
722 |
|
*op = '\0'; |
723 |
+ |
*po = '\0'; |
724 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
725 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
726 |
|
badvalue(ZONE); |
727 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
728 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
729 |
+ |
badvalue(ZONE); |
730 |
|
getoctcube(org, &d); |
731 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
731 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
732 |
> |
d /= asz; |
733 |
|
switch (vscale(DETAIL)) { |
734 |
|
case LOW: |
735 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
736 |
< |
op = addarg(op, "-dp 256"); |
735 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
736 |
> |
op = addarg(op, "-dp 1024"); |
737 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
738 |
|
op += strlen(op); |
739 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
740 |
+ |
op += strlen(op); |
741 |
|
break; |
742 |
|
case MEDIUM: |
743 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
744 |
< |
op = addarg(op, "-dp 512"); |
743 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
744 |
> |
op = addarg(op, "-dp 2048"); |
745 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
746 |
|
op += strlen(op); |
747 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
748 |
+ |
op += strlen(op); |
749 |
|
break; |
750 |
|
case HIGH: |
751 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
752 |
< |
op = addarg(op, "-dp 1024"); |
751 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
752 |
> |
op = addarg(op, "-dp 4096"); |
753 |
|
sprintf(op, " -ar %d", (int)(64*d)); |
754 |
|
op += strlen(op); |
755 |
+ |
sprintf(op, " -ms %.2g", asz/160.); |
756 |
+ |
op += strlen(op); |
757 |
|
break; |
758 |
|
} |
759 |
< |
op = addarg(op, "-pt .04"); |
759 |
> |
po = addarg(po, "-pt .04"); |
760 |
|
if (vbool(PENUMBRAS)) |
761 |
< |
op = addarg(op, "-ds .1 -dj .7"); |
761 |
> |
op = addarg(op, "-ds .1 -dj .65"); |
762 |
|
else |
763 |
|
op = addarg(op, "-ds .2"); |
764 |
< |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03"); |
764 |
> |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
765 |
|
sprintf(op, " -ab %d", overture=vint(INDIRECT)+1); |
766 |
|
op += strlen(op); |
767 |
|
if (vdef(AMBFILE)) { |
771 |
|
overture = 0; |
772 |
|
switch (vscale(VARIABILITY)) { |
773 |
|
case LOW: |
774 |
< |
op = addarg(op, "-aa .15 -ad 200 -as 0"); |
774 |
> |
op = addarg(op, "-aa .15 -ad 256 -as 0"); |
775 |
|
break; |
776 |
|
case MEDIUM: |
777 |
< |
op = addarg(op, "-aa .125 -ad 512 -as 128"); |
777 |
> |
op = addarg(op, "-aa .125 -ad 512 -as 256"); |
778 |
|
break; |
779 |
|
case HIGH: |
780 |
< |
op = addarg(op, "-aa .08 -ad 850 -as 256"); |
780 |
> |
op = addarg(op, "-aa .08 -ad 1024 -as 512"); |
781 |
|
break; |
782 |
|
} |
783 |
|
d = ambval(); |
800 |
|
return; |
801 |
|
if (vdef(OPTFILE)) { |
802 |
|
for (cp = ro; cp[1]; cp++) |
803 |
< |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
803 |
> |
if (isspace(cp[1]) && (cp[2] == '@' || |
804 |
> |
(cp[2] == '-' && isalpha(cp[3])))) |
805 |
|
*cp = '\n'; |
806 |
|
else |
807 |
|
*cp = cp[1]; |
809 |
|
fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666); |
810 |
|
if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0) |
811 |
|
syserr(vval(OPTFILE)); |
812 |
< |
sprintf(ro, " \"^%s\"", vval(OPTFILE)); |
812 |
> |
sprintf(ro, " @%s", vval(OPTFILE)); |
813 |
|
} |
814 |
|
#ifdef MSDOS |
815 |
|
else if (n > 50) { |
833 |
|
po = addarg(po, "-r 1"); |
834 |
|
break; |
835 |
|
case HIGH: |
836 |
< |
po = addarg(po, "-m .15"); |
836 |
> |
po = addarg(po, "-m .25"); |
837 |
|
break; |
838 |
|
} |
839 |
|
if (vdef(PFILT)) |
896 |
|
zpos = -1; vs++; |
897 |
|
} |
898 |
|
viewtype = 'v'; |
899 |
< |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h') |
899 |
> |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c') |
900 |
|
viewtype = *vs++; |
901 |
|
cp = viewopts; |
902 |
|
if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) { /* got one! */ |
907 |
|
badvalue(ZONE); |
908 |
|
for (i = 0; i < 3; i++) { |
909 |
|
dim[i] -= cent[i]; |
910 |
+ |
if (dim[i] <= FTINY) |
911 |
+ |
badvalue(ZONE); |
912 |
|
cent[i] += .5*dim[i]; |
913 |
|
} |
914 |
|
mult = vlet(ZONE)=='E' ? 2. : .45 ; |
951 |
|
case 'h': |
952 |
|
cp = addarg(cp, "-vh 180 -vv 180"); |
953 |
|
break; |
954 |
+ |
case 'c': |
955 |
+ |
cp = addarg(cp, "-vh 180 -vv 90"); |
956 |
+ |
break; |
957 |
|
} |
958 |
|
} else { |
959 |
|
while (!isspace(*vs)) /* else skip id */ |
964 |
|
cp += strlen(cp); |
965 |
|
} |
966 |
|
} |
967 |
< |
strcpy(cp, vs); /* append any additional options */ |
967 |
> |
if (cp == viewopts) /* append any additional options */ |
968 |
> |
vs++; /* skip prefixed space if unneeded */ |
969 |
> |
strcpy(cp, vs); |
970 |
|
#ifdef MSDOS |
971 |
|
if (strlen(viewopts) > 40) { |
972 |
|
setenv("VIEW", viewopts); |
982 |
|
int n; |
983 |
|
char *vn; /* returned view name */ |
984 |
|
{ |
985 |
< |
register char *mv = NULL; |
985 |
> |
register char *mv; |
986 |
|
|
987 |
|
if (viewselect != NULL) { /* command-line selected */ |
988 |
|
if (n) /* only do one */ |
997 |
|
; |
998 |
|
*vn = '\0'; |
999 |
|
} |
1000 |
+ |
/* view number? */ |
1001 |
+ |
if (isint(viewselect)) |
1002 |
+ |
return(specview(nvalue(VIEW, atoi(viewselect)-1))); |
1003 |
|
/* check list */ |
1004 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1004 |
> |
while ((mv = nvalue(VIEW, n++)) != NULL) |
1005 |
|
if (matchword(viewselect, mv)) |
1006 |
|
return(specview(mv)); |
1007 |
|
return(specview(viewselect)); /* standard view? */ |
1008 |
|
} |
1009 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1009 |
> |
mv = nvalue(VIEW, n); /* use view n */ |
1010 |
|
if (vn != NULL & mv != NULL) { |
1011 |
< |
if (*mv != '-') |
1012 |
< |
while (*mv && !isspace(*mv)) |
1013 |
< |
*vn++ = *mv++; |
1011 |
> |
register char *mv2 = mv; |
1012 |
> |
if (*mv2 != '-') |
1013 |
> |
while (*mv2 && !isspace(*mv2)) |
1014 |
> |
*vn++ = *mv2++; |
1015 |
|
*vn = '\0'; |
1016 |
|
} |
1017 |
|
return(specview(mv)); |
1018 |
|
} |
1019 |
|
|
1020 |
|
|
1021 |
< |
rview(opts) /* run rview with first view */ |
1022 |
< |
char *opts; |
1021 |
> |
printview(vopts) /* print out selected view */ |
1022 |
> |
register char *vopts; |
1023 |
|
{ |
1024 |
+ |
extern char *atos(), *getenv(); |
1025 |
+ |
char buf[256]; |
1026 |
+ |
FILE *fp; |
1027 |
+ |
register char *cp; |
1028 |
+ |
|
1029 |
+ |
if (vopts == NULL) |
1030 |
+ |
return(-1); |
1031 |
+ |
fputs("VIEW=", stdout); |
1032 |
+ |
do { |
1033 |
+ |
if (matchword(vopts, "-vf")) { /* expand view file */ |
1034 |
+ |
vopts = sskip(vopts); |
1035 |
+ |
if (!*atos(buf, sizeof(buf), vopts)) |
1036 |
+ |
return(-1); |
1037 |
+ |
if ((fp = fopen(buf, "r")) == NULL) |
1038 |
+ |
return(-1); |
1039 |
+ |
for (buf[sizeof(buf)-2] = '\n'; |
1040 |
+ |
fgets(buf, sizeof(buf), fp) != NULL && |
1041 |
+ |
buf[0] != '\n'; |
1042 |
+ |
buf[sizeof(buf)-2] = '\n') { |
1043 |
+ |
if (buf[sizeof(buf)-2] != '\n') { |
1044 |
+ |
ungetc(buf[sizeof(buf)-2], fp); |
1045 |
+ |
buf[sizeof(buf)-2] = '\0'; |
1046 |
+ |
} |
1047 |
+ |
if (matchword(buf, "VIEW=") || |
1048 |
+ |
matchword(buf, "rview")) { |
1049 |
+ |
for (cp = sskip(buf); *cp && *cp != '\n'; cp++) |
1050 |
+ |
putchar(*cp); |
1051 |
+ |
} |
1052 |
+ |
} |
1053 |
+ |
fclose(fp); |
1054 |
+ |
vopts = sskip(vopts); |
1055 |
+ |
} else { |
1056 |
+ |
while (isspace(*vopts)) |
1057 |
+ |
vopts++; |
1058 |
+ |
putchar(' '); |
1059 |
+ |
#ifdef MSDOS |
1060 |
+ |
if (*vopts == '$') { /* expand env. var. */ |
1061 |
+ |
if (!*atos(buf, sizeof(buf), vopts+1)) |
1062 |
+ |
return(-1); |
1063 |
+ |
if ((cp = getenv(buf)) == NULL) |
1064 |
+ |
return(-1); |
1065 |
+ |
fputs(cp, stdout); |
1066 |
+ |
vopts = sskip(vopts); |
1067 |
+ |
} else |
1068 |
+ |
#endif |
1069 |
+ |
while (*vopts && !isspace(*vopts)) |
1070 |
+ |
putchar(*vopts++); |
1071 |
+ |
} |
1072 |
+ |
} while (*vopts++); |
1073 |
+ |
putchar('\n'); |
1074 |
+ |
return(0); |
1075 |
+ |
} |
1076 |
+ |
|
1077 |
+ |
|
1078 |
+ |
rview(opts, po) /* run rview with first view */ |
1079 |
+ |
char *opts, *po; |
1080 |
+ |
{ |
1081 |
+ |
char *vw; |
1082 |
|
char combuf[512]; |
1083 |
|
/* build command */ |
1084 |
< |
sprintf(combuf, "rview %s%s ", getview(0, NULL), opts); |
1084 |
> |
if (touchonly || (vw = getview(0, NULL)) == NULL) |
1085 |
> |
return; |
1086 |
> |
if (sayview) |
1087 |
> |
printview(vw); |
1088 |
> |
sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname); |
1089 |
|
if (rvdevice != NULL) |
1090 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1091 |
< |
strcat(combuf, vval(OCTREE)); |
1091 |
> |
if (vdef(EXPOSURE)) |
1092 |
> |
sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE)); |
1093 |
> |
strcat(combuf, oct1name); |
1094 |
|
if (runcom(combuf)) { /* run it */ |
1095 |
|
fprintf(stderr, "%s: error running rview\n", progname); |
1096 |
< |
exit(1); |
1096 |
> |
quit(1); |
1097 |
|
} |
1098 |
|
} |
1099 |
|
|
1100 |
|
|
1101 |
< |
rpict(opts) /* run rpict and pfilt for each view */ |
1102 |
< |
char *opts; |
1101 |
> |
rpict(opts, po) /* run rpict and pfilt for each view */ |
1102 |
> |
char *opts, *po; |
1103 |
|
{ |
1104 |
|
char combuf[1024]; |
1105 |
< |
char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32]; |
1105 |
> |
char rawfile[MAXPATH], picfile[MAXPATH]; |
1106 |
> |
char zopt[MAXPATH+4], rep[MAXPATH+16], res[32]; |
1107 |
|
char pfopts[128]; |
1108 |
|
char vs[32], *vw; |
1109 |
|
int vn, mult; |
1110 |
< |
long lastdate; |
1110 |
> |
time_t rfdt, pfdt; |
1111 |
|
/* get pfilt options */ |
1112 |
|
pfiltopts(pfopts); |
1113 |
|
/* get resolution, reporting */ |
1114 |
< |
mult = vscale(QUALITY)+1; |
1114 |
> |
switch (vscale(QUALITY)) { |
1115 |
> |
case LOW: |
1116 |
> |
mult = 1; |
1117 |
> |
break; |
1118 |
> |
case MEDIUM: |
1119 |
> |
mult = 2; |
1120 |
> |
break; |
1121 |
> |
case HIGH: |
1122 |
> |
mult = 3; |
1123 |
> |
break; |
1124 |
> |
} |
1125 |
|
{ |
1126 |
|
int xres, yres; |
1127 |
|
double aspect; |
1148 |
|
else |
1149 |
|
badvalue(REPORT); |
1150 |
|
} |
1060 |
– |
/* get update time */ |
1061 |
– |
lastdate = octreedate > matdate ? octreedate : matdate; |
1151 |
|
/* do each view */ |
1152 |
|
vn = 0; |
1153 |
|
while ((vw = getview(vn++, vs)) != NULL) { |
1154 |
+ |
if (sayview) |
1155 |
+ |
printview(vw); |
1156 |
|
if (!vs[0]) |
1157 |
|
sprintf(vs, "%d", vn); |
1158 |
|
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1159 |
+ |
if (vdef(ZFILE)) |
1160 |
+ |
sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); |
1161 |
+ |
else |
1162 |
+ |
zopt[0] = '\0'; |
1163 |
|
/* check date on picture */ |
1164 |
< |
if (fdate(picfile) >= lastdate) |
1164 |
> |
pfdt = fdate(picfile); |
1165 |
> |
if (pfdt >= oct1date) |
1166 |
|
continue; |
1167 |
+ |
/* get raw file name */ |
1168 |
+ |
sprintf(rawfile, "%s_%s.unf", |
1169 |
+ |
vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs); |
1170 |
+ |
rfdt = fdate(rawfile); |
1171 |
+ |
if (touchonly) { /* update times only */ |
1172 |
+ |
if (rfdt) { |
1173 |
+ |
if (rfdt < oct1date) |
1174 |
+ |
touch(rawfile); |
1175 |
+ |
} else if (pfdt && pfdt < oct1date) |
1176 |
+ |
touch(picfile); |
1177 |
+ |
continue; |
1178 |
+ |
} |
1179 |
|
/* build rpict command */ |
1180 |
< |
sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs); |
1181 |
< |
if (fdate(rawfile) >= octreedate) /* recover */ |
1182 |
< |
sprintf(combuf, "rpict%s%s -ro %s %s", |
1075 |
< |
rep, opts, rawfile, vval(OCTREE)); |
1180 |
> |
if (rfdt >= oct1date) /* recover */ |
1181 |
> |
sprintf(combuf, "rpict%s%s%s%s -ro %s %s", |
1182 |
> |
rep, po, opts, zopt, rawfile, oct1name); |
1183 |
|
else { |
1184 |
|
if (overture) { /* run overture calculation */ |
1185 |
|
sprintf(combuf, |
1186 |
|
"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s", |
1187 |
|
rep, vw, opts, |
1188 |
< |
vval(OCTREE), overfile); |
1188 |
> |
oct1name, overfile); |
1189 |
|
if (runcom(combuf)) { |
1190 |
|
fprintf(stderr, |
1191 |
|
"%s: error in overture for view %s\n", |
1192 |
|
progname, vs); |
1193 |
< |
exit(1); |
1193 |
> |
quit(1); |
1194 |
|
} |
1195 |
|
#ifdef NIX |
1196 |
|
rmfile(overfile); |
1197 |
|
#endif |
1198 |
|
} |
1199 |
< |
sprintf(combuf, "rpict%s %s %s%s %s > %s", |
1200 |
< |
rep, vw, res, opts, |
1201 |
< |
vval(OCTREE), rawfile); |
1199 |
> |
sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s", |
1200 |
> |
rep, vw, res, po, opts, zopt, |
1201 |
> |
oct1name, rawfile); |
1202 |
|
} |
1203 |
|
if (runcom(combuf)) { /* run rpict */ |
1204 |
|
fprintf(stderr, "%s: error rendering view %s\n", |
1205 |
|
progname, vs); |
1206 |
< |
exit(1); |
1206 |
> |
quit(1); |
1207 |
|
} |
1208 |
+ |
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1209 |
|
/* build pfilt command */ |
1210 |
< |
if (mult > 1) |
1211 |
< |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1210 |
> |
if (mult > 1) |
1211 |
> |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1212 |
|
pfopts, mult, mult, rawfile, picfile); |
1213 |
< |
else |
1214 |
< |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1215 |
< |
rawfile, picfile); |
1216 |
< |
if (runcom(combuf)) { /* run pfilt */ |
1217 |
< |
fprintf(stderr, |
1218 |
< |
"%s: error filtering view %s\n\t%s removed\n", |
1219 |
< |
progname, vs, picfile); |
1220 |
< |
unlink(picfile); |
1221 |
< |
exit(1); |
1213 |
> |
else |
1214 |
> |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1215 |
> |
rawfile, picfile); |
1216 |
> |
if (runcom(combuf)) { /* run pfilt */ |
1217 |
> |
fprintf(stderr, |
1218 |
> |
"%s: error filtering view %s\n\t%s removed\n", |
1219 |
> |
progname, vs, picfile); |
1220 |
> |
unlink(picfile); |
1221 |
> |
quit(1); |
1222 |
> |
} |
1223 |
|
} |
1224 |
< |
/* remove raw file */ |
1225 |
< |
rmfile(rawfile); |
1224 |
> |
/* remove/rename raw file */ |
1225 |
> |
if (vdef(RAWFILE)) { |
1226 |
> |
sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); |
1227 |
> |
mvfile(rawfile, combuf); |
1228 |
> |
} else |
1229 |
> |
rmfile(rawfile); |
1230 |
|
} |
1231 |
|
} |
1232 |
|
|
1233 |
|
|
1234 |
+ |
touch(fn) /* update a file */ |
1235 |
+ |
char *fn; |
1236 |
+ |
{ |
1237 |
+ |
if (!silent) |
1238 |
+ |
printf("\ttouch %s\n", fn); |
1239 |
+ |
if (noaction) |
1240 |
+ |
return(0); |
1241 |
+ |
#ifdef notused |
1242 |
+ |
if (access(fn, F_OK) == -1) /* create it */ |
1243 |
+ |
if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1) |
1244 |
+ |
return(-1); |
1245 |
+ |
#endif |
1246 |
+ |
return(setfdate(fn, time((time_t *)NULL))); |
1247 |
+ |
} |
1248 |
+ |
|
1249 |
+ |
|
1250 |
|
runcom(cs) /* run command */ |
1251 |
|
char *cs; |
1252 |
|
{ |
1274 |
|
} |
1275 |
|
|
1276 |
|
|
1277 |
+ |
mvfile(fold, fnew) /* move a file */ |
1278 |
+ |
char *fold, *fnew; |
1279 |
+ |
{ |
1280 |
+ |
if (!silent) |
1281 |
|
#ifdef MSDOS |
1282 |
+ |
printf("\trename %s %s\n", fold, fnew); |
1283 |
+ |
#else |
1284 |
+ |
printf("\tmv %s %s\n", fold, fnew); |
1285 |
+ |
#endif |
1286 |
+ |
if (noaction) |
1287 |
+ |
return(0); |
1288 |
+ |
return(rename(fold, fnew)); |
1289 |
+ |
} |
1290 |
+ |
|
1291 |
+ |
|
1292 |
+ |
#ifdef MSDOS |
1293 |
|
setenv(vname, value) /* set an environment variable */ |
1294 |
|
char *vname, *value; |
1295 |
|
{ |
1301 |
|
sprintf(evp, "%s=%s", vname, value); |
1302 |
|
if (putenv(evp) != 0) { |
1303 |
|
fprintf(stderr, "%s: out of environment space\n", progname); |
1304 |
< |
exit(1); |
1304 |
> |
quit(1); |
1305 |
|
} |
1306 |
|
if (!silent) |
1307 |
|
printf("set %s\n", evp); |
1314 |
|
{ |
1315 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1316 |
|
progname, vnam(vc)); |
1317 |
< |
exit(1); |
1317 |
> |
quit(1); |
1318 |
|
} |
1319 |
|
|
1320 |
|
|
1322 |
|
char *s; |
1323 |
|
{ |
1324 |
|
perror(s); |
1325 |
< |
exit(1); |
1325 |
> |
quit(1); |
1326 |
> |
} |
1327 |
> |
|
1328 |
> |
|
1329 |
> |
quit(ec) /* exit program */ |
1330 |
> |
int ec; |
1331 |
> |
{ |
1332 |
> |
exit(ec); |
1333 |
|
} |