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

SCM Repository

[diderot] Diff of /branches/pure-cfg/test/vr-lite-cam.diderot
ViewVC logotype

Diff of /branches/pure-cfg/test/vr-lite-cam.diderot

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

revision 1534, Fri Oct 14 19:01:39 2011 UTC revision 1535, Fri Oct 14 20:27:48 2011 UTC
# Line 93  Line 93 
93  //                             + phongKd*ld*modulate(matRGB, lightRGB)  //                             + phongKd*ld*modulate(matRGB, lightRGB)
94  //                             + phongKs*hd^phongSp*lightRGB);  //                             + phongKs*hd^phongSp*lightRGB);
95  //              rayRGB += rayTransp*alpha*pntRGB;  //              rayRGB += rayTransp*alpha*pntRGB;
96                  real mat = lerp(0.2, 1.0, 1.0, rayPos[0], 8.0);  //              real mat = lerp(0.2, 1.0, 1.0, rayPos[0], 8.0);
97                  real pnt = phongKa * mat                  real pnt = phongKa
98                           + phongKd * ld * mat                           + phongKd * ld
99                           + phongKs * hd^phongSp;                           + phongKs * hd^phongSp;
100                  rayGrey += rayTransp*alpha*pnt;                  rayGrey += rayTransp*alpha*pnt;
101                  rayTransp = rayTransp*(1.0 - alpha);                  rayTransp = rayTransp*(1.0 - alpha);
# Line 104  Line 104 
104         }         }
105         if (rayTransp < 0.01) {  // early ray termination         if (rayTransp < 0.01) {  // early ray termination
106             rayTransp = 0.0;             rayTransp = 0.0;
 //           outRGBA = [rayRGB[0], rayRGB[1], rayRGB[2], 1.0-rayTransp]; /* FIXME */  
 //           outRGBA = [rayGrey, rayGrey, rayGrey, 1.0-rayTransp]; /* FIXME */  
107             stabilize;             stabilize;
108         }         }
109         if (rayN > camVspFar) {         if (rayN > camVspFar) {
 //           outRGBA = [rayRGB[0], rayRGB[1], rayRGB[2], 1.0-rayTransp]; /* FIXME */  
 //           outRGBA = [rayGrey, rayGrey, rayGrey, 1.0-rayTransp]; /* FIXME */  
110             stabilize;             stabilize;
111         }         }
112         rayN += rayStep;         rayN += rayStep;

Legend:
Removed from v.1534  
changed lines
  Added in v.1535

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