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

cleanup of my debugging items

Browse source
This commit is contained in:
amer cerkic 2019-02-14 16:38:15 -08:00
parent 7037e14d09
commit 72200618d9
5 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/apps/questInterface/build.gradle
View file

@ -92,9 +92,7 @@ android {
variant.mergeResources.dependsOn(task) variant.mergeResources.dependsOn(task)
if (Os.isFamily(Os.FAMILY_UNIX)) { if (Os.isFamily(Os.FAMILY_UNIX)) {
// FIXME // FIXME
def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first() def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${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() def renameHifiACTask = rootProject.getTasksByName("renameHifiACTask${variant.name.capitalize()}", false).first()
runDumpSymsTask.dependsOn(task) runDumpSymsTask.dependsOn(task)

2
android/libraries/oculus/build.gradle
View file

@ -18,6 +18,4 @@ android {
dependencies { dependencies {
compile project(path: ':qt') compile project(path: ':qt')
implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
implementation project(':qt')
} }

2
android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
View file

@ -509,8 +509,6 @@ public class QtActivity extends Activity {
super.onPause(); super.onPause();
// GC: this trick allow us to show a splash activity until Qt app finishes // GC: this trick allow us to show a splash activity until Qt app finishes
// loading // loading
// QtApplication.invokeDelegate(); // QtApplication.invokeDelegate();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

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

@ -51,12 +51,6 @@ struct VrSurface : public TaskQueue {
} }
void setResumed(bool newResumed) { 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; this->resumed = newResumed;
submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); }); submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
} }

2
libraries/render-utils/src/Model.cpp
View file

@ -137,7 +137,7 @@ const float SCALE_CHANGE_EPSILON = 0.0000001f;
void Model::setScaleInternal(const glm::vec3& scale) { void Model::setScaleInternal(const glm::vec3& scale) {
if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) { if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
_scale = scale; _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); simulate(0.0f, true);
} }
} }