ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rtmain.c
(Generate patch)

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.53 by greg, Tue Apr 30 22:25:46 2024 UTC vs.
Revision 2.59 by greg, Sat Jun 7 05:09:46 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 –
24                                          /* persistent processes define */
25   #ifdef  F_SETLKW
26   #define  PERSIST        1               /* normal persist */
# Line 59 | Line 57 | extern void  tranotify(OBJECT obj);
57   char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
58   int  traincl = -1;                      /* include == 1, exclude == 0 */
59  
60 < double  (*sens_curve)(SCOLOR scol) = NULL;      /* spectral conversion for 1-channel */
60 > double  (*sens_curve)(const SCOLOR scol) = NULL;        /* spectral conversion for 1-channel */
61   double  out_scalefactor = 1;            /* output calibration scale factor */
62   RGBPRIMP  out_prims = stdprims;         /* output color primitives (NULL if spectral) */
63   static RGBPRIMS  our_prims;             /* private output color primitives */
# Line 116 | Line 114 | main(int  argc, char  *argv[])
114          strcat(RFeatureList, RTRACE_FEATURES);
115          if (argc > 1 && !strcmp(argv[1], "-features"))
116                  return feature_status(argc-2, argv+2);
117 +                                        /* initialize calcomp routines */
118 +        initfunc();
119                                          /* add trace notify function */
120          for (i = 0; addobjnotify[i] != NULL; i++)
121                  ;
# Line 350 | Line 350 | main(int  argc, char  *argv[])
350          rval = setspectrsamp(CNDX, WLPART);
351          if (rval < 0)
352                  error(USER, "unsupported spectral sampling");
353 <        if (out_prims != NULL) {
353 >        if (sens_curve != NULL)
354 >                out_prims = NULL;
355 >        else if (out_prims != NULL) {
356                  if (!rval)
357                          error(WARNING, "spectral range incompatible with color output");
358          } else if (NCSAMP == 3)
# Line 453 | Line 455 | main(int  argc, char  *argv[])
455                  dup2(duped1, fileno(stdout));
456                  close(duped1);
457                  if (persist == PARALLEL) {      /* multiprocessing */
458 <                        preload_objs();         /* preload scene */
457 <                        shm_boundary = (char *)malloc(16);
458 <                        strcpy(shm_boundary, "SHM_BOUNDARY");
458 >                        cow_memshare();         /* preloads scene */
459                          while ((rval=fork()) == 0) {    /* keep on forkin' */
460                                  pflock(1);
461                                  pfhold();
# Line 512 | Line 512 | wputs(                         /* warning output function */
512   )
513   {
514          int  lasterrno = errno;
515 +        if (erract[WARNING].pf == NULL)
516 +                return;         /* called by calcomp or someone */
517          eputs(s);
518          errno = lasterrno;
519   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines