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.40 by greg, Thu Oct 20 17:18:33 2022 UTC vs.
Revision 2.45 by greg, Tue Aug 15 00:46:56 2023 UTC

# Line 35 | Line 35 | char  *errfile = NULL;                 /* error output file */
35  
36   int  nproc = 1;                         /* number of processes */
37  
38 – extern char  *formstr(int f);           /* string from format */
38   extern int  setrtoutput(void);          /* set output values */
39  
40   int  inform = 'a';                      /* input format */
# Line 67 | Line 66 | static void sigdie(int  signo, char  *msg);
66   static void printdefaults(void);
67  
68   #ifdef PERSIST
69 < #define RTRACE_FEATURES "Persist\nParallelPersist\nMultiProcessing\n" \
69 > #define RTRACE_FEATURES "Persist\nParallelPersist\nMultiprocessing\n" \
70                          "IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \
71                          "HessianAmbientCache\nAmbientAveraging\n" \
72                          "AmbientValueSharing\nAdaptiveShadowTesting\n" \
73 +                        "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
74                          "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
75   #else
76   #define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
77                          "HessianAmbientCache\nAmbientAveraging\n" \
78                          "AmbientValueSharing\nAdaptiveShadowTesting\n" \
79 +                        "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
80                          "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
81   #endif
82  
# Line 104 | Line 105 | main(int  argc, char  *argv[])
105          progname = argv[0] = fixargv0(argv[0]);
106                                          /* feature check only? */
107          strcat(RFeatureList, RTRACE_FEATURES);
108 <        if (!strcmp(argv[1], "-features"))
108 >        if (argc > 1 && !strcmp(argv[1], "-features"))
109                  return feature_status(argc-2, argv+2);
110                                          /* add trace notify function */
111          for (i = 0; addobjnotify[i] != NULL; i++)
# Line 328 | Line 329 | main(int  argc, char  *argv[])
329          if (outform != 'a')
330                  SET_FILE_BINARY(stdout);
331          rval = setrtoutput();
332 <        readoct(octname = octnm, loadflags, &thescene, NULL);
332 >        octname = savqstr(octnm);
333 >        readoct(octname, loadflags, &thescene, NULL);
334          nsceneobjs = nobjects;
335  
336          if (loadflags & IO_INFO) {      /* print header */
# Line 416 | Line 418 | badopt:
418  
419   void
420   wputs(                          /* warning output function */
421 <        char    *s
421 >        const char      *s
422   )
423   {
424          int  lasterrno = errno;
# Line 427 | Line 429 | wputs(                         /* warning output function */
429  
430   void
431   eputs(                          /* put string to stderr */
432 <        char  *s
432 >        const char  *s
433   )
434   {
435          static int  midline = 0;

Diff Legend

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