ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.15 by greg, Sun Aug 3 18:20:44 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 55 | Line 54 | static void printdefaults(void);
54   #define RXTRACE_FEATURES        "IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \
55                                  "HessianAmbientCache\nAmbientAveraging\n" \
56                                  "AmbientValueSharing\nAdaptiveShadowTesting\n" \
57 +                                "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
58                                  "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
59                                  "OutputCS=RGB,XYZ,Y,S,M,prims,spec\n"
60  
# Line 80 | Line 80 | main(int  argc, char  *argv[])
80          strcat(RFeatureList, RXTRACE_FEATURES);
81          if (argc > 1 && !strcmp(argv[1], "-features"))
82                  return feature_status(argc-2, argv+2);
83 +                                        /* initialize calcomp routines */
84 +        initfunc();
85                                          /* add trace notify function */
86          for (i = 0; addobjnotify[i] != NULL; i++)
87                  ;
# Line 303 | Line 305 | main(int  argc, char  *argv[])
305          rval = setspectrsamp(CNDX, WLPART);
306          if (rval < 0)
307                  error(USER, "unsupported spectral sampling");
308 <        if (out_prims != NULL) {
308 >        if (sens_curve != NULL)
309 >                out_prims = NULL;
310 >        else if (out_prims != NULL) {
311                  if (!rval)
312                          error(WARNING, "spectral range incompatible with color output");
313          } else if (NCSAMP == 3)
# Line 357 | Line 361 | main(int  argc, char  *argv[])
361                  printf("SOFTWARE= %s\n", VersionID);
362                  fputnow(stdout);
363                  if (rval > 0)           /* saved from setrtoutput() call */
364 <                        printf("NCOMP=%d\n", rval);
364 >                        fputncomp(rval, stdout);
365 >                if (NCSAMP > 3)
366 >                        fputwlsplit(WLPART, stdout);
367 >                if ((out_prims != stdprims) & (out_prims != NULL))
368 >                        fputprims(out_prims, stdout);
369                  if ((outform == 'f') | (outform == 'd'))
370                          fputendian(stdout);
371                  fputformat(formstr(outform), stdout);

Diff Legend

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