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.38 by greg, Wed Oct 19 21:25:20 2022 UTC vs.
Revision 2.44 by greg, Mon Feb 6 22:40:21 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 69 | Line 68 | static void printdefaults(void);
68   #ifdef PERSIST
69   #define RTRACE_FEATURES "Persist\nParallelPersist\nMultiProcessing\n" \
70                          "IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \
71 <                        "HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n"
71 >                        "HessianAmbientCache\nAmbientAveraging\n" \
72 >                        "AmbientValueSharing\nAdaptiveShadowTesting\n" \
73 >                        "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
74   #else
75   #define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
76 <                        "HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n"
76 >                        "HessianAmbientCache\nAmbientAveraging\n" \
77 >                        "AmbientValueSharing\nAdaptiveShadowTesting\n" \
78 >                        "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
79   #endif
80  
81  
# Line 100 | Line 103 | main(int  argc, char  *argv[])
103          progname = argv[0] = fixargv0(argv[0]);
104                                          /* feature check only? */
105          strcat(RFeatureList, RTRACE_FEATURES);
106 <        if (!strcmp(argv[1], "-features"))
106 >        if (argc > 1 && !strcmp(argv[1], "-features"))
107                  return feature_status(argc-2, argv+2);
108                                          /* add trace notify function */
109          for (i = 0; addobjnotify[i] != NULL; i++)
# Line 324 | Line 327 | main(int  argc, char  *argv[])
327          if (outform != 'a')
328                  SET_FILE_BINARY(stdout);
329          rval = setrtoutput();
330 <        readoct(octname = octnm, loadflags, &thescene, NULL);
330 >        octname = savqstr(octnm);
331 >        readoct(octname, loadflags, &thescene, NULL);
332          nsceneobjs = nobjects;
333  
334          if (loadflags & IO_INFO) {      /* print header */
# Line 412 | Line 416 | badopt:
416  
417   void
418   wputs(                          /* warning output function */
419 <        char    *s
419 >        const char      *s
420   )
421   {
422          int  lasterrno = errno;
# Line 423 | Line 427 | wputs(                         /* warning output function */
427  
428   void
429   eputs(                          /* put string to stderr */
430 <        char  *s
430 >        const char  *s
431   )
432   {
433          static int  midline = 0;

Diff Legend

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