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

SCM Repository

[diderot] Diff of /branches/pure-cfg/test/bug-lookup.diderot
ViewVC logotype

Diff of /branches/pure-cfg/test/bug-lookup.diderot

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

revision 1066, Tue May 3 18:35:24 2011 UTC revision 1068, Tue May 3 19:01:56 2011 UTC
# Line 1  Line 1 
1  //  //
2  // HEY (BUG) compiling this gets:  // HEY (BUG) compiling this gets:
3  /*  /*
4    ...
5  probeElem: d2/dxdz in 3D space  probeElem: d2/dxdz in 3D space
6  probeElem: d2/dxdy in 3D space  probeElem: d2/dxdy in 3D space
7  probeElem: d2/dx2 in 3D space  probeElem: d2/dx2 in 3D space
# Line 62  Line 63 
63    
64      real rayN = camVspNear;      real rayN = camVspNear;
65      real rayTransp = 1.0;      real rayTransp = 1.0;
66      vec3 rayRGB = [0.0, 0.0, 0.0];      output real out = 0.0;
     output vec4 outRGBA = [0.0, 0.0, 0.0, 0.0];  
67    
68      update {      update {
69         vec3 pos = camEye + rayN*rayVec;         vec3 pos = camEye + rayN*rayVec;
# Line 81  Line 81 
81                real k1 = (trace(G) + disc)/2.0;                real k1 = (trace(G) + disc)/2.0;
82                real k2 = (trace(G) - disc)/2.0;                real k2 = (trace(G) - disc)/2.0;
83                real km = sqrt(k1^2 + k2^2);                real km = sqrt(k1^2 + k2^2);
84                rayRGB = [km, 0.0, 0.0];                out = km;
85                rayTransp = rayTransp*(1.0 - alpha);                rayTransp = rayTransp*(1.0 - alpha);
86            }            }
87            // ##########  END  per-sample code            // ##########  END  per-sample code
88         }         }
89         if (rayTransp < 0.01) {  // early ray termination         if (rayTransp < 0.01) {  // early ray termination
            rayTransp = 0.0;  
            rayRGB = 0.6*rayRGB;  
            outRGBA = [rayRGB[0], rayRGB[1], rayRGB[2], 1.0-rayTransp]; /* FIXME */  
90             stabilize;             stabilize;
91         }         }
92         if (rayN > camVspFar) {         if (rayN > camVspFar) {
            rayRGB = 0.6*rayRGB;  
            outRGBA = [rayRGB[0], rayRGB[1], rayRGB[2], 1.0-rayTransp]; /* FIXME */  
93             stabilize;             stabilize;
94         }         }
95         rayN = rayN + rayStep;         rayN = rayN + rayStep;

Legend:
Removed from v.1066  
changed lines
  Added in v.1068

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