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 787, Fri Apr 8 03:39:40 2011 UTC revision 789, Fri Apr 8 09:44:11 2011 UTC
# Line 6  Line 6 
6  // The main thing missing from this is a more general  // The main thing missing from this is a more general
7  // transfer function  // transfer function
8    
9  //string dataFile = "../data/txs-pad3.nrrd";  string dataFile = "../data/txs-pad3.nrrd";
10  //vec3 camEye = [25.0, 15.0, 10.0];  vec3 camEye = [25.0, 15.0, 10.0];
11  //vec3 camAt = [3.0, 3.0, 3.0];  vec3 camAt = [3.0, 3.0, 3.0];
12  //vec3 camUp = [0.0, 0.0, 1.0];  vec3 camUp = [0.0, 0.0, 1.0];
13  //real camNear = -5.0;  real camNear = -5.0;
14  //real camFar = 5.0;  real camFar = 5.0;
15  //real camFOV = 18.0;  real camFOV = 18.0;
 //int imgResU = 480;  
 //int imgResV = 345;  
 //real rayStep = 0.1;  
 //real valOpacMin = 0.20;          // highest value with opacity 0.0  
 //real valOpacMax = 0.25;          // lowest value with opacity 1.0  
   
 string dataFile = "../data/vfrhand-nohip.nhdr";  
 vec3 camEye = [127.331, -1322.05, 272.53];  
 vec3 camAt = [63.0, 82.6536, 98.0];  
 vec3 camUp = [0.9987, 0.0459166, -0.0221267];  
 real camNear = -78.0;  
 real camFar = 78.0;  
 real camFOV = 5.0;  
 //int imgResU = 640;  
 //int imgResV = 480;  
16  int imgResU = 480;  int imgResU = 480;
17  int imgResV = 345;  int imgResV = 345;
 //int imgResU = 320;  
 //int imgResV = 240;  
 // HEY (BUG?) do we intend to allow inconsistent redefinitions of things?  
18  real rayStep = 0.1;  real rayStep = 0.1;
19  real rayStep = 0.5;  real valOpacMin = 0.20;          // highest value with opacity 0.0
20  real valOpacMin = 400.0;        // 400.0 for skin, 1150.0 for bone  real valOpacMax = 0.25;          // lowest value with opacity 1.0
21  real valOpacMax = 700.0;        // 700.0 for skin, 1450.0 for bone  
22    //string dataFile = "../data/vfrhand-nohip.nhdr";
23    //vec3 camEye = [127.331, -1322.05, 272.53];
24    //vec3 camAt = [63.0, 82.6536, 98.0];
25    //vec3 camUp = [0.9987, 0.0459166, -0.0221267];
26    //real camNear = -78.0;
27    //real camFar = 78.0;
28    //real camFOV = 5.0;
29    ////int imgResU = 640;
30    ////int imgResV = 480;
31    //int imgResU = 480;
32    //int imgResV = 345;
33    ////int imgResU = 320;
34    ////int imgResV = 240;
35    //// HEY (BUG?) do we intend to allow inconsistent redefinitions of things?
36    //real rayStep = 0.1;
37    //real rayStep = 0.5;
38    //real valOpacMin = 400.0;        // 400.0 for skin, 1150.0 for bone
39    //real valOpacMax = 700.0;        // 700.0 for skin, 1450.0 for bone
40    
41  real camDist = |camAt - camEye|;  real camDist = |camAt - camEye|;
42  real camVspNear = camDist + camNear;  real camVspNear = camDist + camNear;

Legend:
Removed from v.787  
changed lines
  Added in v.789

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