From 6f2a1b98025b27b64a3e0d2c27a6d82925998a68 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 28 Dec 2013 12:51:50 -0800 Subject: [PATCH] cleanup --- interface/src/Application.cpp | 11 ++++------- interface/src/devices/TV3DManager.cpp | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5becba1e12..fcd02375a6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -478,13 +478,10 @@ void Application::paintGL() { _mirrorCamera.update(1.0f/_fps); // set the bounds of rear mirror view - float mirrorX = _mirrorViewRect.x(); - float mirrorY = _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(); - float mirrorW = _mirrorViewRect.width(); - float mirrorH = _mirrorViewRect.height(); - - glViewport(mirrorX, mirrorY, mirrorW, mirrorH); - glScissor(mirrorX, mirrorY, mirrorW, mirrorH); + glViewport(_mirrorViewRect.x(), _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(), + _mirrorViewRect.width(), _mirrorViewRect.height()); + glScissor(_mirrorViewRect.x(), _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(), + _mirrorViewRect.width(), _mirrorViewRect.height()); bool updateViewFrustum = false; updateProjectionMatrix(_mirrorCamera, updateViewFrustum); glEnable(GL_SCISSOR_TEST); diff --git a/interface/src/devices/TV3DManager.cpp b/interface/src/devices/TV3DManager.cpp index eb4e8ad4c0..d309c33ed3 100644 --- a/interface/src/devices/TV3DManager.cpp +++ b/interface/src/devices/TV3DManager.cpp @@ -2,8 +2,8 @@ // TV3DManager.cpp // hifi // -// Created by Stephen Birarda on 5/9/13. -// Copyright (c) 2012 High Fidelity, Inc. All rights reserved. +// Created by Brad Hefta-Gaub on 12/24/13. +// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // #include