ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.39 by greg, Thu Mar 24 12:28:22 1994 UTC vs.
Revision 2.44 by greg, Fri Aug 18 10:39:56 1995 UTC

#	Line 49 | Line 49 | int    onevalue(), catvalues(), boolvalue(),
49		#define PENUMBRAS       20              /* shadow penumbras are desired */
50		#define VARIABILITY     21              /* level of light variability */
51		#define REPORT          22              /* report frequency and errfile */
52	+	#define RAWSAVE         23              /* save raw picture file */
53		/* total number of variables */
54	<	#define NVARS           23
54	>	#define NVARS           24
55
56		VARIABLE        vv[NVARS] = {           /* variable-value pairs */
57		{"objects",     3,      0,      NULL,   catvalues},
#	Line 76 | Line 77 | VARIABLE       vv[NVARS] = {           /* variable-value pairs */
77		{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
78		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
79		{"REPORT",      3,      0,      NULL,   onevalue},
80	+	{"RAWSAVE",     3,      0,      NULL,   boolvalue},
81		};
82
83		VARIABLE        *matchvar();
#	Line 117 | Line 119 | time_t oct1date;               /* date of post-mkillum octree (>= m
119		int     nowarn = 0;             /* no warnings */
120		int     explicate = 0;          /* explicate variables */
121		int     silent = 0;             /* do work silently */
122	+	int     touchonly = 0;          /* touch files only */
123		int     noaction = 0;           /* don't do anything */
124		int     sayview = 0;            /* print view out */
125		char    *rvdevice = NULL;       /* rview output device */
#	Line 148 | Line 151 | char   *argv[];
151		case 'n':
152		noaction++;
153		break;
154	+	case 't':
155	+	touchonly++;
156	+	break;
157		case 'e':
158		explicate++;
159		break;
#	Line 199 | Line 205 | char   *argv[];
205		exit(0);
206		userr:
207		fprintf(stderr,
208	<	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
208	>	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
209		progname);
210		exit(1);
211		}
#	Line 643 | Line 649 | setdefaults()                  /* set default values for unassigned v
649		vval(VARIABILITY) = "L";
650		vdef(VARIABILITY)++;
651		}
652	+	if (!vdef(RAWSAVE)) {
653	+	vval(RAWSAVE) = "F";
654	+	vdef(RAWSAVE)++;
655	+	}
656		}
657
658
#	Line 685 | Line 695 | oconv()                                /* run oconv and mkillum if necessary */
695
696		oconvopts(ocopts);              /* get options */
697		if (octreedate < scenedate) {   /* check date on original octree */
698	<	/* build command */
699	<	if (vdef(MATERIAL))
700	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
701	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
702	<	else
703	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
704	<	vval(SCENE), vval(OCTREE));
705	<
706	<	if (runcom(combuf)) {           /* run it */
707	<	fprintf(stderr,
698	>	if (touchonly && octreedate)
699	>	touch(vval(OCTREE));
700	>	else {                          /* build command */
701	>	if (vdef(MATERIAL))
702	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
703	>	vval(MATERIAL), vval(SCENE),
704	>	vval(OCTREE));
705	>	else
706	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
707	>	vval(SCENE), vval(OCTREE));
708	>
709	>	if (runcom(combuf)) {           /* run it */
710	>	fprintf(stderr,
711		"%s: error generating octree\n\t%s removed\n",
712	<	progname, vval(OCTREE));
713	<	unlink(vval(OCTREE));
714	<	exit(1);
712	>	progname, vval(OCTREE));
713	>	unlink(vval(OCTREE));
714	>	exit(1);
715	>	}
716		}
717		octreedate = time((time_t *)NULL);
718	+	if (octreedate < scenedate)     /* in case clock is off */
719	+	octreedate = scenedate;
720		}
721		if (oct1name == vval(OCTREE))           /* no mkillum? */
722		oct1date = octreedate > matdate ? octreedate : matdate;
#	Line 709 | Line 725 | oconv()                                /* run oconv and mkillum if necessary */
725		return;
726		/* make octree0 */
727		if (oct0date < scenedate | oct0date < illumdate) {
728	<	/* build command */
728	>	if (touchonly && oct0date)
729	>	touch(oct0name);
730	>	else {                          /* build command */
731	>	if (octreedate)
732	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
733	>	vval(OCTREE), vval(ILLUM), oct0name);
734	>	else if (vdef(MATERIAL))
735	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
736	>	vval(MATERIAL), vval(ILLUM), oct0name);
737	>	else
738	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
739	>	vval(ILLUM), oct0name);
740	>	if (runcom(combuf)) {           /* run it */
741	>	fprintf(stderr,
742	>	"%s: error generating octree\n\t%s removed\n",
743	>	progname, oct0name);
744	>	unlink(oct0name);
745	>	exit(1);
746	>	}
747	>	}
748	>	oct0date = time((time_t *)NULL);
749	>	if (oct0date < octreedate)      /* in case clock is off */
750	>	oct0date = octreedate;
751	>	if (oct0date < illumdate)       /* ditto */
752	>	oct0date = illumdate;
753	>	}
754	>	if (touchonly && oct1date)
755	>	touch(oct1name);
756	>	else {
757	>	mkillumopts(mkopts);            /* build mkillum command */
758	>	mktemp(illumtmp);
759	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
760	>	oct0name, vval(ILLUM), illumtmp);
761	>	if (runcom(combuf)) {                   /* run it */
762	>	fprintf(stderr, "%s: error running mkillum\n",
763	>	progname);
764	>	unlink(illumtmp);
765	>	exit(1);
766	>	}
767	>	/* make octree1 (frozen) */
768		if (octreedate)
769	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
770	<	vval(OCTREE), vval(ILLUM), oct0name);
769	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
770	>	vval(OCTREE), illumtmp, oct1name);
771		else if (vdef(MATERIAL))
772	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
773	<	vval(MATERIAL), vval(ILLUM), oct0name);
772	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
773	>	vval(MATERIAL), illumtmp, oct1name);
774		else
775	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
776	<	vval(ILLUM), oct0name);
775	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
776	>	illumtmp, oct1name);
777		if (runcom(combuf)) {           /* run it */
778		fprintf(stderr,
779		"%s: error generating octree\n\t%s removed\n",
780	<	progname, oct0name);
781	<	unlink(oct0name);
780	>	progname, oct1name);
781	>	unlink(oct1name);
782		exit(1);
783		}
784	<	oct0date = time((time_t *)NULL);
784	>	rmfile(illumtmp);
785		}
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	–	}
786		oct1date = time((time_t *)NULL);
787	<	rmfile(illumtmp);
787	>	if (oct1date < oct0date)        /* in case clock is off */
788	>	oct1date = oct0date;
789		}
790
791
#	Line 801 | Line 831 | checkambfile()                 /* check date on ambient file */
831		if (!(afdate = fdate(vval(AMBFILE))))
832		return;
833		if (oct1date > afdate)
834	<	rmfile(vval(AMBFILE));
834	>	if (touchonly)
835	>	touch(vval(AMBFILE));
836	>	else
837	>	rmfile(vval(AMBFILE));
838		}
839
840
#	Line 1015 | Line 1048 | char   *po;
1048		}
1049		po = addarg(po, "-pt .04");
1050		if (vbool(PENUMBRAS))
1051	<	op = addarg(op, "-ds .1 -dj .7");
1051	>	op = addarg(op, "-ds .1 -dj .65");
1052		else
1053		op = addarg(op, "-ds .2");
1054		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 1152 | Line 1185 | register char  *vs;
1185		zpos = -1; vs++;
1186		}
1187		viewtype = 'v';
1188	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
1188	>	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
1189		viewtype = *vs++;
1190		cp = viewopts;
1191		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 1207 | Line 1240 | register char  *vs;
1240		case 'h':
1241		cp = addarg(cp, "-vh 180 -vv 180");
1242		break;
1243	+	case 'c':
1244	+	cp = addarg(cp, "-vh 180 -vv 90");
1245	+	break;
1246		}
1247		} else {
1248		while (!isspace(*vs))           /* else skip id */
#	Line 1334 | Line 1370 | char   *opts, *po;
1370		char    *vw;
1371		char    combuf[512];
1372		/* build command */
1373	<	if ((vw = getview(0, NULL)) == NULL)
1373	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1374		return;
1375		if (sayview)
1376		printview(vw);
#	Line 1359 | Line 1395 | char   *opts, *po;
1395		char    pfopts[128];
1396		char    vs[32], *vw;
1397		int     vn, mult;
1398	+	time_t  rfdt, pfdt;
1399		/* get pfilt options */
1400		pfiltopts(pfopts);
1401		/* get resolution, reporting */
#	Line 1408 | Line 1445 | char   *opts, *po;
1445		sprintf(vs, "%d", vn);
1446		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1447		/* check date on picture */
1448	<	if (fdate(picfile) >= oct1date)
1448	>	pfdt = fdate(picfile);
1449	>	if (pfdt >= oct1date)
1450		continue;
1451	<	/* build rpict command */
1451	>	/* get raw file name */
1452		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1453	<	if (fdate(rawfile) >= oct1date)         /* recover */
1453	>	rfdt = fdate(rawfile);
1454	>	if (touchonly) {                /* update times only */
1455	>	if (rfdt) {
1456	>	if (rfdt < oct1date)
1457	>	touch(rawfile);
1458	>	} else if (pfdt && pfdt < oct1date)
1459	>	touch(picfile);
1460	>	continue;
1461	>	}
1462	>	/* build rpict command */
1463	>	if (rfdt >= oct1date)           /* recover */
1464		sprintf(combuf, "rpict%s%s%s -ro %s %s",
1465		rep, po, opts, rawfile, oct1name);
1466		else {
#	Line 1454 | Line 1502 | char   *opts, *po;
1502		unlink(picfile);
1503		exit(1);
1504		}
1505	<	/* remove raw file */
1506	<	rmfile(rawfile);
1505	>	/* remove/rename raw file */
1506	>	if (vbool(RAWSAVE)) {
1507	>	sprintf(combuf, "%s_%s.rwp", vval(PICTURE), vs);
1508	>	mvfile(rawfile, combuf);
1509	>	} else
1510	>	rmfile(rawfile);
1511		}
1512		}
1513
1514
1515	+	touch(fn)                       /* update a file */
1516	+	char    *fn;
1517	+	{
1518	+	if (!silent)
1519	+	printf("\ttouch %s\n", fn);
1520	+	if (noaction)
1521	+	return(0);
1522	+	#ifdef notused
1523	+	if (access(fn, F_OK) == -1)             /* create it */
1524	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1525	+	return(-1);
1526	+	#endif
1527	+	return(setfdate(fn, time((time_t *)NULL)));
1528	+	}
1529	+
1530	+
1531		runcom(cs)                      /* run command */
1532		char    *cs;
1533		{
#	Line 1484 | Line 1552 | char   *fn;
1552		if (noaction)
1553		return(0);
1554		return(unlink(fn));
1555	+	}
1556	+
1557	+
1558	+	mvfile(fold, fnew)              /* move a file */
1559	+	char    *fold, *fnew;
1560	+	{
1561	+	if (!silent)
1562	+	#ifdef MSDOS
1563	+	printf("\trename %s %s\n", fold, fnew);
1564	+	#else
1565	+	printf("\tmv %s %s\n", fold, fnew);
1566	+	#endif
1567	+	if (noaction)
1568	+	return(0);
1569	+	return(rename(fold, fnew));
1570		}
1571
1572

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)