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

Comparing ray/src/rt/rxtmain.cpp (file contents):
Revision 2.11 by greg, Tue Nov 19 16:27:21 2024 UTC vs.
Revision 2.14 by greg, Thu Jun 5 18:26:46 2025 UTC

# Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
12   #include  "rtprocess.h" /* getpid() */
13   #include  "platform.h"
14   #include  "RtraceSimulManager.h"
15 + #include  "func.h"
16  
16 extern char     *progname;              /* global argv[0] */
17
17   static const char  *sigerr[NSIG];       /* signal error messages */
18   char  *errfile = NULL;                  /* error output file */
19  
# Line 80 | Line 79 | main(int  argc, char  *argv[])
79          strcat(RFeatureList, RXTRACE_FEATURES);
80          if (argc > 1 && !strcmp(argv[1], "-features"))
81                  return feature_status(argc-2, argv+2);
82 +                                        /* initialize calcomp routines */
83 +        initfunc();
84                                          /* add trace notify function */
85          for (i = 0; addobjnotify[i] != NULL; i++)
86                  ;
# Line 303 | Line 304 | main(int  argc, char  *argv[])
304          rval = setspectrsamp(CNDX, WLPART);
305          if (rval < 0)
306                  error(USER, "unsupported spectral sampling");
307 <        if (out_prims != NULL) {
307 >        if (sens_curve != NULL)
308 >                out_prims = NULL;
309 >        else if (out_prims != NULL) {
310                  if (!rval)
311                          error(WARNING, "spectral range incompatible with color output");
312          } else if (NCSAMP == 3)
# Line 357 | Line 360 | main(int  argc, char  *argv[])
360                  printf("SOFTWARE= %s\n", VersionID);
361                  fputnow(stdout);
362                  if (rval > 0)           /* saved from setrtoutput() call */
363 <                        printf("NCOMP=%d\n", rval);
363 >                        fputncomp(rval, stdout);
364 >                if (NCSAMP > 3)
365 >                        fputwlsplit(WLPART, stdout);
366 >                if ((out_prims != stdprims) & (out_prims != NULL))
367 >                        fputprims(out_prims, stdout);
368                  if ((outform == 'f') | (outform == 'd'))
369                          fputendian(stdout);
370                  fputformat(formstr(outform), stdout);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines