Update camera object's position and orientation with actual Rift values

David Rowe committed 12 years ago

Commit 673afca1 parent 1bffaa22 files · +13 −3Browse files

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

Unified · Split

     if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
         _myCamera.setTightness(0.0f);  //  In first person, camera follows (untweaked) head exactly without delay
-        _myCamera.setTargetPosition(_myAvatar->getHead()->getEyePosition());
+        if (!OculusManager::isConnected()) {
-        _myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());
+            _myCamera.setTargetPosition(_myAvatar->getHead()->getEyePosition());
+            _myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());
+        }
+        // OculusManager::display() updates camera position and rotation a bit further on.
     } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
         //Note, the camera distance is set in Camera::setMode() so we dont have to do it here.
     }
     // Update camera position
-    _myCamera.update( 1.f/_fps );
+    if (!OculusManager::isConnected()) {
+        _myCamera.update(1.f / _fps);
+    }
     // Note: whichCamera is used to pick between the normal camera myCamera for our
     // main camera, vs, an alternate camera. The alternate camera we support right now
         } else {
             OculusManager::display(_myAvatar->getWorldAlignedOrientation(), _myAvatar->getDefaultEyePosition(), *whichCamera);
         }
+        _myCamera.update(1.f / _fps);
     } else if (TV3DManager::isConnected()) {

Keyboard shortcuts