Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:37:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

set size of GVRMainWindow to note 4 size

Browse source
This commit is contained in:
Stephen Birarda 2015-01-29 10:11:46 -08:00
parent c6b7353a17
commit fa166f012f
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gvr-interface/src/GVRInterface.cpp
View file

@ -9,8 +9,13 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#ifdef Q_OS_ANDROID
#include <QtAndroidExtras/QAndroidJniEnvironment> #include <QtAndroidExtras/QAndroidJniEnvironment>
#include <QtAndroidExtras/QAndroidJniObject> #include <QtAndroidExtras/QAndroidJniObject>
#endif
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <QtWidgets/QMenuBar> #include <QtWidgets/QMenuBar>
@ -37,7 +42,7 @@ GVRInterface::GVRInterface(int argc, char* argv[]) :
connect(this, &QGuiApplication::applicationStateChanged, this, &GVRInterface::handleApplicationStateChange); connect(this, &QGuiApplication::applicationStateChanged, this, &GVRInterface::handleApplicationStateChange);
#ifdef Q_OS_ANDROID && HAVE_LIBOVR #if defined(Q_OS_ANDROID) && defined(HAVE_LIBOVR)
QAndroidJniEnvironment jniEnv; QAndroidJniEnvironment jniEnv;
QPlatformNativeInterface* interface = QApplication::platformNativeInterface(); QPlatformNativeInterface* interface = QApplication::platformNativeInterface();
@ -54,7 +59,7 @@ GVRInterface::GVRInterface(int argc, char* argv[]) :
} }
void GVRInterface::idle() { void GVRInterface::idle() {
#ifdef Q_OS_ANDROID && HAVE_LIBOVR #if defined(Q_OS_ANDROID) && defined(HAVE_LIBOVR)
if (!_inVRMode && ovr_IsHeadsetDocked()) { if (!_inVRMode && ovr_IsHeadsetDocked()) {
qDebug() << "The headset just got docked - assume we are in VR mode."; qDebug() << "The headset just got docked - assume we are in VR mode.";
_inVRMode = true; _inVRMode = true;

11
gvr-interface/src/GVRMainWindow.cpp
View file

@ -14,6 +14,10 @@
#include <QtWidgets/QInputDialog> #include <QtWidgets/QInputDialog>
#include <QtWidgets/QMenuBar> #include <QtWidgets/QMenuBar>
#ifndef Q_OS_ANDROID
#include <QtWidgets/QDesktopWidget>
#endif
#include <AddressManager.h> #include <AddressManager.h>
#include "InterfaceView.h" #include "InterfaceView.h"
@ -24,6 +28,13 @@
GVRMainWindow::GVRMainWindow(QWidget* parent) : GVRMainWindow::GVRMainWindow(QWidget* parent) :
QMainWindow(parent) QMainWindow(parent)
{ {
#ifndef Q_OS_ANDROID
const int NOTE_4_WIDTH = 2560;
const int NOTE_4_HEIGHT = 1440;
setFixedSize(NOTE_4_WIDTH / 2, NOTE_4_HEIGHT / 2);
#endif
QMenu* fileMenu = new QMenu("File"); QMenu* fileMenu = new QMenu("File");
QMenu* helpMenu = new QMenu("Help"); QMenu* helpMenu = new QMenu("Help");

4
interface/CMakeLists.txt
View file

@ -183,12 +183,10 @@ add_definitions(-DQT_NO_BEARERMANAGEMENT)
if (APPLE) if (APPLE)
# link in required OS X frameworks and include the right GL headers # link in required OS X frameworks and include the right GL headers
find_library(CoreAudio CoreAudio)
find_library(CoreFoundation CoreFoundation)
find_library(OpenGL OpenGL) find_library(OpenGL OpenGL)
find_library(AppKit AppKit) find_library(AppKit AppKit)
target_link_libraries(${TARGET_NAME} ${CoreAudio} ${CoreFoundation} ${OpenGL} ${AppKit}) target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit})
# install command for OS X bundle # install command for OS X bundle
INSTALL(TARGETS ${TARGET_NAME} INSTALL(TARGETS ${TARGET_NAME}

6
libraries/audio-client/CMakeLists.txt
View file

@ -25,5 +25,11 @@ find_package(Soxr REQUIRED)
target_link_libraries(${TARGET_NAME} ${SOXR_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${SOXR_LIBRARIES})
include_directories(SYSTEM ${SOXR_INCLUDE_DIRS}) include_directories(SYSTEM ${SOXR_INCLUDE_DIRS})
if (APPLE)
find_library(CoreAudio CoreAudio)
find_library(CoreFoundation CoreFoundation)
target_link_libraries(${TARGET_NAME} ${CoreAudio} ${CoreFoundation})
endif ()
# call macro to include our dependency includes and bubble them up via a property on our target # call macro to include our dependency includes and bubble them up via a property on our target
include_dependency_includes() include_dependency_includes()