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

SCM Repository

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

Diff of /trunk/test/vr-phong.diderot

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

revision 87, Wed May 26 23:07:39 2010 UTC revision 104, Tue Jun 1 16:04:19 2010 UTC
# Line 18  Line 18 
18    
19  image(3)[] img = load (dataFile);  image(3)[] img = load (dataFile);
20    
21  field#1(3)[] F = convolve (bspln3, img);  //field#1(3)[] F = convolve (bspln3, img);
22    field#2(3)[] F = convolve (bspln3, img);
23    
24  field#0(1)[4] txf = convolve (tent, load("txf-rgba.nrrd"));  field#0(1)[4] txf = convolve (tent, load("txf-rgba.nrrd"));
25    
# Line 54  Line 55 
55             //// modulate : vec3 x vec3 -> vec3             //// modulate : vec3 x vec3 -> vec3
56             //// + : vec3 x vec3 -> vec3             //// + : vec3 x vec3 -> vec3
57             //// pow : real x real -> real             //// pow : real x real -> real
58             vec3 pntRGB = (ka + kd*ldotn)*modulate(matRGB,lightRGB) + ks*pow(hdotn,psh)*lightRGB;             vec3 pntRGB = (ka + kd*ldotn)*modulate(matRGB,lightRGB) + ks*pow(hdotn,sh)*lightRGB;
59             rayRGB = rayRGB + rayTransp*matRGBA[3]*pntRGB;             rayRGB = rayRGB + rayTransp*matRGBA[3]*pntRGB;
60             //// * : real x real -> real             //// * : real x real -> real
61             //// - : real x real -> real             //// - : real x real -> real
# Line 69  Line 70 
70          t = t + stepSz;          t = t + stepSz;
71      }      }
72    
   
73  }  }
74    
75    initially [ RayCast(r, c) | r in 0..1023, c in 0..1023 ];

Legend:
Removed from v.87  
changed lines
  Added in v.104

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