diff options
author | Dennis Peeten <dpeeten@onsneteindhoven.nl> | 2008-04-17 10:46:52 (GMT) |
---|---|---|
committer | Dennis Peeten <dpeeten@onsneteindhoven.nl> | 2008-04-17 10:46:52 (GMT) |
commit | e3108220e8c9e1a66731d42f1769343d49728efd (patch) | |
tree | 7de84c0024d0cdbed9e5761d719f996a71c5c5ad /headtrack_stereo_demo/src/main.cpp | |
parent | 7e5ef59c21af27e98f2a50b076d3b73882929768 (diff) | |
download | 2iv55-e3108220e8c9e1a66731d42f1769343d49728efd.zip 2iv55-e3108220e8c9e1a66731d42f1769343d49728efd.tar.gz 2iv55-e3108220e8c9e1a66731d42f1769343d49728efd.tar.bz2 |
poep
Diffstat (limited to 'headtrack_stereo_demo/src/main.cpp')
-rw-r--r-- | headtrack_stereo_demo/src/main.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/headtrack_stereo_demo/src/main.cpp b/headtrack_stereo_demo/src/main.cpp index 40e726f..f7f037a 100644 --- a/headtrack_stereo_demo/src/main.cpp +++ b/headtrack_stereo_demo/src/main.cpp @@ -33,7 +33,6 @@ void InitGL(void) glClearDepth(1000.0);
glDisable(GL_DITHER);
glShadeModel(GL_SMOOTH);
- //glEnable(GL_NORMALIZE); //why??
glEnable(GL_CULL_FACE);
}
@@ -104,6 +103,10 @@ bool LoadGreyScaleShader() glLinkProgram(g_GameState.m_GreyScaleShaderProgram);
+ g_GameState.m_GSConvScaleLoc = glGetUniformLocation(g_GameState.m_GreyScaleShaderProgram, "g_ConversionWeights");
+
+
+
return true;
}
@@ -149,12 +152,15 @@ int main(int argc, char **argv) g_GameState.m_FrustumParms.m_dCameraYCenter = 768.0/2.0;
g_GameState.m_FrustumParms.m_dYAngleCorrection = 0.0; //to be initialised correctly
g_GameState.m_FrustumParms.m_dScreenHeightWorld = 20.0;
- g_GameState.m_FrustumParms.m_dCameraYOffset = 130.0;
+ /*g_GameState.m_FrustumParms.m_dCameraYOffset = 130.0;
g_GameState.m_FrustumParms.m_dScreenHeightMM = 210.0;
- g_GameState.m_FrustumParms.m_dScreenAspect = 4.0/3.0;
- //g_GameState.m_FrustumParms.m_dCameraYOffset = 205.0;
- //g_GameState.m_FrustumParms.m_dScreenHeightMM = 320.0;
- //g_GameState.m_FrustumParms.m_dScreenAspect = 16.0/10.0;
+ g_GameState.m_FrustumParms.m_dScreenAspect = 4.0/3.0;*/
+ g_GameState.m_GSConvScale[0] = 0.299;
+ g_GameState.m_GSConvScale[1] = 0.587;
+ g_GameState.m_GSConvScale[2] = 0.114;
+ g_GameState.m_FrustumParms.m_dCameraYOffset = 205.0;
+ g_GameState.m_FrustumParms.m_dScreenHeightMM = 320.0;
+ g_GameState.m_FrustumParms.m_dScreenAspect = 16.0/10.0;
g_GameState.m_bHeadTrackingEnabled = false;
g_GameState.m_bStereoEnabled = false;
|