From 3d426a24f1a1e156ec0afb6d854d6526f520fe6d Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 4 Mar 2014 09:54:34 -0800 Subject: [PATCH] Fixing build warnings --- interface/src/renderer/Model.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 0b524fcc25..7e2e5413b7 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -21,9 +21,9 @@ using namespace std; Model::Model(QObject* parent) : QObject(parent), + _shapesAreDirty(true), _lodDistance(0.0f), - _pupilDilation(0.0f), - _shapesAreDirty(true) { + _pupilDilation(0.0f) { // we may have been created in the network thread, but we live in the main thread moveToThread(Application::getInstance()->thread()); } @@ -741,7 +741,6 @@ void Model::renderCollisionProxies(float alpha) { glPushMatrix(); Application::getInstance()->loadTranslatedViewMatrix(_translation); updateShapePositions(); - float uniformScale = extractUniformScale(_scale); const int BALL_SUBDIVISIONS = 10; glm::quat inverseRotation = glm::inverse(_rotation); for (int i = 0; i < _shapes.size(); i++) { @@ -763,9 +762,6 @@ void Model::renderCollisionProxies(float alpha) { } else if (shape->getType() == Shape::CAPSULE_SHAPE) { CapsuleShape* capsule = static_cast(shape); - // translate to capsule center - glm::vec3 point = inverseRotation * (capsule->getPosition() - _translation); - // draw a blue sphere at the capsule endpoint glm::vec3 endPoint; capsule->getEndPoint(endPoint);