History

Merge branch 'master' of https://github.com/highfidelity/hifi

Andrzej Kapolka committed 12 years ago

Commit 3e2ba9f2 parents 67bef20 72de48620 files · +529 −148Browse files

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

Unified · Split

interface/src/Application.cpp+27−21
@@ -434,9 +434,9 @@ void Application::paintGL() { · 433 unmodified lines
434434 glEnable(GL_LINE_SMOOTH);
435435
436436 if (OculusManager::isConnected()) {
437− _myCamera.setUpShift (0.0f);
438− _myCamera.setDistance (0.0f);
439− _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing
437+ _myCamera.setUpShift(0.0f);
438+ _myCamera.setDistance(0.0f);
439+ _myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing
440440 _myCamera.setTargetPosition(_myAvatar->getHead().calculateAverageEyePosition());
441441 _myCamera.setTargetRotation(_myAvatar->getHead().getOrientation());
442442
@@ -446,7 +446,7 @@ void Application::paintGL() { · 3 unmodified lines
446446 _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation());
447447
448448 } 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
450450 _myCamera.setTargetPosition(_myAvatar->getUprightHeadPosition());
451451 _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation());
452452
@@ -2227,28 +2227,30 @@ void Application::updateMetavoxels(float deltaTime) { · 1774 unmodified lines
22272227 }
22282228 }
22292229
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+
22302249 void Application::updateCamera(float deltaTime) {
22312250 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
22322251 PerformanceWarning warn(showWarnings, "Application::updateCamera()");
22332252
22342253 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−
22522254 if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) {
22532255 float xSign = _myCamera.getMode() == CAMERA_MODE_MIRROR ? 1.0f : -1.0f;
22542256 if (_faceshift.isActive()) {
@@ -4102,6 +4104,10 @@ void Application::loadScript(const QString& fileNameString) { · 1847 unmodified lines
41024104 // hook our avatar object into this script engine
41034105 scriptEngine->setAvatarData( static_cast<Avatar*>(_myAvatar), "MyAvatar");
41044106
4107+ CameraScriptableObject* cameraScriptable = new CameraScriptableObject(&_myCamera, &_viewFrustum);
4108+ scriptEngine->registerGlobalObject("Camera", cameraScriptable);
4109+ connect(scriptEngine, SIGNAL(finished(const QString&)), cameraScriptable, SLOT(deleteLater()));
4110+
41054111 QThread* workerThread = new QThread(this);
41064112
41074113 // when the worker thread is started, call our engine's run..

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t