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.7 by greg, Sun Sep 2 15:33:15 2012 UTC vs.
Revision 3.11 by greg, Tue Mar 22 03:56:17 2016 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 50 | Line 50 | loadBSDF(char *fname)
50          pname = getpath(fname, getrlibpath(), R_OK);
51          if (pname == NULL) {
52                  sprintf(errmsg, "cannot find BSDF file \"%s\"", fname);
53 <                error(USER, errmsg);
53 >                error(SYSTEM, errmsg);
54          }
55          ec = SDloadFile(sd, pname);
56          if (ec)
# Line 60 | Line 60 | loadBSDF(char *fname)
60          checkDF(sd->name, sd->rLambBack.cieY, sd->rb, "rear reflection");
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
63 > #ifdef DEBUG
64 > {
65 > float   rgb[3];
66   fprintf(stderr, "Loaded BSDF '%s' (file \"%s\")\n", sd->name, pname);
67 < fprintf(stderr, "Front diffuse reflectance: %.3f%%\n", sd->rLambFront.cieY*100.);
68 < fprintf(stderr, "Back diffuse reflectance: %.3f%%\n", sd->rLambBack.cieY*100.);
69 < fprintf(stderr, "Diffuse transmittance: %.3f%%\n", sd->tLamb.cieY*100.);
67 > ccy2rgb(&sd->rLambFront.spec, sd->rLambFront.cieY, rgb);
68 > fprintf(stderr, "Front diffuse RGB: %.4f %.4f %.4f\n", rgb[0], rgb[1], rgb[2]);
69 > ccy2rgb(&sd->rLambBack.spec, sd->rLambBack.cieY, rgb);
70 > fprintf(stderr, "Back diffuse RGB: %.4f %.4f %.4f\n", rgb[0], rgb[1], rgb[2]);
71 > ccy2rgb(&sd->tLamb.spec, sd->tLamb.cieY, rgb);
72 > fprintf(stderr, "Diffuse RGB transmittance: %.4f %.4f %.4f\n", rgb[0], rgb[1], rgb[2]);
73   if (sd->rf)
74   fprintf(stderr, "Maximum direct hemispherical front reflection: %.3f%%\n",
75   sd->rf->maxHemi*100.);
# Line 77 | Line 82 | sd->tf->maxHemi*100.);
82   if (sd->tb)
83   fprintf(stderr, "Maximum direct hemispherical back transmission: %.3f%%\n",
84   sd->tb->maxHemi*100.);
85 + }
86   #endif
87          SDretainSet = SDretainAll;              /* keep data in core */
88          return(sd);

Diff Legend

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