From 1f55bdd9a7ac5e512599bc775793dc4e41adfaa9 Mon Sep 17 00:00:00 2001
From: RichardTea <31507749+RichardTea@users.noreply.github.com>
Date: Tue, 9 Apr 2019 16:28:15 +0100
Subject: [PATCH] Save/Load Collada 1.4 Root Asset Metadata
Add Collada 1.4 metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
---
code/ColladaExporter.cpp | 38 ++++++++++++++++--
code/ColladaLoader.cpp | 11 ++++--
code/ColladaParser.cpp | 83 ++++++++++++++++++++++++++++++++++------
code/ColladaParser.h | 16 +++++++-
4 files changed, 128 insertions(+), 20 deletions(-)
diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index 37a6ba4e0..e7cc6907d 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -238,7 +238,11 @@ void ColladaExporter::WriteHeader()
mOutput << startstr << "" << endstr;
PushTag();
- aiMetadata* meta = mScene->mRootNode->mMetaData;
+ // If no Scene metadata, use root node metadata
+ aiMetadata* meta = mScene->mMetaData;
+ if (!meta)
+ meta = mScene->mRootNode->mMetaData;
+
aiString value;
if (!meta || !meta->Get("Author", value))
mOutput << startstr << "" << "Assimp" << "" << endstr;
@@ -250,13 +254,39 @@ void ColladaExporter::WriteHeader()
else
mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
- //mOutput << startstr << "" << mScene->author.C_Str() << "" << endstr;
- //mOutput << startstr << "" << mScene->authoringTool.C_Str() << "" << endstr;
+ if (meta)
+ {
+ if (meta->Get("Comments", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ if (meta->Get("Copyright", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ if (meta->Get("SourceData", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ }
PopTag();
mOutput << startstr << "" << endstr;
- mOutput << startstr << "" << date_str << "" << endstr;
+
+ if (!meta || !meta->Get("Created", value))
+ mOutput << startstr << "" << date_str << "" << endstr;
+ else
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+
+ // Modified date is always the date saved
mOutput << startstr << "" << date_str << "" << endstr;
+
+ if (meta)
+ {
+ if (meta->Get("Keywords", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ if (meta->Get("Revision", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ if (meta->Get("Subject", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ if (meta->Get("Title", value))
+ mOutput << startstr << "" << XMLEscape(value.C_Str()) << "" << endstr;
+ }
+
mOutput << startstr << "" << endstr;
mOutput << startstr << "" << up_axis << "" << endstr;
PopTag();
diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index 47a40f5d9..cf548e890 100644
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -208,9 +208,14 @@ void ColladaLoader::InternReadFile( const std::string& pFile, aiScene* pScene, I
}
// Store scene metadata
- for (auto it = parser.mAssetMetaData.cbegin(); it != parser.mAssetMetaData.cend(); ++it)
- {
- pScene->mMetaData->Add((*it).first, (*it).second);
+ if (!parser.mAssetMetaData.empty()) {
+ const size_t numMeta(parser.mAssetMetaData.size());
+ pScene->mMetaData = aiMetadata::Alloc(static_cast(numMeta));
+ size_t i = 0;
+ for (auto it = parser.mAssetMetaData.cbegin(); it != parser.mAssetMetaData.cend(); ++it, ++i)
+ {
+ pScene->mMetaData->Set(static_cast(i), (*it).first, (*it).second);
+ }
}
// store all meshes
diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp
index c38d18283..2106bf01c 100644
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.cpp
@@ -267,24 +267,16 @@ void ColladaParser::ReadAssetInfo()
}
else if(IsElement("contributor"))
{
- // This has no data of its own, will get children next time through
+ ReadContributorInfo();
}
else
{
- const char* metadata_key = mReader->getNodeName();
- const char* metadata_value = TestTextContent();
- if (metadata_key != nullptr && metadata_value != nullptr)
- {
- aiString aistr;
- aistr.Set(metadata_value);
- mAssetMetaData.emplace(metadata_key, aistr);
- }
- //SkipElement();
+ ReadMetaDataItem(mAssetMetaData);
}
}
else if( mReader->getNodeType() == irr::io::EXN_ELEMENT_END)
{
- if( strcmp( mReader->getNodeName(), "asset") != 0)
+ if (strcmp( mReader->getNodeName(), "asset") != 0)
ThrowException( "Expected end of element.");
break;
@@ -292,6 +284,75 @@ void ColladaParser::ReadAssetInfo()
}
}
+// ------------------------------------------------------------------------------------------------
+// Reads the contributor info
+void ColladaParser::ReadContributorInfo()
+{
+ if (mReader->isEmptyElement())
+ return;
+
+ while (mReader->read())
+ {
+ if (mReader->getNodeType() == irr::io::EXN_ELEMENT)
+ {
+ ReadMetaDataItem(mAssetMetaData);
+ }
+ else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END)
+ {
+ if (strcmp(mReader->getNodeName(), "contributor") != 0)
+ ThrowException("Expected end of element.");
+ break;
+ }
+ }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads a single string metadata item
+void ColladaParser::ReadMetaDataItem(StringMetaData &metadata)
+{
+ // Metadata such as created, keywords, subject etc
+ const char* key_char = mReader->getNodeName();
+ if (key_char != nullptr)
+ {
+ const std::string key_str(key_char);
+ const char* value_char = TestTextContent();
+ if (value_char != nullptr)
+ {
+ std::string camel_key_str = key_str;
+ ToCamelCase(camel_key_str);
+ aiString aistr;
+ aistr.Set(value_char);
+ metadata.emplace(camel_key_str, aistr);
+ TestClosing(key_str.c_str());
+ }
+ else
+ SkipElement();
+ }
+ else
+ SkipElement();
+}
+
+// ------------------------------------------------------------------------------------------------
+// Convert underscore_seperated to CamelCase: "authoring_tool" becomes "AuthoringTool"
+void ColladaParser::ToCamelCase(std::string &text)
+{
+ if (text.empty())
+ return;
+ // Capitalise first character
+ text[0] = ToUpper(text[0]);
+ for (auto it = text.begin(); it != text.end(); /*iterated below*/)
+ {
+ if ((*it) == '_')
+ {
+ it = text.erase(it);
+ if (it != text.end())
+ (*it) = ToUpper(*it);
+ }
+ else
+ ++it;
+ }
+}
+
// ------------------------------------------------------------------------------------------------
// Reads the animation clips
void ColladaParser::ReadAnimationClipLibrary()
diff --git a/code/ColladaParser.h b/code/ColladaParser.h
index 9fdca86c8..22b96c5e0 100644
--- a/code/ColladaParser.h
+++ b/code/ColladaParser.h
@@ -66,6 +66,9 @@ namespace Assimp
friend class ColladaLoader;
protected:
+ /** Map for generic metadata as aiString */
+ typedef std::map StringMetaData;
+
/** Constructor from XML file */
ColladaParser( IOSystem* pIOHandler, const std::string& pFile);
@@ -81,6 +84,15 @@ namespace Assimp
/** Reads asset information such as coordinate system information and legal blah */
void ReadAssetInfo();
+ /** Reads contributor information such as author and legal blah */
+ void ReadContributorInfo();
+
+ /** Reads generic metadata into provided map */
+ void ReadMetaDataItem(StringMetaData &metadata);
+
+ /** Convert underscore_seperated to CamelCase "authoring_tool" becomes "AuthoringTool" */
+ static void ToCamelCase(std::string &text);
+
/** Reads the animation library */
void ReadAnimationLibrary();
@@ -343,8 +355,8 @@ namespace Assimp
/** Which is the up vector */
enum { UP_X, UP_Y, UP_Z } mUpDirection;
- typedef std::map AssetMetaData;
- AssetMetaData mAssetMetaData;
+ /** Asset metadata (global for scene) */
+ StringMetaData mAssetMetaData;
/** Collada file format version */
Collada::FormatVersion mFormat;