Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 00:23:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup from master

Browse source
This commit is contained in:
Brad Davis 2019-02-12 15:14:37 -08:00
parent db121957d2
commit 4dd853ddbc
10 changed files with 20 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
View file

@ -1,4 +1,3 @@
package io.highfidelity.hifiinterface;
import android.app.Activity;

1
android/apps/questFramePlayer/build.gradle
View file

@ -15,6 +15,7 @@ android {
'-DHIFI_ANDROID_APP=questFramePlayer',
'-DANDROID_TOOLCHAIN=clang',
'-DANDROID_STL=c++_shared',
'-DCMAKE_VERBOSE_MAKEFILE=ON'
targets = ['questFramePlayer']
}

6
interface/CMakeLists.txt
View file

@ -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}
)

7
interface/src/Application.cpp
View file

@ -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();

1
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -40,6 +40,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> 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());
}

2
interface/src/ui/AnimStats.cpp
View file

@ -17,7 +17,7 @@ HIFI_QML_DEF(AnimStats)
static AnimStats* INSTANCE{ nullptr };
AnimStats* AnimStats::getInstance() {
//Q_ASSERT(INSTANCE);
Q_ASSERT(INSTANCE);
return INSTANCE;
}

2
interface/src/ui/Stats.cpp
View file

@ -46,7 +46,7 @@ static Stats* INSTANCE{ nullptr };
QString getTextureMemoryPressureModeString();
#endif
Stats* Stats::getInstance() {
//Q_ASSERT(INSTANCE);
Q_ASSERT(INSTANCE);
return INSTANCE;
}

3
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -256,7 +256,6 @@ bool OpenGLDisplayPlugin::activate() {
return false;
}
// Start the present thread if necessary
QSharedPointer<PresentThread> presentThread;
if (DependencyManager::isSet<PresentThread>()) {
@ -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));
}

19
libraries/oculusMobile/src/ovr/VrHandler.cpp
View file

@ -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;

23
scripts/defaultScripts.js
View file

@ -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();
});