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

SCM Repository

[diderot] Diff of /branches/vis12/test/vr-phong.diderot
ViewVC logotype

Diff of /branches/vis12/test/vr-phong.diderot

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

revision 85, Wed May 26 19:51:10 2010 UTC revision 86, Wed May 26 22:23:17 2010 UTC
# Line 32  Line 32 
32      //// / : vec3 x real -> vec3      //// / : vec3 x real -> vec3
33      vec3        dir = (pos - eye)/|pos - eye|;      vec3        dir = (pos - eye)/|pos - eye|;
34      real        t = 0.0;      real        t = 0.0;
35      vec3        rayRGB = vec3(0.0, 0.0, 0.0);      vec3        rayRGB = [0.0, 0.0, 0.0];
36      real        rayTransp = 1.0;      real        rayTransp = 1.0;
37    
38      update      update
# Line 44  Line 44 
44             vec3 grad = (D F)@pos;             vec3 grad = (D F)@pos;
45             vec3 norm = grad/|grad|;             vec3 norm = grad/|grad|;
46             vec3 half = (lightDir - dir)/|lightDir - dir|;             vec3 half = (lightDir - dir)/|lightDir - dir|;
47             vec4 matRGBA = txf@val;             vec4 matRGBA = txf@[val];
48             vec3 matRGB = (matRGBA[0],matRGBA[1],matRGBA[2]);             vec3 matRGB = [matRGBA[0],matRGBA[1],matRGBA[2]];
49             //// dot : vec3 x vec3 -> real             //// dot : vec3 x vec3 -> real
50             real ldotn = dot(lightDir,norm);             real ldotn = dot(lightDir,norm);
51             real hdotn = dot(halfDir,norm);             real hdotn = dot(halfDir,norm);

Legend:
Removed from v.85  
changed lines
  Added in v.86

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