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.4 by greg, Wed May 1 22:06:09 2024 UTC vs.
Revision 2.10 by greg, Thu Oct 31 19:02:38 2024 UTC

# Line 2 | Line 2
2   static const char       RCSid[] = "$Id$";
3   #endif
4   /*
5 < *  rxtmain.c - main for per-ray calculation program
5 > *  rxtmain.cpp - main for per-ray calculation program
6   */
7  
8   #include "copyright.h"
# Line 43 | Line 43 | extern void  tranotify(OBJECT obj);
43   char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
44   int  traincl = -1;                      /* include == 1, exclude == 0 */
45  
46 < double  (*sens_curve)(SCOLOR scol) = NULL;      /* spectral conversion for 1-channel */
46 > double  (*sens_curve)(const SCOLOR scol) = NULL;        /* spectral conversion for 1-channel */
47   double  out_scalefactor = 1;            /* output calibration scale factor */
48   RGBPRIMP  out_prims = stdprims;         /* output color primitives (NULL if spectral) */
49   static RGBPRIMS  our_prims;             /* private output color primitives */
# Line 52 | Line 52 | static void onsig(int  signo);
52   static void sigdie(int  signo, const char  *msg);
53   static void printdefaults(void);
54  
55 < #define RXTRACE_FEATURES        "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
55 > #define RXTRACE_FEATURES        "IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \
56                                  "HessianAmbientCache\nAmbientAveraging\n" \
57                                  "AmbientValueSharing\nAdaptiveShadowTesting\n" \
58                                  "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
# Line 351 | Line 351 | main(int  argc, char  *argv[])
351          if (outform != 'a')
352                  SET_FILE_BINARY(stdout);
353          if (doheader) {                 /* print header? */
354 <                static char     fmt[] = OCTFMT;
355 <                FILE *          octfp = fopen(argv[i], "rb");
356 <                if (checkheader(octfp, fmt, stdout) < 0)
357 <                        error(USER, "bad octree header");
358 <                fclose(octfp);
354 >                newheader("RADIANCE", stdout);
355 >                fputs(myRTmanager.GetHeadStr(), stdout);
356                  printargs(i, argv, stdout);
357                  printf("SOFTWARE= %s\n", VersionID);
358                  fputnow(stdout);
# Line 390 | Line 387 | wputs(                         /* warning output function */
387  
388   void
389   eputs(                          /* put string to stderr */
390 <        char  *s
390 >        const char  *s
391   )
392   {
393          static int  midline = 0;

Diff Legend

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