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

Comparing ray/src/common/loadbsdf.c (file contents):
Revision 3.3 by greg, Sat Feb 19 23:42:09 2011 UTC vs.
Revision 3.8 by greg, Sun Apr 21 21:36:23 2013 UTC

# Line 15 | Line 15 | char *
15   transSDError(SDError ec)
16   {
17          if (!SDerrorDetail[0])
18 <                return(strcpy(errmsg, SDerrorEnglish[ec]));
18 >                return(strcpy(errmsg, SDerrorList[ec]));
19  
20 <        sprintf(errmsg, "%s: %s", SDerrorEnglish[ec], SDerrorDetail);
20 >        sprintf(errmsg, "%s: %s", SDerrorList[ec], SDerrorDetail);
21          return(errmsg);
22   }
23  
# Line 58 | Line 58 | loadBSDF(char *fname)
58                                                  /* simple checks */
59          checkDF(sd->name, sd->rLambFront.cieY, sd->rf, "front reflection");
60          checkDF(sd->name, sd->rLambBack.cieY, sd->rb, "rear reflection");
61 <        checkDF(sd->name, sd->tLamb.cieY, sd->tf, "transmission");
61 >        checkDF(sd->name, sd->tLamb.cieY, sd->tf, "front transmission");
62 >        checkDF(sd->name, sd->tLamb.cieY, sd->tb, "back transmission");
63   #if 0
64   fprintf(stderr, "Loaded BSDF '%s' (file \"%s\")\n", sd->name, pname);
65 < fprintf(stderr, "Front diffuse reflectance: %.1f%%\n", sd->rLambFront.cieY*100.);
66 < fprintf(stderr, "Back diffuse reflectance: %.1f%%\n", sd->rLambBack.cieY*100.);
67 < fprintf(stderr, "Diffuse transmittance: %.1f%%\n", sd->tLamb.cieY*100.);
65 > fprintf(stderr, "Front diffuse reflectance: %.3f%%\n", sd->rLambFront.cieY*100.);
66 > fprintf(stderr, "Back diffuse reflectance: %.3f%%\n", sd->rLambBack.cieY*100.);
67 > fprintf(stderr, "Diffuse transmittance: %.3f%%\n", sd->tLamb.cieY*100.);
68   if (sd->rf)
69 < fprintf(stderr, "Maximum direct hemispherical front reflection: %.1f%%\n",
69 > fprintf(stderr, "Maximum direct hemispherical front reflection: %.3f%%\n",
70   sd->rf->maxHemi*100.);
71   if (sd->rb)
72 < fprintf(stderr, "Maximum direct hemispherical back reflection: %.1f%%\n",
72 > fprintf(stderr, "Maximum direct hemispherical back reflection: %.3f%%\n",
73   sd->rb->maxHemi*100.);
74   if (sd->tf)
75 < fprintf(stderr, "Maximum direct hemispherical transmission: %.1f%%\n",
75 > fprintf(stderr, "Maximum direct hemispherical front transmission: %.3f%%\n",
76   sd->tf->maxHemi*100.);
77 + if (sd->tb)
78 + fprintf(stderr, "Maximum direct hemispherical back transmission: %.3f%%\n",
79 + sd->tb->maxHemi*100.);
80   #endif
81          SDretainSet = SDretainAll;              /* keep data in core */
82          return(sd);

Diff Legend

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