From 1cfbfe6611d3bb134264101467a05bef2bd20b05 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Thu, 16 Jan 2014 14:54:08 -0800 Subject: [PATCH] fix 3d mode switch on/off issue --- interface/src/Application.cpp | 5 +++++ interface/src/Application.h | 2 ++ interface/src/Menu.cpp | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 56632d1cd9..8812a3c49d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1474,6 +1474,11 @@ void Application::setFullscreen(bool fullscreen) { (_window->windowState() & ~Qt::WindowFullScreen)); } +void Application::setEnable3DTVMode(bool enable3DTVMode) { + resizeGL(_glWidget->width(),_glWidget->height()); +} + + void Application::setRenderVoxels(bool voxelRender) { _voxelEditSender.setShouldSend(voxelRender); if (!voxelRender) { diff --git a/interface/src/Application.h b/interface/src/Application.h index c9c7910368..7e78cced4c 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -232,6 +232,8 @@ private slots: void terminate(); void setFullscreen(bool fullscreen); + void setEnable3DTVMode(bool enable3DTVMode); + void renderThrustAtVoxel(const glm::vec3& thrust); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 8c91bfb2af..b2583d7c51 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -232,7 +232,10 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H); - addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0, false); + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0, + false, + appInstance, + SLOT(setEnable3DTVMode(bool))); QMenu* avatarSizeMenu = viewMenu->addMenu("Avatar Size");