Fixes for oculus rift support

* should work in standing and 'seated' mode
* OculusBaseDisplayPlugin getModelView now only applies eye offset to match behavior from the OpenVRPlugin

interface/src/avatar/MyAvatar.cpp

@@ -250,6 +250,14 @@ void MyAvatar::simulate(float deltaTime) {
     maybeUpdateBillboard();
 }
 
+glm::mat4 MyAvatar::getSensorToWorldMatrix() const {
+    if (getStandingHMDSensorMode()) {
+        return _sensorToWorldMatrix;
+    } else {
+        return createMatFromQuatAndPos(getWorldAlignedOrientation(), getDefaultEyePosition());
+    }
+}
+
 // best called at end of main loop, just before rendering.
 // update sensor to world matrix from current body position and hmd sensor.
 // This is so the correct camera can be used for rendering.
@@ -261,10 +269,12 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) {
     _hmdSensorOrientation = glm::quat_cast(hmdSensorMatrix);
     _bodySensorMatrix = deriveBodyFromHMDSensor();
 
-    // set the body position/orientation to reflect motion due to the head.
-    auto worldMat = _sensorToWorldMatrix * _bodySensorMatrix;
-    setPosition(extractTranslation(worldMat));
-    setOrientation(glm::quat_cast(worldMat));
+    if (getStandingHMDSensorMode()) {
+        // set the body position/orientation to reflect motion due to the head.
+        auto worldMat = _sensorToWorldMatrix * _bodySensorMatrix;
+        setPosition(extractTranslation(worldMat));
+        setOrientation(glm::quat_cast(worldMat));
+    }
 }
 
 // best called at end of main loop, just before rendering.

interface/src/avatar/MyAvatar.h

@@ -48,7 +48,7 @@ public:
     const glm::mat4& getHMDSensorMatrix() const { return _hmdSensorMatrix; }
     const glm::vec3& getHMDSensorPosition() const { return _hmdSensorPosition; }
     const glm::quat& getHMDSensorOrientation() const { return _hmdSensorOrientation; }
-    glm::mat4 getSensorToWorldMatrix() const { return _sensorToWorldMatrix; }
+    glm::mat4 getSensorToWorldMatrix() const;
 
     // best called at start of main loop just after we have a fresh hmd pose.
     // update internal body position from new hmd pose.

libraries/display-plugins/src/display-plugins/oculus/OculusBaseDisplayPlugin.cpp

@@ -54,7 +54,9 @@ glm::mat4 OculusBaseDisplayPlugin::getProjection(Eye eye, const glm::mat4& baseP
 }
 
 glm::mat4 OculusBaseDisplayPlugin::getModelview(Eye eye, const glm::mat4& baseModelview) const {
-    return baseModelview * toGlm(_eyePoses[eye]);
+    auto eyeOffsetMat = glm::mat4();
+    setTranslation(eyeOffsetMat, toGlm(_eyeOffsets[eye]));
+    return baseModelview * eyeOffsetMat;
 }
 
 void OculusBaseDisplayPlugin::resetSensors() {