This commit is contained in:
Jeffrey Ventrella 2013-07-26 12:46:27 -07:00
parent ad00747c29
commit 8cecd67731

View file

@ -770,7 +770,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
case Qt::Key_6: case Qt::Key_6:
case Qt::Key_7: case Qt::Key_7:
case Qt::Key_8: case Qt::Key_8:
_swatch.handleEvent(event->key(), _eyedropperMode->isChecked()); _swatch.handleEvent(event->key(), _eyedropperMode->isChecked());
break; break;
default: default:
event->ignore(); event->ignore();
@ -2657,17 +2657,9 @@ void Application::displaySide(Camera& whichCamera) {
float sphereRadius = 0.25f; float sphereRadius = 0.25f;
glColor3f(1,0,0); glColor3f(1,0,0);
glPushMatrix(); glPushMatrix();
glutSolidSphere(sphereRadius, 15, 15); glutSolidSphere(sphereRadius, 15, 15);
glPopMatrix(); glPopMatrix();
/*
glPushMatrix();
glColor3f(1, 0, 1);
glTranslatef(0.0f, 0.0f, 5.0f);
_particleSystem.render();
glPopMatrix();
*/
//draw a grid ground plane.... //draw a grid ground plane....
if (_renderGroundPlaneOn->isChecked()) { if (_renderGroundPlaneOn->isChecked()) {
renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude()); renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude());