From 8cecd6773183cd6c2a31e78a26c26820c4bd3e92 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Fri, 26 Jul 2013 12:46:27 -0700 Subject: [PATCH] cleanup --- interface/src/Application.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7ffc432760..4c596f6e9c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -770,7 +770,7 @@ void Application::keyPressEvent(QKeyEvent* event) { case Qt::Key_6: case Qt::Key_7: case Qt::Key_8: - _swatch.handleEvent(event->key(), _eyedropperMode->isChecked()); + _swatch.handleEvent(event->key(), _eyedropperMode->isChecked()); break; default: event->ignore(); @@ -2657,17 +2657,9 @@ void Application::displaySide(Camera& whichCamera) { float sphereRadius = 0.25f; glColor3f(1,0,0); glPushMatrix(); - glutSolidSphere(sphereRadius, 15, 15); + glutSolidSphere(sphereRadius, 15, 15); glPopMatrix(); -/* -glPushMatrix(); -glColor3f(1, 0, 1); -glTranslatef(0.0f, 0.0f, 5.0f); -_particleSystem.render(); -glPopMatrix(); -*/ - //draw a grid ground plane.... if (_renderGroundPlaneOn->isChecked()) { renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude());