From 72200618d90f2e8c04f248bcf98999bf5c56f73c Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Thu, 14 Feb 2019 16:38:15 -0800 Subject: [PATCH] cleanup of my debugging items --- android/apps/questInterface/build.gradle | 2 -- android/libraries/oculus/build.gradle | 2 -- .../java/org/qtproject/qt5/android/bindings/QtActivity.java | 2 -- libraries/oculusMobile/src/ovr/VrHandler.cpp | 6 ------ libraries/render-utils/src/Model.cpp | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/android/apps/questInterface/build.gradle b/android/apps/questInterface/build.gradle index b1800fe33a..cbf575d7b0 100644 --- a/android/apps/questInterface/build.gradle +++ b/android/apps/questInterface/build.gradle @@ -92,9 +92,7 @@ android { variant.mergeResources.dependsOn(task) if (Os.isFamily(Os.FAMILY_UNIX)) { // FIXME - def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first() - def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first() def renameHifiACTask = rootProject.getTasksByName("renameHifiACTask${variant.name.capitalize()}", false).first() runDumpSymsTask.dependsOn(task) diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle index bc8f8d1c45..776c0c1e48 100644 --- a/android/libraries/oculus/build.gradle +++ b/android/libraries/oculus/build.gradle @@ -18,6 +18,4 @@ android { dependencies { compile project(path: ':qt') - implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs') - implementation project(':qt') } diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java index 11e8ca8e08..a5bc9f31f8 100644 --- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java @@ -509,8 +509,6 @@ public class QtActivity extends Activity { super.onPause(); // GC: this trick allow us to show a splash activity until Qt app finishes // loading - - // QtApplication.invokeDelegate(); } //--------------------------------------------------------------------------- diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp index f12b69d894..b3b1416785 100644 --- a/libraries/oculusMobile/src/ovr/VrHandler.cpp +++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp @@ -51,12 +51,6 @@ struct VrSurface : public TaskQueue { } void setResumed(bool newResumed) { - - if(oculusActivity) - __android_log_write(ANDROID_LOG_WARN, "QQQ", "Set Resumed VRHANDLER ::: OCULUS ACTIVITY IN NOT NULL"); - else - __android_log_write(ANDROID_LOG_WARN, "QQQ", "Set Resumed VRHANDLER ::: OCULUS ACTIVITY is null"); - this->resumed = newResumed; submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); }); } diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 1d7e3fb234..260e25009e 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -137,7 +137,7 @@ const float SCALE_CHANGE_EPSILON = 0.0000001f; void Model::setScaleInternal(const glm::vec3& scale) { if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) { _scale = scale; - // assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f); + assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f); simulate(0.0f, true); } }