History

first cut at 3D TV support

ZappoMan committed 12 years ago

Commit a4384441 parent ebdf80a6 files · +208 −12Browse files

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

Unified · Split

interface/src/Application.cpp+36−10
@@ -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,13 @@ 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+ float mirrorX = _mirrorViewRect.x();
482+ float mirrorY = _glWidget->height() - _mirrorViewRect.y() - _mirrorViewRect.height();
483+ float mirrorW = _mirrorViewRect.width();
484+ float mirrorH = _mirrorViewRect.height();
485+
486+ glViewport(mirrorX, mirrorY, mirrorW, mirrorH);
487+ glScissor(mirrorX, mirrorY, mirrorW, mirrorH);
479488 bool updateViewFrustum = false;
480489 updateProjectionMatrix(_mirrorCamera, updateViewFrustum);
481490 glEnable(GL_SCISSOR_TEST);
@@ -501,14 +510,18 @@ void Application::paintGL() { · 19 unmodified lines
501510 _myAvatar.getSkeletonModel().setTranslation(_myAvatar.getHead().getFaceModel().getTranslation() -
502511 neckPosition);
503512
504− displaySide(_mirrorCamera, true);
513+ //displaySide(_mirrorCamera, true);
514+ displaySide(whichCamera);
515+
505516
506517 // restore absolute translations
507518 _myAvatar.getSkeletonModel().setTranslation(absoluteSkeletonTranslation);
508519 _myAvatar.getHead().getFaceModel().setTranslation(absoluteFaceTranslation);
509520
510521 } else {
511− displaySide(_mirrorCamera, true);
522+ //displaySide(_mirrorCamera, true);
523+ displaySide(whichCamera);
524+
512525 }
513526 glPopMatrix();
514527
@@ -531,7 +544,8 @@ void Application::paintGL() { · 16 unmodified lines
531544 void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) {
532545 if (OculusManager::isConnected()) {
533546 OculusManager::configureCamera(camera, width, height);
534−
547+ } else if (TV3DManager::isConnected()) {
548+ TV3DManager::configureCamera(camera, width, height);
535549 } else {
536550 camera.setAspectRatio((float)width / height);
537551 camera.setFieldOfView(Menu::getInstance()->getFieldOfView());
@@ -910,7 +924,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 372 unmodified lines
910924 case Qt::Key_J:
911925 if (isShifted) {
912926 _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f);
913−
927+ if (TV3DManager::isConnected()) {
928+ TV3DManager::configureCamera(_myCamera, _glWidget->width(),_glWidget->height());
929+ }
914930 } else {
915931 _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(-0.001, 0, 0));
916932 }
@@ -920,6 +936,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
920936 case Qt::Key_M:
921937 if (isShifted) {
922938 _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f);
939+ if (TV3DManager::isConnected()) {
940+ TV3DManager::configureCamera(_myCamera, _glWidget->width(),_glWidget->height());
941+ }
923942
924943 } else {
925944 _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0.001, 0, 0));
@@ -1828,6 +1847,13 @@ void Application::init() { · 902 unmodified lines
18281847 "trigger",
18291848 Qt::QueuedConnection);
18301849 }
1850+
1851+ TV3DManager::connect();
1852+ if (TV3DManager::isConnected()) {
1853+ QMetaObject::invokeMethod(Menu::getInstance()->getActionForOption(MenuOption::Fullscreen),
1854+ "trigger",
1855+ Qt::QueuedConnection);
1856+ }
18311857
18321858 LeapManager::initialize();
18331859
@@ -2415,7 +2441,7 @@ void Application::updateCamera(float deltaTime) { · 581 unmodified lines
24152441 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
24162442 PerformanceWarning warn(showWarnings, "Application::updateCamera()");
24172443
2418− if (!OculusManager::isConnected()) {
2444+ if (!OculusManager::isConnected() && !TV3DManager::isConnected()) {
24192445 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
24202446 if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
24212447 _myCamera.setMode(CAMERA_MODE_MIRROR);
@@ -3800,7 +3826,7 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 1378 unmodified lines
38003826 return;
38013827 }
38023828 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3803− "Application::displaySide() ... Avatars...");
3829+ "Application::renderAvatars()");
38043830
38053831 if (!selfAvatarOnly) {
38063832 // Render avatars of other nodes
@@ -4089,7 +4115,7 @@ void Application::resetSensors() { · 282 unmodified lines
40894115 if (OculusManager::isConnected()) {
40904116 OculusManager::reset();
40914117 }
4092−
4118+
40934119 QCursor::setPos(_headMouseX, _headMouseY);
40944120 _myAvatar.reset();
40954121 _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