From 32b2fb8f219d6a3b894ed1e5995394c4f97f9186 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 28 Dec 2013 12:08:24 -0800 Subject: [PATCH] cleanup --- interface/src/Application.cpp | 9 ++------- interface/src/Application.h | 7 ++----- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 21e6575931..5becba1e12 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -510,18 +510,13 @@ void Application::paintGL() { _myAvatar.getSkeletonModel().setTranslation(_myAvatar.getHead().getFaceModel().getTranslation() - neckPosition); - //displaySide(_mirrorCamera, true); - displaySide(whichCamera); - + displaySide(_mirrorCamera, true); // restore absolute translations _myAvatar.getSkeletonModel().setTranslation(absoluteSkeletonTranslation); _myAvatar.getHead().getFaceModel().setTranslation(absoluteFaceTranslation); - } else { - //displaySide(_mirrorCamera, true); - displaySide(whichCamera); - + displaySide(_mirrorCamera, true); } glPopMatrix(); diff --git a/interface/src/Application.h b/interface/src/Application.h index 2c813d1068..fac4d03fb2 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -254,13 +254,10 @@ private slots: void shrinkMirrorView(); void resetSensors(); - -public: - void updateProjectionMatrix(); - void updateProjectionMatrix(Camera& camera, bool updateViewFrustum = true); - private: void resetCamerasOnResizeGL(Camera& camera, int width, int height); + void updateProjectionMatrix(); + void updateProjectionMatrix(Camera& camera, bool updateViewFrustum = true); static bool sendVoxelsOperation(OctreeElement* node, void* extraData); static void processAvatarURLsMessage(unsigned char* packetData, size_t dataBytes);