livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIRE-32599] Local Mesh - Add Support for broken collada (autodesk) 

reuses the same LLDAELoader function.
meow-7.2.2
Beq 2023-02-05 01:24:27 +00:00
parent 2c11c3d935
commit 0f64c31fcd
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llprimitive/lldaeloader.h
View File

@ -107,9 +107,9 @@ protected:
static std::string getElementLabel(daeElement *element);
static size_t getSuffixPosition(std::string label);
static std::string getLodlessLabel(daeElement *element);
static std::string preprocessDAE(std::string filename);
static LODSuffixArray sLODSuffix; // <FS:Beq/> mesh loader suffix configuration
public: // <FS:Beq/> open up for local mesh to use
static std::string preprocessDAE(std::string filename);
private:
U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels

14
indra/newview/vjlocalmeshimportdae.cpp
View File

@ -32,8 +32,10 @@
#include "vjlocalmeshimportdae.h"
/* linden headers */
#include "llviewercontrol.h" // for gSavedSettings
#include "llmodelloader.h"
#include "llvoavatarself.h"
#include "lldaeloader.h" // for preProcessDAE
/* dae headers*/
#if LL_MSVC
@ -54,7 +56,6 @@
#pragma warning (default : 4264)
#endif
LLLocalMeshImportDAE::loadFile_return LLLocalMeshImportDAE::loadFile(LLLocalMeshFile* data, LLLocalMeshFileLOD lod)
{
pushLog("DAE Importer", "Starting");
@ -70,7 +71,16 @@ LLLocalMeshImportDAE::loadFile_return LLLocalMeshImportDAE::loadFile(LLLocalMesh
mLoadingLog.clear();
// open file and check if opened
collada_dom = collada_core.open(filename);
if (gSavedSettings.getBOOL("ImporterPreprocessDAE"))
{
collada_dom = collada_core.openFromMemory(filename, LLDAELoader::preprocessDAE(filename).c_str());
}
else
{
LL_INFOS() << "Skipping dae preprocessing" << LL_ENDL;
collada_dom = collada_core.open(filename);
}
if (!collada_dom)
{
pushLog("DAE Importer", "Collada DOM instance could not initialize.");