Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4433 from ZappoMan/fix3DTV

Browse source 
fix rendering of models in 3D TV mode
This commit is contained in:
Brad Hefta-Gaub 2015-03-12 16:42:37 -07:00
commit fadd1a09e5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/devices/TV3DManager.cpp
View file

@ -107,13 +107,16 @@ void TV3DManager::display(Camera& whichCamera) {
const bool displayOverlays = Menu::getInstance()->isOptionChecked(MenuOption::UserInterface); const bool displayOverlays = Menu::getInstance()->isOptionChecked(MenuOption::UserInterface);
DependencyManager::get<GlowEffect>()->prepare(); DependencyManager::get<GlowEffect>()->prepare();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
// render left side view // render left side view
glViewport(portalX, portalY, portalW, portalH); glViewport(portalX, portalY, portalW, portalH);
glScissor(portalX, portalY, portalW, portalH); glScissor(portalX, portalY, portalW, portalH);
Camera eyeCamera;
eyeCamera.setRotation(whichCamera.getRotation());
eyeCamera.setPosition(whichCamera.getPosition());
glPushMatrix(); glPushMatrix();
{ {
@ -129,7 +132,8 @@ void TV3DManager::display(Camera& whichCamera) {
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
Application::getInstance()->displaySide(whichCamera, false, RenderArgs::STEREO_LEFT); eyeCamera.setEyeOffsetPosition(glm::vec3(-_activeEye->modelTranslation,0,0));
Application::getInstance()->displaySide(eyeCamera, false, RenderArgs::MONO);
if (displayOverlays) { if (displayOverlays) {
applicationOverlay.displayOverlayTexture3DTV(whichCamera, _aspect, fov); applicationOverlay.displayOverlayTexture3DTV(whichCamera, _aspect, fov);
@ -150,7 +154,7 @@ void TV3DManager::display(Camera& whichCamera) {
_activeEye = &_rightEye; _activeEye = &_rightEye;
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); // reset projection matrix glLoadIdentity(); // reset projection matrix
glFrustum(_rightEye.left, _rightEye.right, _rightEye.bottom, _rightEye.top, nearZ, farZ); // set left view frustum glFrustum(_rightEye.left, _rightEye.right, _rightEye.bottom, _rightEye.top, nearZ, farZ); // set right view frustum
GLfloat p[4][4]; GLfloat p[4][4];
glGetFloatv(GL_PROJECTION_MATRIX, &(p[0][0])); glGetFloatv(GL_PROJECTION_MATRIX, &(p[0][0]));
GLfloat cotangent = p[1][1]; GLfloat cotangent = p[1][1];
@ -159,7 +163,8 @@ void TV3DManager::display(Camera& whichCamera) {
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
Application::getInstance()->displaySide(whichCamera, false, RenderArgs::STEREO_RIGHT); eyeCamera.setEyeOffsetPosition(glm::vec3(-_activeEye->modelTranslation,0,0));
Application::getInstance()->displaySide(eyeCamera, false, RenderArgs::MONO);
if (displayOverlays) { if (displayOverlays) {
applicationOverlay.displayOverlayTexture3DTV(whichCamera, _aspect, fov); applicationOverlay.displayOverlayTexture3DTV(whichCamera, _aspect, fov);