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

Add scene metadata for glTF2 files as allowed by the glTF2 specification.

pull/3955/head
Evangel 2021-06-12 11:44:28 +10:00
parent 2f4fba0703
commit 36c8cdf3de
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/glTF2/glTF2Asset.h
View File

@ -922,6 +922,8 @@ struct Scene : public Object {
std::string name; std::string name;
std::vector<Ref<Node>> nodes; std::vector<Ref<Node>> nodes;
CustomExtension extensions;
Scene() {} Scene() {}
void Read(Value &obj, Asset &r); void Read(Value &obj, Asset &r);
}; };

3
code/AssetLib/glTF2/glTF2Asset.inl
View File

@ -1803,6 +1803,9 @@ inline void Scene::Read(Value &obj, Asset &r) {
this->nodes.push_back(node); this->nodes.push_back(node);
} }
} }
if (Value *extensions = FindObject(obj, "extensions")) {
this->extensions = ReadExtensions("extensions", *extensions);
}
} }
inline void Skin::Read(Value &obj, Asset &r) { inline void Skin::Read(Value &obj, Asset &r) {

6
code/AssetLib/glTF2/glTF2Importer.cpp
View File

@ -1498,7 +1498,8 @@ void glTF2Importer::ImportCommonMetadata(glTF2::Asset& a) {
const bool hasVersion = !a.asset.version.empty(); const bool hasVersion = !a.asset.version.empty();
const bool hasGenerator = !a.asset.generator.empty(); const bool hasGenerator = !a.asset.generator.empty();
const bool hasCopyright = !a.asset.copyright.empty(); const bool hasCopyright = !a.asset.copyright.empty();
if (hasVersion || hasGenerator || hasCopyright) { const bool hasSceneMetadata = a.scene->extensions;
if (hasVersion || hasGenerator || hasCopyright || hasSceneMetadata) {
mScene->mMetaData = new aiMetadata; mScene->mMetaData = new aiMetadata;
if (hasVersion) { if (hasVersion) {
mScene->mMetaData->Add(AI_METADATA_SOURCE_FORMAT_VERSION, aiString(a.asset.version)); mScene->mMetaData->Add(AI_METADATA_SOURCE_FORMAT_VERSION, aiString(a.asset.version));
@ -1509,6 +1510,9 @@ void glTF2Importer::ImportCommonMetadata(glTF2::Asset& a) {
if (hasCopyright) { if (hasCopyright) {
mScene->mMetaData->Add(AI_METADATA_SOURCE_COPYRIGHT, aiString(a.asset.copyright)); mScene->mMetaData->Add(AI_METADATA_SOURCE_COPYRIGHT, aiString(a.asset.copyright));
} }
if (hasSceneMetadata) {
ParseExtensions(mScene->mMetaData, a.scene->extensions);
}
} }
} }