1 |
< |
/* Copyright (c) 1994 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 */ |
43 |
< |
#define OPTFILE 14 /* rendering options file */ |
44 |
< |
#define EXPOSURE 15 /* picture exposure setting */ |
45 |
< |
#define RESOLUTION 16 /* maximum picture resolution */ |
46 |
< |
#define UP 17 /* view up (X, Y or Z) */ |
47 |
< |
#define INDIRECT 18 /* indirection in lighting */ |
48 |
< |
#define DETAIL 19 /* level of scene detail */ |
49 |
< |
#define PENUMBRAS 20 /* shadow penumbras are desired */ |
50 |
< |
#define VARIABILITY 21 /* level of light variability */ |
51 |
< |
#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}, |
63 |
– |
{"pfilt", 2, 0, NULL, catvalues}, |
64 |
– |
{"view", 2, 0, NULL, NULL}, |
65 |
– |
{"ZONE", 2, 0, NULL, onevalue}, |
66 |
– |
{"QUALITY", 3, 0, NULL, qualvalue}, |
59 |
|
{"OCTREE", 3, 0, NULL, onevalue}, |
68 |
– |
{"PICTURE", 3, 0, NULL, onevalue}, |
69 |
– |
{"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}, |
74 |
– |
{"INDIRECT", 3, 0, NULL, intvalue}, |
75 |
– |
{"DETAIL", 3, 0, NULL, qualvalue}, |
76 |
– |
{"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 |
|
|
81 |
– |
VARIABLE *matchvar(); |
82 |
– |
char *nvalue(); |
83 |
– |
|
84 |
– |
#define UPPER(c) ((c)&~0x20) /* ASCII trick */ |
85 |
– |
|
86 |
– |
#define vnam(vc) (vv[vc].name) |
87 |
– |
#define vdef(vc) (vv[vc].nass) |
88 |
– |
#define vval(vc) (vv[vc].value) |
89 |
– |
#define vint(vc) atoi(vval(vc)) |
90 |
– |
#define vlet(vc) UPPER(vval(vc)[0]) |
91 |
– |
#define vscale vlet |
92 |
– |
#define vbool(vc) (vlet(vc)=='T') |
93 |
– |
|
94 |
– |
#define HIGH 'H' |
95 |
– |
#define MEDIUM 'M' |
96 |
– |
#define LOW 'L' |
97 |
– |
|
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 |
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 */ |
128 |
|
case 'n': |
129 |
|
noaction++; |
130 |
|
break; |
131 |
+ |
case 't': |
132 |
+ |
touchonly++; |
133 |
+ |
break; |
134 |
|
case 'e': |
135 |
|
explicate++; |
136 |
|
break; |
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 */ |
183 |
|
rview(ropts, popts); |
184 |
|
else |
185 |
|
rpict(ropts, popts); |
186 |
< |
exit(0); |
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 |
|
|
223 |
– |
#define NOCHAR 127 /* constant for character to delete */ |
224 |
– |
|
225 |
– |
|
226 |
– |
load(rfname) /* load Radiance simulation file */ |
227 |
– |
char *rfname; |
228 |
– |
{ |
229 |
– |
FILE *fp; |
230 |
– |
char buf[512]; |
231 |
– |
register char *cp; |
232 |
– |
|
233 |
– |
if (rfname == NULL) |
234 |
– |
fp = stdin; |
235 |
– |
else if ((fp = fopen(rfname, "r")) == NULL) |
236 |
– |
syserr(rfname); |
237 |
– |
while (fgetline(buf, sizeof(buf), fp) != NULL) { |
238 |
– |
for (cp = buf; *cp; cp++) { |
239 |
– |
switch (*cp) { |
240 |
– |
case '\\': |
241 |
– |
*cp++ = NOCHAR; |
242 |
– |
continue; |
243 |
– |
case '#': |
244 |
– |
*cp = '\0'; |
245 |
– |
break; |
246 |
– |
default: |
247 |
– |
continue; |
248 |
– |
} |
249 |
– |
break; |
250 |
– |
} |
251 |
– |
setvariable(buf); |
252 |
– |
} |
253 |
– |
fclose(fp); |
254 |
– |
} |
255 |
– |
|
256 |
– |
|
257 |
– |
setvariable(ass) /* assign variable according to string */ |
258 |
– |
register char *ass; |
259 |
– |
{ |
260 |
– |
char varname[32]; |
261 |
– |
int n; |
262 |
– |
register char *cp; |
263 |
– |
register VARIABLE *vp; |
264 |
– |
register int i; |
265 |
– |
|
266 |
– |
while (isspace(*ass)) /* skip leading space */ |
267 |
– |
ass++; |
268 |
– |
cp = varname; /* extract name */ |
269 |
– |
while (cp < varname+sizeof(varname)-1 |
270 |
– |
&& *ass && !isspace(*ass) && *ass != '=') |
271 |
– |
*cp++ = *ass++; |
272 |
– |
*cp = '\0'; |
273 |
– |
if (!varname[0]) |
274 |
– |
return; /* no variable name! */ |
275 |
– |
/* trim value */ |
276 |
– |
while (isspace(*ass) || *ass == '=') |
277 |
– |
ass++; |
278 |
– |
for (n = strlen(ass); n > 0; n--) |
279 |
– |
if (!isspace(ass[n-1])) |
280 |
– |
break; |
281 |
– |
if (!n && !nowarn) { |
282 |
– |
fprintf(stderr, "%s: warning - missing value for variable '%s'\n", |
283 |
– |
progname, varname); |
284 |
– |
return; |
285 |
– |
} |
286 |
– |
/* match variable from list */ |
287 |
– |
vp = matchvar(varname); |
288 |
– |
if (vp == NULL) { |
289 |
– |
fprintf(stderr, "%s: unknown variable '%s'\n", |
290 |
– |
progname, varname); |
291 |
– |
exit(1); |
292 |
– |
} |
293 |
– |
/* assign new value */ |
294 |
– |
if (i = vp->nass) { |
295 |
– |
cp = vp->value; |
296 |
– |
while (i--) |
297 |
– |
while (*cp++) |
298 |
– |
; |
299 |
– |
i = cp - vp->value; |
300 |
– |
vp->value = realloc(vp->value, i+n+1); |
301 |
– |
} else |
302 |
– |
vp->value = malloc(n+1); |
303 |
– |
if (vp->value == NULL) |
304 |
– |
syserr(progname); |
305 |
– |
cp = vp->value+i; /* copy value, squeezing spaces */ |
306 |
– |
*cp = *ass; |
307 |
– |
for (i = 1; i <= n; i++) { |
308 |
– |
if (ass[i] == NOCHAR) |
309 |
– |
continue; |
310 |
– |
if (isspace(*cp)) |
311 |
– |
while (isspace(ass[i])) |
312 |
– |
i++; |
313 |
– |
*++cp = ass[i]; |
314 |
– |
} |
315 |
– |
if (isspace(*cp)) /* remove trailing space */ |
316 |
– |
*cp = '\0'; |
317 |
– |
vp->nass++; |
318 |
– |
} |
319 |
– |
|
320 |
– |
|
321 |
– |
VARIABLE * |
322 |
– |
matchvar(nam) /* match a variable by its name */ |
323 |
– |
char *nam; |
324 |
– |
{ |
325 |
– |
int n = strlen(nam); |
326 |
– |
register int i; |
327 |
– |
|
328 |
– |
for (i = 0; i < NVARS; i++) |
329 |
– |
if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n)) |
330 |
– |
return(vv+i); |
331 |
– |
return(NULL); |
332 |
– |
} |
333 |
– |
|
334 |
– |
|
335 |
– |
char * |
336 |
– |
nvalue(vp, n) /* return nth variable value */ |
337 |
– |
VARIABLE *vp; |
338 |
– |
register int n; |
339 |
– |
{ |
340 |
– |
register char *cp; |
341 |
– |
|
342 |
– |
if (vp == NULL | n < 0 | n >= vp->nass) |
343 |
– |
return(NULL); |
344 |
– |
cp = vp->value; |
345 |
– |
while (n--) |
346 |
– |
while (*cp++) |
347 |
– |
; |
348 |
– |
return(cp); |
349 |
– |
} |
350 |
– |
|
351 |
– |
|
352 |
– |
checkvalues() /* check assignments */ |
353 |
– |
{ |
354 |
– |
register int i; |
355 |
– |
|
356 |
– |
for (i = 0; i < NVARS; i++) |
357 |
– |
if (vv[i].fixval != NULL) |
358 |
– |
(*vv[i].fixval)(vv+i); |
359 |
– |
} |
360 |
– |
|
361 |
– |
|
362 |
– |
onevalue(vp) /* only one assignment for this variable */ |
363 |
– |
register VARIABLE *vp; |
364 |
– |
{ |
365 |
– |
if (vp->nass < 2) |
366 |
– |
return; |
367 |
– |
if (!nowarn) |
368 |
– |
fprintf(stderr, |
369 |
– |
"%s: warning - multiple assignment of variable '%s'\n", |
370 |
– |
progname, vp->name); |
371 |
– |
do |
372 |
– |
vp->value += strlen(vp->value)+1; |
373 |
– |
while (--vp->nass > 1); |
374 |
– |
} |
375 |
– |
|
376 |
– |
|
377 |
– |
catvalues(vp) /* concatenate variable values */ |
378 |
– |
register VARIABLE *vp; |
379 |
– |
{ |
380 |
– |
register char *cp; |
381 |
– |
|
382 |
– |
if (vp->nass < 2) |
383 |
– |
return; |
384 |
– |
for (cp = vp->value; vp->nass > 1; vp->nass--) { |
385 |
– |
while (*cp) |
386 |
– |
cp++; |
387 |
– |
*cp++ = ' '; |
388 |
– |
} |
389 |
– |
} |
390 |
– |
|
391 |
– |
|
392 |
– |
int |
393 |
– |
badmatch(tv, cv) /* case insensitive truncated comparison */ |
394 |
– |
register char *tv, *cv; |
395 |
– |
{ |
396 |
– |
if (!*tv) return(1); /* null string cannot match */ |
397 |
– |
do |
398 |
– |
if (UPPER(*tv) != *cv++) |
399 |
– |
return(1); |
400 |
– |
while (*++tv); |
401 |
– |
return(0); /* OK */ |
402 |
– |
} |
403 |
– |
|
404 |
– |
|
405 |
– |
boolvalue(vp) /* check boolean for legal values */ |
406 |
– |
register VARIABLE *vp; |
407 |
– |
{ |
408 |
– |
if (!vp->nass) return; |
409 |
– |
onevalue(vp); |
410 |
– |
switch (UPPER(vp->value[0])) { |
411 |
– |
case 'T': |
412 |
– |
if (badmatch(vp->value, "TRUE")) break; |
413 |
– |
return; |
414 |
– |
case 'F': |
415 |
– |
if (badmatch(vp->value, "FALSE")) break; |
416 |
– |
return; |
417 |
– |
} |
418 |
– |
fprintf(stderr, "%s: illegal value for boolean variable '%s'\n", |
419 |
– |
progname, vp->name); |
420 |
– |
exit(1); |
421 |
– |
} |
422 |
– |
|
423 |
– |
|
424 |
– |
qualvalue(vp) /* check qualitative var. for legal values */ |
425 |
– |
register VARIABLE *vp; |
426 |
– |
{ |
427 |
– |
if (!vp->nass) return; |
428 |
– |
onevalue(vp); |
429 |
– |
switch (UPPER(vp->value[0])) { |
430 |
– |
case 'L': |
431 |
– |
if (badmatch(vp->value, "LOW")) break; |
432 |
– |
return; |
433 |
– |
case 'M': |
434 |
– |
if (badmatch(vp->value, "MEDIUM")) break; |
435 |
– |
return; |
436 |
– |
case 'H': |
437 |
– |
if (badmatch(vp->value, "HIGH")) break; |
438 |
– |
return; |
439 |
– |
} |
440 |
– |
fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n", |
441 |
– |
progname, vp->name); |
442 |
– |
exit(1); |
443 |
– |
} |
444 |
– |
|
445 |
– |
|
446 |
– |
intvalue(vp) /* check integer variable for legal values */ |
447 |
– |
register VARIABLE *vp; |
448 |
– |
{ |
449 |
– |
if (!vp->nass) return; |
450 |
– |
onevalue(vp); |
451 |
– |
if (isint(vp->value)) return; |
452 |
– |
fprintf(stderr, "%s: illegal value for integer variable '%s'\n", |
453 |
– |
progname, vp->name); |
454 |
– |
exit(1); |
455 |
– |
} |
456 |
– |
|
457 |
– |
|
458 |
– |
fltvalue(vp) /* check float variable for legal values */ |
459 |
– |
register VARIABLE *vp; |
460 |
– |
{ |
461 |
– |
if (!vp->nass) return; |
462 |
– |
onevalue(vp); |
463 |
– |
if (isflt(vp->value)) return; |
464 |
– |
fprintf(stderr, "%s: illegal value for real variable '%s'\n", |
465 |
– |
progname, vp->name); |
466 |
– |
exit(1); |
467 |
– |
} |
468 |
– |
|
469 |
– |
|
210 |
|
time_t |
211 |
|
checklast(fnames) /* check files and find most recent */ |
212 |
|
register char *fnames; |
283 |
|
if (!octreedate & !scenedate & !illumdate) { |
284 |
|
fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname, |
285 |
|
vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); |
286 |
< |
exit(1); |
286 |
> |
quit(1); |
287 |
|
} |
288 |
|
matdate = checklast(vval(MATERIAL)); |
289 |
|
} |
295 |
|
extern FILE *popen(); |
296 |
|
static double oorg[3], osiz = 0.; |
297 |
|
double min[3], max[3]; |
298 |
< |
char buf[512]; |
298 |
> |
char buf[1024]; |
299 |
|
FILE *fp; |
300 |
|
register int i; |
301 |
|
|
313 |
|
fprintf(stderr, |
314 |
|
"%s: error reading bounding box from getbbox\n", |
315 |
|
progname); |
316 |
< |
exit(1); |
316 |
> |
quit(1); |
317 |
|
} |
318 |
|
for (i = 0; i < 3; i++) |
319 |
|
if (max[i] - min[i] > osiz) |
331 |
|
fprintf(stderr, |
332 |
|
"%s: error reading bounding cube from getinfo\n", |
333 |
|
progname); |
334 |
< |
exit(1); |
334 |
> |
quit(1); |
335 |
|
} |
336 |
|
pclose(fp); |
337 |
|
} |
341 |
|
|
342 |
|
setdefaults() /* set default values for unassigned var's */ |
343 |
|
{ |
344 |
< |
double org[3], size; |
344 |
> |
double org[3], lim[3], size; |
345 |
|
char buf[128]; |
346 |
|
|
347 |
|
if (!vdef(ZONE)) { |
351 |
|
vval(ZONE) = savqstr(buf); |
352 |
|
vdef(ZONE)++; |
353 |
|
} |
354 |
+ |
if (!vdef(EYESEP)) { |
355 |
+ |
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", |
356 |
+ |
&org[0], &lim[0], &org[1], &lim[1], |
357 |
+ |
&org[2], &lim[2]) != 6) |
358 |
+ |
badvalue(ZONE); |
359 |
+ |
sprintf(buf, "%f", |
360 |
+ |
0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2])); |
361 |
+ |
vval(EYESEP) = savqstr(buf); |
362 |
+ |
vdef(EYESEP)++; |
363 |
+ |
} |
364 |
|
if (!vdef(INDIRECT)) { |
365 |
|
vval(INDIRECT) = "0"; |
366 |
|
vdef(INDIRECT)++; |
377 |
|
vval(PICTURE) = radname; |
378 |
|
vdef(PICTURE)++; |
379 |
|
} |
380 |
< |
if (!vdef(VIEW)) { |
381 |
< |
vval(VIEW) = "X"; |
382 |
< |
vdef(VIEW)++; |
380 |
> |
if (!vdef(VIEWS)) { |
381 |
> |
vval(VIEWS) = "X"; |
382 |
> |
vdef(VIEWS)++; |
383 |
|
} |
384 |
|
if (!vdef(DETAIL)) { |
385 |
|
vval(DETAIL) = "M"; |
396 |
|
} |
397 |
|
|
398 |
|
|
649 |
– |
printvals() /* print variable values */ |
650 |
– |
{ |
651 |
– |
int i, j, clipline; |
652 |
– |
register char *cp; |
653 |
– |
register int k; |
654 |
– |
|
655 |
– |
for (i = 0; i < NVARS; i++) /* print each variable */ |
656 |
– |
for (j = 0; j < vdef(i); j++) { /* print each assignment */ |
657 |
– |
fputs(vnam(i), stdout); |
658 |
– |
fputs("= ", stdout); |
659 |
– |
k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 ) |
660 |
– |
- strlen(vnam(i)) ; |
661 |
– |
cp = nvalue(vv+i, j); |
662 |
– |
while (*cp) { |
663 |
– |
putchar(*cp++); |
664 |
– |
if (--k <= 0) { /* line too long */ |
665 |
– |
while (*cp && !isspace(*cp)) |
666 |
– |
putchar(*cp++); /* finish this word */ |
667 |
– |
if (*cp) { /* start new line */ |
668 |
– |
putchar('\n'); |
669 |
– |
fputs(vnam(i), stdout); |
670 |
– |
putchar('='); |
671 |
– |
k = clipline; |
672 |
– |
} |
673 |
– |
} |
674 |
– |
} |
675 |
– |
putchar('\n'); |
676 |
– |
} |
677 |
– |
fflush(stdout); |
678 |
– |
} |
679 |
– |
|
680 |
– |
|
399 |
|
oconv() /* run oconv and mkillum if necessary */ |
400 |
|
{ |
401 |
|
static char illumtmp[] = "ilXXXXXX"; |
402 |
< |
char combuf[512], ocopts[64], mkopts[64]; |
402 |
> |
char combuf[1024], ocopts[64], mkopts[64]; |
403 |
|
|
404 |
|
oconvopts(ocopts); /* get options */ |
405 |
|
if (octreedate < scenedate) { /* check date on original octree */ |
406 |
< |
/* build command */ |
407 |
< |
if (vdef(MATERIAL)) |
408 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
409 |
< |
vval(MATERIAL), vval(SCENE), 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, |
406 |
> |
if (touchonly && octreedate) |
407 |
> |
touch(vval(OCTREE)); |
408 |
> |
else { /* build command */ |
409 |
> |
if (vdef(MATERIAL)) |
410 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
411 |
> |
vval(MATERIAL), vval(SCENE), |
412 |
> |
vval(OCTREE)); |
413 |
> |
else |
414 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
415 |
> |
vval(SCENE), vval(OCTREE)); |
416 |
> |
|
417 |
> |
if (runcom(combuf)) { /* run it */ |
418 |
> |
fprintf(stderr, |
419 |
|
"%s: error generating octree\n\t%s removed\n", |
420 |
< |
progname, vval(OCTREE)); |
421 |
< |
unlink(vval(OCTREE)); |
422 |
< |
exit(1); |
420 |
> |
progname, vval(OCTREE)); |
421 |
> |
unlink(vval(OCTREE)); |
422 |
> |
quit(1); |
423 |
> |
} |
424 |
|
} |
425 |
|
octreedate = time((time_t *)NULL); |
426 |
+ |
if (octreedate < scenedate) /* in case clock is off */ |
427 |
+ |
octreedate = scenedate; |
428 |
|
} |
429 |
|
if (oct1name == vval(OCTREE)) /* no mkillum? */ |
430 |
|
oct1date = octreedate > matdate ? octreedate : matdate; |
433 |
|
return; |
434 |
|
/* make octree0 */ |
435 |
|
if (oct0date < scenedate | oct0date < illumdate) { |
436 |
< |
/* build command */ |
436 |
> |
if (touchonly && oct0date) |
437 |
> |
touch(oct0name); |
438 |
> |
else { /* build command */ |
439 |
> |
if (octreedate) |
440 |
> |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
441 |
> |
vval(OCTREE), vval(ILLUM), oct0name); |
442 |
> |
else if (vdef(MATERIAL)) |
443 |
> |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
444 |
> |
vval(MATERIAL), vval(ILLUM), oct0name); |
445 |
> |
else |
446 |
> |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
447 |
> |
vval(ILLUM), oct0name); |
448 |
> |
if (runcom(combuf)) { /* run it */ |
449 |
> |
fprintf(stderr, |
450 |
> |
"%s: error generating octree\n\t%s removed\n", |
451 |
> |
progname, oct0name); |
452 |
> |
unlink(oct0name); |
453 |
> |
quit(1); |
454 |
> |
} |
455 |
> |
} |
456 |
> |
oct0date = time((time_t *)NULL); |
457 |
> |
if (oct0date < octreedate) /* in case clock is off */ |
458 |
> |
oct0date = octreedate; |
459 |
> |
if (oct0date < illumdate) /* ditto */ |
460 |
> |
oct0date = illumdate; |
461 |
> |
} |
462 |
> |
if (touchonly && oct1date) |
463 |
> |
touch(oct1name); |
464 |
> |
else { |
465 |
> |
mkillumopts(mkopts); /* build mkillum command */ |
466 |
> |
mktemp(illumtmp); |
467 |
> |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
468 |
> |
oct0name, vval(ILLUM), illumtmp); |
469 |
> |
if (runcom(combuf)) { /* run it */ |
470 |
> |
fprintf(stderr, "%s: error running mkillum\n", |
471 |
> |
progname); |
472 |
> |
unlink(illumtmp); |
473 |
> |
quit(1); |
474 |
> |
} |
475 |
> |
/* make octree1 (frozen) */ |
476 |
|
if (octreedate) |
477 |
< |
sprintf(combuf, "oconv%s -i %s %s > %s", ocopts, |
478 |
< |
vval(OCTREE), vval(ILLUM), oct0name); |
477 |
> |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
478 |
> |
vval(OCTREE), illumtmp, oct1name); |
479 |
|
else if (vdef(MATERIAL)) |
480 |
< |
sprintf(combuf, "oconv%s %s %s > %s", ocopts, |
481 |
< |
vval(MATERIAL), vval(ILLUM), oct0name); |
480 |
> |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
481 |
> |
vval(MATERIAL), illumtmp, oct1name); |
482 |
|
else |
483 |
< |
sprintf(combuf, "oconv%s %s > %s", ocopts, |
484 |
< |
vval(ILLUM), oct0name); |
483 |
> |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
484 |
> |
illumtmp, oct1name); |
485 |
|
if (runcom(combuf)) { /* run it */ |
486 |
|
fprintf(stderr, |
487 |
|
"%s: error generating octree\n\t%s removed\n", |
488 |
< |
progname, oct0name); |
489 |
< |
unlink(oct0name); |
490 |
< |
exit(1); |
488 |
> |
progname, oct1name); |
489 |
> |
unlink(oct1name); |
490 |
> |
unlink(illumtmp); |
491 |
> |
quit(1); |
492 |
|
} |
493 |
< |
oct0date = time((time_t *)NULL); |
493 |
> |
rmfile(illumtmp); |
494 |
|
} |
731 |
– |
mkillumopts(mkopts); /* build mkillum command */ |
732 |
– |
mktemp(illumtmp); |
733 |
– |
sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts, |
734 |
– |
oct0name, vval(ILLUM), illumtmp); |
735 |
– |
if (runcom(combuf)) { /* run it */ |
736 |
– |
fprintf(stderr, "%s: error running mkillum\n", progname); |
737 |
– |
unlink(illumtmp); |
738 |
– |
exit(1); |
739 |
– |
} |
740 |
– |
/* make octree1 (frozen) */ |
741 |
– |
if (octreedate) |
742 |
– |
sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts, |
743 |
– |
vval(OCTREE), illumtmp, oct1name); |
744 |
– |
else if (vdef(MATERIAL)) |
745 |
– |
sprintf(combuf, "oconv%s -f %s %s > %s", ocopts, |
746 |
– |
vval(MATERIAL), illumtmp, oct1name); |
747 |
– |
else |
748 |
– |
sprintf(combuf, "oconv%s -f %s > %s", ocopts, |
749 |
– |
illumtmp, oct1name); |
750 |
– |
if (runcom(combuf)) { /* run it */ |
751 |
– |
fprintf(stderr, |
752 |
– |
"%s: error generating octree\n\t%s removed\n", |
753 |
– |
progname, oct1name); |
754 |
– |
unlink(oct1name); |
755 |
– |
exit(1); |
756 |
– |
} |
495 |
|
oct1date = time((time_t *)NULL); |
496 |
< |
rmfile(illumtmp); |
496 |
> |
if (oct1date < oct0date) /* in case clock is off */ |
497 |
> |
oct1date = oct0date; |
498 |
|
} |
499 |
|
|
500 |
|
|
540 |
|
if (!(afdate = fdate(vval(AMBFILE)))) |
541 |
|
return; |
542 |
|
if (oct1date > afdate) |
543 |
< |
rmfile(vval(AMBFILE)); |
543 |
> |
if (touchonly) |
544 |
> |
touch(vval(AMBFILE)); |
545 |
> |
else |
546 |
> |
rmfile(vval(AMBFILE)); |
547 |
|
} |
548 |
|
|
549 |
|
|
552 |
|
{ |
553 |
|
if (vdef(EXPOSURE)) { |
554 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
555 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
556 |
< |
return(.5/atof(vval(EXPOSURE))); |
555 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
556 |
> |
return(.5/vflt(EXPOSURE)); |
557 |
|
} |
558 |
|
if (vlet(ZONE) == 'E') |
559 |
|
return(10.); |
592 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
593 |
|
badvalue(ZONE); |
594 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
595 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
596 |
+ |
badvalue(ZONE); |
597 |
|
getoctcube(org, &d); |
598 |
|
d *= 3./(siz[0]+siz[1]+siz[2]); |
599 |
|
switch (vscale(DETAIL)) { |
652 |
|
register char *op; |
653 |
|
char *po; |
654 |
|
{ |
655 |
< |
double d, org[3], siz[3]; |
655 |
> |
double d, org[3], siz[3], asz; |
656 |
|
|
657 |
|
*op = '\0'; |
658 |
|
*po = '\0'; |
660 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
661 |
|
badvalue(ZONE); |
662 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
663 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
664 |
+ |
badvalue(ZONE); |
665 |
|
getoctcube(org, &d); |
666 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
666 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
667 |
> |
d /= asz; |
668 |
|
switch (vscale(DETAIL)) { |
669 |
|
case LOW: |
670 |
|
po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
671 |
|
op = addarg(op, "-dp 256"); |
672 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
673 |
|
op += strlen(op); |
674 |
+ |
sprintf(op, " -ms %.2g", asz/20.); |
675 |
+ |
op += strlen(op); |
676 |
|
break; |
677 |
|
case MEDIUM: |
678 |
|
po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
679 |
|
op = addarg(op, "-dp 512"); |
680 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
681 |
|
op += strlen(op); |
682 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
683 |
+ |
op += strlen(op); |
684 |
|
break; |
685 |
|
case HIGH: |
686 |
|
po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
687 |
|
op = addarg(op, "-dp 1024"); |
688 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
689 |
|
op += strlen(op); |
690 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
691 |
+ |
op += strlen(op); |
692 |
|
break; |
693 |
|
} |
694 |
|
po = addarg(po, "-pt .08"); |
730 |
|
register char *op; |
731 |
|
char *po; |
732 |
|
{ |
733 |
< |
double d, org[3], siz[3]; |
733 |
> |
double d, org[3], siz[3], asz; |
734 |
|
|
735 |
|
*op = '\0'; |
736 |
|
*po = '\0'; |
738 |
|
&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6) |
739 |
|
badvalue(ZONE); |
740 |
|
siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2]; |
741 |
+ |
if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY) |
742 |
+ |
badvalue(ZONE); |
743 |
|
getoctcube(org, &d); |
744 |
< |
d *= 3./(siz[0]+siz[1]+siz[2]); |
744 |
> |
asz = (siz[0]+siz[1]+siz[2])/3.; |
745 |
> |
d /= asz; |
746 |
|
switch (vscale(DETAIL)) { |
747 |
|
case LOW: |
748 |
|
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
749 |
|
op = addarg(op, "-dp 1024"); |
750 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
751 |
|
op += strlen(op); |
752 |
+ |
sprintf(op, " -ms %.2g", asz/40.); |
753 |
+ |
op += strlen(op); |
754 |
|
break; |
755 |
|
case MEDIUM: |
756 |
|
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
757 |
|
op = addarg(op, "-dp 2048"); |
758 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
759 |
|
op += strlen(op); |
760 |
+ |
sprintf(op, " -ms %.2g", asz/80.); |
761 |
+ |
op += strlen(op); |
762 |
|
break; |
763 |
|
case HIGH: |
764 |
|
po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
765 |
|
op = addarg(op, "-dp 4096"); |
766 |
|
sprintf(op, " -ar %d", (int)(64*d)); |
767 |
|
op += strlen(op); |
768 |
+ |
sprintf(op, " -ms %.2g", asz/160.); |
769 |
+ |
op += strlen(op); |
770 |
|
break; |
771 |
|
} |
772 |
|
po = addarg(po, "-pt .04"); |
773 |
|
if (vbool(PENUMBRAS)) |
774 |
< |
op = addarg(op, "-ds .1 -dj .7"); |
774 |
> |
op = addarg(op, "-ds .1 -dj .65"); |
775 |
|
else |
776 |
|
op = addarg(op, "-ds .2"); |
777 |
|
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
813 |
|
return; |
814 |
|
if (vdef(OPTFILE)) { |
815 |
|
for (cp = ro; cp[1]; cp++) |
816 |
< |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
816 |
> |
if (isspace(cp[1]) && (cp[2] == '@' || |
817 |
> |
(cp[2] == '-' && isalpha(cp[3])))) |
818 |
|
*cp = '\n'; |
819 |
|
else |
820 |
|
*cp = cp[1]; |
909 |
|
zpos = -1; vs++; |
910 |
|
} |
911 |
|
viewtype = 'v'; |
912 |
< |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h') |
912 |
> |
if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c') |
913 |
|
viewtype = *vs++; |
914 |
|
cp = viewopts; |
915 |
|
if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) { /* got one! */ |
920 |
|
badvalue(ZONE); |
921 |
|
for (i = 0; i < 3; i++) { |
922 |
|
dim[i] -= cent[i]; |
923 |
+ |
if (dim[i] <= FTINY) |
924 |
+ |
badvalue(ZONE); |
925 |
|
cent[i] += .5*dim[i]; |
926 |
|
} |
927 |
|
mult = vlet(ZONE)=='E' ? 2. : .45 ; |
964 |
|
case 'h': |
965 |
|
cp = addarg(cp, "-vh 180 -vv 180"); |
966 |
|
break; |
967 |
+ |
case 'c': |
968 |
+ |
cp = addarg(cp, "-vh 180 -vv 90"); |
969 |
+ |
break; |
970 |
|
} |
971 |
|
} else { |
972 |
|
while (!isspace(*vs)) /* else skip id */ |
1012 |
|
} |
1013 |
|
/* view number? */ |
1014 |
|
if (isint(viewselect)) |
1015 |
< |
return(specview(nvalue(vv+VIEW, atoi(viewselect)-1))); |
1015 |
> |
return(specview(nvalue(VIEWS, atoi(viewselect)-1))); |
1016 |
|
/* check list */ |
1017 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1017 |
> |
while ((mv = nvalue(VIEWS, n++)) != NULL) |
1018 |
|
if (matchword(viewselect, mv)) |
1019 |
|
return(specview(mv)); |
1020 |
|
return(specview(viewselect)); /* standard view? */ |
1021 |
|
} |
1022 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1022 |
> |
mv = nvalue(VIEWS, n); /* use view n */ |
1023 |
|
if (vn != NULL & mv != NULL) { |
1024 |
|
register char *mv2 = mv; |
1025 |
|
if (*mv2 != '-') |
1034 |
|
printview(vopts) /* print out selected view */ |
1035 |
|
register char *vopts; |
1036 |
|
{ |
1037 |
< |
extern char *atos(), *getenv(); |
1038 |
< |
char buf[256]; |
1039 |
< |
FILE *fp; |
1037 |
> |
extern char *strstr(), *atos(), *getenv(); |
1038 |
> |
VIEW vwr; |
1039 |
> |
char buf[128]; |
1040 |
|
register char *cp; |
1041 |
< |
|
1041 |
> |
again: |
1042 |
|
if (vopts == NULL) |
1043 |
|
return(-1); |
1276 |
– |
fputs("VIEW=", stdout); |
1277 |
– |
do { |
1278 |
– |
if (matchword(vopts, "-vf")) { /* expand view file */ |
1279 |
– |
vopts = sskip(vopts); |
1280 |
– |
if (!*atos(buf, sizeof(buf), vopts)) |
1281 |
– |
return(-1); |
1282 |
– |
if ((fp = fopen(buf, "r")) == NULL) |
1283 |
– |
return(-1); |
1284 |
– |
for (buf[sizeof(buf)-2] = '\n'; |
1285 |
– |
fgets(buf, sizeof(buf), fp) != NULL && |
1286 |
– |
buf[0] != '\n'; |
1287 |
– |
buf[sizeof(buf)-2] = '\n') { |
1288 |
– |
if (buf[sizeof(buf)-2] != '\n') { |
1289 |
– |
ungetc(buf[sizeof(buf)-2], fp); |
1290 |
– |
buf[sizeof(buf)-2] = '\0'; |
1291 |
– |
} |
1292 |
– |
if (matchword(buf, "VIEW=") || |
1293 |
– |
matchword(buf, "rview")) { |
1294 |
– |
for (cp = sskip(buf); *cp && *cp != '\n'; cp++) |
1295 |
– |
putchar(*cp); |
1296 |
– |
} |
1297 |
– |
} |
1298 |
– |
fclose(fp); |
1299 |
– |
vopts = sskip(vopts); |
1300 |
– |
} else { |
1301 |
– |
while (isspace(*vopts)) |
1302 |
– |
vopts++; |
1303 |
– |
putchar(' '); |
1044 |
|
#ifdef MSDOS |
1045 |
< |
if (*vopts == '$') { /* expand env. var. */ |
1046 |
< |
if (!*atos(buf, sizeof(buf), vopts+1)) |
1047 |
< |
return(-1); |
1048 |
< |
if ((cp = getenv(buf)) == NULL) |
1309 |
< |
return(-1); |
1310 |
< |
fputs(cp, stdout); |
1311 |
< |
vopts = sskip(vopts); |
1312 |
< |
} else |
1045 |
> |
if (vopts[0] == '$') { |
1046 |
> |
vopts = getenv(vopts+1); |
1047 |
> |
goto again; |
1048 |
> |
} |
1049 |
|
#endif |
1050 |
< |
while (*vopts && !isspace(*vopts)) |
1051 |
< |
putchar(*vopts++); |
1052 |
< |
} |
1053 |
< |
} while (*vopts++); |
1054 |
< |
putchar('\n'); |
1050 |
> |
copystruct(&vwr, &stdview); |
1051 |
> |
sscanview(&vwr, cp=vopts); /* set initial options */ |
1052 |
> |
while ((cp = strstr(cp, "-vf ")) != NULL && |
1053 |
> |
*atos(buf, sizeof(buf), cp += 4)) { |
1054 |
> |
viewfile(buf, &vwr, NULL); /* load -vf file */ |
1055 |
> |
sscanview(&vwr, cp); /* reset tail */ |
1056 |
> |
} |
1057 |
> |
fputs(VIEWSTR, stdout); |
1058 |
> |
fprintview(&vwr, stdout); /* print full spec. */ |
1059 |
> |
fputc('\n', stdout); |
1060 |
|
return(0); |
1061 |
|
} |
1062 |
|
|
1067 |
|
char *vw; |
1068 |
|
char combuf[512]; |
1069 |
|
/* build command */ |
1070 |
< |
if ((vw = getview(0, NULL)) == NULL) |
1070 |
> |
if (touchonly || (vw = getview(0, NULL)) == NULL) |
1071 |
|
return; |
1072 |
|
if (sayview) |
1073 |
|
printview(vw); |
1079 |
|
strcat(combuf, oct1name); |
1080 |
|
if (runcom(combuf)) { /* run it */ |
1081 |
|
fprintf(stderr, "%s: error running rview\n", progname); |
1082 |
< |
exit(1); |
1082 |
> |
quit(1); |
1083 |
|
} |
1084 |
|
} |
1085 |
|
|
1088 |
|
char *opts, *po; |
1089 |
|
{ |
1090 |
|
char combuf[1024]; |
1091 |
< |
char rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32]; |
1091 |
> |
char rawfile[MAXPATH], picfile[MAXPATH]; |
1092 |
> |
char zopt[MAXPATH+4], rep[MAXPATH+16], res[32]; |
1093 |
|
char pfopts[128]; |
1094 |
|
char vs[32], *vw; |
1095 |
|
int vn, mult; |
1096 |
+ |
time_t rfdt, pfdt; |
1097 |
|
/* get pfilt options */ |
1098 |
|
pfiltopts(pfopts); |
1099 |
|
/* get resolution, reporting */ |
1142 |
|
if (!vs[0]) |
1143 |
|
sprintf(vs, "%d", vn); |
1144 |
|
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1145 |
+ |
if (vdef(ZFILE)) |
1146 |
+ |
sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); |
1147 |
+ |
else |
1148 |
+ |
zopt[0] = '\0'; |
1149 |
|
/* check date on picture */ |
1150 |
< |
if (fdate(picfile) >= oct1date) |
1150 |
> |
pfdt = fdate(picfile); |
1151 |
> |
if (pfdt >= oct1date) |
1152 |
|
continue; |
1153 |
+ |
/* get raw file name */ |
1154 |
+ |
sprintf(rawfile, "%s_%s.unf", |
1155 |
+ |
vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs); |
1156 |
+ |
rfdt = fdate(rawfile); |
1157 |
+ |
if (touchonly) { /* update times only */ |
1158 |
+ |
if (rfdt) { |
1159 |
+ |
if (rfdt < oct1date) |
1160 |
+ |
touch(rawfile); |
1161 |
+ |
} else if (pfdt && pfdt < oct1date) |
1162 |
+ |
touch(picfile); |
1163 |
+ |
continue; |
1164 |
+ |
} |
1165 |
|
/* build rpict command */ |
1166 |
< |
sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs); |
1167 |
< |
if (fdate(rawfile) >= oct1date) /* recover */ |
1168 |
< |
sprintf(combuf, "rpict%s%s%s -ro %s %s", |
1409 |
< |
rep, po, opts, rawfile, oct1name); |
1166 |
> |
if (rfdt >= oct1date) /* recover */ |
1167 |
> |
sprintf(combuf, "rpict%s%s%s%s -ro %s %s", |
1168 |
> |
rep, po, opts, zopt, rawfile, oct1name); |
1169 |
|
else { |
1170 |
|
if (overture) { /* run overture calculation */ |
1171 |
|
sprintf(combuf, |
1176 |
|
fprintf(stderr, |
1177 |
|
"%s: error in overture for view %s\n", |
1178 |
|
progname, vs); |
1179 |
< |
exit(1); |
1179 |
> |
quit(1); |
1180 |
|
} |
1181 |
|
#ifdef NIX |
1182 |
|
rmfile(overfile); |
1183 |
|
#endif |
1184 |
|
} |
1185 |
< |
sprintf(combuf, "rpict%s %s %s%s%s %s > %s", |
1186 |
< |
rep, vw, res, po, opts, |
1187 |
< |
oct1name, rawfile); |
1185 |
> |
sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s", |
1186 |
> |
rep, vw, res, po, opts, zopt, |
1187 |
> |
oct1name, rawfile); |
1188 |
|
} |
1189 |
|
if (runcom(combuf)) { /* run rpict */ |
1190 |
|
fprintf(stderr, "%s: error rendering view %s\n", |
1191 |
|
progname, vs); |
1192 |
< |
exit(1); |
1192 |
> |
quit(1); |
1193 |
|
} |
1194 |
+ |
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1195 |
|
/* build pfilt command */ |
1196 |
< |
if (mult > 1) |
1197 |
< |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1196 |
> |
if (mult > 1) |
1197 |
> |
sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s", |
1198 |
|
pfopts, mult, mult, rawfile, picfile); |
1199 |
< |
else |
1200 |
< |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1201 |
< |
rawfile, picfile); |
1202 |
< |
if (runcom(combuf)) { /* run pfilt */ |
1203 |
< |
fprintf(stderr, |
1204 |
< |
"%s: error filtering view %s\n\t%s removed\n", |
1205 |
< |
progname, vs, picfile); |
1206 |
< |
unlink(picfile); |
1207 |
< |
exit(1); |
1199 |
> |
else |
1200 |
> |
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1201 |
> |
rawfile, picfile); |
1202 |
> |
if (runcom(combuf)) { /* run pfilt */ |
1203 |
> |
fprintf(stderr, |
1204 |
> |
"%s: error filtering view %s\n\t%s removed\n", |
1205 |
> |
progname, vs, picfile); |
1206 |
> |
unlink(picfile); |
1207 |
> |
quit(1); |
1208 |
> |
} |
1209 |
|
} |
1210 |
< |
/* remove raw file */ |
1211 |
< |
rmfile(rawfile); |
1210 |
> |
/* remove/rename raw file */ |
1211 |
> |
if (vdef(RAWFILE)) { |
1212 |
> |
sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); |
1213 |
> |
mvfile(rawfile, combuf); |
1214 |
> |
} else |
1215 |
> |
rmfile(rawfile); |
1216 |
|
} |
1217 |
|
} |
1218 |
|
|
1219 |
|
|
1220 |
+ |
touch(fn) /* update a file */ |
1221 |
+ |
char *fn; |
1222 |
+ |
{ |
1223 |
+ |
if (!silent) |
1224 |
+ |
printf("\ttouch %s\n", fn); |
1225 |
+ |
if (noaction) |
1226 |
+ |
return(0); |
1227 |
+ |
#ifdef notused |
1228 |
+ |
if (access(fn, F_OK) == -1) /* create it */ |
1229 |
+ |
if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1) |
1230 |
+ |
return(-1); |
1231 |
+ |
#endif |
1232 |
+ |
return(setfdate(fn, time((time_t *)NULL))); |
1233 |
+ |
} |
1234 |
+ |
|
1235 |
+ |
|
1236 |
|
runcom(cs) /* run command */ |
1237 |
|
char *cs; |
1238 |
|
{ |
1260 |
|
} |
1261 |
|
|
1262 |
|
|
1263 |
+ |
mvfile(fold, fnew) /* move a file */ |
1264 |
+ |
char *fold, *fnew; |
1265 |
+ |
{ |
1266 |
+ |
if (!silent) |
1267 |
|
#ifdef MSDOS |
1268 |
+ |
printf("\trename %s %s\n", fold, fnew); |
1269 |
+ |
#else |
1270 |
+ |
printf("\tmv %s %s\n", fold, fnew); |
1271 |
+ |
#endif |
1272 |
+ |
if (noaction) |
1273 |
+ |
return(0); |
1274 |
+ |
return(rename(fold, fnew)); |
1275 |
+ |
} |
1276 |
+ |
|
1277 |
+ |
|
1278 |
+ |
#ifdef MSDOS |
1279 |
|
setenv(vname, value) /* set an environment variable */ |
1280 |
|
char *vname, *value; |
1281 |
|
{ |
1287 |
|
sprintf(evp, "%s=%s", vname, value); |
1288 |
|
if (putenv(evp) != 0) { |
1289 |
|
fprintf(stderr, "%s: out of environment space\n", progname); |
1290 |
< |
exit(1); |
1290 |
> |
quit(1); |
1291 |
|
} |
1292 |
|
if (!silent) |
1293 |
|
printf("set %s\n", evp); |
1300 |
|
{ |
1301 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1302 |
|
progname, vnam(vc)); |
1303 |
< |
exit(1); |
1303 |
> |
quit(1); |
1304 |
|
} |
1305 |
|
|
1306 |
|
|
1308 |
|
char *s; |
1309 |
|
{ |
1310 |
|
perror(s); |
1311 |
< |
exit(1); |
1311 |
> |
quit(1); |
1312 |
> |
} |
1313 |
> |
|
1314 |
> |
|
1315 |
> |
quit(ec) /* exit program */ |
1316 |
> |
int ec; |
1317 |
> |
{ |
1318 |
> |
exit(ec); |
1319 |
|
} |