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 978, Tue Apr 26 00:55:57 2011 UTC revision 1008, Thu Apr 28 22:18:46 2011 UTC
# Line 63  Line 63 
63      real rayU = lerp(-camUmax, camUmax, -0.5, real(ui), real(imgResU)-0.5);      real rayU = lerp(-camUmax, camUmax, -0.5, real(ui), real(imgResU)-0.5);
64      real rayV = lerp(-camVmax, camVmax, -0.5, real(vi), real(imgResV)-0.5);      real rayV = lerp(-camVmax, camVmax, -0.5, real(vi), real(imgResV)-0.5);
65      vec3 rayVec = (camDist*camN + rayU*camU + rayV*camV)/camDist;      vec3 rayVec = (camDist*camN + rayU*camU + rayV*camV)/camDist;
66        vec3 toEye = normalize(-rayVec);
67    
68      real rayN = camVspNear;      real rayN = camVspNear;
69      // ########## BEGIN per-ray initialization      // ########## BEGIN per-ray initialization
# Line 82  Line 83 
83            if (val > valOpacMin) {  // we have some opacity            if (val > valOpacMin) {  // we have some opacity
84                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));
85                real ld = max(0.0, norm • lightDir);                real ld = max(0.0, norm • lightDir);
86                real hd = max(0.0, norm • normalize(lightDir + normalize(camEye - rayPos)));                real hd = max(0.0, norm • normalize(lightDir + toEye));
87                // contrived assignment of RGB from XYZ, only sensible                // contrived assignment of RGB from XYZ, only sensible
88                // for txs-pad3.nrrd, not for vfrhand-nohip.nhdr!!                // for txs-pad3.nrrd, not for vfrhand-nohip.nhdr!!
89                vec3 matRGB = [lerp(0.2, 1.0, 1.0, rayPos[0], 8.0),                vec3 matRGB = [lerp(0.2, 1.0, 1.0, rayPos[0], 8.0),

Legend:
Removed from v.978  
changed lines
  Added in v.1008

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