From 4dd853ddbc7a7b0b39298c14335fac75a631508b Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 12 Feb 2019 15:14:37 -0800 Subject: [PATCH] Cleanup from master --- .../hifiinterface/MainActivity.java | 1 - android/apps/questFramePlayer/build.gradle | 1 + interface/CMakeLists.txt | 6 +---- interface/src/Application.cpp | 7 +++--- .../src/octree/OctreePacketProcessor.cpp | 1 + interface/src/ui/AnimStats.cpp | 2 +- interface/src/ui/Stats.cpp | 2 +- .../display-plugins/OpenGLDisplayPlugin.cpp | 3 +-- libraries/oculusMobile/src/ovr/VrHandler.cpp | 19 --------------- scripts/defaultScripts.js | 23 +++++++++---------- 10 files changed, 20 insertions(+), 45 deletions(-) diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java index 239dc96523..e5ea0f998d 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java @@ -1,4 +1,3 @@ - package io.highfidelity.hifiinterface; import android.app.Activity; diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle index f72b4c126e..0b153af0a9 100644 --- a/android/apps/questFramePlayer/build.gradle +++ b/android/apps/questFramePlayer/build.gradle @@ -15,6 +15,7 @@ android { '-DHIFI_ANDROID_APP=questFramePlayer', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared', + '-DCMAKE_VERBOSE_MAKEFILE=ON' targets = ['questFramePlayer'] } diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 2cc3302af7..0bfed88d9c 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -202,10 +202,6 @@ if (WIN32) set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF") endif() -if (ANDROID) - set(PLATFORM_DISPLAY_PLUGINS oculusMobile oculusMobilePlugin) -endif() - # link required hifi libraries link_hifi_libraries( shared workload task octree ktx gpu gl procedural graphics graphics-scripting render @@ -283,7 +279,7 @@ target_link_libraries( ${TARGET_NAME} Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::Widgets Qt5::Qml Qt5::Quick Qt5::Script Qt5::Svg - Qt5::WebChannel + Qt5::WebChannel ${PLATFORM_QT_LIBRARIES} ) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 543a7a5146..9272dbd1b0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2428,7 +2428,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground); AndroidHelper::instance().notifyLoadComplete(); #endif - AndroidHelper::instance().notifyLoadComplete(); pauseUntilLoginDetermined(); } @@ -3641,14 +3640,14 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { } // Get controller availability - #ifdef Q_OS_ANDROID +#ifdef Q_OS_ANDROID bool hasHandControllers = true; - #else +#else bool hasHandControllers = false; if (PluginUtils::isViveControllerAvailable() || PluginUtils::isOculusTouchControllerAvailable()) { hasHandControllers = true; } - #endif +#endif // Check HMD use (may be technically available without being in use) bool hasHMD = PluginUtils::isHMDAvailable(); diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index 62ef9cd875..6b07e6717c 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -40,6 +40,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer messag #ifndef Q_OS_ANDROID const int WAY_BEHIND = 300; + if (packetsToProcessCount() > WAY_BEHIND && qApp->getLogger()->extraDebugging()) { qDebug("OctreePacketProcessor::processPacket() packets to process=%d", packetsToProcessCount()); } diff --git a/interface/src/ui/AnimStats.cpp b/interface/src/ui/AnimStats.cpp index 162292087d..6317c069f4 100644 --- a/interface/src/ui/AnimStats.cpp +++ b/interface/src/ui/AnimStats.cpp @@ -17,7 +17,7 @@ HIFI_QML_DEF(AnimStats) static AnimStats* INSTANCE{ nullptr }; AnimStats* AnimStats::getInstance() { - //Q_ASSERT(INSTANCE); + Q_ASSERT(INSTANCE); return INSTANCE; } diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp index 4fc14171e8..cb204c9772 100644 --- a/interface/src/ui/Stats.cpp +++ b/interface/src/ui/Stats.cpp @@ -46,7 +46,7 @@ static Stats* INSTANCE{ nullptr }; QString getTextureMemoryPressureModeString(); #endif Stats* Stats::getInstance() { - //Q_ASSERT(INSTANCE); + Q_ASSERT(INSTANCE); return INSTANCE; } diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 5b202429ab..e4deaf8f4b 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -256,7 +256,6 @@ bool OpenGLDisplayPlugin::activate() { return false; } - // Start the present thread if necessary QSharedPointer presentThread; if (DependencyManager::isSet()) { @@ -719,11 +718,11 @@ void OpenGLDisplayPlugin::present() { PROFILE_RANGE_EX(render, "internalPresent", 0xff00ffff, frameId) internalPresent(); } + gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory()); } else { internalPresent(); } - _movingAveragePresent.addSample((float)(usecTimestampNow() - startPresent)); } diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp index c6329c62a6..de2b4e1ff6 100644 --- a/libraries/oculusMobile/src/ovr/VrHandler.cpp +++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp @@ -27,25 +27,6 @@ using namespace ovr; static thread_local bool isRenderThread { false }; -static void getClassName(JNIEnv *env, jobject obj){ - jclass cls = env->GetObjectClass(obj); - jmethodID mid = env->GetMethodID(cls,"getClass", "()Ljava/lang/Class;"); - jobject clsObj = env->CallObjectMethod(obj, mid); - - cls= env->GetObjectClass(clsObj); - - mid= env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); - - jstring strObj = (jstring) env->CallObjectMethod(clsObj, mid); - - const char* str = env->GetStringUTFChars(strObj, NULL); - - __android_log_print(ANDROID_LOG_ERROR,__FUNCTION__, "VRHandler class: %s",str); - - env->ReleaseStringUTFChars(strObj, str); - -} - struct VrSurface : public TaskQueue { using HandlerTask = VrHandler::HandlerTask; diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 75c266e6c9..bd7e79dffc 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -14,21 +14,20 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/request-service.js", "system/progress.js", - // "system/away.js", - // "system/audio.js", + "system/away.js", + "system/audio.js", "system/hmd.js", "system/menu.js", "system/bubble.js", - // "system/snapshot.js", - //"system/pal.js", // "system/mod.js", // older UX, if you prefer + "system/snapshot.js", + "system/pal.js", // "system/mod.js", // older UX, if you prefer "system/avatarapp.js", "system/makeUserConnection.js", - "system/goto.js", - // "system/tablet-goto.js", - // "system/marketplaces/marketplaces.js", + "system/tablet-goto.js", + "system/marketplaces/marketplaces.js", "system/notifications.js", - // "system/commerce/wallet.js", - // "system/edit.js", + "system/commerce/wallet.js", + "system/edit.js", "system/dialTone.js", "system/firstPersonHMD.js", "system/tablet-ui/tabletUI.js", @@ -41,12 +40,12 @@ var DEFAULT_SCRIPTS_SEPARATE = [ ]; if (Window.interstitialModeEnabled) { - // Insert interstitial scripts at front so that they're started first. + // Insert interstitial scripts at front so that they're started first. DEFAULT_SCRIPTS_COMBINED.splice(0, 0, "system/interstitialPage.js", "system/redirectOverlays.js"); } // add a menu item for debugging -var MENU_CATEGORY = "Developer"; +var MENU_CATEGORY = "Developer > Scripting"; var MENU_ITEM = "Debug defaultScripts.js"; var SETTINGS_KEY = '_debugDefaultScriptsIsChecked'; @@ -117,7 +116,7 @@ function removeMenuItem() { } } -Script.scriptEnding.connect(function () { +Script.scriptEnding.connect(function() { removeMenuItem(); });