From 9346b45188462056698083f4f83fe8fecbe19bdf Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 29 Sep 2022 22:38:40 +0300 Subject: SL-17653 Multi-material file support for local materials --- indra/newview/lllocalgltfmaterials.cpp | 190 ++++++++++++++++++++++----------- 1 file changed, 126 insertions(+), 64 deletions(-) (limited to 'indra/newview/lllocalgltfmaterials.cpp') diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp index 524693e7ea..6e6671d360 100644 --- a/indra/newview/lllocalgltfmaterials.cpp +++ b/indra/newview/lllocalgltfmaterials.cpp @@ -59,70 +59,76 @@ static const S32 LL_LOCAL_UPDATE_RETRIES = 5; /*=======================================*/ /* LLLocalGLTFMaterial: unit class */ /*=======================================*/ -LLLocalGLTFMaterial::LLLocalGLTFMaterial(std::string filename) - : mFilename(filename) - , mShortName(gDirUtilp->getBaseFileName(filename, true)) - , mValid(false) - , mLastModified() - , mLinkStatus(LS_ON) - , mUpdateRetries(LL_LOCAL_UPDATE_RETRIES) +LLLocalGLTFMaterial::LLLocalGLTFMaterial(std::string filename, S32 index) + : mFilename(filename) + , mShortName(gDirUtilp->getBaseFileName(filename, true)) + , mValid(false) + , mLastModified() + , mLinkStatus(LS_ON) + , mUpdateRetries(LL_LOCAL_UPDATE_RETRIES) + , mMaterialIndex(index) { - mTrackingID.generate(); + mTrackingID.generate(); - /* extension */ - std::string temp_exten = gDirUtilp->getExtension(mFilename); + /* extension */ + std::string temp_exten = gDirUtilp->getExtension(mFilename); - if (temp_exten == "gltf") - { - mExtension = ET_MATERIAL_GLTF; - } - else if (temp_exten == "glb") - { - mExtension = ET_MATERIAL_GLB; - } - else - { - LL_WARNS() << "File of no valid extension given, local material creation aborted." << "\n" - << "Filename: " << mFilename << LL_ENDL; - return; // no valid extension. - } + if (temp_exten == "gltf") + { + mExtension = ET_MATERIAL_GLTF; + } + else if (temp_exten == "glb") + { + mExtension = ET_MATERIAL_GLB; + } + else + { + LL_WARNS() << "File of no valid extension given, local material creation aborted." << "\n" + << "Filename: " << mFilename << LL_ENDL; + return; // no valid extension. + } - /* next phase of unit creation is nearly the same as an update cycle. - we're running updateSelf as a special case with the optional UT_FIRSTUSE - which omits the parts associated with removing the outdated texture */ - mValid = updateSelf(); + /* next phase of unit creation is nearly the same as an update cycle. + we're running updateSelf as a special case with the optional UT_FIRSTUSE + which omits the parts associated with removing the outdated texture */ + mValid = updateSelf(); } LLLocalGLTFMaterial::~LLLocalGLTFMaterial() { - // delete self from material list + // delete self from material list gGLTFMaterialList.removeMaterial(mWorldID); } /* accessors */ std::string LLLocalGLTFMaterial::getFilename() { - return mFilename; + return mFilename; } std::string LLLocalGLTFMaterial::getShortName() { - return mShortName; + return mShortName; } LLUUID LLLocalGLTFMaterial::getTrackingID() { - return mTrackingID; + return mTrackingID; } LLUUID LLLocalGLTFMaterial::getWorldID() { - return mWorldID; + return mWorldID; +} + +S32 LLLocalGLTFMaterial::getIndexInFile() +{ + return mMaterialIndex; } bool LLLocalGLTFMaterial::getValid() { - return mValid; + return mValid; } /* update functions */ @@ -147,7 +153,7 @@ bool LLLocalGLTFMaterial::updateSelf() if (mLastModified.asString() != new_last_modified.asString()) { LLPointer raw_material = new LLGLTFMaterial(); - if (loadMaterial(raw_material)) + if (loadMaterial(raw_material, mMaterialIndex)) { // decode is successful, we can safely proceed. if (mWorldID.isNull()) @@ -207,7 +213,7 @@ bool LLLocalGLTFMaterial::updateSelf() return updated; } -bool LLLocalGLTFMaterial::loadMaterial(LLPointer mat) +bool LLLocalGLTFMaterial::loadMaterial(LLPointer mat, S32 index) { bool decode_successful = false; @@ -238,26 +244,31 @@ bool LLLocalGLTFMaterial::loadMaterial(LLPointer mat) if (!decode_successful) { - LL_WARNS() << "Cannot Upload Material, error: " << error_msg + LL_WARNS() << "Cannot load Material, error: " << error_msg << ", warning:" << warn_msg << " file: " << mFilename << LL_ENDL; break; } - if (model_in.materials.empty()) + if (model_in.materials.size() <= index) { // materials are missing - LL_WARNS() << "Cannot Upload Material, Material missing, " << mFilename << LL_ENDL; + LL_WARNS() << "Cannot load Material, Material " << index << " is missing, " << mFilename << LL_ENDL; decode_successful = false; break; } // sets everything, but textures will have inaccurate ids - LLTinyGLTFHelper::setFromModel(mat, model_in); + LLTinyGLTFHelper::setFromModel(mat, model_in, index); std::string folder = gDirUtilp->getDirName(filename_lc); - tinygltf::Material material_in = model_in.materials[0]; + tinygltf::Material material_in = model_in.materials[index]; + + if (!material_in.name.empty()) + { + mShortName = material_in.name; + } // get base color texture LLPointer base_img = LLTinyGLTFHelper::getTexture(folder, model_in, material_in.pbrMetallicRoughness.baseColorTexture.index); @@ -362,44 +373,95 @@ LLLocalGLTFMaterialMgr::~LLLocalGLTFMaterialMgr() mMaterialList.clear(); } -bool LLLocalGLTFMaterialMgr::addUnit(const std::vector& filenames) +S32 LLLocalGLTFMaterialMgr::addUnit(const std::vector& filenames) { - bool add_successful = false; + S32 add_count = 0; std::vector::const_iterator iter = filenames.begin(); while (iter != filenames.end()) { - if (!iter->empty() && addUnit(*iter).notNull()) + if (!iter->empty()) { - add_successful = true; + add_count += addUnit(*iter); } iter++; } - return add_successful; + return add_count; } -LLUUID LLLocalGLTFMaterialMgr::addUnit(const std::string& filename) +S32 LLLocalGLTFMaterialMgr::addUnit(const std::string& filename) { - LLLocalGLTFMaterial* unit = new LLLocalGLTFMaterial(filename); + std::string exten = gDirUtilp->getExtension(filename); + S32 materials_in_file = 0; - if (unit->getValid()) + if (exten == "gltf" || exten == "glb") { - mMaterialList.push_back(unit); - return unit->getTrackingID(); + tinygltf::TinyGLTF loader; + std::string error_msg; + std::string warn_msg; + + tinygltf::Model model_in; + + std::string filename_lc = filename; + LLStringUtil::toLower(filename_lc); + + // Load a tinygltf model fom a file. Assumes that the input filename has already been + // been sanitized to one of (.gltf , .glb) extensions, so does a simple find to distinguish. + bool decode_successful = false; + if (std::string::npos == filename_lc.rfind(".gltf")) + { // file is binary + decode_successful = loader.LoadBinaryFromFile(&model_in, &error_msg, &warn_msg, filename_lc); + } + else + { // file is ascii + decode_successful = loader.LoadASCIIFromFile(&model_in, &error_msg, &warn_msg, filename_lc); + } + + if (!decode_successful) + { + LL_WARNS() << "Cannot load, error: Failed to decode" << error_msg + << ", warning:" << warn_msg + << " file: " << filename + << LL_ENDL; + return 0; + } + + if (model_in.materials.empty()) + { + // materials are missing + LL_WARNS() << "Cannot load. File has no materials " << filename << LL_ENDL; + return 0; + } + materials_in_file = model_in.materials.size(); } - else + + S32 loaded_materials = 0; + for (S32 i = 0; i < materials_in_file; i++) { - LL_WARNS() << "Attempted to add invalid or unreadable image file, attempt cancelled.\n" - << "Filename: " << filename << LL_ENDL; + // Todo: this is rather inefficient, files will be spammed with + // separate loads and date checks, find a way to improve this. + // May be doUpdates() should be checking individual files. + LLLocalGLTFMaterial* unit = new LLLocalGLTFMaterial(filename, i); + + if (unit->getValid()) + { + mMaterialList.push_back(unit); + loaded_materials++; + } + else + { + LL_WARNS() << "Attempted to add invalid or unreadable image file, attempt cancelled.\n" + << "Filename: " << filename << LL_ENDL; - LLSD notif_args; - notif_args["FNAME"] = filename; - LLNotificationsUtil::add("LocalGLTFVerifyFail", notif_args); + LLSD notif_args; + notif_args["FNAME"] = filename; + LLNotificationsUtil::add("LocalGLTFVerifyFail", notif_args); - delete unit; - unit = NULL; + delete unit; + unit = NULL; + } } - return LLUUID::null; + return loaded_materials; } void LLLocalGLTFMaterialMgr::delUnit(LLUUID tracking_id) @@ -456,9 +518,10 @@ bool LLLocalGLTFMaterialMgr::isLocal(const LLUUID world_id) return false; } -std::string LLLocalGLTFMaterialMgr::getFilename(LLUUID tracking_id) +void LLLocalGLTFMaterialMgr::getFilenameAndIndex(LLUUID tracking_id, std::string &filename, S32 &index) { - std::string filename = ""; + filename = ""; + index = 0; for (local_list_iter iter = mMaterialList.begin(); iter != mMaterialList.end(); iter++) { @@ -466,10 +529,9 @@ std::string LLLocalGLTFMaterialMgr::getFilename(LLUUID tracking_id) if (unit->getTrackingID() == tracking_id) { filename = unit->getFilename(); + index = unit->getIndexInFile(); } } - - return filename; } // probably shouldn't be here, but at the moment this mirrors lllocalbitmaps -- cgit v1.3 From 332ddc67de2de245a52d9db3be20f4ba8051f166 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 29 Sep 2022 23:17:49 +0300 Subject: SL-17653 Small change in material loading order --- indra/newview/lllocalgltfmaterials.cpp | 2 +- indra/newview/llmaterialeditor.cpp | 80 ++++++++++++++-------------------- indra/newview/llmaterialeditor.h | 2 +- indra/newview/lltexturectrl.cpp | 7 +-- 4 files changed, 36 insertions(+), 55 deletions(-) (limited to 'indra/newview/lllocalgltfmaterials.cpp') diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp index 6e6671d360..02331e9cd7 100644 --- a/indra/newview/lllocalgltfmaterials.cpp +++ b/indra/newview/lllocalgltfmaterials.cpp @@ -267,7 +267,7 @@ bool LLLocalGLTFMaterial::loadMaterial(LLPointer mat, S32 index) if (!material_in.name.empty()) { - mShortName = material_in.name; + mShortName = gDirUtilp->getBaseFileName(filename_lc, true) + " (" + material_in.name + ")"; } // get base color texture diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 7270317b8c..a72d38223f 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -1152,40 +1152,6 @@ void LLMaterialEditor::onCancelMsgCallback(const LLSD& notification, const LLSD& } } -class LLMaterialFilePicker : public LLFilePickerThread -{ -public: - LLMaterialFilePicker(); - virtual void notify(const std::vector& filenames); - static void textureLoadedCallback(BOOL success, LLViewerFetchedTexture* src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata); - -}; - -LLMaterialFilePicker::LLMaterialFilePicker() - : LLFilePickerThread(LLFilePicker::FFLOAD_MATERIAL) -{ -} - -void LLMaterialFilePicker::notify(const std::vector& filenames) -{ - if (LLAppViewer::instance()->quitRequested()) - { - return; - } - - - if (filenames.size() > 0) - { - // Todo: there is no point creating LLMaterialEditor before - // loading material, just creates unnessesary work if decode fails - LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("material_editor"); - if (me) - { - me->loadMaterialFromFile(filenames[0]); - } - } -} - static void pack_textures( LLPointer& base_color_img, LLPointer& normal_img, @@ -1233,10 +1199,6 @@ static void pack_textures( } } -void LLMaterialFilePicker::textureLoadedCallback(BOOL success, LLViewerFetchedTexture* src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata) -{ -} - void LLMaterialEditor::loadMaterialFromFile(const std::string& filename, S32 index) { tinygltf::TinyGLTF loader; @@ -1266,22 +1228,31 @@ void LLMaterialEditor::loadMaterialFromFile(const std::string& filename, S32 ind return; } - if (model_in.materials.empty() || (index >= model_in.materials.size())) + if (model_in.materials.empty()) { // materials are missing LLNotificationsUtil::add("CannotUploadMaterial"); return; } + if (index >= 0 && model_in.materials.size() <= index) + { + // material is missing + LLNotificationsUtil::add("CannotUploadMaterial"); + return; + } + + LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("material_editor"); + if (index >= 0) { // Prespecified material - loadMaterial(model_in, filename_lc, index); + me->loadMaterial(model_in, filename_lc, index); } else if (model_in.materials.size() == 1) { // Only one, just load it - loadMaterial(model_in, filename_lc, 0); + me->loadMaterial(model_in, filename_lc, 0); } else { @@ -1302,12 +1273,12 @@ void LLMaterialEditor::loadMaterialFromFile(const std::string& filename, S32 ind } } LLFloaterComboOptions::showUI( - [this, model_in, filename_lc](const std::string& option, S32 index) + [me, model_in, filename_lc](const std::string& option, S32 index) { - loadMaterial(model_in, filename_lc, index); + me->loadMaterial(model_in, filename_lc, index); }, - getString("material_selection_title"), - getString("material_selection_text"), + me->getString("material_selection_title"), + me->getString("material_selection_text"), material_list ); } @@ -1315,7 +1286,7 @@ void LLMaterialEditor::loadMaterialFromFile(const std::string& filename, S32 ind void LLMaterialEditor::loadMaterial(const tinygltf::Model &model_in, const std::string &filename_lc, S32 index) { - if (model_in.materials.size() < index) + if (model_in.materials.size() <= index) { return; } @@ -1410,7 +1381,9 @@ void LLMaterialEditor::loadMaterial(const tinygltf::Model &model_in, const std:: setFromGltfMetaData(filename_lc, model_in, index); setHasUnsavedChanges(true); + openFloater(); + setFocus(TRUE); applyToSelection(); } @@ -1704,7 +1677,20 @@ void LLMaterialEditor::setFromGltfMetaData(const std::string& filename, const ti void LLMaterialEditor::importMaterial() { - (new LLMaterialFilePicker())->getFile(); + LLFilePickerReplyThread::startPicker( + [](const std::vector& filenames, LLFilePicker::ELoadFilter load_filter, LLFilePicker::ESaveFilter save_filter) + { + if (LLAppViewer::instance()->quitRequested()) + { + return; + } + if (filenames.size() > 0) + { + LLMaterialEditor::loadMaterialFromFile(filenames[0], -1); + } + }, + LLFilePicker::FFLOAD_MATERIAL, + true); } class LLRemderMaterialFunctor : public LLSelectedTEFunctor diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index 23cfc93763..4e17cee154 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -103,7 +103,7 @@ public: void loadAsset() override; // @index if -1 and file contains more than one material, // will promt to select specific one - void loadMaterialFromFile(const std::string& filename, S32 index = -1); + static void loadMaterialFromFile(const std::string& filename, S32 index = -1); static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index ff0d74a7c9..5d9eb48e6c 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -970,12 +970,7 @@ void LLFloaterTexturePicker::onBtnUpload(void* userdata) LLLocalGLTFMaterialMgr::getInstance()->getFilenameAndIndex(tracking_id, filename, index); if (!filename.empty()) { - LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("material_editor"); - if (me) - { - me->loadMaterialFromFile(filename, index); - me->setFocus(TRUE); - } + LLMaterialEditor::loadMaterialFromFile(filename, index); } } else -- cgit v1.3