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.13 by greg, Tue Apr 22 17:12:25 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  
17   extern char     *progname;              /* global argv[0] */
18  
# Line 80 | Line 81 | main(int  argc, char  *argv[])
81          strcat(RFeatureList, RXTRACE_FEATURES);
82          if (argc > 1 && !strcmp(argv[1], "-features"))
83                  return feature_status(argc-2, argv+2);
84 +                                        /* initialize calcomp routines */
85 +        initfunc();
86                                          /* add trace notify function */
87          for (i = 0; addobjnotify[i] != NULL; i++)
88                  ;
# Line 303 | Line 306 | main(int  argc, char  *argv[])
306          rval = setspectrsamp(CNDX, WLPART);
307          if (rval < 0)
308                  error(USER, "unsupported spectral sampling");
309 <        if (out_prims != NULL) {
309 >        if (sens_curve != NULL)
310 >                out_prims = NULL;
311 >        else if (out_prims != NULL) {
312                  if (!rval)
313                          error(WARNING, "spectral range incompatible with color output");
314          } else if (NCSAMP == 3)
# Line 357 | Line 362 | main(int  argc, char  *argv[])
362                  printf("SOFTWARE= %s\n", VersionID);
363                  fputnow(stdout);
364                  if (rval > 0)           /* saved from setrtoutput() call */
365 <                        printf("NCOMP=%d\n", rval);
365 >                        fputncomp(rval, stdout);
366 >                if (NCSAMP > 3)
367 >                        fputwlsplit(WLPART, stdout);
368 >                if ((out_prims != stdprims) & (out_prims != NULL))
369 >                        fputprims(out_prims, stdout);
370                  if ((outform == 'f') | (outform == 'd'))
371                          fputendian(stdout);
372                  fputformat(formstr(outform), stdout);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines