From c71b10f639f1ba2f351c30978f852c6c0a5d8f80 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Mon, 24 Feb 2014 17:43:47 -0800
Subject: [PATCH] Added toggles for rendering bucky balls, particles.

---
 interface/src/Application.cpp | 14 +++++++++++---
 interface/src/Menu.cpp        |  4 +++-
 interface/src/Menu.h          |  2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9a26c1407f..70b785b172 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2817,11 +2817,19 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
             _metavoxels.render();
         }
         
-        _buckyBalls.render();
+        if (Menu::getInstance()->isOptionChecked(MenuOption::BuckyBalls)) {
+            PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
+                "Application::displaySide() ... bucky balls...");
+            _buckyBalls.render();
+        }
 
         // render particles...
-        _particles.render();
-
+        if (Menu::getInstance()->isOptionChecked(MenuOption::Particles)) {
+            PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
+                "Application::displaySide() ... particles...");
+            _particles.render();
+        }
+        
         // render the ambient occlusion effect if enabled
         if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
             PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 7e5fe63524..0606737b80 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -289,7 +289,9 @@ Menu::Menu() :
                                   SLOT(cycleRenderMode()));
 
     addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Shadows, 0, false);
-    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Metavoxels, 0, false);
+    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Metavoxels, 0, true);
+    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::BuckyBalls, 0, true);
+    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Particles, 0, true);
 
 
     QMenu* voxelOptionsMenu = developerMenu->addMenu("Voxel Options");
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 262b618526..a3829d5bde 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -184,6 +184,7 @@ namespace MenuOption {
     const QString AutomaticallyAuditTree = "Automatically Audit Tree Stats";
     const QString Bandwidth = "Bandwidth Display";
     const QString BandwidthDetails = "Bandwidth Details";
+    const QString BuckyBalls = "Bucky Balls";
     const QString ChatCircling = "Chat Circling";
     const QString Collisions = "Collisions";
     const QString CollideWithAvatars = "Collide With Avatars";
@@ -260,6 +261,7 @@ namespace MenuOption {
     const QString LoadScript = "Open and Run Script...";
     const QString Oscilloscope = "Audio Oscilloscope";
     const QString Pair = "Pair";
+    const QString Particles = "Particles";
     const QString PasteVoxels = "Paste";
     const QString PasteToVoxel = "Paste to Voxel...";
     const QString PipelineWarnings = "Show Render Pipeline Warnings";