1 |
< |
/* Copyright (c) 1993 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1999 Silicon Graphics, Inc. */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
4 |
> |
static char SCCSid[] = "$SunId$ SGI"; |
5 |
|
#endif |
6 |
|
|
7 |
|
/* |
9 |
|
*/ |
10 |
|
|
11 |
|
#include "standard.h" |
12 |
+ |
#include "view.h" |
13 |
|
#include "paths.h" |
14 |
+ |
#include "vars.h" |
15 |
|
#include <ctype.h> |
16 |
+ |
#include <sys/types.h> |
17 |
|
|
18 |
< |
|
19 |
< |
typedef struct { |
20 |
< |
char *name; /* variable name */ |
21 |
< |
short nick; /* # characters required for nickname */ |
22 |
< |
short nass; /* # assignments made */ |
23 |
< |
char *value; /* assigned value(s) */ |
24 |
< |
int (*fixval)(); /* assignment checking function */ |
25 |
< |
} VARIABLE; |
26 |
< |
|
27 |
< |
int onevalue(), catvalues(), boolvalue(), |
28 |
< |
qualvalue(), fltvalue(), intvalue(); |
29 |
< |
|
30 |
< |
/* variables */ |
31 |
< |
#define OBJECT 0 /* object files */ |
32 |
< |
#define SCENE 1 /* scene files */ |
33 |
< |
#define MATERIAL 2 /* material files */ |
34 |
< |
#define ILLUM 3 /* mkillum input files */ |
35 |
< |
#define MKILLUM 4 /* mkillum options */ |
36 |
< |
#define RENDER 5 /* rendering options */ |
37 |
< |
#define OCONV 6 /* oconv options */ |
38 |
< |
#define PFILT 7 /* pfilt options */ |
39 |
< |
#define VIEW 8 /* view(s) for picture(s) */ |
40 |
< |
#define ZONE 9 /* simulation zone */ |
41 |
< |
#define QUALITY 10 /* desired rendering quality */ |
42 |
< |
#define OCTREE 11 /* octree file name */ |
43 |
< |
#define PICTURE 12 /* picture file name */ |
44 |
< |
#define AMBFILE 13 /* ambient file name */ |
42 |
< |
#define OPTFILE 14 /* rendering options file */ |
43 |
< |
#define EXPOSURE 15 /* picture exposure setting */ |
44 |
< |
#define RESOLUTION 16 /* maximum picture resolution */ |
45 |
< |
#define UP 17 /* view up (X, Y or Z) */ |
46 |
< |
#define INDIRECT 18 /* indirection in lighting */ |
47 |
< |
#define DETAIL 19 /* level of scene detail */ |
48 |
< |
#define PENUMBRAS 20 /* shadow penumbras are desired */ |
49 |
< |
#define VARIABILITY 21 /* level of light variability */ |
50 |
< |
#define REPORT 22 /* report frequency and errfile */ |
18 |
> |
/* variables (alphabetical by name) */ |
19 |
> |
#define AMBFILE 0 /* ambient file name */ |
20 |
> |
#define DETAIL 1 /* level of scene detail */ |
21 |
> |
#define EXPOSURE 2 /* picture exposure setting */ |
22 |
> |
#define EYESEP 3 /* interocular distance */ |
23 |
> |
#define ILLUM 4 /* mkillum input files */ |
24 |
> |
#define INDIRECT 5 /* indirection in lighting */ |
25 |
> |
#define MATERIAL 6 /* material files */ |
26 |
> |
#define MKILLUM 7 /* mkillum options */ |
27 |
> |
#define OBJECT 8 /* object files */ |
28 |
> |
#define OCONV 9 /* oconv options */ |
29 |
> |
#define OCTREE 10 /* octree file name */ |
30 |
> |
#define OPTFILE 11 /* rendering options file */ |
31 |
> |
#define PENUMBRAS 12 /* shadow penumbras are desired */ |
32 |
> |
#define PFILT 13 /* pfilt options */ |
33 |
> |
#define PICTURE 14 /* picture file root name */ |
34 |
> |
#define QUALITY 15 /* desired rendering quality */ |
35 |
> |
#define RAWFILE 16 /* raw picture file root name */ |
36 |
> |
#define RENDER 17 /* rendering options */ |
37 |
> |
#define REPORT 18 /* report frequency and errfile */ |
38 |
> |
#define RESOLUTION 19 /* maximum picture resolution */ |
39 |
> |
#define SCENE 20 /* scene files */ |
40 |
> |
#define UP 21 /* view up (X, Y or Z) */ |
41 |
> |
#define VARIABILITY 22 /* level of light variability */ |
42 |
> |
#define VIEWS 23 /* view(s) for picture(s) */ |
43 |
> |
#define ZFILE 24 /* distance file root name */ |
44 |
> |
#define ZONE 25 /* simulation zone */ |
45 |
|
/* total number of variables */ |
46 |
< |
#define NVARS 23 |
46 |
> |
int NVARS = 26; |
47 |
|
|
48 |
< |
VARIABLE vv[NVARS] = { /* variable-value pairs */ |
49 |
< |
{"objects", 3, 0, NULL, catvalues}, |
50 |
< |
{"scene", 3, 0, NULL, catvalues}, |
51 |
< |
{"materials", 3, 0, NULL, catvalues}, |
48 |
> |
VARIABLE vv[] = { /* variable-value pairs */ |
49 |
> |
{"AMBFILE", 3, 0, NULL, onevalue}, |
50 |
> |
{"DETAIL", 3, 0, NULL, qualvalue}, |
51 |
> |
{"EXPOSURE", 3, 0, NULL, fltvalue}, |
52 |
> |
{"EYESEP", 3, 0, NULL, fltvalue}, |
53 |
|
{"illum", 3, 0, NULL, catvalues}, |
54 |
+ |
{"INDIRECT", 3, 0, NULL, intvalue}, |
55 |
+ |
{"materials", 3, 0, NULL, catvalues}, |
56 |
|
{"mkillum", 3, 0, NULL, catvalues}, |
57 |
< |
{"render", 3, 0, NULL, catvalues}, |
57 |
> |
{"objects", 3, 0, NULL, catvalues}, |
58 |
|
{"oconv", 3, 0, NULL, catvalues}, |
62 |
– |
{"pfilt", 2, 0, NULL, catvalues}, |
63 |
– |
{"view", 2, 0, NULL, NULL}, |
64 |
– |
{"ZONE", 2, 0, NULL, onevalue}, |
65 |
– |
{"QUALITY", 3, 0, NULL, qualvalue}, |
59 |
|
{"OCTREE", 3, 0, NULL, onevalue}, |
67 |
– |
{"PICTURE", 3, 0, NULL, onevalue}, |
68 |
– |
{"AMBFILE", 3, 0, NULL, onevalue}, |
60 |
|
{"OPTFILE", 3, 0, NULL, onevalue}, |
61 |
< |
{"EXPOSURE", 3, 0, NULL, fltvalue}, |
61 |
> |
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
62 |
> |
{"pfilt", 2, 0, NULL, catvalues}, |
63 |
> |
{"PICTURE", 3, 0, NULL, onevalue}, |
64 |
> |
{"QUALITY", 3, 0, NULL, qualvalue}, |
65 |
> |
{"RAWFILE", 3, 0, NULL, onevalue}, |
66 |
> |
{"render", 3, 0, NULL, catvalues}, |
67 |
> |
{"REPORT", 3, 0, NULL, onevalue}, |
68 |
|
{"RESOLUTION", 3, 0, NULL, onevalue}, |
69 |
+ |
{"scene", 3, 0, NULL, catvalues}, |
70 |
|
{"UP", 2, 0, NULL, onevalue}, |
73 |
– |
{"INDIRECT", 3, 0, NULL, intvalue}, |
74 |
– |
{"DETAIL", 3, 0, NULL, qualvalue}, |
75 |
– |
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
71 |
|
{"VARIABILITY", 3, 0, NULL, qualvalue}, |
72 |
< |
{"REPORT", 3, 0, NULL, onevalue}, |
72 |
> |
{"view", 2, 0, NULL, NULL}, |
73 |
> |
{"ZFILE", 2, 0, NULL, onevalue}, |
74 |
> |
{"ZONE", 2, 0, NULL, onevalue}, |
75 |
|
}; |
76 |
|
|
80 |
– |
VARIABLE *matchvar(); |
81 |
– |
char *nvalue(); |
82 |
– |
|
83 |
– |
#define UPPER(c) ((c)&~0x20) /* ASCII trick */ |
84 |
– |
|
85 |
– |
#define vnam(vc) (vv[vc].name) |
86 |
– |
#define vdef(vc) (vv[vc].nass) |
87 |
– |
#define vval(vc) (vv[vc].value) |
88 |
– |
#define vint(vc) atoi(vval(vc)) |
89 |
– |
#define vlet(vc) UPPER(vval(vc)[0]) |
90 |
– |
#define vscale vlet |
91 |
– |
#define vbool(vc) (vlet(vc)=='T') |
92 |
– |
|
93 |
– |
#define HIGH 'H' |
94 |
– |
#define MEDIUM 'M' |
95 |
– |
#define LOW 'L' |
96 |
– |
|
77 |
|
/* overture calculation file */ |
78 |
|
#ifdef NIX |
79 |
< |
char overfile[] = "overture.raw"; |
79 |
> |
char overfile[] = "overture.unf"; |
80 |
|
#else |
81 |
|
char overfile[] = "/dev/null"; |
82 |
|
#endif |
83 |
|
|
84 |
< |
extern unsigned long fdate(), time(); |
84 |
> |
extern time_t fdate(), time(); |
85 |
|
|
86 |
< |
unsigned long scenedate; /* date of latest scene or object file */ |
87 |
< |
unsigned long octreedate; /* date of octree */ |
88 |
< |
unsigned long matdate; /* date of latest material file */ |
89 |
< |
unsigned long illumdate; /* date of last illum file */ |
86 |
> |
time_t scenedate; /* date of latest scene or object file */ |
87 |
> |
time_t octreedate; /* date of octree */ |
88 |
> |
time_t matdate; /* date of latest material file */ |
89 |
> |
time_t illumdate; /* date of last illum file */ |
90 |
|
|
91 |
|
char *oct0name; /* name of pre-mkillum octree */ |
92 |
< |
unsigned long oct0date; /* date of pre-mkillum octree */ |
92 |
> |
time_t oct0date; /* date of pre-mkillum octree */ |
93 |
|
char *oct1name; /* name of post-mkillum octree */ |
94 |
< |
unsigned long oct1date; /* date of post-mkillum octree (>= matdate) */ |
94 |
> |
time_t oct1date; /* date of post-mkillum octree (>= matdate) */ |
95 |
|
|
96 |
+ |
int nowarn = 0; /* no warnings */ |
97 |
|
int explicate = 0; /* explicate variables */ |
98 |
|
int silent = 0; /* do work silently */ |
99 |
+ |
int touchonly = 0; /* touch files only */ |
100 |
|
int noaction = 0; /* don't do anything */ |
101 |
|
int sayview = 0; /* print view out */ |
102 |
|
char *rvdevice = NULL; /* rview output device */ |
115 |
|
char *argv[]; |
116 |
|
{ |
117 |
|
char ropts[512]; |
118 |
+ |
char popts[64]; |
119 |
|
int i; |
120 |
|
|
121 |
|
progname = argv[0]; |
128 |
|
case 'n': |
129 |
|
noaction++; |
130 |
|
break; |
131 |
+ |
case 't': |
132 |
+ |
touchonly++; |
133 |
+ |
break; |
134 |
|
case 'e': |
135 |
|
explicate++; |
136 |
|
break; |
143 |
|
case 'v': |
144 |
|
viewselect = argv[++i]; |
145 |
|
break; |
146 |
+ |
case 'w': |
147 |
+ |
nowarn++; |
148 |
+ |
break; |
149 |
|
default: |
150 |
|
goto userr; |
151 |
|
} |
155 |
|
/* assign Radiance root file name */ |
156 |
|
rootname(radname, rifname); |
157 |
|
/* load variable values */ |
158 |
< |
load(rifname); |
158 |
> |
loadvars(rifname); |
159 |
|
/* get any additional assignments */ |
160 |
|
for (i++; i < argc; i++) |
161 |
< |
setvariable(argv[i]); |
161 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
162 |
> |
fprintf(stderr, "%s: unknown variable: %s\n", |
163 |
> |
progname, argv[i]); |
164 |
> |
quit(1); |
165 |
> |
} |
166 |
|
/* check assignments */ |
167 |
|
checkvalues(); |
168 |
|
/* check files and dates */ |
171 |
|
setdefaults(); |
172 |
|
/* print all values if requested */ |
173 |
|
if (explicate) |
174 |
< |
printvals(); |
174 |
> |
printvars(stdout); |
175 |
|
/* build octree (and run mkillum) */ |
176 |
|
oconv(); |
177 |
|
/* check date on ambient file */ |
178 |
|
checkambfile(); |
179 |
|
/* run simulation */ |
180 |
< |
renderopts(ropts); |
180 |
> |
renderopts(ropts, popts); |
181 |
|
xferopts(ropts); |
182 |
|
if (rvdevice != NULL) |
183 |
< |
rview(ropts); |
183 |
> |
rview(ropts, popts); |
184 |
|
else |
185 |
< |
rpict(ropts); |
186 |
< |
exit(0); |
185 |
> |
rpict(ropts, popts); |
186 |
> |
quit(0); |
187 |
|
userr: |
188 |
|
fprintf(stderr, |
189 |
< |
"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
189 |
> |
"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
190 |
|
progname); |
191 |
< |
exit(1); |
191 |
> |
quit(1); |
192 |
|
} |
193 |
|
|
194 |
|
|
207 |
|
} |
208 |
|
|
209 |
|
|
210 |
< |
#define NOCHAR 127 /* constant for character to delete */ |
218 |
< |
|
219 |
< |
|
220 |
< |
load(rfname) /* load Radiance simulation file */ |
221 |
< |
char *rfname; |
222 |
< |
{ |
223 |
< |
FILE *fp; |
224 |
< |
char buf[512]; |
225 |
< |
register char *cp; |
226 |
< |
|
227 |
< |
if (rfname == NULL) |
228 |
< |
fp = stdin; |
229 |
< |
else if ((fp = fopen(rfname, "r")) == NULL) |
230 |
< |
syserr(rfname); |
231 |
< |
while (fgetline(buf, sizeof(buf), fp) != NULL) { |
232 |
< |
for (cp = buf; *cp; cp++) { |
233 |
< |
switch (*cp) { |
234 |
< |
case '\\': |
235 |
< |
*cp++ = NOCHAR; |
236 |
< |
continue; |
237 |
< |
case '#': |
238 |
< |
*cp = '\0'; |
239 |
< |
break; |
240 |
< |
default: |
241 |
< |
continue; |
242 |
< |
} |
243 |
< |
break; |
244 |
< |
} |
245 |
< |
setvariable(buf); |
246 |
< |
} |
247 |
< |
fclose(fp); |
248 |
< |
} |
249 |
< |
|
250 |
< |
|
251 |
< |
setvariable(ass) /* assign variable according to string */ |
252 |
< |
register char *ass; |
253 |
< |
{ |
254 |
< |
char varname[32]; |
255 |
< |
char varval[512]; |
256 |
< |
int n; |
257 |
< |
register char *cp; |
258 |
< |
register VARIABLE *vp; |
259 |
< |
register int i; |
260 |
< |
|
261 |
< |
while (isspace(*ass)) /* skip leading space */ |
262 |
< |
ass++; |
263 |
< |
cp = varname; /* extract name */ |
264 |
< |
while (cp < varname+sizeof(varname)-1 |
265 |
< |
&& *ass && !isspace(*ass) && *ass != '=') |
266 |
< |
*cp++ = *ass++; |
267 |
< |
*cp = '\0'; |
268 |
< |
if (!varname[0]) |
269 |
< |
return; /* no variable name! */ |
270 |
< |
/* trim value */ |
271 |
< |
while (isspace(*ass) || *ass == '=') |
272 |
< |
ass++; |
273 |
< |
for (n = strlen(ass); n > 0; n--) |
274 |
< |
if (!isspace(ass[n-1])) |
275 |
< |
break; |
276 |
< |
if (!n) { |
277 |
< |
fprintf(stderr, "%s: warning - missing value for variable '%s'\n", |
278 |
< |
progname, varname); |
279 |
< |
return; |
280 |
< |
} |
281 |
< |
/* match variable from list */ |
282 |
< |
vp = matchvar(varname); |
283 |
< |
if (vp == NULL) { |
284 |
< |
fprintf(stderr, "%s: unknown variable '%s'\n", |
285 |
< |
progname, varname); |
286 |
< |
exit(1); |
287 |
< |
} |
288 |
< |
/* assign new value */ |
289 |
< |
if (i = vp->nass) { |
290 |
< |
cp = vp->value; |
291 |
< |
while (i--) |
292 |
< |
while (*cp++) |
293 |
< |
; |
294 |
< |
i = cp - vp->value; |
295 |
< |
vp->value = realloc(vp->value, i+n+1); |
296 |
< |
} else |
297 |
< |
vp->value = malloc(n+1); |
298 |
< |
if (vp->value == NULL) |
299 |
< |
syserr(progname); |
300 |
< |
cp = vp->value+i; /* copy value, squeezing spaces */ |
301 |
< |
*cp = *ass; |
302 |
< |
for (i = 1; i <= n; i++) { |
303 |
< |
if (ass[i] == NOCHAR) |
304 |
< |
continue; |
305 |
< |
if (isspace(*cp)) |
306 |
< |
while (isspace(ass[i])) |
307 |
< |
i++; |
308 |
< |
*++cp = ass[i]; |
309 |
< |
} |
310 |
< |
if (isspace(*cp)) /* remove trailing space */ |
311 |
< |
*cp = '\0'; |
312 |
< |
vp->nass++; |
313 |
< |
} |
314 |
< |
|
315 |
< |
|
316 |
< |
VARIABLE * |
317 |
< |
matchvar(nam) /* match a variable by its name */ |
318 |
< |
char *nam; |
319 |
< |
{ |
320 |
< |
int n = strlen(nam); |
321 |
< |
register int i; |
322 |
< |
|
323 |
< |
for (i = 0; i < NVARS; i++) |
324 |
< |
if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n)) |
325 |
< |
return(vv+i); |
326 |
< |
return(NULL); |
327 |
< |
} |
328 |
< |
|
329 |
< |
|
330 |
< |
char * |
331 |
< |
nvalue(vp, n) /* return nth variable value */ |
332 |
< |
VARIABLE *vp; |
333 |
< |
register int n; |
334 |
< |
{ |
335 |
< |
register char *cp; |
336 |
< |
|
337 |
< |
if (vp == NULL | n < 0 | n >= vp->nass) |
338 |
< |
return(NULL); |
339 |
< |
cp = vp->value; |
340 |
< |
while (n--) |
341 |
< |
while (*cp++) |
342 |
< |
; |
343 |
< |
return(cp); |
344 |
< |
} |
345 |
< |
|
346 |
< |
|
347 |
< |
checkvalues() /* check assignments */ |
348 |
< |
{ |
349 |
< |
register int i; |
350 |
< |
|
351 |
< |
for (i = 0; i < NVARS; i++) |
352 |
< |
if (vv[i].fixval != NULL) |
353 |
< |
(*vv[i].fixval)(vv+i); |
354 |
< |
} |
355 |
< |
|
356 |
< |
|
357 |
< |
onevalue(vp) /* only one assignment for this variable */ |
358 |
< |
register VARIABLE *vp; |
359 |
< |
{ |
360 |
< |
if (vp->nass < 2) |
361 |
< |
return; |
362 |
< |
fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n", |
363 |
< |
progname, vp->name); |
364 |
< |
do |
365 |
< |
vp->value += strlen(vp->value)+1; |
366 |
< |
while (--vp->nass > 1); |
367 |
< |
} |
368 |
< |
|
369 |
< |
|
370 |
< |
catvalues(vp) /* concatenate variable values */ |
371 |
< |
register VARIABLE *vp; |
372 |
< |
{ |
373 |
< |
register char *cp; |
374 |
< |
|
375 |
< |
if (vp->nass < 2) |
376 |
< |
return; |
377 |
< |
for (cp = vp->value; vp->nass > 1; vp->nass--) { |
378 |
< |
while (*cp) |
379 |
< |
cp++; |
380 |
< |
*cp++ = ' '; |
381 |
< |
} |
382 |
< |
} |
383 |
< |
|
384 |
< |
|
385 |
< |
int |
386 |
< |
badmatch(tv, cv) /* case insensitive truncated comparison */ |
387 |
< |
register char *tv, *cv; |
388 |
< |
{ |
389 |
< |
if (!*tv) return(1); /* null string cannot match */ |
390 |
< |
do |
391 |
< |
if (UPPER(*tv) != *cv++) |
392 |
< |
return(1); |
393 |
< |
while (*++tv); |
394 |
< |
return(0); /* OK */ |
395 |
< |
} |
396 |
< |
|
397 |
< |
|
398 |
< |
boolvalue(vp) /* check boolean for legal values */ |
399 |
< |
register VARIABLE *vp; |
400 |
< |
{ |
401 |
< |
if (!vp->nass) return; |
402 |
< |
onevalue(vp); |
403 |
< |
switch (UPPER(vp->value[0])) { |
404 |
< |
case 'T': |
405 |
< |
if (badmatch(vp->value, "TRUE")) break; |
406 |
< |
return; |
407 |
< |
case 'F': |
408 |
< |
if (badmatch(vp->value, "FALSE")) break; |
409 |
< |
return; |
410 |
< |
} |
411 |
< |
fprintf(stderr, "%s: illegal value for boolean variable '%s'\n", |
412 |
< |
progname, vp->name); |
413 |
< |
exit(1); |
414 |
< |
} |
415 |
< |
|
416 |
< |
|
417 |
< |
qualvalue(vp) /* check qualitative var. for legal values */ |
418 |
< |
register VARIABLE *vp; |
419 |
< |
{ |
420 |
< |
if (!vp->nass) return; |
421 |
< |
onevalue(vp); |
422 |
< |
switch (UPPER(vp->value[0])) { |
423 |
< |
case 'L': |
424 |
< |
if (badmatch(vp->value, "LOW")) break; |
425 |
< |
return; |
426 |
< |
case 'M': |
427 |
< |
if (badmatch(vp->value, "MEDIUM")) break; |
428 |
< |
return; |
429 |
< |
case 'H': |
430 |
< |
if (badmatch(vp->value, "HIGH")) break; |
431 |
< |
return; |
432 |
< |
} |
433 |
< |
fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n", |
434 |
< |
progname, vp->name); |
435 |
< |
exit(1); |
436 |
< |
} |
437 |
< |
|
438 |
< |
|
439 |
< |
intvalue(vp) /* check integer variable for legal values */ |
440 |
< |
register VARIABLE *vp; |
441 |
< |
{ |
442 |
< |
if (!vp->nass) return; |
443 |
< |
onevalue(vp); |
444 |
< |
if (isint(vp->value)) return; |
445 |
< |
fprintf(stderr, "%s: illegal value for integer variable '%s'\n", |
446 |
< |
progname, vp->name); |
447 |
< |
exit(1); |
448 |
< |
} |
449 |
< |
|
450 |
< |
|
451 |
< |
fltvalue(vp) /* check float variable for legal values */ |
452 |
< |
register VARIABLE *vp; |
453 |
< |
{ |
454 |
< |
if (!vp->nass) return; |
455 |
< |
onevalue(vp); |
456 |
< |
if (isflt(vp->value)) return; |
457 |
< |
fprintf(stderr, "%s: illegal value for real variable '%s'\n", |
458 |
< |
progname, vp->name); |
459 |
< |
exit(1); |
460 |
< |
} |
461 |
< |
|
462 |
< |
|
463 |
< |
unsigned long |
210 |
> |
time_t |
211 |
|
checklast(fnames) /* check files and find most recent */ |
212 |
|
register char *fnames; |
213 |
|
{ |
214 |
|
char thisfile[MAXPATH]; |
215 |
< |
unsigned long thisdate, lastdate = 0; |
469 |
< |
register char *cp; |
215 |
> |
time_t thisdate, lastdate = 0; |
216 |
|
|
217 |
|
if (fnames == NULL) |
218 |
|
return(0); |
219 |
< |
while (*fnames) { |
220 |
< |
while (isspace(*fnames)) fnames++; |
221 |
< |
cp = thisfile; |
222 |
< |
while (*fnames && !isspace(*fnames)) |
477 |
< |
*cp++ = *fnames++; |
478 |
< |
*cp = '\0'; |
219 |
> |
while ((fnames = nextword(thisfile, MAXPATH, fnames)) != NULL) { |
220 |
> |
if (thisfile[0] == '!' || |
221 |
> |
(thisfile[0] == '\\' && thisfile[1] == '!')) |
222 |
> |
continue; |
223 |
|
if (!(thisdate = fdate(thisfile))) |
224 |
|
syserr(thisfile); |
225 |
|
if (thisdate > lastdate) |
257 |
|
|
258 |
|
checkfiles() /* check for existence and modified times */ |
259 |
|
{ |
260 |
< |
unsigned long objdate; |
260 |
> |
time_t objdate; |
261 |
|
|
262 |
|
if (!vdef(OCTREE)) { |
263 |
|
if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL) |
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 |
< |
exit(1); |
283 |
> |
quit(1); |
284 |
|
} |
285 |
|
matdate = checklast(vval(MATERIAL)); |
286 |
|
} |
292 |
|
extern FILE *popen(); |
293 |
|
static double oorg[3], osiz = 0.; |
294 |
|
double min[3], max[3]; |
295 |
< |
char buf[512]; |
295 |
> |
char buf[1024]; |
296 |
|
FILE *fp; |
297 |
|
register int i; |
298 |
|
|
310 |
|
fprintf(stderr, |
311 |
|
"%s: error reading bounding box from getbbox\n", |
312 |
|
progname); |
313 |
< |
exit(1); |
313 |
> |
quit(1); |
314 |
|
} |
315 |
|
for (i = 0; i < 3; i++) |
316 |
|
if (max[i] - min[i] > osiz) |
328 |
|
fprintf(stderr, |
329 |
|
"%s: error reading bounding cube from getinfo\n", |
330 |
|
progname); |
331 |
< |
exit(1); |
331 |
> |
quit(1); |
332 |
|
} |
333 |
|
pclose(fp); |
334 |
|
} |
338 |
|
|
339 |
|
setdefaults() /* set default values for unassigned var's */ |
340 |
|
{ |
341 |
< |
double org[3], size; |
341 |
> |
double org[3], lim[3], size; |
342 |
|
char buf[128]; |
343 |
|
|
344 |
|
if (!vdef(ZONE)) { |
348 |
|
vval(ZONE) = savqstr(buf); |
349 |
|
vdef(ZONE)++; |
350 |
|
} |
351 |
+ |
if (!vdef(EYESEP)) { |
352 |
+ |
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", |
353 |
+ |
&org[0], &lim[0], &org[1], &lim[1], |
354 |
+ |
&org[2], &lim[2]) != 6) |
355 |
+ |
badvalue(ZONE); |
356 |
+ |
sprintf(buf, "%f", |
357 |
+ |
0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2])); |
358 |
+ |
vval(EYESEP) = savqstr(buf); |
359 |
+ |
vdef(EYESEP)++; |
360 |
+ |
} |
361 |
|
if (!vdef(INDIRECT)) { |
362 |
|
vval(INDIRECT) = "0"; |
363 |
|
vdef(INDIRECT)++; |
374 |
|
vval(PICTURE) = radname; |
375 |
|
vdef(PICTURE)++; |
376 |
|
} |
377 |
< |
if (!vdef(VIEW)) { |
378 |
< |
vval(VIEW) = "X"; |
379 |
< |
vdef(VIEW)++; |
377 |
> |
if (!vdef(VIEWS)) { |
378 |
> |
vval(VIEWS) = "X"; |
379 |
> |
vdef(VIEWS)++; |
380 |
|
} |
381 |
|
if (!vdef(DETAIL)) { |
382 |
|
vval(DETAIL) = "M"; |
393 |
|
} |
394 |
|
|
395 |
|
|
642 |
– |
printvals() /* print variable values */ |
643 |
– |
{ |
644 |
– |
register int i, j; |
645 |
– |
|
646 |
– |
for (i = 0; i < NVARS; i++) |
647 |
– |
for (j = 0; j < vdef(i); j++) |
648 |
– |
printf("%s= %s\n", vnam(i), nvalue(vv+i, j)); |
649 |
– |
fflush(stdout); |
650 |
– |
} |
651 |
– |
|
652 |
– |
|
396 |
|
oconv() /* run oconv and mkillum if necessary */ |
397 |
|
{ |
398 |
|
static char illumtmp[] = "ilXXXXXX"; |
399 |
< |
char combuf[512], ocopts[64], mkopts[64]; |
399 |
> |
char combuf[1024], ocopts[64], mkopts[64]; |
400 |
|
|
401 |
|
oconvopts(ocopts); /* get options */ |
402 |
|
if (octreedate < scenedate) { /* check date on original octree */ |
403 |
< |
/* build command */ |
404 |
< |
if (vdef(MATERIAL)) |
405 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
406 |
< |
vval(MATERIAL), vval(SCENE), vval(OCTREE)); |
407 |
< |
else |
408 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
409 |
< |
vval(SCENE), vval(OCTREE)); |
410 |
< |
|
411 |
< |
if (runcom(combuf)) { /* run it */ |
412 |
< |
fprintf(stderr, |
403 |
> |
if (touchonly && octreedate) |
404 |
> |
touch(vval(OCTREE)); |
405 |
> |
else { /* build command */ |
406 |
> |
if (vdef(MATERIAL)) |
407 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
408 |
> |
vval(MATERIAL), vval(SCENE), |
409 |
> |
vval(OCTREE)); |
410 |
> |
else |
411 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
412 |
> |
vval(SCENE), vval(OCTREE)); |
413 |
> |
|
414 |
> |
if (runcom(combuf)) { /* run it */ |
415 |
> |
fprintf(stderr, |
416 |
|
"%s: error generating octree\n\t%s removed\n", |
417 |
< |
progname, vval(OCTREE)); |
418 |
< |
unlink(vval(OCTREE)); |
419 |
< |
exit(1); |
417 |
> |
progname, vval(OCTREE)); |
418 |
> |
unlink(vval(OCTREE)); |
419 |
> |
quit(1); |
420 |
> |
} |
421 |
|
} |
422 |
< |
octreedate = time(0); |
422 |
> |
octreedate = time((time_t *)NULL); |
423 |
> |
if (octreedate < scenedate) /* in case clock is off */ |
424 |
> |
octreedate = scenedate; |
425 |
|
} |
426 |
|
if (oct1name == vval(OCTREE)) /* no mkillum? */ |
427 |
|
oct1date = octreedate > matdate ? octreedate : matdate; |
430 |
|
return; |
431 |
|
/* make octree0 */ |
432 |
|
if (oct0date < scenedate | oct0date < illumdate) { |
433 |
< |
/* build command */ |
433 |
> |
if (touchonly && oct0date) |
434 |
> |
touch(oct0name); |
435 |
> |
else { /* build command */ |
436 |
> |
if (octreedate) |
437 |
> |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
438 |
> |
vval(OCTREE), vval(ILLUM), oct0name); |
439 |
> |
else if (vdef(MATERIAL)) |
440 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
441 |
> |
vval(MATERIAL), vval(ILLUM), oct0name); |
442 |
> |
else |
443 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
444 |
> |
vval(ILLUM), oct0name); |
445 |
> |
if (runcom(combuf)) { /* run it */ |
446 |
> |
fprintf(stderr, |
447 |
> |
"%s: error generating octree\n\t%s removed\n", |
448 |
> |
progname, oct0name); |
449 |
> |
unlink(oct0name); |
450 |
> |
quit(1); |
451 |
> |
} |
452 |
> |
} |
453 |
> |
oct0date = time((time_t *)NULL); |
454 |
> |
if (oct0date < octreedate) /* in case clock is off */ |
455 |
> |
oct0date = octreedate; |
456 |
> |
if (oct0date < illumdate) /* ditto */ |
457 |
> |
oct0date = illumdate; |
458 |
> |
} |
459 |
> |
if (touchonly && oct1date) |
460 |
> |
touch(oct1name); |
461 |
> |
else { |
462 |
> |
mkillumopts(mkopts); /* build mkillum command */ |
463 |
> |
mktemp(illumtmp); |
464 |
> |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
465 |
> |
oct0name, vval(ILLUM), illumtmp); |
466 |
> |
if (runcom(combuf)) { /* run it */ |
467 |
> |
fprintf(stderr, "%s: error running mkillum\n", |
468 |
> |
progname); |
469 |
> |
unlink(illumtmp); |
470 |
> |
quit(1); |
471 |
> |
} |
472 |
> |
/* make octree1 (frozen) */ |
473 |
|
if (octreedate) |
474 |
< |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
475 |
< |
vval(OCTREE), vval(ILLUM), oct0name); |
474 |
> |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
475 |
> |
vval(OCTREE), illumtmp, oct1name); |
476 |
|
else if (vdef(MATERIAL)) |
477 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
478 |
< |
vval(MATERIAL), vval(ILLUM), oct0name); |
477 |
> |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
478 |
> |
vval(MATERIAL), illumtmp, oct1name); |
479 |
|
else |
480 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
481 |
< |
vval(ILLUM), oct0name); |
480 |
> |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
481 |
> |
illumtmp, oct1name); |
482 |
|
if (runcom(combuf)) { /* run it */ |
483 |
|
fprintf(stderr, |
484 |
|
"%s: error generating octree\n\t%s removed\n", |
485 |
< |
progname, oct0name); |
486 |
< |
unlink(oct0name); |
487 |
< |
exit(1); |
485 |
> |
progname, oct1name); |
486 |
> |
unlink(oct1name); |
487 |
> |
unlink(illumtmp); |
488 |
> |
quit(1); |
489 |
|
} |
490 |
< |
oct0date = time(0); |
490 |
> |
rmfile(illumtmp); |
491 |
|
} |
492 |
< |
mkillumopts(mkopts); /* build mkillum command */ |
493 |
< |
mktemp(illumtmp); |
494 |
< |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
706 |
< |
oct0name, vval(ILLUM), illumtmp); |
707 |
< |
if (runcom(combuf)) { /* run it */ |
708 |
< |
fprintf(stderr, "%s: error running mkillum\n", progname); |
709 |
< |
unlink(illumtmp); |
710 |
< |
exit(1); |
711 |
< |
} |
712 |
< |
/* make octree1 (frozen) */ |
713 |
< |
if (octreedate) |
714 |
< |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
715 |
< |
vval(OCTREE), illumtmp, oct1name); |
716 |
< |
else if (vdef(MATERIAL)) |
717 |
< |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
718 |
< |
vval(MATERIAL), illumtmp, oct1name); |
719 |
< |
else |
720 |
< |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
721 |
< |
illumtmp, oct1name); |
722 |
< |
if (runcom(combuf)) { /* run it */ |
723 |
< |
fprintf(stderr, |
724 |
< |
"%s: error generating octree\n\t%s removed\n", |
725 |
< |
progname, oct1name); |
726 |
< |
unlink(oct1name); |
727 |
< |
exit(1); |
728 |
< |
} |
729 |
< |
oct1date = time(0); |
730 |
< |
rmfile(illumtmp); |
492 |
> |
oct1date = time((time_t *)NULL); |
493 |
> |
if (oct1date < oct0date) /* in case clock is off */ |
494 |
> |
oct1date = oct0date; |
495 |
|
} |
496 |
|
|
497 |
|
|
530 |
|
|
531 |
|
checkambfile() /* check date on ambient file */ |
532 |
|
{ |
533 |
< |
unsigned long afdate; |
533 |
> |
time_t afdate; |
534 |
|
|
535 |
|
if (!vdef(AMBFILE)) |
536 |
|
return; |
537 |
|
if (!(afdate = fdate(vval(AMBFILE)))) |
538 |
|
return; |
539 |
|
if (oct1date > afdate) |
540 |
< |
rmfile(vval(AMBFILE)); |
540 |
> |
if (touchonly) |
541 |
> |
touch(vval(AMBFILE)); |
542 |
> |
else |
543 |
> |
rmfile(vval(AMBFILE)); |
544 |
|
} |
545 |
|
|
546 |
|
|
549 |
|
{ |
550 |
|
if (vdef(EXPOSURE)) { |
551 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
552 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
553 |
< |
return(.5/atof(vval(EXPOSURE))); |
552 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
553 |
> |
return(.5/vflt(EXPOSURE)); |
554 |
|
} |
555 |
|
if (vlet(ZONE) == 'E') |
556 |
|
return(10.); |
560 |
|
} |
561 |
|
|
562 |
|
|
563 |
< |
renderopts(op) /* set rendering options */ |
564 |
< |
char *op; |
563 |
> |
renderopts(op, po) /* set rendering options */ |
564 |
> |
char *op, *po; |
565 |
|
{ |
566 |
|
switch(vscale(QUALITY)) { |
567 |
|
case LOW: |
568 |
< |
lowqopts(op); |
568 |
> |
lowqopts(op, po); |
569 |
|
break; |
570 |
|
case MEDIUM: |
571 |
< |
medqopts(op); |
571 |
> |
medqopts(op, po); |
572 |
|
break; |
573 |
|
case HIGH: |
574 |
< |
lowqopts(op); |
574 |
> |
hiqopts(op, po); |
575 |
|
break; |
576 |
|
} |
577 |
|
} |
578 |
|
|
579 |
|
|
580 |
< |
lowqopts(op) /* low quality rendering options */ |
580 |
> |
lowqopts(op, po) /* low quality rendering options */ |
581 |
|
register char *op; |
582 |
+ |
char *po; |
583 |
|
{ |
584 |
|
double d, org[3], siz[3]; |
585 |
|
|
586 |
|
*op = '\0'; |
587 |
+ |
*po = '\0'; |
588 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
589 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
590 |
|
badvalue(ZONE); |
591 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
592 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
593 |
+ |
badvalue(ZONE); |
594 |
|
getoctcube(org, &d); |
595 |
|
d *= 3./(siz[0]+siz[1]+siz[2]); |
596 |
|
switch (vscale(DETAIL)) { |
597 |
|
case LOW: |
598 |
< |
op = addarg(op, "-ps 16 -dp 64"); |
598 |
> |
po = addarg(po, "-ps 16"); |
599 |
> |
op = addarg(op, "-dp 64"); |
600 |
|
sprintf(op, " -ar %d", (int)(4*d)); |
601 |
|
op += strlen(op); |
602 |
|
break; |
603 |
|
case MEDIUM: |
604 |
< |
op = addarg(op, "-ps 8 -dp 128"); |
604 |
> |
po = addarg(po, "-ps 8"); |
605 |
> |
op = addarg(op, "-dp 128"); |
606 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
607 |
|
op += strlen(op); |
608 |
|
break; |
609 |
|
case HIGH: |
610 |
< |
op = addarg(op, "-ps 4 -dp 256"); |
610 |
> |
po = addarg(po, "-ps 4"); |
611 |
> |
op = addarg(op, "-dp 256"); |
612 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
613 |
|
op += strlen(op); |
614 |
|
break; |
615 |
|
} |
616 |
< |
op = addarg(op, "-pt .16"); |
616 |
> |
po = addarg(po, "-pt .16"); |
617 |
|
if (vbool(PENUMBRAS)) |
618 |
|
op = addarg(op, "-ds .4"); |
619 |
|
else |
645 |
|
} |
646 |
|
|
647 |
|
|
648 |
< |
medqopts(op) /* medium quality rendering options */ |
648 |
> |
medqopts(op, po) /* medium quality rendering options */ |
649 |
|
register char *op; |
650 |
+ |
char *po; |
651 |
|
{ |
652 |
< |
double d, org[3], siz[3]; |
652 |
> |
double d, org[3], siz[3], asz; |
653 |
|
|
654 |
|
*op = '\0'; |
655 |
+ |
*po = '\0'; |
656 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
657 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
658 |
|
badvalue(ZONE); |
659 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
660 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
661 |
+ |
badvalue(ZONE); |
662 |
|
getoctcube(org, &d); |
663 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
663 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
664 |
> |
d /= asz; |
665 |
|
switch (vscale(DETAIL)) { |
666 |
|
case LOW: |
667 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
667 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
668 |
|
op = addarg(op, "-dp 256"); |
669 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
670 |
|
op += strlen(op); |
671 |
+ |
sprintf(op, " -ms %.2g", asz/20.); |
672 |
+ |
op += strlen(op); |
673 |
|
break; |
674 |
|
case MEDIUM: |
675 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
675 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
676 |
|
op = addarg(op, "-dp 512"); |
677 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
678 |
|
op += strlen(op); |
679 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
680 |
+ |
op += strlen(op); |
681 |
|
break; |
682 |
|
case HIGH: |
683 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
683 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
684 |
|
op = addarg(op, "-dp 1024"); |
685 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
686 |
|
op += strlen(op); |
687 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
688 |
+ |
op += strlen(op); |
689 |
|
break; |
690 |
|
} |
691 |
< |
op = addarg(op, "-pt .08"); |
691 |
> |
po = addarg(po, "-pt .08"); |
692 |
|
if (vbool(PENUMBRAS)) |
693 |
|
op = addarg(op, "-ds .2 -dj .5"); |
694 |
|
else |
723 |
|
} |
724 |
|
|
725 |
|
|
726 |
< |
hiqopts(op) /* high quality rendering options */ |
726 |
> |
hiqopts(op, po) /* high quality rendering options */ |
727 |
|
register char *op; |
728 |
+ |
char *po; |
729 |
|
{ |
730 |
< |
double d, org[3], siz[3]; |
730 |
> |
double d, org[3], siz[3], asz; |
731 |
|
|
732 |
|
*op = '\0'; |
733 |
+ |
*po = '\0'; |
734 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
735 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
736 |
|
badvalue(ZONE); |
737 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
738 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
739 |
+ |
badvalue(ZONE); |
740 |
|
getoctcube(org, &d); |
741 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
741 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
742 |
> |
d /= asz; |
743 |
|
switch (vscale(DETAIL)) { |
744 |
|
case LOW: |
745 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
745 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
746 |
|
op = addarg(op, "-dp 1024"); |
747 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
748 |
|
op += strlen(op); |
749 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
750 |
+ |
op += strlen(op); |
751 |
|
break; |
752 |
|
case MEDIUM: |
753 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
753 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
754 |
|
op = addarg(op, "-dp 2048"); |
755 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
756 |
|
op += strlen(op); |
757 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
758 |
+ |
op += strlen(op); |
759 |
|
break; |
760 |
|
case HIGH: |
761 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
761 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
762 |
|
op = addarg(op, "-dp 4096"); |
763 |
|
sprintf(op, " -ar %d", (int)(64*d)); |
764 |
|
op += strlen(op); |
765 |
+ |
sprintf(op, " -ms %.2g", asz/160.); |
766 |
+ |
op += strlen(op); |
767 |
|
break; |
768 |
|
} |
769 |
< |
op = addarg(op, "-pt .04"); |
769 |
> |
po = addarg(po, "-pt .04"); |
770 |
|
if (vbool(PENUMBRAS)) |
771 |
< |
op = addarg(op, "-ds .1 -dj .7"); |
771 |
> |
op = addarg(op, "-ds .1 -dj .65"); |
772 |
|
else |
773 |
|
op = addarg(op, "-ds .2"); |
774 |
|
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
810 |
|
return; |
811 |
|
if (vdef(OPTFILE)) { |
812 |
|
for (cp = ro; cp[1]; cp++) |
813 |
< |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
813 |
> |
if (isspace(cp[1]) && (cp[2] == '@' || |
814 |
> |
(cp[2] == '-' && isalpha(cp[3])))) |
815 |
|
*cp = '\n'; |
816 |
|
else |
817 |
|
*cp = cp[1]; |
906 |
|
zpos = -1; vs++; |
907 |
|
} |
908 |
|
viewtype = 'v'; |
909 |
< |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h') |
909 |
> |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c') |
910 |
|
viewtype = *vs++; |
911 |
|
cp = viewopts; |
912 |
|
if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) { /* got one! */ |
917 |
|
badvalue(ZONE); |
918 |
|
for (i = 0; i < 3; i++) { |
919 |
|
dim[i] -= cent[i]; |
920 |
+ |
if (dim[i] <= FTINY) |
921 |
+ |
badvalue(ZONE); |
922 |
|
cent[i] += .5*dim[i]; |
923 |
|
} |
924 |
|
mult = vlet(ZONE)=='E' ? 2. : .45 ; |
961 |
|
case 'h': |
962 |
|
cp = addarg(cp, "-vh 180 -vv 180"); |
963 |
|
break; |
964 |
+ |
case 'c': |
965 |
+ |
cp = addarg(cp, "-vh 180 -vv 90"); |
966 |
+ |
break; |
967 |
|
} |
968 |
|
} else { |
969 |
|
while (!isspace(*vs)) /* else skip id */ |
1009 |
|
} |
1010 |
|
/* view number? */ |
1011 |
|
if (isint(viewselect)) |
1012 |
< |
return(specview(nvalue(vv+VIEW, atoi(viewselect)-1))); |
1012 |
> |
return(specview(nvalue(VIEWS, atoi(viewselect)-1))); |
1013 |
|
/* check list */ |
1014 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1014 |
> |
while ((mv = nvalue(VIEWS, n++)) != NULL) |
1015 |
|
if (matchword(viewselect, mv)) |
1016 |
|
return(specview(mv)); |
1017 |
|
return(specview(viewselect)); /* standard view? */ |
1018 |
|
} |
1019 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1019 |
> |
mv = nvalue(VIEWS, n); /* use view n */ |
1020 |
|
if (vn != NULL & mv != NULL) { |
1021 |
|
register char *mv2 = mv; |
1022 |
|
if (*mv2 != '-') |
1031 |
|
printview(vopts) /* print out selected view */ |
1032 |
|
register char *vopts; |
1033 |
|
{ |
1034 |
< |
extern char *atos(), *getenv(); |
1035 |
< |
char buf[256]; |
1036 |
< |
FILE *fp; |
1034 |
> |
extern char *strstr(), *atos(), *getenv(); |
1035 |
> |
VIEW vwr; |
1036 |
> |
char buf[128]; |
1037 |
|
register char *cp; |
1038 |
< |
|
1038 |
> |
again: |
1039 |
|
if (vopts == NULL) |
1040 |
|
return(-1); |
1239 |
– |
fputs("VIEW=", stdout); |
1240 |
– |
do { |
1241 |
– |
if (matchword(vopts, "-vf")) { /* expand view file */ |
1242 |
– |
vopts = sskip(vopts); |
1243 |
– |
if (!*atos(buf, sizeof(buf), vopts)) |
1244 |
– |
return(-1); |
1245 |
– |
if ((fp = fopen(buf, "r")) == NULL) |
1246 |
– |
return(-1); |
1247 |
– |
for (buf[sizeof(buf)-2] = '\n'; |
1248 |
– |
fgets(buf, sizeof(buf), fp) != NULL && |
1249 |
– |
buf[0] != '\n'; |
1250 |
– |
buf[sizeof(buf)-2] = '\n') { |
1251 |
– |
if (buf[sizeof(buf)-2] != '\n') { |
1252 |
– |
ungetc(buf[sizeof(buf)-2], fp); |
1253 |
– |
buf[sizeof(buf)-2] = '\0'; |
1254 |
– |
} |
1255 |
– |
if (matchword(buf, "VIEW=") || |
1256 |
– |
matchword(buf, "rview")) { |
1257 |
– |
for (cp = sskip(buf); *cp && *cp != '\n'; cp++) |
1258 |
– |
putchar(*cp); |
1259 |
– |
} |
1260 |
– |
} |
1261 |
– |
fclose(fp); |
1262 |
– |
vopts = sskip(vopts); |
1263 |
– |
} else { |
1264 |
– |
while (isspace(*vopts)) |
1265 |
– |
vopts++; |
1266 |
– |
putchar(' '); |
1041 |
|
#ifdef MSDOS |
1042 |
< |
if (*vopts == '$') { /* expand env. var. */ |
1043 |
< |
if (!*atos(buf, sizeof(buf), vopts+1)) |
1044 |
< |
return(-1); |
1045 |
< |
if ((cp = getenv(buf)) == NULL) |
1272 |
< |
return(-1); |
1273 |
< |
fputs(cp, stdout); |
1274 |
< |
vopts = sskip(vopts); |
1275 |
< |
} else |
1042 |
> |
if (vopts[0] == '$') { |
1043 |
> |
vopts = getenv(vopts+1); |
1044 |
> |
goto again; |
1045 |
> |
} |
1046 |
|
#endif |
1047 |
< |
while (*vopts && !isspace(*vopts)) |
1048 |
< |
putchar(*vopts++); |
1049 |
< |
} |
1050 |
< |
} while (*vopts++); |
1051 |
< |
putchar('\n'); |
1047 |
> |
copystruct(&vwr, &stdview); |
1048 |
> |
sscanview(&vwr, cp=vopts); /* set initial options */ |
1049 |
> |
while ((cp = strstr(cp, "-vf ")) != NULL && |
1050 |
> |
*atos(buf, sizeof(buf), cp += 4)) { |
1051 |
> |
viewfile(buf, &vwr, NULL); /* load -vf file */ |
1052 |
> |
sscanview(&vwr, cp); /* reset tail */ |
1053 |
> |
} |
1054 |
> |
fputs(VIEWSTR, stdout); |
1055 |
> |
fprintview(&vwr, stdout); /* print full spec. */ |
1056 |
> |
fputc('\n', stdout); |
1057 |
|
return(0); |
1058 |
|
} |
1059 |
|
|
1060 |
|
|
1061 |
< |
rview(opts) /* run rview with first view */ |
1062 |
< |
char *opts; |
1061 |
> |
rview(opts, po) /* run rview with first view */ |
1062 |
> |
char *opts, *po; |
1063 |
|
{ |
1064 |
|
char *vw; |
1065 |
|
char combuf[512]; |
1066 |
|
/* build command */ |
1067 |
< |
if ((vw = getview(0, NULL)) == NULL) |
1067 |
> |
if (touchonly || (vw = getview(0, NULL)) == NULL) |
1068 |
|
return; |
1069 |
|
if (sayview) |
1070 |
|
printview(vw); |
1071 |
< |
sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname); |
1071 |
> |
sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname); |
1072 |
|
if (rvdevice != NULL) |
1073 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1074 |
|
if (vdef(EXPOSURE)) |
1076 |
|
strcat(combuf, oct1name); |
1077 |
|
if (runcom(combuf)) { /* run it */ |
1078 |
|
fprintf(stderr, "%s: error running rview\n", progname); |
1079 |
< |
exit(1); |
1079 |
> |
quit(1); |
1080 |
|
} |
1081 |
|
} |
1082 |
|
|
1083 |
|
|
1084 |
< |
rpict(opts) /* run rpict and pfilt for each view */ |
1085 |
< |
char *opts; |
1084 |
> |
rpict(opts, po) /* run rpict and pfilt for each view */ |
1085 |
> |
char *opts, *po; |
1086 |
|
{ |
1087 |
|
char combuf[1024]; |
1088 |
< |
char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32]; |
1088 |
> |
char rawfile[MAXPATH], picfile[MAXPATH]; |
1089 |
> |
char zopt[MAXPATH+4], rep[MAXPATH+16], res[32]; |
1090 |
|
char pfopts[128]; |
1091 |
|
char vs[32], *vw; |
1092 |
|
int vn, mult; |
1093 |
+ |
time_t rfdt, pfdt; |
1094 |
|
/* get pfilt options */ |
1095 |
|
pfiltopts(pfopts); |
1096 |
|
/* get resolution, reporting */ |
1097 |
< |
mult = vscale(QUALITY)+1; |
1097 |
> |
switch (vscale(QUALITY)) { |
1098 |
> |
case LOW: |
1099 |
> |
mult = 1; |
1100 |
> |
break; |
1101 |
> |
case MEDIUM: |
1102 |
> |
mult = 2; |
1103 |
> |
break; |
1104 |
> |
case HIGH: |
1105 |
> |
mult = 3; |
1106 |
> |
break; |
1107 |
> |
} |
1108 |
|
{ |
1109 |
|
int xres, yres; |
1110 |
|
double aspect; |
1139 |
|
if (!vs[0]) |
1140 |
|
sprintf(vs, "%d", vn); |
1141 |
|
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1142 |
+ |
if (vdef(ZFILE)) |
1143 |
+ |
sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); |
1144 |
+ |
else |
1145 |
+ |
zopt[0] = '\0'; |
1146 |
|
/* check date on picture */ |
1147 |
< |
if (fdate(picfile) >= oct1date) |
1147 |
> |
pfdt = fdate(picfile); |
1148 |
> |
if (pfdt >= oct1date) |
1149 |
|
continue; |
1150 |
+ |
/* get raw file name */ |
1151 |
+ |
sprintf(rawfile, "%s_%s.unf", |
1152 |
+ |
vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs); |
1153 |
+ |
rfdt = fdate(rawfile); |
1154 |
+ |
if (touchonly) { /* update times only */ |
1155 |
+ |
if (rfdt) { |
1156 |
+ |
if (rfdt < oct1date) |
1157 |
+ |
touch(rawfile); |
1158 |
+ |
} else if (pfdt && pfdt < oct1date) |
1159 |
+ |
touch(picfile); |
1160 |
+ |
continue; |
1161 |
+ |
} |
1162 |
|
/* build rpict command */ |
1163 |
< |
sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs); |
1164 |
< |
if (fdate(rawfile) >= oct1date) /* recover */ |
1165 |
< |
sprintf(combuf, "rpict%s%s -ro %s %s", |
1362 |
< |
rep, opts, rawfile, oct1name); |
1163 |
> |
if (rfdt >= oct1date) /* recover */ |
1164 |
> |
sprintf(combuf, "rpict%s%s%s%s -ro %s %s", |
1165 |
> |
rep, po, opts, zopt, rawfile, oct1name); |
1166 |
|
else { |
1167 |
|
if (overture) { /* run overture calculation */ |
1168 |
|
sprintf(combuf, |
1173 |
|
fprintf(stderr, |
1174 |
|
"%s: error in overture for view %s\n", |
1175 |
|
progname, vs); |
1176 |
< |
exit(1); |
1176 |
> |
quit(1); |
1177 |
|
} |
1178 |
|
#ifdef NIX |
1179 |
|
rmfile(overfile); |
1180 |
|
#endif |
1181 |
|
} |
1182 |
< |
sprintf(combuf, "rpict%s %s %s%s %s > %s", |
1183 |
< |
rep, vw, res, opts, |
1184 |
< |
oct1name, rawfile); |
1182 |
> |
sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s", |
1183 |
> |
rep, vw, res, po, opts, zopt, |
1184 |
> |
oct1name, rawfile); |
1185 |
|
} |
1186 |
|
if (runcom(combuf)) { /* run rpict */ |
1187 |
|
fprintf(stderr, "%s: error rendering view %s\n", |
1188 |
|
progname, vs); |
1189 |
< |
exit(1); |
1189 |
> |
quit(1); |
1190 |
|
} |
1191 |
+ |
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1192 |
|
/* build pfilt command */ |
1193 |
< |
if (mult > 1) |
1194 |
< |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1193 |
> |
if (mult > 1) |
1194 |
> |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1195 |
|
pfopts, mult, mult, rawfile, picfile); |
1196 |
< |
else |
1197 |
< |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1198 |
< |
rawfile, picfile); |
1199 |
< |
if (runcom(combuf)) { /* run pfilt */ |
1200 |
< |
fprintf(stderr, |
1201 |
< |
"%s: error filtering view %s\n\t%s removed\n", |
1202 |
< |
progname, vs, picfile); |
1203 |
< |
unlink(picfile); |
1204 |
< |
exit(1); |
1196 |
> |
else |
1197 |
> |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1198 |
> |
rawfile, picfile); |
1199 |
> |
if (runcom(combuf)) { /* run pfilt */ |
1200 |
> |
fprintf(stderr, |
1201 |
> |
"%s: error filtering view %s\n\t%s removed\n", |
1202 |
> |
progname, vs, picfile); |
1203 |
> |
unlink(picfile); |
1204 |
> |
quit(1); |
1205 |
> |
} |
1206 |
|
} |
1207 |
< |
/* remove raw file */ |
1208 |
< |
rmfile(rawfile); |
1207 |
> |
/* remove/rename raw file */ |
1208 |
> |
if (vdef(RAWFILE)) { |
1209 |
> |
sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); |
1210 |
> |
mvfile(rawfile, combuf); |
1211 |
> |
} else |
1212 |
> |
rmfile(rawfile); |
1213 |
|
} |
1214 |
|
} |
1215 |
|
|
1216 |
|
|
1217 |
+ |
touch(fn) /* update a file */ |
1218 |
+ |
char *fn; |
1219 |
+ |
{ |
1220 |
+ |
if (!silent) |
1221 |
+ |
printf("\ttouch %s\n", fn); |
1222 |
+ |
if (noaction) |
1223 |
+ |
return(0); |
1224 |
+ |
#ifdef notused |
1225 |
+ |
if (access(fn, F_OK) == -1) /* create it */ |
1226 |
+ |
if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1) |
1227 |
+ |
return(-1); |
1228 |
+ |
#endif |
1229 |
+ |
return(setfdate(fn, time((time_t *)NULL))); |
1230 |
+ |
} |
1231 |
+ |
|
1232 |
+ |
|
1233 |
|
runcom(cs) /* run command */ |
1234 |
|
char *cs; |
1235 |
|
{ |
1257 |
|
} |
1258 |
|
|
1259 |
|
|
1260 |
+ |
mvfile(fold, fnew) /* move a file */ |
1261 |
+ |
char *fold, *fnew; |
1262 |
+ |
{ |
1263 |
+ |
if (!silent) |
1264 |
|
#ifdef MSDOS |
1265 |
+ |
printf("\trename %s %s\n", fold, fnew); |
1266 |
+ |
#else |
1267 |
+ |
printf("\tmv %s %s\n", fold, fnew); |
1268 |
+ |
#endif |
1269 |
+ |
if (noaction) |
1270 |
+ |
return(0); |
1271 |
+ |
return(rename(fold, fnew)); |
1272 |
+ |
} |
1273 |
+ |
|
1274 |
+ |
|
1275 |
+ |
#ifdef MSDOS |
1276 |
|
setenv(vname, value) /* set an environment variable */ |
1277 |
|
char *vname, *value; |
1278 |
|
{ |
1284 |
|
sprintf(evp, "%s=%s", vname, value); |
1285 |
|
if (putenv(evp) != 0) { |
1286 |
|
fprintf(stderr, "%s: out of environment space\n", progname); |
1287 |
< |
exit(1); |
1287 |
> |
quit(1); |
1288 |
|
} |
1289 |
|
if (!silent) |
1290 |
|
printf("set %s\n", evp); |
1297 |
|
{ |
1298 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1299 |
|
progname, vnam(vc)); |
1300 |
< |
exit(1); |
1300 |
> |
quit(1); |
1301 |
|
} |
1302 |
|
|
1303 |
|
|
1305 |
|
char *s; |
1306 |
|
{ |
1307 |
|
perror(s); |
1308 |
< |
exit(1); |
1308 |
> |
quit(1); |
1309 |
> |
} |
1310 |
> |
|
1311 |
> |
|
1312 |
> |
quit(ec) /* exit program */ |
1313 |
> |
int ec; |
1314 |
> |
{ |
1315 |
> |
exit(ec); |
1316 |
|
} |