Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

show GVRInterface in full screen on Android

Browse source
This commit is contained in:
Stephen Birarda 2015-01-30 10:16:48 -08:00
parent d7ad20e476
commit 3af97b7f8d
5 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gvr-interface/CMakeLists.txt
View file

@ -28,19 +28,21 @@ include_glm()
link_hifi_libraries(shared networking audio-client avatars)
include_dependency_includes()
find_package(LibOVR)
if (LIBOVR_FOUND)
add_definitions(-DHAVE_LIBOVR)
target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES})
include_directories(SYSTEM ${LIBOVR_INCLUDE_DIRS})
if (ANDROID)
find_package(LibOVR)
if (LIBOVR_FOUND)
add_definitions(-DHAVE_LIBOVR)
target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES})
include_directories(SYSTEM ${LIBOVR_INCLUDE_DIRS})
if (ANDROID)
# we need VRLib, so add a project.properties to our apk build folder that says that
file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${LIBOVR_VRLIB_DIR}")
file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
list(APPEND IGNORE_COPY_LIBS ${LIBOVR_ANDROID_LIBRARIES})
endif (ANDROID)
endif ()
endif ()
# the presence of a HOCKEY_APP_ID means we are making a beta build

BIN
gvr-interface/res/drawable/icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

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

@ -62,7 +62,7 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) :
setCentralWidget(baseWidget);
// add the interface view
InterfaceView* interfaceView = new InterfaceView(baseWidget);
new InterfaceView(baseWidget);
}
void GVRMainWindow::showAddressBar() {

4
gvr-interface/src/main.cpp
View file

@ -16,7 +16,11 @@ int main(int argc, char* argv[]) {
GVRInterface app(argc, argv);
GVRMainWindow mainWindow;
#ifdef ANDROID
mainWindow.showFullScreen();
#else
mainWindow.showMaximized();
#endif
return app.exec();
}

6
libraries/networking/src/AddressManager.cpp
View file

@ -57,7 +57,11 @@ const QUrl AddressManager::currentAddress() const {
void AddressManager::loadSettings(const QString& lookupString) {
if (lookupString.isEmpty()) {
handleLookupString(SettingHandles::currentAddress.get().toString());
const QString& lastAddress = SettingHandles::currentAddress.get().toString();
if (lastAddress.isEmpty()) {
handleLookupString(lastAddress);
}
} else {
handleLookupString(lookupString);
}