Merge pull request #1232 from PhilipRosedale/master

Voxel click to fly defaults OFF, in tools menu

interface/src/Application.cpp

@@ -1124,7 +1124,7 @@ void Application::mousePressEvent(QMouseEvent* event) {
                     _hoverVoxel.green / 255.f * GREEN_CLICK_FREQUENCY +
                     _hoverVoxel.blue / 255.f * BLUE_CLICK_FREQUENCY) / 3.f;
                 
-                _audio.startCollisionSound(1.0, frequency, 0.0, HOVER_VOXEL_DECAY);
+                _audio.startCollisionSound(1.0, frequency, 0.0, HOVER_VOXEL_DECAY, false);
                 _isHoverVoxelSounding = true;
                 
                 const float PERCENTAGE_TO_MOVE_TOWARD = 0.90f;
@@ -1132,7 +1132,8 @@ void Application::mousePressEvent(QMouseEvent* event) {
                 glm::vec3 myPosition = _myAvatar.getPosition();
                 
                 // If there is not an action tool set (add, delete, color), move to this voxel
-                if (!(Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode) ||
+                if (Menu::getInstance()->isOptionChecked(MenuOption::ClickToFly) &&
+                     !(Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode) ||
                      Menu::getInstance()->isOptionChecked(MenuOption::VoxelDeleteMode) ||
                      Menu::getInstance()->isOptionChecked(MenuOption::VoxelColorMode))) {
                     _myAvatar.setMoveTarget(myPosition + (newTarget - myPosition) * PERCENTAGE_TO_MOVE_TOWARD);
@@ -2038,7 +2039,7 @@ void Application::updateHoverVoxels(float deltaTime, glm::vec3& mouseRayOrigin,
                 _hoverVoxelOriginalColor[1] = _hoverVoxel.green;
                 _hoverVoxelOriginalColor[2] = _hoverVoxel.blue;
                 _hoverVoxelOriginalColor[3] = 1;
-                _audio.startCollisionSound(1.0, HOVER_VOXEL_FREQUENCY * _hoverVoxel.s * TREE_SCALE, 0.0, HOVER_VOXEL_DECAY);
+                _audio.startCollisionSound(1.0, HOVER_VOXEL_FREQUENCY * _hoverVoxel.s * TREE_SCALE, 0.0, HOVER_VOXEL_DECAY, false);
                 _isHoverVoxelSounding = true;
             }
         }
@@ -3175,11 +3176,13 @@ void Application::displayOverlay() {
         glDisable(GL_LIGHTING);
     
         //  Display a single screen-size quad to create an alpha blended 'collision' flash
+        if (_audio.getCollisionFlashesScreen()) {
             float collisionSoundMagnitude = _audio.getCollisionSoundMagnitude();
             const float VISIBLE_COLLISION_SOUND_MAGNITUDE = 0.5f;
             if (collisionSoundMagnitude > VISIBLE_COLLISION_SOUND_MAGNITUDE) {
                     renderCollisionOverlay(_glWidget->width(), _glWidget->height(), _audio.getCollisionSoundMagnitude());
             }
+        }
    
         #ifndef _WIN32
         if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {

interface/src/Audio.cpp

@@ -676,11 +676,12 @@ void Audio::addProceduralSounds(int16_t* inputBuffer,
 //
 //  Starts a collision sound.  magnitude is 0-1, with 1 the loudest possible sound. 
 //
-void Audio::startCollisionSound(float magnitude, float frequency, float noise, float duration) {
+void Audio::startCollisionSound(float magnitude, float frequency, float noise, float duration, bool flashScreen) {
     _collisionSoundMagnitude = magnitude;
     _collisionSoundFrequency = frequency;
     _collisionSoundNoise = noise;
     _collisionSoundDuration = duration;
+    _collisionFlashesScreen = flashScreen;
 }
 // -----------------------------------------------------------
 // Accoustic ping (audio system round trip time determination)

interface/src/Audio.h

@@ -55,10 +55,12 @@ public:
     
     void lowPassFilter(int16_t* inputBuffer);
     
-    void startCollisionSound(float magnitude, float frequency, float noise, float duration);
+    void startCollisionSound(float magnitude, float frequency, float noise, float duration, bool flashScreen);
     
     float getCollisionSoundMagnitude() { return _collisionSoundMagnitude; }
     
+    bool getCollisionFlashesScreen() { return _collisionFlashesScreen; }
+    
     void ping();
     
     void init(QGLWidget *parent = 0);
@@ -102,6 +104,7 @@ private:
     float _collisionSoundFrequency;
     float _collisionSoundNoise;
     float _collisionSoundDuration;
+    bool _collisionFlashesScreen;
     int _proceduralEffectSample;
     float _heartbeatMagnitude;
 

interface/src/Menu.cpp

@@ -170,6 +170,9 @@ Menu::Menu() :
     QAction* getColorMode = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::VoxelGetColorMode, Qt::Key_G);
     _voxelModeActionsGroup->addAction(getColorMode);
     
+    addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::ClickToFly);
+    
+    
     // connect each of the voxel mode actions to the updateVoxelModeActionsSlot
     foreach (QAction* action, _voxelModeActionsGroup->actions()) {
         connect(action, SIGNAL(triggered()), this, SLOT(updateVoxelModeActions()));

interface/src/Menu.h

@@ -208,6 +208,7 @@ namespace MenuOption {
     const QString OffAxisProjection = "Off-Axis Projection";
     const QString OldVoxelCullingMode = "Old Voxel Culling Mode";
     const QString TurnWithHead = "Turn using Head";
+    const QString ClickToFly = "Fly to voxel on click";
     const QString Oscilloscope = "Audio Oscilloscope";
     const QString Pair = "Pair";
     const QString PasteVoxels = "Paste";

interface/src/avatar/MyAvatar.cpp

@@ -1020,7 +1020,7 @@ void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTim
             fmin(COLLISION_LOUDNESS * velocityTowardCollision, 1.f),
             frequency * (1.f + velocityTangentToCollision / velocityTowardCollision),
             fmin(velocityTangentToCollision / velocityTowardCollision * NOISE_SCALING, 1.f),
-            1.f - DURATION_SCALING * powf(frequency, 0.5f) / velocityTowardCollision);
+            1.f - DURATION_SCALING * powf(frequency, 0.5f) / velocityTowardCollision, true);
     }
 }