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

Comparing ray/src/cv/bsdf2rad.c (file contents):
Revision 2.28 by greg, Wed Apr 12 04:27:04 2017 UTC vs.
Revision 2.30 by greg, Mon May 15 19:17:27 2017 UTC

# Line 42 | Line 42 | const double   sph_xoffset = 15.;
42  
43   #define FEQ(a,b)        ((a)-(b) <= 1e-7 && (b)-(a) <= 1e-7)
44  
45 < #define set_minlog()    (min_log10 = log10(overall_min + 1e-5) - .1)
45 > #define set_minlog()    overall_min = (overall_min < 1e-5) ? 1e-5 : overall_min; \
46 >                                min_log10 = log10(overall_min) - .1
47  
48   char    *progname;
49  
# Line 282 | Line 283 | put_mirror_arrow(const FVECT origin, const FVECT nrm)
283          refl[2] = 2.*nrm[2]*nrm[2] - 1.;
284  
285          printf("\n# Mirror arrow\n");
286 <        printf("\narrow_mat cylinder inc_dir\n0\n0\n7");
286 >        printf("\nshaft_mat cylinder inc_dir\n0\n0\n7");
287          printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
288                          origin[0], origin[1], origin[2]+arrow_len,
289                          origin[0], origin[1], origin[2],
290                          arrow_rad);
291 <        printf("\narrow_mat cylinder mir_dir\n0\n0\n7");
291 >        printf("\nshaft_mat cylinder mir_dir\n0\n0\n7");
292          printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
293                          origin[0], origin[1], origin[2],
294                          origin[0] + arrow_len*refl[0],
295                          origin[1] + arrow_len*refl[1],
296                          origin[2] + arrow_len*refl[2],
297                          arrow_rad);
298 <        printf("\narrow_mat cone mir_tip\n0\n0\n8");
298 >        printf("\ntip_mat cone mir_tip\n0\n0\n8");
299          printf("\n\t%f %f %f\n\t%f %f %f\n\t%f 0\n",
300                          origin[0] + (arrow_len-.5*tip_len)*refl[0],
301                          origin[1] + (arrow_len-.5*tip_len)*refl[1],
# Line 314 | Line 315 | put_trans_arrow(const FVECT origin)
315          int             i;
316  
317          printf("\n# Transmission arrow\n");
318 <        printf("\narrow_mat cylinder trans_dir\n0\n0\n7");
318 >        printf("\nshaft_mat cylinder trans_dir\n0\n0\n7");
319          printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
320                          origin[0], origin[1], origin[2],
321                          origin[0], origin[1], origin[2]-arrow_len,
322                          arrow_rad);
323 <        printf("\narrow_mat cone trans_tip\n0\n0\n8");
323 >        printf("\ntip_mat cone trans_tip\n0\n0\n8");
324          printf("\n\t%f %f %f\n\t%f %f %f\n\t%f 0\n",
325                          origin[0], origin[1], origin[2]-arrow_len+.5*tip_len,
326                          origin[0], origin[1], origin[2]-arrow_len-.5*tip_len,
# Line 378 | Line 379 | put_BSDFs(void)
379          printf("\n# Gensurf output corresponding to %d incident directions\n",
380                          NINCIDENT);
381  
382 <        printf("\nvoid glow arrow_glow\n0\n0\n4 1 0 1 0\n");
383 <        printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void 0.25 .\n0\n0\n");
382 >        printf("\nvoid glow tip_mat\n0\n0\n4 1 0 1 0\n");
383 >        printf("\nvoid mixfunc shaft_mat\n4 tip_mat void 0.25 .\n0\n0\n");
384  
385          for (i = 0; i < NINCIDENT; i++) {
386                  get_ivector(ivec, i);

Diff Legend

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