Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/charisee/test/vr-kcomp.diderot
ViewVC logotype

Diff of /branches/charisee/test/vr-kcomp.diderot

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2839, Tue Nov 25 19:45:46 2014 UTC revision 2840, Tue Nov 25 19:46:43 2014 UTC
# Line 56  Line 56 
56            real val = 0.0;            real val = 0.0;
57            vec3 norm = [0.0,0.0,0.0];            vec3 norm = [0.0,0.0,0.0];
58            if (ui + vi < imgResU) {            if (ui + vi < imgResU) {
59               val = Fc0@rayPos;               val = Fc0(rayPos);
60               norm = normalize(-∇Fc0@rayPos);               norm = normalize(-∇Fc0(rayPos));
61            } else {            } else {
62               val = Fc1@rayPos;               val = Fc1(rayPos);
63               norm = normalize(-∇Fc1@rayPos);               norm = normalize(-∇Fc1(rayPos));
64            }            }
65            if (val > valOpacMin) {  // we have some opacity            if (val > valOpacMin) {  // we have some opacity
66                real opac = min(1.0, lerp(0.0, 1.0, valOpacMin, val, valOpacMax));                real opac = min(1.0, lerp(0.0, 1.0, valOpacMin, val, valOpacMax));

Legend:
Removed from v.2839  
changed lines
  Added in v.2840

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0