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 48, Tue Apr 13 23:11:15 2010 UTC revision 49, Tue Apr 13 23:16:22 2010 UTC
# Line 20  Line 20 
20    
21  field#1[3] F = convolve (bspln3, img);  field#1[3] F = convolve (bspln3, img);
22    
23    field#0<4>[1] txf = convolve (tent, load("txf-rgba.nrrd"));
24    
25  actor RayCast (int row, int col)  actor RayCast (int row, int col)
26  {  {
27      vec<3>      pos = orig + row*rVec + col*cVec;      vec<3>      pos = orig + row*rVec + col*cVec;
# Line 35  Line 37 
37             vec<3> grad = (D F)@pos;             vec<3> grad = (D F)@pos;
38             vec<3> norm = grad/|grad|;             vec<3> norm = grad/|grad|;
39             vec<3> half = lightDir - dir/|lightDir - dir|;             vec<3> half = lightDir - dir/|lightDir - dir|;
40             vec<4> matRGBA = txf(val);             vec<4> matRGBA = txf@val;
41             vec<3> matRGB = (matRGBA[0],matRGBA[1],matRGBA[2]);             vec<3> matRGB = (matRGBA[0],matRGBA[1],matRGBA[2]);
42             real ldotn = dot(lightDir,norm);             real ldotn = dot(lightDir,norm);
43             real hdotn = dot(halfDir,norm);             real hdotn = dot(halfDir,norm);

Legend:
Removed from v.48  
changed lines
  Added in v.49

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