Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -2071,9 +2071,21 @@ void Application::updateAvatar(float deltaTime) { · 2070 unmodified lines | |||
| 2071 | // Update my avatar's state from gyros and/or webcam | 2071 | // Update my avatar's state from gyros and/or webcam |
| 2072 | _myAvatar.updateFromGyrosAndOrWebcam(Menu::getInstance()->isOptionChecked(MenuOption::GyroLook), | 2072 | _myAvatar.updateFromGyrosAndOrWebcam(Menu::getInstance()->isOptionChecked(MenuOption::GyroLook), |
| 2073 | _pitchFromTouch); | 2073 | _pitchFromTouch); |
| 2074 | 2074 | ||
| 2075 | // Update head mouse from faceshift if active | ||
| 2076 | if (_faceshift.isActive()) { | ||
| 2077 | //glm::quat headRotation = _faceshift.getHeadRotation(); | ||
| 2078 | /* | ||
| 2079 | _headMouseX = _glWidget->getWidth() / 2 + _faceshift.getHeadAngularVelocity() | ||
| 2080 | _headMouseX = max(_headMouseX, 0); | ||
| 2081 | _headMouseX = min(_headMouseX, _glWidget->width()); | ||
| 2082 | _headMouseY = max(_headMouseY, 0); | ||
| 2083 | _headMouseY = min(_headMouseY, _glWidget->height()); | ||
| 2084 | */ | ||
| 2085 | |||
| 2086 | } | ||
| 2075 | if (_serialHeadSensor.isActive()) { | 2087 | if (_serialHeadSensor.isActive()) { |
| 2076 | 2088 | ||
| 2077 | // Grab latest readings from the gyros | 2089 | // Grab latest readings from the gyros |
| 2078 | float measuredPitchRate = _serialHeadSensor.getLastPitchRate(); | 2090 | float measuredPitchRate = _serialHeadSensor.getLastPitchRate(); |
| 2079 | float measuredYawRate = _serialHeadSensor.getLastYawRate(); | 2091 | float measuredYawRate = _serialHeadSensor.getLastYawRate(); |