Showing the changes to interface/src/Application.cpp (1 of 20 files). Show all
Unified · Split
| @@ -434,9 +434,9 @@ void Application::paintGL() { · 433 unmodified lines | |||
| 434 | glEnable(GL_LINE_SMOOTH); | 434 | glEnable(GL_LINE_SMOOTH); |
| 435 | 435 | ||
| 436 | if (OculusManager::isConnected()) { | 436 | if (OculusManager::isConnected()) { |
| 437 | _myCamera.setUpShift (0.0f); | 437 | _myCamera.setUpShift(0.0f); |
| 438 | _myCamera.setDistance (0.0f); | 438 | _myCamera.setDistance(0.0f); |
| 439 | _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing | 439 | _myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing |
| 440 | _myCamera.setTargetPosition(_myAvatar->getHead().calculateAverageEyePosition()); | 440 | _myCamera.setTargetPosition(_myAvatar->getHead().calculateAverageEyePosition()); |
| 441 | _myCamera.setTargetRotation(_myAvatar->getHead().getOrientation()); | 441 | _myCamera.setTargetRotation(_myAvatar->getHead().getOrientation()); |
| 442 | 442 | ||
| @@ -446,7 +446,7 @@ void Application::paintGL() { · 3 unmodified lines | |||
| 446 | _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation()); | 446 | _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation()); |
| 447 | 447 | ||
| 448 | } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { | 448 | } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { |
| 449 | _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing | 449 | _myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing |
| 450 | _myCamera.setTargetPosition(_myAvatar->getUprightHeadPosition()); | 450 | _myCamera.setTargetPosition(_myAvatar->getUprightHeadPosition()); |
| 451 | _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation()); | 451 | _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation()); |
| 452 | 452 | ||
| @@ -2227,28 +2227,30 @@ void Application::updateMetavoxels(float deltaTime) { · 1774 unmodified lines | |||
| 2227 | } | 2227 | } |
| 2228 | } | 2228 | } |
| 2229 | 2229 | ||
| 2230 | void Application::cameraMenuChanged() { | ||
| 2231 | if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { | ||
| 2232 | if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { | ||
| 2233 | _myCamera.setMode(CAMERA_MODE_MIRROR); | ||
| 2234 | _myCamera.setModeShiftRate(100.0f); | ||
| 2235 | } | ||
| 2236 | } else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) { | ||
| 2237 | if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) { | ||
| 2238 | _myCamera.setMode(CAMERA_MODE_FIRST_PERSON); | ||
| 2239 | _myCamera.setModeShiftRate(1.0f); | ||
| 2240 | } | ||
| 2241 | } else { | ||
| 2242 | if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) { | ||
| 2243 | _myCamera.setMode(CAMERA_MODE_THIRD_PERSON); | ||
| 2244 | _myCamera.setModeShiftRate(1.0f); | ||
| 2245 | } | ||
| 2246 | } | ||
| 2247 | } | ||
| 2248 | |||
| 2230 | void Application::updateCamera(float deltaTime) { | 2249 | void Application::updateCamera(float deltaTime) { |
| 2231 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | 2250 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 2232 | PerformanceWarning warn(showWarnings, "Application::updateCamera()"); | 2251 | PerformanceWarning warn(showWarnings, "Application::updateCamera()"); |
| 2233 | 2252 | ||
| 2234 | if (!OculusManager::isConnected() && !TV3DManager::isConnected()) { | 2253 | if (!OculusManager::isConnected() && !TV3DManager::isConnected()) { |
| 2235 | if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { | ||
| 2236 | if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { | ||
| 2237 | _myCamera.setMode(CAMERA_MODE_MIRROR); | ||
| 2238 | _myCamera.setModeShiftRate(100.0f); | ||
| 2239 | } | ||
| 2240 | } else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) { | ||
| 2241 | if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) { | ||
| 2242 | _myCamera.setMode(CAMERA_MODE_FIRST_PERSON); | ||
| 2243 | _myCamera.setModeShiftRate(1.0f); | ||
| 2244 | } | ||
| 2245 | } else { | ||
| 2246 | if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) { | ||
| 2247 | _myCamera.setMode(CAMERA_MODE_THIRD_PERSON); | ||
| 2248 | _myCamera.setModeShiftRate(1.0f); | ||
| 2249 | } | ||
| 2250 | } | ||
| 2251 | |||
| 2252 | if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) { | 2254 | if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) { |
| 2253 | float xSign = _myCamera.getMode() == CAMERA_MODE_MIRROR ? 1.0f : -1.0f; | 2255 | float xSign = _myCamera.getMode() == CAMERA_MODE_MIRROR ? 1.0f : -1.0f; |
| 2254 | if (_faceshift.isActive()) { | 2256 | if (_faceshift.isActive()) { |
| @@ -4102,6 +4104,10 @@ void Application::loadScript(const QString& fileNameString) { · 1847 unmodified lines | |||
| 4102 | // hook our avatar object into this script engine | 4104 | // hook our avatar object into this script engine |
| 4103 | scriptEngine->setAvatarData( static_cast<Avatar*>(_myAvatar), "MyAvatar"); | 4105 | scriptEngine->setAvatarData( static_cast<Avatar*>(_myAvatar), "MyAvatar"); |
| 4104 | 4106 | ||
| 4107 | CameraScriptableObject* cameraScriptable = new CameraScriptableObject(&_myCamera, &_viewFrustum); | ||
| 4108 | scriptEngine->registerGlobalObject("Camera", cameraScriptable); | ||
| 4109 | connect(scriptEngine, SIGNAL(finished(const QString&)), cameraScriptable, SLOT(deleteLater())); | ||
| 4110 | |||
| 4105 | QThread* workerThread = new QThread(this); | 4111 | QThread* workerThread = new QThread(this); |
| 4106 | 4112 | ||
| 4107 | // when the worker thread is started, call our engine's run.. | 4113 | // when the worker thread is started, call our engine's run.. |