Refactor of MyAvatar and Application HMD sensor

MyAvatar now uses a cached copy of the HMDSensor location, instead of calling into Application for every access. This allows us to simplify application to always return the most recent pose, instead of a different one pre and post physics. Added accessors to HMD Sensor in MyAvatar, besides being helpful, it also an optimization to avoid extracting quaternions from the HMD matrix on every access.

Anthony J. Thibault committed 11 years ago

Commit d07a02c1 parent ac9e1386 files · +88 −88Browse files

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

Unified · Split

interface/src/Application.cpp+8−25

             // If not using an HMD, grab the camera orientation directly
             _myCamera.setRotation(_myAvatar->getHead()->getCameraOrientation());
         } else {
-            // In an HMD, people can look up and down with their actual neck, and the
+            _myCamera.setRotation(glm::quat_cast(_myAvatar->getSensorToWorldMatrix() * getHMDSensorPose()));
-            // per-eye HMD pose will be applied later.  So set the camera orientation
-            // to only the yaw, excluding pitch and roll, i.e. an orientation that
-            // is orthongonal to the (body's) Y axis
-            //_myCamera.setRotation(_myAvatar->getWorldAlignedOrientation());
-            // AJT: no actually we do want the roll and pitch
-            _myCamera.setRotation(glm::quat_cast(_myAvatar->getSensorToWorldMat()) * getHeadOrientation());
         }
         /*
     }
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
-    userInputMapper->setSensorToWorldMat(_myAvatar->getSensorToWorldMat());
+    userInputMapper->setSensorToWorldMat(_myAvatar->getSensorToWorldMatrix());
     userInputMapper->update(deltaTime);
     _keyboardMouseDevice.update();
         _physicsEngine.stepSimulation();
         _entities.getTree()->unlock();
-        // AJT: FIXME due to sensitve order of operations, within MyAvatar,
+        // update the avatar with the current HMD pose
-        // delay the head pose until after the physics step.
+        _myAvatar->setHMDSensorMatrix(getHMDSensorPose());
-        _headPosition = glm::vec3(getActiveDisplayPlugin()->getHeadPose()[3]);
-        _headOrientation = glm::quat_cast(getActiveDisplayPlugin()->getHeadPose());
         if (_physicsEngine.hasOutgoingChanges()) {
             _entities.getTree()->lockForWrite();
     // transform from sensor space, to world space, to avatar model space.
     glm::mat4 poseMat = createMatFromQuatAndPos(pose.getRotation(), pose.getTranslation());
-    glm::mat4 sensorToWorldMat = _myAvatar->getSensorToWorldMat();
+    glm::mat4 sensorToWorldMat = _myAvatar->getSensorToWorldMatrix();
     glm::mat4 modelMat = createMatFromQuatAndPos(_myAvatar->getOrientation(), _myAvatar->getPosition());
     glm::mat4 objectPose = glm::inverse(modelMat) * sensorToWorldMat * poseMat;
 void Application::shutdownPlugins() {
 }
-glm::vec3 Application::getHeadPosition() const {
-    return _headPosition;
-}
-glm::quat Application::getHeadOrientation() const {
-    return _headOrientation;
-}
 glm::uvec2 Application::getCanvasSize() const {
     return getActiveDisplayPlugin()->getRecommendedUiSize();
 }
 mat4 Application::getEyeProjection(int eye) const {
     if (isHMDMode()) {
         return getActiveDisplayPlugin()->getProjection((Eye)eye, _viewFrustum.getProjection());
     }
     return _viewFrustum.getProjection();
 }
     return mat4();
 }
-mat4 Application::getHeadPose() const {
+mat4 Application::getHMDSensorPose() const {
     if (isHMDMode()) {
         return getActiveDisplayPlugin()->getHeadPose();
     }