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.37 by greg, Tue Oct 18 18:07:50 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 66 | Line 65 | static void onsig(int  signo);
65   static void sigdie(int  signo, char  *msg);
66   static void printdefaults(void);
67  
68 + #ifdef PERSIST
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  
83 +
84   int
85   main(int  argc, char  *argv[])
86   {
# Line 89 | Line 103 | main(int  argc, char  *argv[])
103          int  i;
104                                          /* global program name */
105          progname = argv[0] = fixargv0(argv[0]);
106 +                                        /* feature check only? */
107 +        strcat(RFeatureList, RTRACE_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++)
112                  ;
# Line 311 | 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 399 | 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 410 | Line 429 | wputs(                         /* warning output function */
429  
430   void
431   eputs(                          /* put string to stderr */
432 <        register char  *s
432 >        const char  *s
433   )
434   {
435          static int  midline = 0;
# Line 465 | Line 484 | sigdie(                        /* set fatal signal */
484   static void
485   printdefaults(void)                     /* print default values to stdout */
486   {
487 <        register char  *cp;
487 >        char  *cp;
488  
489          if (imm_irrad)
490                  printf("-I+\t\t\t\t# immediate irradiance on\n");

Diff Legend

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