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

SCM Repository

[diderot] Diff of /branches/pure-cfg/test/zslice-k1k2.diderot
ViewVC logotype

Diff of /branches/pure-cfg/test/zslice-k1k2.diderot

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

revision 1060, Tue May 3 17:44:46 2011 UTC revision 1061, Tue May 3 17:47:38 2011 UTC
# Line 9  Line 9 
9  vec3 orig = [0.0, 0.0, 10.0];  vec3 orig = [0.0, 0.0, 10.0];
10  vec3 uVec = [1.0, 0.0, 0.0];  vec3 uVec = [1.0, 0.0, 0.0];
11  vec3 vVec = [0.0, 1.0, 0.0];  vec3 vVec = [0.0, 1.0, 0.0];
12  image(3)[] vol = load("../data/quad-patches-pad.nrrd");  field#2(3)[] F = load("../data/quad-patches-pad.nrrd") ⊛ bspln3;
13  field#2(3)[] F = vol ⊛ bspln3;  field#0(2)[3] RGB = load("../data/txf/2d-bow.nrrd") ⊛ tent;
 image(2)[3] imgRGB = load("../data/hue.nhdr");  
 field#0(2)[3] RGB = imgRGB ⊛ tent;  
14    
15  strand sample (int ui, int vi)  strand sample (int ui, int vi)
16  {  {
# Line 38  Line 36 
36                // correct curvature computation ends here                // correct curvature computation ends here
37                k1 = max(-1.0, min(1.0, 4.2*k1));                k1 = max(-1.0, min(1.0, 4.2*k1));
38                k2 = max(-1.0, min(1.0, 4.2*k2));                k2 = max(-1.0, min(1.0, 4.2*k2));
39                rgb = RGB([k1,k2]) if inside([k1,k2],RGB) else [0.0,0.0,0.0];                rgb = RGB([k1,k2]);
40             }             }
41          }          }
42          stabilize;          stabilize;

Legend:
Removed from v.1060  
changed lines
  Added in v.1061

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