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"; |
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 |
|
|
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(), boolvalue(), |
25 |
– |
qualvalue(), fltvalue(), intvalue(); |
26 |
– |
|
18 |
|
/* variables */ |
19 |
|
#define OBJECT 0 /* object files */ |
20 |
|
#define SCENE 1 /* scene files */ |
24 |
|
#define RENDER 5 /* rendering options */ |
25 |
|
#define OCONV 6 /* oconv options */ |
26 |
|
#define PFILT 7 /* pfilt options */ |
27 |
< |
#define VIEW 8 /* view(s) for picture(s) */ |
27 |
> |
#define VIEWS 8 /* view(s) for picture(s) */ |
28 |
|
#define ZONE 9 /* simulation zone */ |
29 |
|
#define QUALITY 10 /* desired rendering quality */ |
30 |
|
#define OCTREE 11 /* octree file name */ |
31 |
< |
#define PICTURE 12 /* picture file name */ |
31 |
> |
#define PICTURE 12 /* picture file root name */ |
32 |
|
#define AMBFILE 13 /* ambient file name */ |
33 |
|
#define OPTFILE 14 /* rendering options file */ |
34 |
|
#define EXPOSURE 15 /* picture exposure setting */ |
39 |
|
#define PENUMBRAS 20 /* shadow penumbras are desired */ |
40 |
|
#define VARIABILITY 21 /* level of light variability */ |
41 |
|
#define REPORT 22 /* report frequency and errfile */ |
42 |
+ |
#define RAWFILE 23 /* raw picture file root name */ |
43 |
+ |
#define ZFILE 24 /* distance file root name */ |
44 |
|
/* total number of variables */ |
45 |
< |
#define NVARS 23 |
45 |
> |
int NVARS = 25; |
46 |
|
|
47 |
< |
VARIABLE vv[NVARS] = { /* variable-value pairs */ |
47 |
> |
VARIABLE vv[] = { /* variable-value pairs */ |
48 |
|
{"objects", 3, 0, NULL, catvalues}, |
49 |
|
{"scene", 3, 0, NULL, catvalues}, |
50 |
|
{"materials", 3, 0, NULL, catvalues}, |
68 |
|
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
69 |
|
{"VARIABILITY", 3, 0, NULL, qualvalue}, |
70 |
|
{"REPORT", 3, 0, NULL, onevalue}, |
71 |
+ |
{"RAWFILE", 3, 0, NULL, onevalue}, |
72 |
+ |
{"ZFILE", 2, 0, NULL, onevalue}, |
73 |
|
}; |
74 |
|
|
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 |
– |
|
75 |
|
/* overture calculation file */ |
76 |
|
#ifdef NIX |
77 |
< |
char overfile[] = "overture.raw"; |
77 |
> |
char overfile[] = "overture.unf"; |
78 |
|
#else |
79 |
|
char overfile[] = "/dev/null"; |
80 |
|
#endif |
81 |
|
|
82 |
< |
extern unsigned long fdate(), time(); |
82 |
> |
extern time_t fdate(), time(); |
83 |
|
|
84 |
< |
unsigned long scenedate; /* date of latest scene or object file */ |
85 |
< |
unsigned long octreedate; /* date of octree */ |
86 |
< |
unsigned long matdate; /* date of latest material file */ |
87 |
< |
unsigned long illumdate; /* date of last illum file */ |
84 |
> |
time_t scenedate; /* date of latest scene or object file */ |
85 |
> |
time_t octreedate; /* date of octree */ |
86 |
> |
time_t matdate; /* date of latest material file */ |
87 |
> |
time_t illumdate; /* date of last illum file */ |
88 |
|
|
89 |
|
char *oct0name; /* name of pre-mkillum octree */ |
90 |
< |
unsigned long oct0date; /* date of pre-mkillum octree */ |
90 |
> |
time_t oct0date; /* date of pre-mkillum octree */ |
91 |
|
char *oct1name; /* name of post-mkillum octree */ |
92 |
< |
unsigned long oct1date; /* date of post-mkillum octree (>= matdate) */ |
92 |
> |
time_t oct1date; /* date of post-mkillum octree (>= matdate) */ |
93 |
|
|
94 |
+ |
int nowarn = 0; /* no warnings */ |
95 |
|
int explicate = 0; /* explicate variables */ |
96 |
|
int silent = 0; /* do work silently */ |
97 |
+ |
int touchonly = 0; /* touch files only */ |
98 |
|
int noaction = 0; /* don't do anything */ |
99 |
|
int sayview = 0; /* print view out */ |
100 |
|
char *rvdevice = NULL; /* rview output device */ |
113 |
|
char *argv[]; |
114 |
|
{ |
115 |
|
char ropts[512]; |
116 |
+ |
char popts[64]; |
117 |
|
int i; |
118 |
|
|
119 |
|
progname = argv[0]; |
126 |
|
case 'n': |
127 |
|
noaction++; |
128 |
|
break; |
129 |
+ |
case 't': |
130 |
+ |
touchonly++; |
131 |
+ |
break; |
132 |
|
case 'e': |
133 |
|
explicate++; |
134 |
|
break; |
141 |
|
case 'v': |
142 |
|
viewselect = argv[++i]; |
143 |
|
break; |
144 |
+ |
case 'w': |
145 |
+ |
nowarn++; |
146 |
+ |
break; |
147 |
|
default: |
148 |
|
goto userr; |
149 |
|
} |
153 |
|
/* assign Radiance root file name */ |
154 |
|
rootname(radname, rifname); |
155 |
|
/* load variable values */ |
156 |
< |
load(rifname); |
156 |
> |
loadvars(rifname); |
157 |
|
/* get any additional assignments */ |
158 |
|
for (i++; i < argc; i++) |
159 |
< |
setvariable(argv[i]); |
159 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
160 |
> |
fprintf(stderr, "%s: unknown variable: %s\n", |
161 |
> |
progname, argv[i]); |
162 |
> |
quit(1); |
163 |
> |
} |
164 |
|
/* check assignments */ |
165 |
|
checkvalues(); |
166 |
|
/* check files and dates */ |
169 |
|
setdefaults(); |
170 |
|
/* print all values if requested */ |
171 |
|
if (explicate) |
172 |
< |
printvals(); |
172 |
> |
printvars(stdout); |
173 |
|
/* build octree (and run mkillum) */ |
174 |
|
oconv(); |
175 |
|
/* check date on ambient file */ |
176 |
|
checkambfile(); |
177 |
|
/* run simulation */ |
178 |
< |
renderopts(ropts); |
178 |
> |
renderopts(ropts, popts); |
179 |
|
xferopts(ropts); |
180 |
|
if (rvdevice != NULL) |
181 |
< |
rview(ropts); |
181 |
> |
rview(ropts, popts); |
182 |
|
else |
183 |
< |
rpict(ropts); |
184 |
< |
exit(0); |
183 |
> |
rpict(ropts, popts); |
184 |
> |
quit(0); |
185 |
|
userr: |
186 |
|
fprintf(stderr, |
187 |
< |
"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
187 |
> |
"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
188 |
|
progname); |
189 |
< |
exit(1); |
189 |
> |
quit(1); |
190 |
|
} |
191 |
|
|
192 |
|
|
205 |
|
} |
206 |
|
|
207 |
|
|
208 |
< |
#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 |
< |
int n; |
256 |
< |
register char *cp; |
257 |
< |
register VARIABLE *vp; |
258 |
< |
register int i; |
259 |
< |
|
260 |
< |
while (isspace(*ass)) /* skip leading space */ |
261 |
< |
ass++; |
262 |
< |
cp = varname; /* extract name */ |
263 |
< |
while (cp < varname+sizeof(varname)-1 |
264 |
< |
&& *ass && !isspace(*ass) && *ass != '=') |
265 |
< |
*cp++ = *ass++; |
266 |
< |
*cp = '\0'; |
267 |
< |
if (!varname[0]) |
268 |
< |
return; /* no variable name! */ |
269 |
< |
/* trim value */ |
270 |
< |
while (isspace(*ass) || *ass == '=') |
271 |
< |
ass++; |
272 |
< |
for (n = strlen(ass); n > 0; n--) |
273 |
< |
if (!isspace(ass[n-1])) |
274 |
< |
break; |
275 |
< |
if (!n) { |
276 |
< |
fprintf(stderr, "%s: warning - missing value for variable '%s'\n", |
277 |
< |
progname, varname); |
278 |
< |
return; |
279 |
< |
} |
280 |
< |
/* match variable from list */ |
281 |
< |
vp = matchvar(varname); |
282 |
< |
if (vp == NULL) { |
283 |
< |
fprintf(stderr, "%s: unknown variable '%s'\n", |
284 |
< |
progname, varname); |
285 |
< |
exit(1); |
286 |
< |
} |
287 |
< |
/* assign new value */ |
288 |
< |
if (i = vp->nass) { |
289 |
< |
cp = vp->value; |
290 |
< |
while (i--) |
291 |
< |
while (*cp++) |
292 |
< |
; |
293 |
< |
i = cp - vp->value; |
294 |
< |
vp->value = realloc(vp->value, i+n+1); |
295 |
< |
} else |
296 |
< |
vp->value = malloc(n+1); |
297 |
< |
if (vp->value == NULL) |
298 |
< |
syserr(progname); |
299 |
< |
cp = vp->value+i; /* copy value, squeezing spaces */ |
300 |
< |
*cp = *ass; |
301 |
< |
for (i = 1; i <= n; i++) { |
302 |
< |
if (ass[i] == NOCHAR) |
303 |
< |
continue; |
304 |
< |
if (isspace(*cp)) |
305 |
< |
while (isspace(ass[i])) |
306 |
< |
i++; |
307 |
< |
*++cp = ass[i]; |
308 |
< |
} |
309 |
< |
if (isspace(*cp)) /* remove trailing space */ |
310 |
< |
*cp = '\0'; |
311 |
< |
vp->nass++; |
312 |
< |
} |
313 |
< |
|
314 |
< |
|
315 |
< |
VARIABLE * |
316 |
< |
matchvar(nam) /* match a variable by its name */ |
317 |
< |
char *nam; |
318 |
< |
{ |
319 |
< |
int n = strlen(nam); |
320 |
< |
register int i; |
321 |
< |
|
322 |
< |
for (i = 0; i < NVARS; i++) |
323 |
< |
if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n)) |
324 |
< |
return(vv+i); |
325 |
< |
return(NULL); |
326 |
< |
} |
327 |
< |
|
328 |
< |
|
329 |
< |
char * |
330 |
< |
nvalue(vp, n) /* return nth variable value */ |
331 |
< |
VARIABLE *vp; |
332 |
< |
register int n; |
333 |
< |
{ |
334 |
< |
register char *cp; |
335 |
< |
|
336 |
< |
if (vp == NULL | n < 0 | n >= vp->nass) |
337 |
< |
return(NULL); |
338 |
< |
cp = vp->value; |
339 |
< |
while (n--) |
340 |
< |
while (*cp++) |
341 |
< |
; |
342 |
< |
return(cp); |
343 |
< |
} |
344 |
< |
|
345 |
< |
|
346 |
< |
checkvalues() /* check assignments */ |
347 |
< |
{ |
348 |
< |
register int i; |
349 |
< |
|
350 |
< |
for (i = 0; i < NVARS; i++) |
351 |
< |
if (vv[i].fixval != NULL) |
352 |
< |
(*vv[i].fixval)(vv+i); |
353 |
< |
} |
354 |
< |
|
355 |
< |
|
356 |
< |
onevalue(vp) /* only one assignment for this variable */ |
357 |
< |
register VARIABLE *vp; |
358 |
< |
{ |
359 |
< |
if (vp->nass < 2) |
360 |
< |
return; |
361 |
< |
fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n", |
362 |
< |
progname, vp->name); |
363 |
< |
do |
364 |
< |
vp->value += strlen(vp->value)+1; |
365 |
< |
while (--vp->nass > 1); |
366 |
< |
} |
367 |
< |
|
368 |
< |
|
369 |
< |
catvalues(vp) /* concatenate variable values */ |
370 |
< |
register VARIABLE *vp; |
371 |
< |
{ |
372 |
< |
register char *cp; |
373 |
< |
|
374 |
< |
if (vp->nass < 2) |
375 |
< |
return; |
376 |
< |
for (cp = vp->value; vp->nass > 1; vp->nass--) { |
377 |
< |
while (*cp) |
378 |
< |
cp++; |
379 |
< |
*cp++ = ' '; |
380 |
< |
} |
381 |
< |
} |
382 |
< |
|
383 |
< |
|
384 |
< |
int |
385 |
< |
badmatch(tv, cv) /* case insensitive truncated comparison */ |
386 |
< |
register char *tv, *cv; |
387 |
< |
{ |
388 |
< |
if (!*tv) return(1); /* null string cannot match */ |
389 |
< |
do |
390 |
< |
if (UPPER(*tv) != *cv++) |
391 |
< |
return(1); |
392 |
< |
while (*++tv); |
393 |
< |
return(0); /* OK */ |
394 |
< |
} |
395 |
< |
|
396 |
< |
|
397 |
< |
boolvalue(vp) /* check boolean for legal values */ |
398 |
< |
register VARIABLE *vp; |
399 |
< |
{ |
400 |
< |
if (!vp->nass) return; |
401 |
< |
onevalue(vp); |
402 |
< |
switch (UPPER(vp->value[0])) { |
403 |
< |
case 'T': |
404 |
< |
if (badmatch(vp->value, "TRUE")) break; |
405 |
< |
return; |
406 |
< |
case 'F': |
407 |
< |
if (badmatch(vp->value, "FALSE")) break; |
408 |
< |
return; |
409 |
< |
} |
410 |
< |
fprintf(stderr, "%s: illegal value for boolean variable '%s'\n", |
411 |
< |
progname, vp->name); |
412 |
< |
exit(1); |
413 |
< |
} |
414 |
< |
|
415 |
< |
|
416 |
< |
qualvalue(vp) /* check qualitative var. for legal values */ |
417 |
< |
register VARIABLE *vp; |
418 |
< |
{ |
419 |
< |
if (!vp->nass) return; |
420 |
< |
onevalue(vp); |
421 |
< |
switch (UPPER(vp->value[0])) { |
422 |
< |
case 'L': |
423 |
< |
if (badmatch(vp->value, "LOW")) break; |
424 |
< |
return; |
425 |
< |
case 'M': |
426 |
< |
if (badmatch(vp->value, "MEDIUM")) break; |
427 |
< |
return; |
428 |
< |
case 'H': |
429 |
< |
if (badmatch(vp->value, "HIGH")) break; |
430 |
< |
return; |
431 |
< |
} |
432 |
< |
fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n", |
433 |
< |
progname, vp->name); |
434 |
< |
exit(1); |
435 |
< |
} |
436 |
< |
|
437 |
< |
|
438 |
< |
intvalue(vp) /* check integer variable for legal values */ |
439 |
< |
register VARIABLE *vp; |
440 |
< |
{ |
441 |
< |
if (!vp->nass) return; |
442 |
< |
onevalue(vp); |
443 |
< |
if (isint(vp->value)) return; |
444 |
< |
fprintf(stderr, "%s: illegal value for integer variable '%s'\n", |
445 |
< |
progname, vp->name); |
446 |
< |
exit(1); |
447 |
< |
} |
448 |
< |
|
449 |
< |
|
450 |
< |
fltvalue(vp) /* check float variable for legal values */ |
451 |
< |
register VARIABLE *vp; |
452 |
< |
{ |
453 |
< |
if (!vp->nass) return; |
454 |
< |
onevalue(vp); |
455 |
< |
if (isflt(vp->value)) return; |
456 |
< |
fprintf(stderr, "%s: illegal value for real variable '%s'\n", |
457 |
< |
progname, vp->name); |
458 |
< |
exit(1); |
459 |
< |
} |
460 |
< |
|
461 |
< |
|
462 |
< |
unsigned long |
208 |
> |
time_t |
209 |
|
checklast(fnames) /* check files and find most recent */ |
210 |
|
register char *fnames; |
211 |
|
{ |
212 |
|
char thisfile[MAXPATH]; |
213 |
< |
unsigned long thisdate, lastdate = 0; |
213 |
> |
time_t thisdate, lastdate = 0; |
214 |
|
register char *cp; |
215 |
|
|
216 |
|
if (fnames == NULL) |
258 |
|
|
259 |
|
checkfiles() /* check for existence and modified times */ |
260 |
|
{ |
261 |
< |
unsigned long objdate; |
261 |
> |
time_t objdate; |
262 |
|
|
263 |
|
if (!vdef(OCTREE)) { |
264 |
|
if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL) |
281 |
|
if (!octreedate & !scenedate & !illumdate) { |
282 |
|
fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname, |
283 |
|
vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); |
284 |
< |
exit(1); |
284 |
> |
quit(1); |
285 |
|
} |
286 |
|
matdate = checklast(vval(MATERIAL)); |
287 |
|
} |
293 |
|
extern FILE *popen(); |
294 |
|
static double oorg[3], osiz = 0.; |
295 |
|
double min[3], max[3]; |
296 |
< |
char buf[512]; |
296 |
> |
char buf[1024]; |
297 |
|
FILE *fp; |
298 |
|
register int i; |
299 |
|
|
311 |
|
fprintf(stderr, |
312 |
|
"%s: error reading bounding box from getbbox\n", |
313 |
|
progname); |
314 |
< |
exit(1); |
314 |
> |
quit(1); |
315 |
|
} |
316 |
|
for (i = 0; i < 3; i++) |
317 |
|
if (max[i] - min[i] > osiz) |
329 |
|
fprintf(stderr, |
330 |
|
"%s: error reading bounding cube from getinfo\n", |
331 |
|
progname); |
332 |
< |
exit(1); |
332 |
> |
quit(1); |
333 |
|
} |
334 |
|
pclose(fp); |
335 |
|
} |
365 |
|
vval(PICTURE) = radname; |
366 |
|
vdef(PICTURE)++; |
367 |
|
} |
368 |
< |
if (!vdef(VIEW)) { |
369 |
< |
vval(VIEW) = "X"; |
370 |
< |
vdef(VIEW)++; |
368 |
> |
if (!vdef(VIEWS)) { |
369 |
> |
vval(VIEWS) = "X"; |
370 |
> |
vdef(VIEWS)++; |
371 |
|
} |
372 |
|
if (!vdef(DETAIL)) { |
373 |
|
vval(DETAIL) = "M"; |
384 |
|
} |
385 |
|
|
386 |
|
|
641 |
– |
printvals() /* print variable values */ |
642 |
– |
{ |
643 |
– |
register int i, j; |
644 |
– |
|
645 |
– |
for (i = 0; i < NVARS; i++) |
646 |
– |
for (j = 0; j < vdef(i); j++) |
647 |
– |
printf("%s= %s\n", vnam(i), nvalue(vv+i, j)); |
648 |
– |
fflush(stdout); |
649 |
– |
} |
650 |
– |
|
651 |
– |
|
387 |
|
oconv() /* run oconv and mkillum if necessary */ |
388 |
|
{ |
389 |
|
static char illumtmp[] = "ilXXXXXX"; |
390 |
< |
char combuf[512], ocopts[64], mkopts[64]; |
390 |
> |
char combuf[1024], ocopts[64], mkopts[64]; |
391 |
|
|
392 |
|
oconvopts(ocopts); /* get options */ |
393 |
|
if (octreedate < scenedate) { /* check date on original octree */ |
394 |
< |
/* build command */ |
395 |
< |
if (vdef(MATERIAL)) |
396 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
397 |
< |
vval(MATERIAL), vval(SCENE), vval(OCTREE)); |
398 |
< |
else |
399 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
400 |
< |
vval(SCENE), vval(OCTREE)); |
401 |
< |
|
402 |
< |
if (runcom(combuf)) { /* run it */ |
403 |
< |
fprintf(stderr, |
394 |
> |
if (touchonly && octreedate) |
395 |
> |
touch(vval(OCTREE)); |
396 |
> |
else { /* build command */ |
397 |
> |
if (vdef(MATERIAL)) |
398 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
399 |
> |
vval(MATERIAL), vval(SCENE), |
400 |
> |
vval(OCTREE)); |
401 |
> |
else |
402 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
403 |
> |
vval(SCENE), vval(OCTREE)); |
404 |
> |
|
405 |
> |
if (runcom(combuf)) { /* run it */ |
406 |
> |
fprintf(stderr, |
407 |
|
"%s: error generating octree\n\t%s removed\n", |
408 |
< |
progname, vval(OCTREE)); |
409 |
< |
unlink(vval(OCTREE)); |
410 |
< |
exit(1); |
408 |
> |
progname, vval(OCTREE)); |
409 |
> |
unlink(vval(OCTREE)); |
410 |
> |
quit(1); |
411 |
> |
} |
412 |
|
} |
413 |
< |
octreedate = time((unsigned long *)NULL); |
413 |
> |
octreedate = time((time_t *)NULL); |
414 |
> |
if (octreedate < scenedate) /* in case clock is off */ |
415 |
> |
octreedate = scenedate; |
416 |
|
} |
417 |
|
if (oct1name == vval(OCTREE)) /* no mkillum? */ |
418 |
|
oct1date = octreedate > matdate ? octreedate : matdate; |
421 |
|
return; |
422 |
|
/* make octree0 */ |
423 |
|
if (oct0date < scenedate | oct0date < illumdate) { |
424 |
< |
/* build command */ |
424 |
> |
if (touchonly && oct0date) |
425 |
> |
touch(oct0name); |
426 |
> |
else { /* build command */ |
427 |
> |
if (octreedate) |
428 |
> |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
429 |
> |
vval(OCTREE), vval(ILLUM), oct0name); |
430 |
> |
else if (vdef(MATERIAL)) |
431 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
432 |
> |
vval(MATERIAL), vval(ILLUM), oct0name); |
433 |
> |
else |
434 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
435 |
> |
vval(ILLUM), oct0name); |
436 |
> |
if (runcom(combuf)) { /* run it */ |
437 |
> |
fprintf(stderr, |
438 |
> |
"%s: error generating octree\n\t%s removed\n", |
439 |
> |
progname, oct0name); |
440 |
> |
unlink(oct0name); |
441 |
> |
quit(1); |
442 |
> |
} |
443 |
> |
} |
444 |
> |
oct0date = time((time_t *)NULL); |
445 |
> |
if (oct0date < octreedate) /* in case clock is off */ |
446 |
> |
oct0date = octreedate; |
447 |
> |
if (oct0date < illumdate) /* ditto */ |
448 |
> |
oct0date = illumdate; |
449 |
> |
} |
450 |
> |
if (touchonly && oct1date) |
451 |
> |
touch(oct1name); |
452 |
> |
else { |
453 |
> |
mkillumopts(mkopts); /* build mkillum command */ |
454 |
> |
mktemp(illumtmp); |
455 |
> |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
456 |
> |
oct0name, vval(ILLUM), illumtmp); |
457 |
> |
if (runcom(combuf)) { /* run it */ |
458 |
> |
fprintf(stderr, "%s: error running mkillum\n", |
459 |
> |
progname); |
460 |
> |
unlink(illumtmp); |
461 |
> |
quit(1); |
462 |
> |
} |
463 |
> |
/* make octree1 (frozen) */ |
464 |
|
if (octreedate) |
465 |
< |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
466 |
< |
vval(OCTREE), vval(ILLUM), oct0name); |
465 |
> |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
466 |
> |
vval(OCTREE), illumtmp, oct1name); |
467 |
|
else if (vdef(MATERIAL)) |
468 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
469 |
< |
vval(MATERIAL), vval(ILLUM), oct0name); |
468 |
> |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
469 |
> |
vval(MATERIAL), illumtmp, oct1name); |
470 |
|
else |
471 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
472 |
< |
vval(ILLUM), oct0name); |
471 |
> |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
472 |
> |
illumtmp, oct1name); |
473 |
|
if (runcom(combuf)) { /* run it */ |
474 |
|
fprintf(stderr, |
475 |
|
"%s: error generating octree\n\t%s removed\n", |
476 |
< |
progname, oct0name); |
477 |
< |
unlink(oct0name); |
478 |
< |
exit(1); |
476 |
> |
progname, oct1name); |
477 |
> |
unlink(oct1name); |
478 |
> |
unlink(illumtmp); |
479 |
> |
quit(1); |
480 |
|
} |
481 |
< |
oct0date = time((unsigned long *)NULL); |
481 |
> |
rmfile(illumtmp); |
482 |
|
} |
483 |
< |
mkillumopts(mkopts); /* build mkillum command */ |
484 |
< |
mktemp(illumtmp); |
485 |
< |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
705 |
< |
oct0name, vval(ILLUM), illumtmp); |
706 |
< |
if (runcom(combuf)) { /* run it */ |
707 |
< |
fprintf(stderr, "%s: error running mkillum\n", progname); |
708 |
< |
unlink(illumtmp); |
709 |
< |
exit(1); |
710 |
< |
} |
711 |
< |
/* make octree1 (frozen) */ |
712 |
< |
if (octreedate) |
713 |
< |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
714 |
< |
vval(OCTREE), illumtmp, oct1name); |
715 |
< |
else if (vdef(MATERIAL)) |
716 |
< |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
717 |
< |
vval(MATERIAL), illumtmp, oct1name); |
718 |
< |
else |
719 |
< |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
720 |
< |
illumtmp, oct1name); |
721 |
< |
if (runcom(combuf)) { /* run it */ |
722 |
< |
fprintf(stderr, |
723 |
< |
"%s: error generating octree\n\t%s removed\n", |
724 |
< |
progname, oct1name); |
725 |
< |
unlink(oct1name); |
726 |
< |
exit(1); |
727 |
< |
} |
728 |
< |
oct1date = time((unsigned long *)NULL); |
729 |
< |
rmfile(illumtmp); |
483 |
> |
oct1date = time((time_t *)NULL); |
484 |
> |
if (oct1date < oct0date) /* in case clock is off */ |
485 |
> |
oct1date = oct0date; |
486 |
|
} |
487 |
|
|
488 |
|
|
521 |
|
|
522 |
|
checkambfile() /* check date on ambient file */ |
523 |
|
{ |
524 |
< |
unsigned long afdate; |
524 |
> |
time_t afdate; |
525 |
|
|
526 |
|
if (!vdef(AMBFILE)) |
527 |
|
return; |
528 |
|
if (!(afdate = fdate(vval(AMBFILE)))) |
529 |
|
return; |
530 |
|
if (oct1date > afdate) |
531 |
< |
rmfile(vval(AMBFILE)); |
531 |
> |
if (touchonly) |
532 |
> |
touch(vval(AMBFILE)); |
533 |
> |
else |
534 |
> |
rmfile(vval(AMBFILE)); |
535 |
|
} |
536 |
|
|
537 |
|
|
540 |
|
{ |
541 |
|
if (vdef(EXPOSURE)) { |
542 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
543 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
544 |
< |
return(.5/atof(vval(EXPOSURE))); |
543 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
544 |
> |
return(.5/vflt(EXPOSURE)); |
545 |
|
} |
546 |
|
if (vlet(ZONE) == 'E') |
547 |
|
return(10.); |
551 |
|
} |
552 |
|
|
553 |
|
|
554 |
< |
renderopts(op) /* set rendering options */ |
555 |
< |
char *op; |
554 |
> |
renderopts(op, po) /* set rendering options */ |
555 |
> |
char *op, *po; |
556 |
|
{ |
557 |
|
switch(vscale(QUALITY)) { |
558 |
|
case LOW: |
559 |
< |
lowqopts(op); |
559 |
> |
lowqopts(op, po); |
560 |
|
break; |
561 |
|
case MEDIUM: |
562 |
< |
medqopts(op); |
562 |
> |
medqopts(op, po); |
563 |
|
break; |
564 |
|
case HIGH: |
565 |
< |
hiqopts(op); |
565 |
> |
hiqopts(op, po); |
566 |
|
break; |
567 |
|
} |
568 |
|
} |
569 |
|
|
570 |
|
|
571 |
< |
lowqopts(op) /* low quality rendering options */ |
571 |
> |
lowqopts(op, po) /* low quality rendering options */ |
572 |
|
register char *op; |
573 |
+ |
char *po; |
574 |
|
{ |
575 |
|
double d, org[3], siz[3]; |
576 |
|
|
577 |
|
*op = '\0'; |
578 |
+ |
*po = '\0'; |
579 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
580 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
581 |
|
badvalue(ZONE); |
582 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
583 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
584 |
+ |
badvalue(ZONE); |
585 |
|
getoctcube(org, &d); |
586 |
|
d *= 3./(siz[0]+siz[1]+siz[2]); |
587 |
|
switch (vscale(DETAIL)) { |
588 |
|
case LOW: |
589 |
< |
op = addarg(op, "-ps 16 -dp 64"); |
589 |
> |
po = addarg(po, "-ps 16"); |
590 |
> |
op = addarg(op, "-dp 64"); |
591 |
|
sprintf(op, " -ar %d", (int)(4*d)); |
592 |
|
op += strlen(op); |
593 |
|
break; |
594 |
|
case MEDIUM: |
595 |
< |
op = addarg(op, "-ps 8 -dp 128"); |
595 |
> |
po = addarg(po, "-ps 8"); |
596 |
> |
op = addarg(op, "-dp 128"); |
597 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
598 |
|
op += strlen(op); |
599 |
|
break; |
600 |
|
case HIGH: |
601 |
< |
op = addarg(op, "-ps 4 -dp 256"); |
601 |
> |
po = addarg(po, "-ps 4"); |
602 |
> |
op = addarg(op, "-dp 256"); |
603 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
604 |
|
op += strlen(op); |
605 |
|
break; |
606 |
|
} |
607 |
< |
op = addarg(op, "-pt .16"); |
607 |
> |
po = addarg(po, "-pt .16"); |
608 |
|
if (vbool(PENUMBRAS)) |
609 |
|
op = addarg(op, "-ds .4"); |
610 |
|
else |
636 |
|
} |
637 |
|
|
638 |
|
|
639 |
< |
medqopts(op) /* medium quality rendering options */ |
639 |
> |
medqopts(op, po) /* medium quality rendering options */ |
640 |
|
register char *op; |
641 |
+ |
char *po; |
642 |
|
{ |
643 |
< |
double d, org[3], siz[3]; |
643 |
> |
double d, org[3], siz[3], asz; |
644 |
|
|
645 |
|
*op = '\0'; |
646 |
+ |
*po = '\0'; |
647 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
648 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
649 |
|
badvalue(ZONE); |
650 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
651 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
652 |
+ |
badvalue(ZONE); |
653 |
|
getoctcube(org, &d); |
654 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
654 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
655 |
> |
d /= asz; |
656 |
|
switch (vscale(DETAIL)) { |
657 |
|
case LOW: |
658 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
658 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
659 |
|
op = addarg(op, "-dp 256"); |
660 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
661 |
|
op += strlen(op); |
662 |
+ |
sprintf(op, " -ms %.2g", asz/20.); |
663 |
+ |
op += strlen(op); |
664 |
|
break; |
665 |
|
case MEDIUM: |
666 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
666 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
667 |
|
op = addarg(op, "-dp 512"); |
668 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
669 |
|
op += strlen(op); |
670 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
671 |
+ |
op += strlen(op); |
672 |
|
break; |
673 |
|
case HIGH: |
674 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
674 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
675 |
|
op = addarg(op, "-dp 1024"); |
676 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
677 |
|
op += strlen(op); |
678 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
679 |
+ |
op += strlen(op); |
680 |
|
break; |
681 |
|
} |
682 |
< |
op = addarg(op, "-pt .08"); |
682 |
> |
po = addarg(po, "-pt .08"); |
683 |
|
if (vbool(PENUMBRAS)) |
684 |
|
op = addarg(op, "-ds .2 -dj .5"); |
685 |
|
else |
714 |
|
} |
715 |
|
|
716 |
|
|
717 |
< |
hiqopts(op) /* high quality rendering options */ |
717 |
> |
hiqopts(op, po) /* high quality rendering options */ |
718 |
|
register char *op; |
719 |
+ |
char *po; |
720 |
|
{ |
721 |
< |
double d, org[3], siz[3]; |
721 |
> |
double d, org[3], siz[3], asz; |
722 |
|
|
723 |
|
*op = '\0'; |
724 |
+ |
*po = '\0'; |
725 |
|
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0], |
726 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
727 |
|
badvalue(ZONE); |
728 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
729 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
730 |
+ |
badvalue(ZONE); |
731 |
|
getoctcube(org, &d); |
732 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
732 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
733 |
> |
d /= asz; |
734 |
|
switch (vscale(DETAIL)) { |
735 |
|
case LOW: |
736 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
736 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
737 |
|
op = addarg(op, "-dp 1024"); |
738 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
739 |
|
op += strlen(op); |
740 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
741 |
+ |
op += strlen(op); |
742 |
|
break; |
743 |
|
case MEDIUM: |
744 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
744 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
745 |
|
op = addarg(op, "-dp 2048"); |
746 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
747 |
|
op += strlen(op); |
748 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
749 |
+ |
op += strlen(op); |
750 |
|
break; |
751 |
|
case HIGH: |
752 |
< |
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
752 |
> |
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
753 |
|
op = addarg(op, "-dp 4096"); |
754 |
|
sprintf(op, " -ar %d", (int)(64*d)); |
755 |
|
op += strlen(op); |
756 |
+ |
sprintf(op, " -ms %.2g", asz/160.); |
757 |
+ |
op += strlen(op); |
758 |
|
break; |
759 |
|
} |
760 |
< |
op = addarg(op, "-pt .04"); |
760 |
> |
po = addarg(po, "-pt .04"); |
761 |
|
if (vbool(PENUMBRAS)) |
762 |
< |
op = addarg(op, "-ds .1 -dj .7"); |
762 |
> |
op = addarg(op, "-ds .1 -dj .65"); |
763 |
|
else |
764 |
|
op = addarg(op, "-ds .2"); |
765 |
|
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
801 |
|
return; |
802 |
|
if (vdef(OPTFILE)) { |
803 |
|
for (cp = ro; cp[1]; cp++) |
804 |
< |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
804 |
> |
if (isspace(cp[1]) && (cp[2] == '@' || |
805 |
> |
(cp[2] == '-' && isalpha(cp[3])))) |
806 |
|
*cp = '\n'; |
807 |
|
else |
808 |
|
*cp = cp[1]; |
897 |
|
zpos = -1; vs++; |
898 |
|
} |
899 |
|
viewtype = 'v'; |
900 |
< |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h') |
900 |
> |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c') |
901 |
|
viewtype = *vs++; |
902 |
|
cp = viewopts; |
903 |
|
if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) { /* got one! */ |
908 |
|
badvalue(ZONE); |
909 |
|
for (i = 0; i < 3; i++) { |
910 |
|
dim[i] -= cent[i]; |
911 |
+ |
if (dim[i] <= FTINY) |
912 |
+ |
badvalue(ZONE); |
913 |
|
cent[i] += .5*dim[i]; |
914 |
|
} |
915 |
|
mult = vlet(ZONE)=='E' ? 2. : .45 ; |
952 |
|
case 'h': |
953 |
|
cp = addarg(cp, "-vh 180 -vv 180"); |
954 |
|
break; |
955 |
+ |
case 'c': |
956 |
+ |
cp = addarg(cp, "-vh 180 -vv 90"); |
957 |
+ |
break; |
958 |
|
} |
959 |
|
} else { |
960 |
|
while (!isspace(*vs)) /* else skip id */ |
1000 |
|
} |
1001 |
|
/* view number? */ |
1002 |
|
if (isint(viewselect)) |
1003 |
< |
return(specview(nvalue(vv+VIEW, atoi(viewselect)-1))); |
1003 |
> |
return(specview(nvalue(VIEWS, atoi(viewselect)-1))); |
1004 |
|
/* check list */ |
1005 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1005 |
> |
while ((mv = nvalue(VIEWS, n++)) != NULL) |
1006 |
|
if (matchword(viewselect, mv)) |
1007 |
|
return(specview(mv)); |
1008 |
|
return(specview(viewselect)); /* standard view? */ |
1009 |
|
} |
1010 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1010 |
> |
mv = nvalue(VIEWS, n); /* use view n */ |
1011 |
|
if (vn != NULL & mv != NULL) { |
1012 |
|
register char *mv2 = mv; |
1013 |
|
if (*mv2 != '-') |
1022 |
|
printview(vopts) /* print out selected view */ |
1023 |
|
register char *vopts; |
1024 |
|
{ |
1025 |
< |
extern char *atos(), *getenv(); |
1026 |
< |
char buf[256]; |
1027 |
< |
FILE *fp; |
1025 |
> |
extern char *strstr(), *atos(), *getenv(); |
1026 |
> |
VIEW vwr; |
1027 |
> |
char buf[128]; |
1028 |
|
register char *cp; |
1029 |
< |
|
1029 |
> |
again: |
1030 |
|
if (vopts == NULL) |
1031 |
|
return(-1); |
1238 |
– |
fputs("VIEW=", stdout); |
1239 |
– |
do { |
1240 |
– |
if (matchword(vopts, "-vf")) { /* expand view file */ |
1241 |
– |
vopts = sskip(vopts); |
1242 |
– |
if (!*atos(buf, sizeof(buf), vopts)) |
1243 |
– |
return(-1); |
1244 |
– |
if ((fp = fopen(buf, "r")) == NULL) |
1245 |
– |
return(-1); |
1246 |
– |
for (buf[sizeof(buf)-2] = '\n'; |
1247 |
– |
fgets(buf, sizeof(buf), fp) != NULL && |
1248 |
– |
buf[0] != '\n'; |
1249 |
– |
buf[sizeof(buf)-2] = '\n') { |
1250 |
– |
if (buf[sizeof(buf)-2] != '\n') { |
1251 |
– |
ungetc(buf[sizeof(buf)-2], fp); |
1252 |
– |
buf[sizeof(buf)-2] = '\0'; |
1253 |
– |
} |
1254 |
– |
if (matchword(buf, "VIEW=") || |
1255 |
– |
matchword(buf, "rview")) { |
1256 |
– |
for (cp = sskip(buf); *cp && *cp != '\n'; cp++) |
1257 |
– |
putchar(*cp); |
1258 |
– |
} |
1259 |
– |
} |
1260 |
– |
fclose(fp); |
1261 |
– |
vopts = sskip(vopts); |
1262 |
– |
} else { |
1263 |
– |
while (isspace(*vopts)) |
1264 |
– |
vopts++; |
1265 |
– |
putchar(' '); |
1032 |
|
#ifdef MSDOS |
1033 |
< |
if (*vopts == '$') { /* expand env. var. */ |
1034 |
< |
if (!*atos(buf, sizeof(buf), vopts+1)) |
1035 |
< |
return(-1); |
1036 |
< |
if ((cp = getenv(buf)) == NULL) |
1271 |
< |
return(-1); |
1272 |
< |
fputs(cp, stdout); |
1273 |
< |
vopts = sskip(vopts); |
1274 |
< |
} else |
1033 |
> |
if (vopts[0] == '$') { |
1034 |
> |
vopts = getenv(vopts+1); |
1035 |
> |
goto again; |
1036 |
> |
} |
1037 |
|
#endif |
1038 |
< |
while (*vopts && !isspace(*vopts)) |
1039 |
< |
putchar(*vopts++); |
1040 |
< |
} |
1041 |
< |
} while (*vopts++); |
1042 |
< |
putchar('\n'); |
1038 |
> |
copystruct(&vwr, &stdview); |
1039 |
> |
cp = vopts; /* get -vf files first */ |
1040 |
> |
while ((cp = strstr(cp, "-vf ")) != NULL && |
1041 |
> |
*atos(buf, sizeof(buf), cp += 4)) |
1042 |
> |
viewfile(buf, &vwr, NULL); |
1043 |
> |
sscanview(&vwr, vopts); /* get the rest */ |
1044 |
> |
fputs(VIEWSTR, stdout); |
1045 |
> |
fprintview(&vwr, stdout); /* print full spec. */ |
1046 |
> |
fputc('\n', stdout); |
1047 |
|
return(0); |
1048 |
|
} |
1049 |
|
|
1050 |
|
|
1051 |
< |
rview(opts) /* run rview with first view */ |
1052 |
< |
char *opts; |
1051 |
> |
rview(opts, po) /* run rview with first view */ |
1052 |
> |
char *opts, *po; |
1053 |
|
{ |
1054 |
|
char *vw; |
1055 |
|
char combuf[512]; |
1056 |
|
/* build command */ |
1057 |
< |
if ((vw = getview(0, NULL)) == NULL) |
1057 |
> |
if (touchonly || (vw = getview(0, NULL)) == NULL) |
1058 |
|
return; |
1059 |
|
if (sayview) |
1060 |
|
printview(vw); |
1061 |
< |
sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname); |
1061 |
> |
sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname); |
1062 |
|
if (rvdevice != NULL) |
1063 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1064 |
|
if (vdef(EXPOSURE)) |
1066 |
|
strcat(combuf, oct1name); |
1067 |
|
if (runcom(combuf)) { /* run it */ |
1068 |
|
fprintf(stderr, "%s: error running rview\n", progname); |
1069 |
< |
exit(1); |
1069 |
> |
quit(1); |
1070 |
|
} |
1071 |
|
} |
1072 |
|
|
1073 |
|
|
1074 |
< |
rpict(opts) /* run rpict and pfilt for each view */ |
1075 |
< |
char *opts; |
1074 |
> |
rpict(opts, po) /* run rpict and pfilt for each view */ |
1075 |
> |
char *opts, *po; |
1076 |
|
{ |
1077 |
|
char combuf[1024]; |
1078 |
< |
char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32]; |
1078 |
> |
char rawfile[MAXPATH], picfile[MAXPATH]; |
1079 |
> |
char zopt[MAXPATH+4], rep[MAXPATH+16], res[32]; |
1080 |
|
char pfopts[128]; |
1081 |
|
char vs[32], *vw; |
1082 |
|
int vn, mult; |
1083 |
+ |
time_t rfdt, pfdt; |
1084 |
|
/* get pfilt options */ |
1085 |
|
pfiltopts(pfopts); |
1086 |
|
/* get resolution, reporting */ |
1129 |
|
if (!vs[0]) |
1130 |
|
sprintf(vs, "%d", vn); |
1131 |
|
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1132 |
+ |
if (vdef(ZFILE)) |
1133 |
+ |
sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); |
1134 |
+ |
else |
1135 |
+ |
zopt[0] = '\0'; |
1136 |
|
/* check date on picture */ |
1137 |
< |
if (fdate(picfile) >= oct1date) |
1137 |
> |
pfdt = fdate(picfile); |
1138 |
> |
if (pfdt >= oct1date) |
1139 |
|
continue; |
1140 |
+ |
/* get raw file name */ |
1141 |
+ |
sprintf(rawfile, "%s_%s.unf", |
1142 |
+ |
vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs); |
1143 |
+ |
rfdt = fdate(rawfile); |
1144 |
+ |
if (touchonly) { /* update times only */ |
1145 |
+ |
if (rfdt) { |
1146 |
+ |
if (rfdt < oct1date) |
1147 |
+ |
touch(rawfile); |
1148 |
+ |
} else if (pfdt && pfdt < oct1date) |
1149 |
+ |
touch(picfile); |
1150 |
+ |
continue; |
1151 |
+ |
} |
1152 |
|
/* build rpict command */ |
1153 |
< |
sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs); |
1154 |
< |
if (fdate(rawfile) >= oct1date) /* recover */ |
1155 |
< |
sprintf(combuf, "rpict%s%s -ro %s %s", |
1371 |
< |
rep, opts, rawfile, oct1name); |
1153 |
> |
if (rfdt >= oct1date) /* recover */ |
1154 |
> |
sprintf(combuf, "rpict%s%s%s%s -ro %s %s", |
1155 |
> |
rep, po, opts, zopt, rawfile, oct1name); |
1156 |
|
else { |
1157 |
|
if (overture) { /* run overture calculation */ |
1158 |
|
sprintf(combuf, |
1163 |
|
fprintf(stderr, |
1164 |
|
"%s: error in overture for view %s\n", |
1165 |
|
progname, vs); |
1166 |
< |
exit(1); |
1166 |
> |
quit(1); |
1167 |
|
} |
1168 |
|
#ifdef NIX |
1169 |
|
rmfile(overfile); |
1170 |
|
#endif |
1171 |
|
} |
1172 |
< |
sprintf(combuf, "rpict%s %s %s%s %s > %s", |
1173 |
< |
rep, vw, res, opts, |
1174 |
< |
oct1name, rawfile); |
1172 |
> |
sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s", |
1173 |
> |
rep, vw, res, po, opts, zopt, |
1174 |
> |
oct1name, rawfile); |
1175 |
|
} |
1176 |
|
if (runcom(combuf)) { /* run rpict */ |
1177 |
|
fprintf(stderr, "%s: error rendering view %s\n", |
1178 |
|
progname, vs); |
1179 |
< |
exit(1); |
1179 |
> |
quit(1); |
1180 |
|
} |
1181 |
+ |
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1182 |
|
/* build pfilt command */ |
1183 |
< |
if (mult > 1) |
1184 |
< |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1183 |
> |
if (mult > 1) |
1184 |
> |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1185 |
|
pfopts, mult, mult, rawfile, picfile); |
1186 |
< |
else |
1187 |
< |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1188 |
< |
rawfile, picfile); |
1189 |
< |
if (runcom(combuf)) { /* run pfilt */ |
1190 |
< |
fprintf(stderr, |
1191 |
< |
"%s: error filtering view %s\n\t%s removed\n", |
1192 |
< |
progname, vs, picfile); |
1193 |
< |
unlink(picfile); |
1194 |
< |
exit(1); |
1186 |
> |
else |
1187 |
> |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1188 |
> |
rawfile, picfile); |
1189 |
> |
if (runcom(combuf)) { /* run pfilt */ |
1190 |
> |
fprintf(stderr, |
1191 |
> |
"%s: error filtering view %s\n\t%s removed\n", |
1192 |
> |
progname, vs, picfile); |
1193 |
> |
unlink(picfile); |
1194 |
> |
quit(1); |
1195 |
> |
} |
1196 |
|
} |
1197 |
< |
/* remove raw file */ |
1198 |
< |
rmfile(rawfile); |
1197 |
> |
/* remove/rename raw file */ |
1198 |
> |
if (vdef(RAWFILE)) { |
1199 |
> |
sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); |
1200 |
> |
mvfile(rawfile, combuf); |
1201 |
> |
} else |
1202 |
> |
rmfile(rawfile); |
1203 |
|
} |
1204 |
|
} |
1205 |
|
|
1206 |
|
|
1207 |
+ |
touch(fn) /* update a file */ |
1208 |
+ |
char *fn; |
1209 |
+ |
{ |
1210 |
+ |
if (!silent) |
1211 |
+ |
printf("\ttouch %s\n", fn); |
1212 |
+ |
if (noaction) |
1213 |
+ |
return(0); |
1214 |
+ |
#ifdef notused |
1215 |
+ |
if (access(fn, F_OK) == -1) /* create it */ |
1216 |
+ |
if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1) |
1217 |
+ |
return(-1); |
1218 |
+ |
#endif |
1219 |
+ |
return(setfdate(fn, time((time_t *)NULL))); |
1220 |
+ |
} |
1221 |
+ |
|
1222 |
+ |
|
1223 |
|
runcom(cs) /* run command */ |
1224 |
|
char *cs; |
1225 |
|
{ |
1247 |
|
} |
1248 |
|
|
1249 |
|
|
1250 |
+ |
mvfile(fold, fnew) /* move a file */ |
1251 |
+ |
char *fold, *fnew; |
1252 |
+ |
{ |
1253 |
+ |
if (!silent) |
1254 |
|
#ifdef MSDOS |
1255 |
+ |
printf("\trename %s %s\n", fold, fnew); |
1256 |
+ |
#else |
1257 |
+ |
printf("\tmv %s %s\n", fold, fnew); |
1258 |
+ |
#endif |
1259 |
+ |
if (noaction) |
1260 |
+ |
return(0); |
1261 |
+ |
return(rename(fold, fnew)); |
1262 |
+ |
} |
1263 |
+ |
|
1264 |
+ |
|
1265 |
+ |
#ifdef MSDOS |
1266 |
|
setenv(vname, value) /* set an environment variable */ |
1267 |
|
char *vname, *value; |
1268 |
|
{ |
1274 |
|
sprintf(evp, "%s=%s", vname, value); |
1275 |
|
if (putenv(evp) != 0) { |
1276 |
|
fprintf(stderr, "%s: out of environment space\n", progname); |
1277 |
< |
exit(1); |
1277 |
> |
quit(1); |
1278 |
|
} |
1279 |
|
if (!silent) |
1280 |
|
printf("set %s\n", evp); |
1287 |
|
{ |
1288 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1289 |
|
progname, vnam(vc)); |
1290 |
< |
exit(1); |
1290 |
> |
quit(1); |
1291 |
|
} |
1292 |
|
|
1293 |
|
|
1295 |
|
char *s; |
1296 |
|
{ |
1297 |
|
perror(s); |
1298 |
< |
exit(1); |
1298 |
> |
quit(1); |
1299 |
> |
} |
1300 |
> |
|
1301 |
> |
|
1302 |
> |
quit(ec) /* exit program */ |
1303 |
> |
int ec; |
1304 |
> |
{ |
1305 |
> |
exit(ec); |
1306 |
|
} |