From 0f16e8cb88cec5f026ae9c6bf0ffaf7e1b5dddc9 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Sun, 9 Jun 2024 22:44:04 -0700 Subject: [PATCH] CR --- interface/src/Application.cpp | 3 --- interface/src/Application_Assets.cpp | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f27d8a944d..74a252f473 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1159,9 +1159,6 @@ void Application::loadSettings(const QCommandLineParser& parser) { DependencyManager::get()->loadSettings(); DependencyManager::get()->loadSettings(); - // DONT CHECK IN - //DependencyManager::get()->setAutomaticLODAdjust(false); - auto menu = Menu::getInstance(); menu->loadSettings(); diff --git a/interface/src/Application_Assets.cpp b/interface/src/Application_Assets.cpp index fde508b22b..8012ee93a5 100644 --- a/interface/src/Application_Assets.cpp +++ b/interface/src/Application_Assets.cpp @@ -34,6 +34,8 @@ static const QString JS_EXTENSION = ".js"; static const QString FST_EXTENSION = ".fst"; static const QString FBX_EXTENSION = ".fbx"; static const QString OBJ_EXTENSION = ".obj"; +static const QString GLTF_EXTENSION = ".gltf"; +static const QString GLB_EXTENSION = ".glb"; static const QString JSON_GZ_EXTENSION = ".json.gz"; static const QString CONTENT_ZIP_EXTENSION = ".content.zip"; static const QString ZIP_EXTENSION = ".zip"; @@ -281,7 +283,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q addAssetToWorldError(filenameFromPath(filePath), errorInfo); } else { // to prevent files that aren't models or texture files from being loaded into world automatically - if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) || + if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || + filePath.toLower().endsWith(GLTF_EXTENSION) || filePath.toLower().endsWith(GLB_EXTENSION)) || ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) && ((!isBlocks) && (!isZip)))) { addAssetToWorldAddEntity(filePath, mapping);