Skip to content
Snippets Groups Projects
Commit 0fe39a1f authored by Brad Kittenbrink's avatar Brad Kittenbrink
Browse files

Correcting windows specific filesystem issues and removing unused DAE code in...

Correcting windows specific filesystem issues and removing unused DAE code in llgltfloader.cpp from SL-17214
parent 6b857059
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#include "LLGLTFLoader.h" #include "llgltfloader.h"
// Import & define single-header gltf import/export lib // Import & define single-header gltf import/export lib
#define TINYGLTF_IMPLEMENTATION #define TINYGLTF_IMPLEMENTATION
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// Additionally, disable inclusion of STB header files entirely with // Additionally, disable inclusion of STB header files entirely with
// TINYGLTF_NO_INCLUDE_STB_IMAGE // TINYGLTF_NO_INCLUDE_STB_IMAGE
// TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE // TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE
#include "tinygltf\tiny_gltf.h" #include "tinygltf/tiny_gltf.h"
// TODO: includes inherited from dae loader. Validate / prune // TODO: includes inherited from dae loader. Validate / prune
...@@ -68,7 +68,6 @@ static const std::string lod_suffix[LLModel::NUM_LODS] = ...@@ -68,7 +68,6 @@ static const std::string lod_suffix[LLModel::NUM_LODS] =
"_PHYS", "_PHYS",
}; };
const U32 LIMIT_MATERIALS_OUTPUT = 12;
LLGLTFLoader::LLGLTFLoader(std::string filename, LLGLTFLoader::LLGLTFLoader(std::string filename,
S32 lod, S32 lod,
...@@ -94,7 +93,6 @@ LLGLTFLoader::LLGLTFLoader(std::string filename, ...@@ -94,7 +93,6 @@ LLGLTFLoader::LLGLTFLoader(std::string filename,
jointsFromNodes, jointsFromNodes,
jointAliasMap, jointAliasMap,
maxJointsPerMesh ), maxJointsPerMesh ),
mGeneratedModelLimit(modelLimit),
//mPreprocessGLTF(preprocess), //mPreprocessGLTF(preprocess),
mMeshesLoaded(false), mMeshesLoaded(false),
mMaterialsLoaded(false) mMaterialsLoaded(false)
......
...@@ -158,7 +158,6 @@ class LLGLTFLoader : public LLModelLoader ...@@ -158,7 +158,6 @@ class LLGLTFLoader : public LLModelLoader
bool populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &mesh); bool populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &mesh);
LLUUID imageBufferToTextureUUID(const gltf_texture& tex); LLUUID imageBufferToTextureUUID(const gltf_texture& tex);
U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels
// bool mPreprocessGLTF; // bool mPreprocessGLTF;
/* Below inherited from dae loader - unknown if/how useful here /* Below inherited from dae loader - unknown if/how useful here
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment