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.128 by greg, Thu Jan 21 21:36:28 2021 UTC vs.
Revision 2.133 by greg, Mon Dec 23 01:39:27 2024 UTC

#	Line 64 | Line 64 | static const char      RCSid[] = "$Id$";
64		int NVARS = 31;
65
66		VARIABLE        vv[] = {                /* variable-value pairs */
67	<	{"AMBFILE",     3,      0,      NULL,   onevalue},
67	>	{"AMBFILE",     3,      0,      NULL,   strvalue},
68		{"DETAIL",      3,      0,      NULL,   qualvalue},
69		{"EXPOSURE",    3,      0,      NULL,   fltvalue},
70		{"EYESEP",      3,      0,      NULL,   fltvalue},
#	Line 75 | Line 75 | VARIABLE       vv[] = {                /* variable-value pairs */
75		{"mkpmap",      3,      0,      NULL,   catvalues},
76		{"objects",     3,      0,      NULL,   catvalues},
77		{"oconv",       3,      0,      NULL,   catvalues},
78	<	{"OCTREE",      3,      0,      NULL,   onevalue},
79	<	{"OPTFILE",     3,      0,      NULL,   onevalue},
80	<	{"PCMAP",       2,      0,      NULL,   onevalue},
78	>	{"OCTREE",      3,      0,      NULL,   strvalue},
79	>	{"OPTFILE",     3,      0,      NULL,   strvalue},
80	>	{"PCMAP",       2,      0,      NULL,   strvalue},
81		{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
82		{"pfilt",       2,      0,      NULL,   catvalues},
83	<	{"PGMAP",       2,      0,      NULL,   onevalue},
84	<	{"PICTURE",     3,      0,      NULL,   onevalue},
83	>	{"PGMAP",       2,      0,      NULL,   strvalue},
84	>	{"PICTURE",     3,      0,      NULL,   strvalue},
85		{"QUALITY",     3,      0,      NULL,   qualvalue},
86	<	{"RAWFILE",     3,      0,      NULL,   onevalue},
86	>	{"RAWFILE",     3,      0,      NULL,   strvalue},
87		{"render",      3,      0,      NULL,   catvalues},
88		{"REPORT",      3,      0,      NULL,   onevalue},
89		{"RESOLUTION",  3,      0,      NULL,   onevalue},
#	Line 93 | Line 93 | VARIABLE       vv[] = {                /* variable-value pairs */
93		{"UP",          2,      0,      NULL,   onevalue},
94		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
95		{"view",        2,      0,      NULL,   NULL},
96	<	{"ZFILE",       2,      0,      NULL,   onevalue},
96	>	{"ZFILE",       2,      0,      NULL,   strvalue},
97		{"ZONE",        2,      0,      NULL,   onevalue},
98		};
99
#	Line 131 | Line 131 | char   *viewselect = NULL;     /* specific view only */
131
132		#define DEF_RPICT_PATH  "rpict"         /* default rpict path */
133
134	+	#define R_CMDMAX        (5*PATH_MAX+512)
135		/* command paths */
136		char    c_oconv[256] = "oconv";
137		char    c_mkillum[256] = "mkillum";
#	Line 242 | Line 243 | main(
243		/* load variable values */
244		loadvars(rifname);
245		/* get any additional assignments */
246	<	for (i++; i < argc; i++)
247	<	if (setvariable(argv[i], matchvar) < 0) {
248	<	fprintf(stderr, "%s: unknown variable: %s\n",
246	>	for (i++; i < argc; i++) {
247	>	int     rv = setvariable(argv[i], matchvar);
248	>	if (rv < 0) {
249	>	fprintf(stderr, "%s: unknown setting: %s\n",
250		progname, argv[i]);
251		quit(1);
252		}
253	+	if (!rv)
254	+	fprintf(stderr,
255	+	"%s: bad variable assignment: %s (ignored)\n",
256	+	progname, argv[i]);
257	+	}
258		/* check assignments */
259		checkvalues();
260		/* check files and dates */
#	Line 522 | Line 529 | static void
529		oconv(void)                             /* run oconv and mkillum if necessary */
530		{
531		static char     illumtmp[] = "ilXXXXXX";
532	<	char    combuf[PATH_MAX], ocopts[64], mkopts[1024];
532	>	char    combuf[R_CMDMAX], ocopts[64], mkopts[1024];
533
534		oconvopts(ocopts);              /* get options */
535		if (octreedate < scenedate) {   /* check date on original octree */
#	Line 924 | Line 931 | lowqopts(                      /* low quality rendering options */
931		d = ambval();
932		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
933		op += strlen(op);
934	<	op = addarg(op, "-lr 6 -lw .003");
934	>	op = addarg(op, "-lr 6 -lw .001");
935		}
936
937
#	Line 1078 | Line 1085 | hiqopts(                               /* high quality rendering options */
1085		d = ambval();
1086		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
1087		op += strlen(op);
1088	<	op = addarg(op, "-lr 12 -lw 1e-5");
1088	>	op = addarg(op, "-lr 12 -lw 5e-6");
1089		}
1090
1091
#	Line 1409 | Line 1416 | rvu(                           /* run rvu with first view */
1416		)
1417		{
1418		char    *vw;
1419	<	char    combuf[PATH_MAX];
1419	>	char    combuf[R_CMDMAX];
1420		/* build command */
1421		if (touchonly || (vw = getview(0, NULL)) == NULL)
1422		return;
#	Line 1607 | Line 1614 | rpict(                         /* run rpict and pfilt for each view */
1614		} else {
1615		if (overture) {         /* run overture calculation */
1616		sprintf(combuf,
1617	<	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1618	<	c_rpict, rep, vw, opts,
1617	>	"%s%s %s%s%s -x 64 -y 64 -ps 1 %s > %s",
1618	>	c_rpict, rep, vw, opts, po,
1619		oct1name, overfile);
1620		if (!do_rpiece || !next_process(0)) {
1621		if (runcom(combuf)) {

Diff Legend

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