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.37 by greg, Sat Jan 1 09:16:50 1994 UTC vs.
Revision 2.43 by greg, Thu Jul 6 12:15:40 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 135 | Line 138 | int    argc;
138		char    *argv[];
139		{
140		char    ropts[512];
141	+	char    popts[64];
142		int     i;
143
144		progname = argv[0];
#	Line 147 | 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 189 | Line 196 | char   *argv[];
196		/* check date on ambient file */
197		checkambfile();
198		/* run simulation */
199	<	renderopts(ropts);
199	>	renderopts(ropts, popts);
200		xferopts(ropts);
201		if (rvdevice != NULL)
202	<	rview(ropts);
202	>	rview(ropts, popts);
203		else
204	<	rpict(ropts);
204	>	rpict(ropts, popts);
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 642 | 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 684 | 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 708 | 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		}
730	–	mkillumopts(mkopts);                    /* build mkillum command */
731	–	mktemp(illumtmp);
732	–	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
733	–	oct0name, vval(ILLUM), illumtmp);
734	–	if (runcom(combuf)) {                   /* run it */
735	–	fprintf(stderr, "%s: error running mkillum\n", progname);
736	–	unlink(illumtmp);
737	–	exit(1);
738	–	}
739	–	/* make octree1 (frozen) */
740	–	if (octreedate)
741	–	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
742	–	vval(OCTREE), illumtmp, oct1name);
743	–	else if (vdef(MATERIAL))
744	–	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
745	–	vval(MATERIAL), illumtmp, oct1name);
746	–	else
747	–	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
748	–	illumtmp, oct1name);
749	–	if (runcom(combuf)) {           /* run it */
750	–	fprintf(stderr,
751	–	"%s: error generating octree\n\t%s removed\n",
752	–	progname, oct1name);
753	–	unlink(oct1name);
754	–	exit(1);
755	–	}
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 800 | 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 820 | Line 854 | ambval()                               /* compute ambient value */
854		}
855
856
857	<	renderopts(op)                          /* set rendering options */
858	<	char    *op;
857	>	renderopts(op, po)                      /* set rendering options */
858	>	char    *op, *po;
859		{
860		switch(vscale(QUALITY)) {
861		case LOW:
862	<	lowqopts(op);
862	>	lowqopts(op, po);
863		break;
864		case MEDIUM:
865	<	medqopts(op);
865	>	medqopts(op, po);
866		break;
867		case HIGH:
868	<	hiqopts(op);
868	>	hiqopts(op, po);
869		break;
870		}
871		}
872
873
874	<	lowqopts(op)                            /* low quality rendering options */
874	>	lowqopts(op, po)                        /* low quality rendering options */
875		register char   *op;
876	+	char    *po;
877		{
878		double  d, org[3], siz[3];
879
880		*op = '\0';
881	+	*po = '\0';
882		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
883		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
884		badvalue(ZONE);
885		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
886	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
887	+	badvalue(ZONE);
888		getoctcube(org, &d);
889		d *= 3./(siz[0]+siz[1]+siz[2]);
890		switch (vscale(DETAIL)) {
891		case LOW:
892	<	op = addarg(op, "-ps 16 -dp 64");
892	>	po = addarg(po, "-ps 16");
893	>	op = addarg(op, "-dp 64");
894		sprintf(op, " -ar %d", (int)(4*d));
895		op += strlen(op);
896		break;
897		case MEDIUM:
898	<	op = addarg(op, "-ps 8 -dp 128");
898	>	po = addarg(po, "-ps 8");
899	>	op = addarg(op, "-dp 128");
900		sprintf(op, " -ar %d", (int)(8*d));
901		op += strlen(op);
902		break;
903		case HIGH:
904	<	op = addarg(op, "-ps 4 -dp 256");
904	>	po = addarg(po, "-ps 4");
905	>	op = addarg(op, "-dp 256");
906		sprintf(op, " -ar %d", (int)(16*d));
907		op += strlen(op);
908		break;
909		}
910	<	op = addarg(op, "-pt .16");
910	>	po = addarg(po, "-pt .16");
911		if (vbool(PENUMBRAS))
912		op = addarg(op, "-ds .4");
913		else
#	Line 898 | Line 939 | register char  *op;
939		}
940
941
942	<	medqopts(op)                            /* medium quality rendering options */
942	>	medqopts(op, po)                        /* medium quality rendering options */
943		register char   *op;
944	+	char    *po;
945		{
946		double  d, org[3], siz[3];
947
948		*op = '\0';
949	+	*po = '\0';
950		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
951		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
952		badvalue(ZONE);
953		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
954	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
955	+	badvalue(ZONE);
956		getoctcube(org, &d);
957		d *= 3./(siz[0]+siz[1]+siz[2]);
958		switch (vscale(DETAIL)) {
959		case LOW:
960	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
960	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
961		op = addarg(op, "-dp 256");
962		sprintf(op, " -ar %d", (int)(8*d));
963		op += strlen(op);
964		break;
965		case MEDIUM:
966	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
966	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
967		op = addarg(op, "-dp 512");
968		sprintf(op, " -ar %d", (int)(16*d));
969		op += strlen(op);
970		break;
971		case HIGH:
972	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
972	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
973		op = addarg(op, "-dp 1024");
974		sprintf(op, " -ar %d", (int)(32*d));
975		op += strlen(op);
976		break;
977		}
978	<	op = addarg(op, "-pt .08");
978	>	po = addarg(po, "-pt .08");
979		if (vbool(PENUMBRAS))
980		op = addarg(op, "-ds .2 -dj .5");
981		else
#	Line 965 | Line 1010 | register char  *op;
1010		}
1011
1012
1013	<	hiqopts(op)                             /* high quality rendering options */
1013	>	hiqopts(op, po)                         /* high quality rendering options */
1014		register char   *op;
1015	+	char    *po;
1016		{
1017		double  d, org[3], siz[3];
1018
1019		*op = '\0';
1020	+	*po = '\0';
1021		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
1022		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
1023		badvalue(ZONE);
1024		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
1025	+	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
1026	+	badvalue(ZONE);
1027		getoctcube(org, &d);
1028		d *= 3./(siz[0]+siz[1]+siz[2]);
1029		switch (vscale(DETAIL)) {
1030		case LOW:
1031	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
1031	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
1032		op = addarg(op, "-dp 1024");
1033		sprintf(op, " -ar %d", (int)(16*d));
1034		op += strlen(op);
1035		break;
1036		case MEDIUM:
1037	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
1037	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
1038		op = addarg(op, "-dp 2048");
1039		sprintf(op, " -ar %d", (int)(32*d));
1040		op += strlen(op);
1041		break;
1042		case HIGH:
1043	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
1043	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
1044		op = addarg(op, "-dp 4096");
1045		sprintf(op, " -ar %d", (int)(64*d));
1046		op += strlen(op);
1047		break;
1048		}
1049	<	op = addarg(op, "-pt .04");
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 1147 | Line 1196 | register char  *vs;
1196		badvalue(ZONE);
1197		for (i = 0; i < 3; i++) {
1198		dim[i] -= cent[i];
1199	+	if (dim[i] <= FTINY)
1200	+	badvalue(ZONE);
1201		cent[i] += .5*dim[i];
1202		}
1203		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1310 | Line 1361 | register char  *vopts;
1361		}
1362
1363
1364	<	rview(opts)                             /* run rview with first view */
1365	<	char    *opts;
1364	>	rview(opts, po)                         /* run rview with first view */
1365	>	char    *opts, *po;
1366		{
1367		char    *vw;
1368		char    combuf[512];
1369		/* build command */
1370	<	if ((vw = getview(0, NULL)) == NULL)
1370	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1371		return;
1372		if (sayview)
1373		printview(vw);
1374	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1374	>	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1375		if (rvdevice != NULL)
1376		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1377		if (vdef(EXPOSURE))
#	Line 1333 | Line 1384 | char   *opts;
1384		}
1385
1386
1387	<	rpict(opts)                             /* run rpict and pfilt for each view */
1388	<	char    *opts;
1387	>	rpict(opts, po)                         /* run rpict and pfilt for each view */
1388	>	char    *opts, *po;
1389		{
1390		char    combuf[1024];
1391		char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1392		char    pfopts[128];
1393		char    vs[32], *vw;
1394		int     vn, mult;
1395	+	time_t  rfdt, pfdt;
1396		/* get pfilt options */
1397		pfiltopts(pfopts);
1398		/* get resolution, reporting */
#	Line 1390 | Line 1442 | char   *opts;
1442		sprintf(vs, "%d", vn);
1443		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1444		/* check date on picture */
1445	<	if (fdate(picfile) >= oct1date)
1445	>	pfdt = fdate(picfile);
1446	>	if (pfdt >= oct1date)
1447		continue;
1448	<	/* build rpict command */
1448	>	/* get raw file name */
1449		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1450	<	if (fdate(rawfile) >= oct1date)         /* recover */
1451	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1452	<	rep, opts, rawfile, oct1name);
1450	>	rfdt = fdate(rawfile);
1451	>	if (touchonly) {                /* update times only */
1452	>	if (rfdt) {
1453	>	if (rfdt < oct1date)
1454	>	touch(rawfile);
1455	>	} else if (pfdt && pfdt < oct1date)
1456	>	touch(picfile);
1457	>	continue;
1458	>	}
1459	>	/* build rpict command */
1460	>	if (rfdt >= oct1date)           /* recover */
1461	>	sprintf(combuf, "rpict%s%s%s -ro %s %s",
1462	>	rep, po, opts, rawfile, oct1name);
1463		else {
1464		if (overture) {         /* run overture calculation */
1465		sprintf(combuf,
#	Line 1413 | Line 1476 | char   *opts;
1476		rmfile(overfile);
1477		#endif
1478		}
1479	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1480	<	rep, vw, res, opts,
1479	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1480	>	rep, vw, res, po, opts,
1481		oct1name, rawfile);
1482		}
1483		if (runcom(combuf)) {           /* run rpict */
#	Line 1436 | Line 1499 | char   *opts;
1499		unlink(picfile);
1500		exit(1);
1501		}
1502	<	/* remove raw file */
1503	<	rmfile(rawfile);
1502	>	/* remove/rename raw file */
1503	>	if (vbool(RAWSAVE)) {
1504	>	sprintf(combuf, "%s_%s.rwp", vval(PICTURE), vs);
1505	>	mvfile(rawfile, combuf);
1506	>	} else
1507	>	rmfile(rawfile);
1508		}
1509		}
1510
1511
1512	+	touch(fn)                       /* update a file */
1513	+	char    *fn;
1514	+	{
1515	+	if (!silent)
1516	+	printf("\ttouch %s\n", fn);
1517	+	if (noaction)
1518	+	return(0);
1519	+	#ifdef notused
1520	+	if (access(fn, F_OK) == -1)             /* create it */
1521	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1522	+	return(-1);
1523	+	#endif
1524	+	return(setfdate(fn, time((time_t *)NULL)));
1525	+	}
1526	+
1527	+
1528		runcom(cs)                      /* run command */
1529		char    *cs;
1530		{
#	Line 1466 | Line 1549 | char   *fn;
1549		if (noaction)
1550		return(0);
1551		return(unlink(fn));
1552	+	}
1553	+
1554	+
1555	+	mvfile(fold, fnew)              /* move a file */
1556	+	char    *fold, *fnew;
1557	+	{
1558	+	if (!silent)
1559	+	#ifdef MSDOS
1560	+	printf("\trename %s %s\n", fold, fnew);
1561	+	#else
1562	+	printf("\tmv %s %s\n", fold, fnew);
1563	+	#endif
1564	+	if (noaction)
1565	+	return(0);
1566	+	return(rename(fold, fnew));
1567		}
1568
1569

Diff Legend

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