ViewVC Help

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

root/Development/ray/src/rt/rtmain.c

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.35 by greg, Tue Apr 5 03:02:15 2022 UTC vs.
Revision 2.62 by greg, Fri Dec 5 17:51:34 2025 UTC

#	Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13		#include  "rtprocess.h" /* getpid() */
14		#include  "resolu.h"
15		#include  "ray.h"
16	+	#include  "func.h"
17		#include  "source.h"
18		#include  "ambient.h"
19		#include  "random.h"
19	–	#include  "paths.h"
20		#include  "pmapray.h"
21	–
22	–	extern char     *progname;              /* global argv[0] */
23	–
24	–	extern char     *shm_boundary;          /* boundary of shared memory */
25	–
21		/* persistent processes define */
22		#ifdef  F_SETLKW
23		#define  PERSIST        1               /* normal persist */
#	Line 35 | Line 30 | char  *errfile = NULL;                 /* error output file */
30
31		int  nproc = 1;                         /* number of processes */
32
38	–	extern char  *formstr(int f);           /* string from format */
33		extern int  setrtoutput(void);          /* set output values */
34
35		int  inform = 'a';                      /* input format */
#	Line 60 | Line 54 | extern void  tranotify(OBJECT obj);
54		char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
55		int  traincl = -1;                      /* include == 1, exclude == 0 */
56
57	+	double  (*sens_curve)(const SCOLOR scol) = NULL;        /* spectral conversion for 1-channel */
58	+	double  out_scalefactor = 1;            /* output calibration scale factor */
59	+	RGBPRIMP  out_prims = stdprims;         /* output color primitives (NULL if spectral) */
60	+	static RGBPRIMS  our_prims;             /* private output color primitives */
61	+
62		static int  loadflags = ~IO_FILES;      /* what to load from octree */
63
64		static void onsig(int  signo);
65		static void sigdie(int  signo, char  *msg);
66		static void printdefaults(void);
67
68	+	#ifdef PERSIST
69	+	#define RTRACE_FEATURES "Persist\nParallelPersist\nMultiprocessing\n" \
70	+	"IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \
71	+	"ParticipatingMedia=Mist\n" \
72	+	"HessianAmbientCache\nAmbientAveraging\n" \
73	+	"AmbientValueSharing\nAdaptiveShadowTesting\n" \
74	+	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
75	+	"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
76	+	"OutputCS=RGB,XYZ,Y,S,M,prims,spec\n"
77	+	#else
78	+	#define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
79	+	"ParticipatingMedia=Mist\n" \
80	+	"HessianAmbientCache\nAmbientAveraging\n" \
81	+	"AmbientValueSharing\nAdaptiveShadowTesting\n" \
82	+	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
83	+	"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
84	+	"OutputCS=RGB,XYZ,Y,S,M,prims,spec\n"
85	+	#endif
86
87	+
88		int
89		main(int  argc, char  *argv[])
90		{
#	Line 89 | Line 107 | main(int  argc, char  *argv[])
107		int  i;
108		/* global program name */
109		progname = argv[0] = fixargv0(argv[0]);
110	+	/* feature check only? */
111	+	strcat(RFeatureList, RTRACE_FEATURES);
112	+	if (argc > 1 && !strcmp(argv[1], "-features"))
113	+	return feature_status(argc-2, argv+2);
114	+	/* initialize calcomp routines */
115	+	initfunc();
116		/* add trace notify function */
117		for (i = 0; addobjnotify[i] != NULL; i++)
118		;
#	Line 133 | Line 157 | main(int  argc, char  *argv[])
157		check(2,"i");
158		vresolu = atoi(argv[++i]);
159		break;
160	<	case 'w':                               /* warnings */
160	>	case 'w':                               /* warnings & spectral */
161		rval = erract[WARNING].pf != NULL;
162		check_bool(2,rval);
163		if (rval) erract[WARNING].pf = wputs;
#	Line 235 | Line 259 | main(int  argc, char  *argv[])
259		goto badopt;
260		}
261		break;
262	+	case 'p':                               /* value output */
263	+	switch (argv[i][2]) {
264	+	case 'R':                       /* standard RGB output */
265	+	if (strcmp(argv[i]+2, "RGB"))
266	+	goto badopt;
267	+	out_prims = stdprims;
268	+	out_scalefactor = 1;
269	+	sens_curve = NULL;
270	+	break;
271	+	case 'X':                       /* XYZ output */
272	+	if (strcmp(argv[i]+2, "XYZ"))
273	+	goto badopt;
274	+	out_prims = xyzprims;
275	+	out_scalefactor = WHTEFFICACY;
276	+	sens_curve = NULL;
277	+	break;
278	+	case 'c': {
279	+	int     j;
280	+	check(3,"ffffffff");
281	+	rval = 0;
282	+	for (j = 0; j < 8; j++) {
283	+	our_prims[0][j] = atof(argv[++i]);
284	+	rval |= fabs(our_prims[0][j]-stdprims[0][j]) > .001;
285	+	}
286	+	if (rval) {
287	+	if (!colorprimsOK(our_prims))
288	+	error(USER, "illegal primary chromaticities");
289	+	out_prims = our_prims;
290	+	} else
291	+	out_prims = stdprims;
292	+	out_scalefactor = 1;
293	+	sens_curve = NULL;
294	+	} break;
295	+	case 'Y':                       /* photopic response */
296	+	if (argv[i][3])
297	+	goto badopt;
298	+	sens_curve = scolor_photopic;
299	+	out_scalefactor = WHTEFFICACY;
300	+	break;
301	+	case 'S':                       /* scotopic response */
302	+	if (argv[i][3])
303	+	goto badopt;
304	+	out_scalefactor = WHTSCOTOPIC;
305	+	sens_curve = scolor_scotopic;
306	+	break;
307	+	case 'M':                       /* melanopic response */
308	+	if (argv[i][3])
309	+	goto badopt;
310	+	out_scalefactor = WHTMELANOPIC;
311	+	sens_curve = scolor_melanopic;
312	+	break;
313	+	case 'A':                       /* radiometric average */
314	+	if (argv[i][3])
315	+	goto badopt;
316	+	out_scalefactor = 1;
317	+	sens_curve = scolor_mean;
318	+	break;
319	+	default:
320	+	goto badopt;
321	+	}
322	+	break;
323	+	#if MAXCSAMP>3
324	+	case 'c':                               /* output spectral results */
325	+	if (argv[i][2] != 'o')
326	+	goto badopt;
327	+	rval = (out_prims == NULL) & (sens_curve == NULL);
328	+	check_bool(3,rval);
329	+	if (rval) {
330	+	out_prims = NULL;
331	+	sens_curve = NULL;
332	+	} else if (out_prims == NULL)
333	+	out_prims = stdprims;
334	+	break;
335	+	#endif
336		#ifdef  PERSIST
337		case 'P':                               /* persist file */
338		if (argv[i][2] == 'P') {
#	Line 251 | Line 349 | main(int  argc, char  *argv[])
349		goto badopt;
350		}
351		}
352	+	/* set/check spectral sampling */
353	+	rval = setspectrsamp(CNDX, WLPART);
354	+	if (rval < 0)
355	+	error(USER, "unsupported spectral sampling");
356	+	if (sens_curve != NULL)
357	+	out_prims = NULL;
358	+	else if (out_prims != NULL) {
359	+	if (!rval)
360	+	error(WARNING, "spectral range incompatible with color output");
361	+	} else if (NCSAMP == 3)
362	+	out_prims = stdprims;   /* 3 samples do not a spectrum make */
363		if (nproc > 1 && persist)
364		error(USER, "multiprocessing incompatible with persist file");
365		/* initialize object types */
366		initotypes();
367		/* initialize urand */
368	<	if (rand_samp) {
260	<	srandom((long)time(0));
261	<	initurand(0);
262	<	} else {
263	<	srandom(0L);
264	<	initurand(2048);
265	<	}
368	>	reset_random();
369		/* set up signal handling */
370		sigdie(SIGINT, "Interrupt");
371		#ifdef SIGHUP
#	Line 311 | Line 414 | main(int  argc, char  *argv[])
414		if (outform != 'a')
415		SET_FILE_BINARY(stdout);
416		rval = setrtoutput();
417	<	readoct(octname = octnm, loadflags, &thescene, NULL);
417	>	octname = savqstr(octnm);
418	>	readoct(octname, loadflags, &thescene, NULL);
419		nsceneobjs = nobjects;
420
421		if (loadflags & IO_INFO) {      /* print header */
#	Line 319 | Line 423 | main(int  argc, char  *argv[])
423		printf("SOFTWARE= %s\n", VersionID);
424		fputnow(stdout);
425		if (rval > 0)           /* saved from setrtoutput() call */
426	<	printf("NCOMP=%d\n", rval);
426	>	fputncomp(rval, stdout);
427	>	if (NCSAMP > 3)
428	>	fputwlsplit(WLPART, stdout);
429	>	if ((out_prims != stdprims) & (out_prims != NULL))
430	>	fputprims(out_prims, stdout);
431		if ((outform == 'f') | (outform == 'd'))
432		fputendian(stdout);
433		fputformat(formstr(outform), stdout);
434	<	putchar('\n');
434	>	fputc('\n', stdout);    /* end of header */
435		}
436
437		if (!castonly) {        /* any actual ray traversal to do? */
#	Line 336 | Line 444 | main(int  argc, char  *argv[])
444		} else
445		distantsources();       /* else mark only distant sources */
446
447	<	fflush(stdout);         /* in case we're duplicating header */
447	>	fflush(stdout);                 /* in case we're duplicating header */
448
449		#ifdef  PERSIST
450		if (persist) {
#	Line 344 | Line 452 | main(int  argc, char  *argv[])
452		dup2(duped1, fileno(stdout));
453		close(duped1);
454		if (persist == PARALLEL) {      /* multiprocessing */
455	<	preload_objs();         /* preload scene */
348	<	shm_boundary = (char *)malloc(16);
349	<	strcpy(shm_boundary, "SHM_BOUNDARY");
455	>	cow_memshare();         /* preloads scene */
456		while ((rval=fork()) == 0) {    /* keep on forkin' */
457		pflock(1);
458		pfhold();
#	Line 399 | Line 505 | badopt:
505
506		void
507		wputs(                          /* warning output function */
508	<	char    *s
508	>	const char      *s
509		)
510		{
511		int  lasterrno = errno;
512	+	if (erract[WARNING].pf == NULL)
513	+	return;         /* called by calcomp or someone */
514		eputs(s);
515		errno = lasterrno;
516		}
#	Line 410 | Line 518 | wputs(                         /* warning output function */
518
519		void
520		eputs(                          /* put string to stderr */
521	<	register char  *s
521	>	const char  *s
522		)
523		{
524		static int  midline = 0;
#	Line 465 | Line 573 | sigdie(                        /* set fatal signal */
573		static void
574		printdefaults(void)                     /* print default values to stdout */
575		{
576	<	register char  *cp;
576	>	char  *cp;
577
578	+	printf(erract[WARNING].pf != NULL ?
579	+	"-w+\t\t\t\t# warning messages on\n" :
580	+	"-w-\t\t\t\t# warning messages off\n");
581		if (imm_irrad)
582		printf("-I+\t\t\t\t# immediate irradiance on\n");
583		printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
#	Line 475 | Line 586 | printdefaults(void)                    /* print default values to stdou
586		printf("-y %-9d\t\t\t# y resolution\n", vresolu);
587		printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
588		"-ld-\t\t\t\t# limit distance off\n");
589	<	printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
590	<	loadflags & IO_INFO ? "output" : "no");
589	>	printf(loadflags & IO_INFO ? "-h+\t\t\t\t# output header\n" :
590	>	"-h-\t\t\t\t# no header\n");
591		printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
592		inform, outform, formstr(inform), formstr(outform));
593		printf("-o%-9s\t\t\t# output", outvals);
#	Line 501 | Line 612 | printdefaults(void)                    /* print default values to stdou
612		case 'W': printf(" coefficient"); break;
613		case 'm': printf(" modifier"); break;
614		case 'M': printf(" material"); break;
615	<	case '-': printf(" stroke"); break;
615	>	case '~': printf(" tilde"); break;
616		}
617	<	putchar('\n');
618	<	printf(erract[WARNING].pf != NULL ?
619	<	"-w+\t\t\t\t# warning messages on\n" :
620	<	"-w-\t\t\t\t# warning messages off\n");
617	>	fputc('\n', stdout);
618	>	if (sens_curve == scolor_photopic)
619	>	printf("-pY\t\t\t\t# photopic output\n");
620	>	else if (sens_curve == scolor_scotopic)
621	>	printf("-pS\t\t\t\t# scotopic output\n");
622	>	else if (sens_curve == scolor_melanopic)
623	>	printf("-pM\t\t\t\t# melanopic output\n");
624	>	else if (out_prims == stdprims)
625	>	printf("-pRGB\t\t\t\t# standard RGB color output\n");
626	>	else if (out_prims == xyzprims)
627	>	printf("-pXYZ\t\t\t\t# CIE XYZ color output\n");
628	>	else if (out_prims != NULL)
629	>	printf("-pc %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\t# output color primaries and white point\n",
630	>	out_prims[RED][0], out_prims[RED][1],
631	>	out_prims[GRN][0], out_prims[GRN][1],
632	>	out_prims[BLU][0], out_prims[BLU][1],
633	>	out_prims[WHT][0], out_prims[WHT][1]);
634	>	if ((sens_curve == NULL) & (NCSAMP > 3))
635	>	printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" :
636	>	"-co+\t\t\t\t# output spectral values\n");
637		print_rdefaults();
638		}

Diff Legend

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