ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/testBSDF.c
(Generate patch)

Comparing ray/src/common/testBSDF.c (file contents):
Revision 1.9 by greg, Thu Feb 2 04:46:38 2017 UTC vs.
Revision 1.13 by greg, Thu May 10 01:41:33 2018 UTC

# Line 24 | Line 24 | Usage(const char *prog)
24          printf("  i\t\t\t\t Report general information (metadata)\n");
25          printf("  c\t\t\t\t Report diffuse and specular components\n");
26          printf("  q theta_i phi_i theta_o phi_o\t Query BSDF for given path (CIE-XYZ)\n");
27 <        printf("  s[r|t][s|d] N theta phi\t\t\t Generate N ray directions & colors at given incidence\n");
28 <        printf("  h[s|d] theta phi\t\t\t Report hemispherical scatteromg at given incidence\n");
29 <        printf("  r[s|d] theta phi\t\t\t Report hemispherical reflection at given incidence\n");
30 <        printf("  t[s|d] theta phi\t\t\t Report hemispherical transmission at given incidence\n");
27 >        printf("  s[r|t][s|d] N theta phi\t Generate N ray directions & colors at given incidence\n");
28 >        printf("  h[s|d] theta phi\t\t Report hemispherical scattering at given incidence\n");
29 >        printf("  r[s|d] theta phi\t\t Report hemispherical reflection at given incidence\n");
30 >        printf("  t[s|d] theta phi\t\t Report hemispherical transmission at given incidence\n");
31          printf("  a theta phi [t2 p2]\t\t Report resolution (in proj. steradians) for given direction(s)\n");
32          printf("  ^D\t\t\t\t Quit program\n");
33   }
# Line 47 | Line 47 | vec_from_deg(FVECT v, double theta, double phi)
47   static void
48   printXYZ(const char *intro, const SDValue *vp)
49   {
50 +        if (vp->cieY <= 1e-9) {
51 +                printf("%s0 0 0\n", intro);
52 +                return;
53 +        }
54          printf("%s%.3e %.3e %.3e\n", intro,
55                          vp->spec.cx/vp->spec.cy*vp->cieY,
56                          vp->cieY,
# Line 104 | Line 108 | main(int argc, char *argv[])
108                          printf("Manufacturer: '%s'\n", bsdf->makr);
109                          printf("Width, Height, Thickness (m): %.4e, %.4e, %.4e\n",
110                                          bsdf->dim[0], bsdf->dim[1], bsdf->dim[2]);
111 <                        printf("Has geometry: %s\n", bsdf->mgf ? "yes" : "no");
111 >                        if (bsdf->mgf)
112 >                                printf("Has geometry: %lu bytes\n",
113 >                                                (unsigned long)strlen(bsdf->mgf));
114 >                        else
115 >                                printf("Has geometry: no\n");
116                          continue;
117                  case 'C':                       /* report constant values */
118                          if (!bsdf)
# Line 191 | Line 199 | main(int argc, char *argv[])
199                          vec_from_deg(vin, atof(sskip2(cp,1)), atof(sskip2(cp,2)));
200                          if (*sskip2(cp,4)) {
201                                  vec_from_deg(vout, atof(sskip2(cp,3)), atof(sskip2(cp,4)));
202 <                                if (SDreportError(SDsizeBSDF(proja, vin, vout,
202 >                                if (SDreportError(SDsizeBSDF(proja, vout, vin,
203                                                  SDqueryMin+SDqueryMax, bsdf), stderr))
204                                          continue;
205                          } else if (SDreportError(SDsizeBSDF(proja, vin, NULL,

Diff Legend

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