ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.29 by greg, Wed Apr 12 05:01:45 2017 UTC

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

Diff Legend

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