History

Remove code that will be added back in fullscreen mirror request.

Andrzej Kapolka committed 13 years ago

Commit 183a8661 parent e8885331 file · +1 −14Browse files

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

Unified · Split

interface/src/Application.cpp+1−14
@@ -367,20 +367,7 @@ void Application::paintGL() { · 366 unmodified lines
367 367
368 glEnable(GL_LINE_SMOOTH);368 glEnable(GL_LINE_SMOOTH);
369 369
370 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {370 if (OculusManager::isConnected()) {
371 _myCamera.setTightness (100.0f);
372 glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();
373 if (_myAvatar.getHead().getFaceModel().isActive()) {
374 // make sure we're aligned to the blend face eyes
375 glm::vec3 leftEyePosition, rightEyePosition;
376 if (_myAvatar.getHead().getFaceModel().getEyePositions(leftEyePosition, rightEyePosition)) {
377 targetPosition = (leftEyePosition + rightEyePosition) * 0.5f;
378 }
379 }
380 _myCamera.setTargetPosition(targetPosition);
381 _myCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
382
383 } else if (OculusManager::isConnected()) {
384 _myCamera.setUpShift (0.0f);371 _myCamera.setUpShift (0.0f);
385 _myCamera.setDistance (0.0f);372 _myCamera.setDistance (0.0f);
386 _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing373 _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing

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