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

SCM Repository

[diderot] Diff of /benchmarks/programs/vr-lite-cam/bmark-diderot.diderot
ViewVC logotype

Diff of /benchmarks/programs/vr-lite-cam/bmark-diderot.diderot

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

revision 1586, Mon Oct 31 10:55:08 2011 UTC revision 1599, Thu Nov 3 04:59:43 2011 UTC
# Line 34  Line 34 
34  vec3 lightDir = normalize(lightVspDir[0]*camU + lightVspDir[1]*camV + lightVspDir[2]*camN);  vec3 lightDir = normalize(lightVspDir[0]*camU + lightVspDir[1]*camV + lightVspDir[2]*camN);
35    
36  real phongKa = 0.05;  real phongKa = 0.05;
37  real phongKd = 0.65;  real phongKd = 0.80;
38  real phongKs = 0.45;  real phongKs = 0.20;
39  real phongSp = 50.0;  real phongSp = 50.0;
40    
41  field#2(3)[] F =  bspln3 ⊛ load(dataFile);  field#2(3)[] F =  bspln3 ⊛ load(dataFile);
# Line 62  Line 62 
62                  real alpha = min(1.0, lerp(0.0, 1.0, valOpacMin, val, valOpacMax));                  real alpha = min(1.0, lerp(0.0, 1.0, valOpacMin, val, valOpacMax));
63                  real ld = max(0.0, norm • lightDir);                  real ld = max(0.0, norm • lightDir);
64                  real hd = max(0.0, norm • normalize(lightDir + toEye));                  real hd = max(0.0, norm • normalize(lightDir + toEye));
65                  real mat = lerp(0.2, 1.0, 1.0, rayPos[0], 8.0);                 // GLK not sure why this line is here
66                  real pnt = phongKa * mat                 // real mat = lerp(0.2, 1.0, 1.0, rayPos[0], 8.0);
67                           + phongKd * ld * mat                 real pnt = phongKa
68                              + phongKd * ld
69                           + phongKs * hd^phongSp;                           + phongKs * hd^phongSp;
70                  rayGrey += rayTransp*alpha*pnt;                  rayGrey += rayTransp*alpha*pnt;
71                  rayTransp = rayTransp*(1.0 - alpha);                  rayTransp = rayTransp*(1.0 - alpha);

Legend:
Removed from v.1586  
changed lines
  Added in v.1599

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