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

SCM Repository

[diderot] Diff of /branches/vis12/test/psamp.diderot
ViewVC logotype

Diff of /branches/vis12/test/psamp.diderot

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

revision 3148, Fri Mar 27 16:30:52 2015 UTC revision 3149, Fri Mar 27 16:42:21 2015 UTC
# Line 1  Line 1 
1    
2  field#2(2)[] F = bspln3 ⊛ clamp(image("italy.nrrd"));  field#2(2)[] F = bspln3 ⊛ clamp(image("italy.nrrd"));
3    
4  field#0(1)[3] cmap = tent ⊛ image("italy-cmap.nrrd"); // fallback  //field#0(1)[3] cmap = tent ⊛ image("italy-cmap.nrrd"); // fallback
5  //field#0(1)[3] cmap = tent ⊛ clamp(image("italy-cmap.nrrd"));  field#0(1)[3] cmap = tent ⊛ clamp(image("italy-cmap.nrrd"));
6    
7  //input vec3 ldir = [-1, 1, 1];  //input vec3 ldir = [-1, 1, 1];
8  //input real sh = 0.5;  //input real sh = 0.5;
# Line 29  Line 29 
29    output vec3 rgb = [0,0,0];    output vec3 rgb = [0,0,0];
30    
31    update {    update {
32      rgb = cmap(clamp(-2000,2000,F(wpos))); // fallback      //rgb = cmap(clamp(-2000,2000,F(wpos))); // fallback
33      //rgb = cmap(F(wpos));      rgb = cmap(F(wpos));
34    
35      // TODO: compute shading, involving ∇F(wpos)      // TODO: compute shading, involving ∇F(wpos)
36      stabilize;      stabilize;

Legend:
Removed from v.3148  
changed lines
  Added in v.3149

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