From d39b25a17b26f55b52012387ce57dfafd614b5bd Mon Sep 17 00:00:00 2001 From: tosh Date: Sat, 8 Jun 2013 02:31:23 +0200 Subject: [PATCH 1/2] adds menu option to set whether ground plane gets rendered --- interface/src/Application.cpp | 10 ++++++++-- interface/src/Application.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index acb82412ca..f4f5f8f11b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1383,11 +1383,16 @@ void Application::initMenu() { (_renderAtmosphereOn = renderMenu->addAction("Atmosphere"))->setCheckable(true); _renderAtmosphereOn->setChecked(true); _renderAtmosphereOn->setShortcut(Qt::SHIFT | Qt::Key_A); + (_renderGroundPlaneOn = renderMenu->addAction("Ground Plane"))->setCheckable(true); + _renderGroundPlaneOn->setChecked(true); + _renderGroundPlaneOn->setShortcut(Qt::SHIFT | Qt::Key_G); (_renderAvatarsOn = renderMenu->addAction("Avatars"))->setCheckable(true); _renderAvatarsOn->setChecked(true); (_renderAvatarBalls = renderMenu->addAction("Avatar as Balls"))->setCheckable(true); _renderAvatarBalls->setChecked(false); (_renderFrameTimerOn = renderMenu->addAction("Show Timer"))->setCheckable(true); + + _renderFrameTimerOn->setChecked(false); (_renderLookatOn = renderMenu->addAction("Lookat Vectors"))->setCheckable(true); _renderLookatOn->setChecked(false); @@ -1913,8 +1918,9 @@ void Application::displaySide(Camera& whichCamera) { glPopMatrix(); //draw a grid ground plane.... - drawGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE); - + if (_renderGroundPlaneOn->isChecked()) { + drawGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE); + } // Draw voxels if (_renderVoxels->isChecked()) { _voxels.render(_renderVoxelTextures->isChecked()); diff --git a/interface/src/Application.h b/interface/src/Application.h index 3fe1e8e4b5..1f251ff724 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -180,6 +180,7 @@ private: QAction* _renderVoxelTextures; // Whether to render noise textures on voxels QAction* _renderStarsOn; // Whether to display the stars QAction* _renderAtmosphereOn; // Whether to display the atmosphere + QAction* _renderGroundPlaneOn; // Whether to display the ground plane QAction* _renderAvatarsOn; // Whether to render avatars QAction* _renderStatsOn; // Whether to show onscreen text overlay with stats QAction* _renderFrameTimerOn; // Whether to show onscreen text overlay with stats From 9ca0b5e7a769c5777a7c6f62921e9dfcc7ed99ba Mon Sep 17 00:00:00 2001 From: tosh Date: Sat, 8 Jun 2013 02:35:55 +0200 Subject: [PATCH 2/2] removes blank lines that slipped in --- interface/src/Application.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f4f5f8f11b..01679f76c7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1391,8 +1391,6 @@ void Application::initMenu() { (_renderAvatarBalls = renderMenu->addAction("Avatar as Balls"))->setCheckable(true); _renderAvatarBalls->setChecked(false); (_renderFrameTimerOn = renderMenu->addAction("Show Timer"))->setCheckable(true); - - _renderFrameTimerOn->setChecked(false); (_renderLookatOn = renderMenu->addAction("Lookat Vectors"))->setCheckable(true); _renderLookatOn->setChecked(false);