v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4693 from vkaytsanov/master 

Remove exception on glTF 2.0 loading
pull/4701/head
Kim Kulling 2022-08-23 23:36:26 +02:00 committed by GitHub
parent aa521569f7 87f601531c
commit 88c69d4edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/glTF/glTFAsset.h
View File

@ -903,8 +903,10 @@ struct AssetMetadata {
void Read(Document &doc); void Read(Document &doc);
AssetMetadata() : AssetMetadata() :
premultipliedAlpha(false), version() { premultipliedAlpha(false) {
} }
operator bool() const { return version.size() && version[0] == '1'; }
}; };
// //

8
code/AssetLib/glTF/glTFAsset.inl
View File

@ -1114,10 +1114,6 @@ inline void AssetMetadata::Read(Document &doc) {
ReadMember(*curProfile, "version", this->profile.version); ReadMember(*curProfile, "version", this->profile.version);
} }
} }
if (version.empty() || version[0] != '1') {
throw DeadlyImportError("GLTF: Unsupported glTF version: ", version);
}
} }
// //
@ -1222,6 +1218,10 @@ inline void Asset::Load(const std::string &pFile, bool isBinary) {
// Load the metadata // Load the metadata
asset.Read(doc); asset.Read(doc);
if (!asset) {
return;
}
ReadExtensionsUsed(doc); ReadExtensionsUsed(doc);
// Prepare the dictionaries // Prepare the dictionaries

3
code/AssetLib/glTF/glTFImporter.cpp
View File

@ -96,8 +96,7 @@ bool glTFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool
glTF::Asset asset(pIOHandler); glTF::Asset asset(pIOHandler);
try { try {
asset.Load(pFile, GetExtension(pFile) == "glb"); asset.Load(pFile, GetExtension(pFile) == "glb");
std::string version = asset.asset.version; return asset.asset;
return !version.empty() && version[0] == '1';
} catch (...) { } catch (...) {
return false; return false;
} }