History

Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430

Andrew Meadows committed 12 years ago

Commit 68c09c52 parents f5433c8 788bb536 files · +203 −10Browse files

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

Unified · Split

interface/src/Application.cpp+27−9
@@ -57,6 +57,7 @@ · 56 unmodified lines
5757 #include "Util.h"
5858 #include "devices/LeapManager.h"
5959 #include "devices/OculusManager.h"
60+#include "devices/TV3DManager.h"
6061 #include "renderer/ProgramObject.h"
6162 #include "ui/TextRenderer.h"
6263 #include "InfoView.h"
@@ -439,7 +440,10 @@ void Application::paintGL() { · 376 unmodified lines
439440
440441 if (OculusManager::isConnected()) {
441442 OculusManager::display(whichCamera);
442−
443+ } else if (TV3DManager::isConnected()) {
444+ _glowEffect.prepare();
445+ TV3DManager::display(whichCamera);
446+ _glowEffect.render();
443447 } else {
444448 _glowEffect.prepare();
445449
@@ -474,8 +478,10 @@ void Application::paintGL() { · 28 unmodified lines
474478 _mirrorCamera.update(1.0f/_fps);
475479
476480 // set the bounds of rear mirror view
477− glViewport(_mirrorViewRect.x(), _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(), _mirrorViewRect.width(), _mirrorViewRect.height());
478− glScissor(_mirrorViewRect.x(), _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(), _mirrorViewRect.width(), _mirrorViewRect.height());
481+ glViewport(_mirrorViewRect.x(), _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(),
482+ _mirrorViewRect.width(), _mirrorViewRect.height());
483+ glScissor(_mirrorViewRect.x(), _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height(),
484+ _mirrorViewRect.width(), _mirrorViewRect.height());
479485 bool updateViewFrustum = false;
480486 updateProjectionMatrix(_mirrorCamera, updateViewFrustum);
481487 glEnable(GL_SCISSOR_TEST);
@@ -506,7 +512,6 @@ void Application::paintGL() { · 24 unmodified lines
506512 // restore absolute translations
507513 _myAvatar.getSkeletonModel().setTranslation(absoluteSkeletonTranslation);
508514 _myAvatar.getHead().getFaceModel().setTranslation(absoluteFaceTranslation);
509−
510515 } else {
511516 displaySide(_mirrorCamera, true);
512517 }
@@ -531,7 +536,8 @@ void Application::paintGL() { · 18 unmodified lines
531536 void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) {
532537 if (OculusManager::isConnected()) {
533538 OculusManager::configureCamera(camera, width, height);
534−
539+ } else if (TV3DManager::isConnected()) {
540+ TV3DManager::configureCamera(camera, width, height);
535541 } else {
536542 camera.setAspectRatio((float)width / height);
537543 camera.setFieldOfView(Menu::getInstance()->getFieldOfView());
@@ -910,7 +916,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 372 unmodified lines
910916 case Qt::Key_J:
911917 if (isShifted) {
912918 _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f);
913−
919+ if (TV3DManager::isConnected()) {
920+ TV3DManager::configureCamera(_myCamera, _glWidget->width(),_glWidget->height());
921+ }
914922 } else {
915923 _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(-0.001, 0, 0));
916924 }
@@ -920,6 +928,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
920928 case Qt::Key_M:
921929 if (isShifted) {
922930 _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f);
931+ if (TV3DManager::isConnected()) {
932+ TV3DManager::configureCamera(_myCamera, _glWidget->width(),_glWidget->height());
933+ }
923934
924935 } else {
925936 _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0.001, 0, 0));
@@ -1839,6 +1850,13 @@ void Application::init() { · 913 unmodified lines
18391850 "trigger",
18401851 Qt::QueuedConnection);
18411852 }
1853+
1854+ TV3DManager::connect();
1855+ if (TV3DManager::isConnected()) {
1856+ QMetaObject::invokeMethod(Menu::getInstance()->getActionForOption(MenuOption::Fullscreen),
1857+ "trigger",
1858+ Qt::QueuedConnection);
1859+ }
18421860
18431861 LeapManager::initialize();
18441862
@@ -2426,7 +2444,7 @@ void Application::updateCamera(float deltaTime) { · 581 unmodified lines
24262444 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
24272445 PerformanceWarning warn(showWarnings, "Application::updateCamera()");
24282446
2429− if (!OculusManager::isConnected()) {
2447+ if (!OculusManager::isConnected() && !TV3DManager::isConnected()) {
24302448 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
24312449 if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
24322450 _myCamera.setMode(CAMERA_MODE_MIRROR);
@@ -3811,7 +3829,7 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 1378 unmodified lines
38113829 return;
38123830 }
38133831 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3814− "Application::displaySide() ... Avatars...");
3832+ "Application::renderAvatars()");
38153833
38163834 if (!selfAvatarOnly) {
38173835 // Render avatars of other nodes
@@ -4100,7 +4118,7 @@ void Application::resetSensors() { · 282 unmodified lines
41004118 if (OculusManager::isConnected()) {
41014119 OculusManager::reset();
41024120 }
4103−
4121+
41044122 QCursor::setPos(_headMouseX, _headMouseY);
41054123 _myAvatar.reset();
41064124 _myTransmitter.resetLevels();

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