Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version is strictly a string

Browse Source
This commit is contained in:
Malcolm Tyrrell
2021-03-15 16:27:50 +00:00
parent 053c0f5e0a
commit 57652a9084
10 changed files with 1113 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/AssetLib/glTF2/glTF2Asset.inl
+1 -8
View File
@@ -249,7 +249,7 @@ inline Value *FindObjectInContext(Value &val, const char *memberId, const char*
inline Value *FindExtensionInContext(Value &val, const char *extensionId, const char* context, const char* extraContext = nullptr) {
if (Value *extensionList = FindObjectInContext(val, "extensions", context, extraContext)) {
if (Value *extension = FindObjectInContext(*extensionList, extensionId, "extensions")) {
if (Value *extension = FindObjectInContext(*extensionList, extensionId, context, extraContext)) {
return extension;
}
}
@@ -1857,14 +1857,7 @@ inline void AssetMetadata::Read(Document &doc) {
if (Value *versionString = FindStringInContext(*obj, "version", "\"asset\"")) {
version = versionString->GetString();
} else if (Value *versionNumber = FindNumberInContext(*obj, "version", "\"asset\"")) {
char buf[4];
ai_snprintf(buf, 4, "%.1f", versionNumber->GetDouble());
version = buf;
}
Value *curProfile = FindObjectInContext(*obj, "profile", "\"asset\"");
if (nullptr != curProfile) {
ReadMember(*curProfile, "api", this->profile.api);