mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-22 23:14:10 +02:00
Add menu item that toggles VR display mode
Toggles the display mode if a Rift is found connected at program start.
This commit is contained in:
parent
f3fb39574f
commit
39e3deb9b9
6 changed files with 19 additions and 1 deletions
|
@ -1369,6 +1369,9 @@ void Application::setEnable3DTVMode(bool enable3DTVMode) {
|
||||||
resizeGL(_glWidget->width(),_glWidget->height());
|
resizeGL(_glWidget->width(),_glWidget->height());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Application::setEnableVRMode(bool enableVRMode) {
|
||||||
|
resizeGL(_glWidget->width(), _glWidget->height());
|
||||||
|
}
|
||||||
|
|
||||||
void Application::setRenderVoxels(bool voxelRender) {
|
void Application::setRenderVoxels(bool voxelRender) {
|
||||||
_voxelEditSender.setShouldSend(voxelRender);
|
_voxelEditSender.setShouldSend(voxelRender);
|
||||||
|
|
|
@ -345,6 +345,7 @@ private slots:
|
||||||
|
|
||||||
void setFullscreen(bool fullscreen);
|
void setFullscreen(bool fullscreen);
|
||||||
void setEnable3DTVMode(bool enable3DTVMode);
|
void setEnable3DTVMode(bool enable3DTVMode);
|
||||||
|
void setEnableVRMode(bool enableVRMode);
|
||||||
void cameraMenuChanged();
|
void cameraMenuChanged();
|
||||||
|
|
||||||
glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint);
|
glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint);
|
||||||
|
|
|
@ -253,6 +253,11 @@ Menu::Menu() :
|
||||||
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false,
|
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false,
|
||||||
appInstance, SLOT(cameraMenuChanged()));
|
appInstance, SLOT(cameraMenuChanged()));
|
||||||
|
|
||||||
|
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0,
|
||||||
|
false,
|
||||||
|
appInstance,
|
||||||
|
SLOT(setEnableVRMode(bool)));
|
||||||
|
|
||||||
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0,
|
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0,
|
||||||
false,
|
false,
|
||||||
appInstance,
|
appInstance,
|
||||||
|
|
|
@ -334,6 +334,7 @@ namespace MenuOption {
|
||||||
const QString EchoLocalAudio = "Echo Local Audio";
|
const QString EchoLocalAudio = "Echo Local Audio";
|
||||||
const QString EchoServerAudio = "Echo Server Audio";
|
const QString EchoServerAudio = "Echo Server Audio";
|
||||||
const QString Enable3DTVMode = "Enable 3DTV Mode";
|
const QString Enable3DTVMode = "Enable 3DTV Mode";
|
||||||
|
const QString EnableVRMode = "Enable VR Mode";
|
||||||
const QString ExpandMiscAvatarTiming = "Expand Misc MyAvatar Timing";
|
const QString ExpandMiscAvatarTiming = "Expand Misc MyAvatar Timing";
|
||||||
const QString ExpandAvatarUpdateTiming = "Expand MyAvatar update Timing";
|
const QString ExpandAvatarUpdateTiming = "Expand MyAvatar update Timing";
|
||||||
const QString ExpandAvatarSimulateTiming = "Expand MyAvatar simulate Timing";
|
const QString ExpandAvatarSimulateTiming = "Expand MyAvatar simulate Timing";
|
||||||
|
|
|
@ -72,6 +72,14 @@ void OculusManager::connect() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool OculusManager::isConnected() {
|
||||||
|
#ifdef HAVE_LIBOVR
|
||||||
|
return _isConnected && Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode);
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void OculusManager::configureCamera(Camera& camera, int screenWidth, int screenHeight) {
|
void OculusManager::configureCamera(Camera& camera, int screenWidth, int screenHeight) {
|
||||||
#ifdef HAVE_LIBOVR
|
#ifdef HAVE_LIBOVR
|
||||||
_stereoConfig.SetFullViewport(Viewport(0, 0, screenWidth, screenHeight));
|
_stereoConfig.SetFullViewport(Viewport(0, 0, screenWidth, screenHeight));
|
||||||
|
|
|
@ -27,7 +27,7 @@ class OculusManager {
|
||||||
public:
|
public:
|
||||||
static void connect();
|
static void connect();
|
||||||
|
|
||||||
static bool isConnected() { return _isConnected; }
|
static bool isConnected();
|
||||||
|
|
||||||
static void configureCamera(Camera& camera, int screenWidth, int screenHeight);
|
static void configureCamera(Camera& camera, int screenWidth, int screenHeight);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue