Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 01:22:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix/revert-instancing-temporarily-1

Browse source
This commit is contained in:
kasenvr 2020-06-03 22:44:32 -04:00 committed by GitHub
commit 103fd8eef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1979,7 +1979,7 @@ void MyAvatar::loadData() {
// Flying preferences must be loaded before calling setFlyingEnabled()
Setting::Handle<bool> 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());

2
interface/src/avatar/MyAvatar.h
View file

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

8
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -399,7 +399,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 {
@ -646,7 +646,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);
}
@ -1744,8 +1744,8 @@ HFMTexture GLTFSerializer::getHFMTexture(const GLTFTexture& texture) {
hifi::URL textureUrl = _url.resolved(url);
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];