ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/renderopts.c
(Generate patch)

Comparing ray/src/rt/renderopts.c (file contents):
Revision 2.20 by greg, Wed Oct 19 23:10:34 2022 UTC vs.
Revision 2.24 by greg, Sat Nov 18 18:14:26 2023 UTC

# Line 20 | Line 20 | char   RFeatureList[2048] =    /* newline-separated feature
20                  "SourceVisibility\nAmbientModifierSelection\n"
21                  "PathTracing\nRussianRoulette\nLowDiscrepancySeq\n"
22                  "SpecularSampling\nMaterialMixtures\nAntimatter\nBackFaceVisibility\n"
23 <                "ParticipatingMedia=Mist\nScatteringModels=WGMD,Ashikhmin-Shirley\n"
23 >                "ScatteringModels=WGMD,Ashikhmin-Shirley\n"
24                  "TabulatedBSDFs=DataFile,KlemsXML,TensorTreeXML,+ViewPeakExtraction\n"
25                  "Instancing=Octree,TriangleMesh\nAliases\n"
26 + #if MAXCSAMP>3
27 +                "Hyperspectral\n"
28 + #endif
29   #if !defined(SHADCACHE) || SHADCACHE > 0
30                  "ShadowCache\n"
31   #endif
# Line 74 | Line 77 | match_subfeatures(     /* check if subfeatures are support
77                  *cp = '\0';
78                  n = cp - subfeat;
79                  if (!(cp = strstr(mysublist, subfeat)) ||
80 +                                (cp[-1] != ',') & (cp[-1] != '=') ||
81                                  (cp[n] != ',') & (cp[n] != '\n'))
82                          return(0);      /* missing this one! */
83          }
# Line 306 | Line 310 | getrenderopt(          /* get next render option */
310                          return(1);
311                  }
312                  break;
313 + #if MAXCSAMP>3
314 +        case 'c':                               /* spectral sampling */
315 +                switch (av[0][2]) {
316 +                case 's':                       /* spectral bin count */
317 +                        check(3,"i");
318 +                        NCSAMP = atoi(av[1]);
319 +                        return(1);
320 +                case 'w':                       /* wavelength extrema */
321 +                        check(3,"ff");
322 +                        WLPART[0] = atof(av[1]);
323 +                        WLPART[3] = atof(av[2]);
324 +                        return(2);
325 +                }
326 +                break;
327 + #endif
328          }
329          
330          /* PMAP: Parse photon mapping options */
# Line 353 | Line 372 | print_rdefaults(void)          /* print default render values
372                          colval(salbedo,GRN), colval(salbedo,BLU));
373          printf("-mg %f\t\t\t# mist scattering eccentricity\n", seccg);
374          printf("-ms %f\t\t\t# mist sampling distance\n", ssampdist);
375 +        if (NCSAMP > 3) {
376 +                printf("-cs %-2d\t\t\t\t# number of spectral bins\n", NCSAMP);
377 +                printf("-cw %3.0f %3.0f\t\t\t# wavelength limits (nm)\n",
378 +                                WLPART[3], WLPART[0]);
379 +        }
380          printf("-lr %-9d\t\t\t# limit reflection%s\n", maxdepth,
381                          maxdepth<=0 ? " (Russian roulette)" : "");
382          printf("-lw %.2e\t\t\t# limit weight\n", minweight);

Diff Legend

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