From b7352335f23e2c61b4e3b7854f786136ca93f60a Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 14 Feb 2014 16:31:53 -0800
Subject: [PATCH] Adding collisions options to menu at a second location.

And adding CollideWithParticle option which will be working soon...
---
 interface/src/Menu.cpp | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 4a3733f760..6e2cf17c88 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -166,14 +166,19 @@ Menu::Menu() :
     
     addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ClickToFly);
 
-    QMenu* collisionsOptionsMenu = editMenu->addMenu("Collision Options");
-
-    QObject* avatar = appInstance->getAvatar();
-    addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithEnvironment, 0, false, avatar, SLOT(updateCollisionFlags()));
-    addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithAvatars, 0, false, avatar, SLOT(updateCollisionFlags()));
-    addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithVoxels, 0, false, avatar, SLOT(updateCollisionFlags()));
-    // TODO: make this option work
-    //addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithParticles, 0, false, avatar, SLOT(updateCollisionFlags()));
+    {
+        // add collision options to the general edit menu
+        QMenu* collisionsOptionsMenu = editMenu->addMenu("Collision Options");
+        QObject* avatar = appInstance->getAvatar();
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithEnvironment, 
+                0, false, avatar, SLOT(updateCollisionFlags()));
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithAvatars, 
+                0, true, avatar, SLOT(updateCollisionFlags()));
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithVoxels, 
+                0, false, avatar, SLOT(updateCollisionFlags()));
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithParticles, 
+                0, true, avatar, SLOT(updateCollisionFlags()));
+    }
     
     QMenu* toolsMenu = addMenu("Tools");
 
@@ -341,6 +346,20 @@ Menu::Menu() :
                                            SLOT(setTCPEnabled(bool)));
     addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);
 
+    {
+        // add collision options to the avatar menu
+        QMenu* collisionsOptionsMenu = avatarOptionsMenu->addMenu("Collision Options");
+        QObject* avatar = appInstance->getAvatar();
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithEnvironment, 
+                0, false, avatar, SLOT(updateCollisionFlags()));
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithAvatars, 
+                0, true, avatar, SLOT(updateCollisionFlags()));
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithVoxels, 
+                0, false, avatar, SLOT(updateCollisionFlags()));
+        addCheckableActionToQMenuAndActionHash(collisionsOptionsMenu, MenuOption::CollideWithParticles, 
+                0, true, avatar, SLOT(updateCollisionFlags()));
+    }
+    
     QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");
 
     addCheckableActionToQMenuAndActionHash(handOptionsMenu,
@@ -515,6 +534,11 @@ void Menu::loadSettings(QSettings* settings) {
     Application::getInstance()->getProfile()->loadData(settings);
     Application::getInstance()->updateWindowTitle();
     NodeList::getInstance()->loadData(settings);
+
+    // MyAvatar caches some menu options, so we have to update them whenever we load settings.
+    // TODO: cache more settings in MyAvatar that are checked with very high frequency.
+    MyAvatar* myAvatar = Application::getInstance()->getAvatar();
+    myAvatar->updateCollisionFlags();
 }
 
 void Menu::saveSettings(QSettings* settings) {