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

SCM Repository

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

Diff of /branches/charisee/test/vr.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 9  Line 9 
9  input int wid = 640;  input int wid = 640;
10  input int ht = 480;  input int ht = 480;
11    
 image[3] img = load (dataFile);  
12    
13  field#1[3] F = convolve (bspln3, img);  
14    field#1(3)[3] F = bspln3 ⊛load (dataFile);
15    
16  strand RayCast (int row, int col)  strand RayCast (int row, int col)
17  {  {
# Line 24  Line 24 
24      {      {
25          vec<3> pt = pos + t*dir;          vec<3> pt = pos + t*dir;
26          t = t + stepSz;          t = t + stepSz;
27          vec<3> g = (D F)@pt;          vec<3> g = (D F)(pt);
28          color = over(color, phong(light, g, txf(F@pt)));          color = over(color, phong(light, g, txf(F(pt))));
29          if (color[3] >= 0.999)          if (color[3] >= 0.999)
30              stabilize;              stabilize;
31      }      }

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