Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins

Bradley Austin Davis committed 11 years ago

Commit 975c95e2 parents a60e669 87a0e4811 files · +296 −14Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

         // or with changes from the face tracker
         renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
-        _myCamera.setPosition(_myAvatar->getDefaultEyePosition());
         if (!getActiveDisplayPlugin()->isHmd()) {
+            _myCamera.setPosition(_myAvatar->getDefaultEyePosition());
             _myCamera.setRotation(_myAvatar->getHead()->getCameraOrientation());
         } else {
             // The plugin getModelview() call below will compose the base
-            // avatar transform with the HMD pose.
+            // sensor to world transform with the HMD pose.
-            _myCamera.setRotation(_myAvatar->getOrientation());
+            mat4 sensorToWorldMat = _myAvatar->getSensorToWorldMatrix();
+            _myCamera.setPosition(extractTranslation(sensorToWorldMat));
+            _myCamera.setRotation(glm::quat_cast(sensorToWorldMat));
         }
     } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
         if (isHMDMode()) {
 }
 void Application::faceTrackerMuteToggled() {
     QAction* muteAction = Menu::getInstance()->getActionForOption(MenuOption::MuteFaceTracking);
     Q_CHECK_PTR(muteAction);
     bool isMuted = getSelectedFaceTracker()->isMuted();
         } else if (event->button() == Qt::RightButton) {
             // right click items here
+        } else if (event->button() == Qt::MiddleButton) {
+            // toggle the overlay
+            _overlayConductor.setEnabled(!_overlayConductor.getEnabled());
         }
     }
 }
             }
         }
+        float secondsSinceLastUpdate = (float)timeSinceLastUpdate / 1000.0f;
+        _overlayConductor.update(secondsSinceLastUpdate);
         // depending on whether we're throttling or not.
         // Once rendering is off on another thread we should be able to have Application::idle run at start(0) in
         // perpetuity and not expect events to get backed up.
     return mat4();
 }
+mat4 Application::getEyeOffset(int eye) const {
+    if (isHMDMode()) {
+        mat4 identity;
+        return getActiveDisplayPlugin()->getModelview((Eye)eye, identity);
+    }
+    return mat4();
+}
 mat4 Application::getHMDSensorPose() const {
     if (isHMDMode()) {
         return getActiveDisplayPlugin()->getHeadPose();