From d451012d086593686445c80879b7d4b19a3b00fb Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 28 May 2020 09:12:17 +1200 Subject: [PATCH 1/2] Enable flying in VR by default --- interface/src/avatar/MyAvatar.cpp | 2 +- interface/src/avatar/MyAvatar.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 4736362fcb..65e1240da4 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1988,7 +1988,7 @@ void MyAvatar::loadData() { // Flying preferences must be loaded before calling setFlyingEnabled() Setting::Handle firstRunVal { Settings::firstRun, true }; - setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); + setFlyingHMDPref(firstRunVal.get() ? true : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); setDriveGear2(firstRunVal.get() ? DEFAULT_GEAR_2 : _driveGear2Setting.get()); diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 2a83ab69c1..bde7e98240 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -2702,7 +2702,7 @@ private: bool _enableFlying { false }; bool _flyingPrefDesktop { true }; - bool _flyingPrefHMD { false }; + bool _flyingPrefHMD { true }; bool _wasPushing { false }; bool _isPushing { false }; bool _isBeingPushed { false }; From ade6bf24bb81688733f72c2c699bf569ef3285d5 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Wed, 3 Jun 2020 15:19:54 -0700 Subject: [PATCH 2/2] fix issues with glb urls --- libraries/fbx/src/GLTFSerializer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index 9d9d16d733..7fa1da2971 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -437,7 +437,7 @@ bool GLTFSerializer::addBuffer(const QJsonObject& object) { getIntVal(object, "byteLength", buffer.byteLength, buffer.defined); - if (_url.toString().endsWith("glb")) { + if (_url.path().endsWith("glb")) { if (!_glbBinary.isEmpty()) { buffer.blob = _glbBinary; } else { @@ -677,7 +677,7 @@ bool GLTFSerializer::parseGLTF(const hifi::ByteArray& data) { hifi::ByteArray jsonChunk = data; - if (_url.toString().endsWith("glb") && data.indexOf("glTF") == 0 && data.contains("JSON")) { + if (_url.path().endsWith("glb") && data.indexOf("glTF") == 0 && data.contains("JSON")) { jsonChunk = setGLBChunks(data); } @@ -1686,7 +1686,7 @@ HFMTexture GLTFSerializer::getHFMTexture(const GLTFTexture& texture) { fbxtex.name = fname; fbxtex.filename = textureUrl.toEncoded(); - if (_url.toString().endsWith("glb") && !_glbBinary.isEmpty()) { + if (_url.path().endsWith("glb") && !_glbBinary.isEmpty()) { int bufferView = _file.images[texture.source].bufferView; GLTFBufferView& imagesBufferview = _file.bufferviews[bufferView];