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

Merge pull request #224 from VirusFree/master 

[FBX] Do not rename null nodes. Preserve information in node metadata.
pull/232/head
Alexander Gessler 2014-03-02 10:41:28 -05:00
parent 49e9ad9fa5 2db48ef532
commit 5c95848f51
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
code/FBXConverter.cpp
View File

@ -62,7 +62,6 @@ namespace FBX {
#define MAGIC_NODE_TAG "_$AssimpFbx$" #define MAGIC_NODE_TAG "_$AssimpFbx$"
#define MAGIC_NULL_TAG "_$AssimpFbxNull$"
#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L #define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L
@ -95,7 +94,13 @@ public:
TransformationComp_MAXIMUM TransformationComp_MAXIMUM
}; };
enum MetadataKeys
{
MetadataKeys_UserProperties = 0,
MetadataKeys_IsNull,
MetadataKeys_MAXIMUM
};
public: public:
@ -257,14 +262,6 @@ private:
ConvertCameras(*model); ConvertCameras(*model);
} }
// preserve the info that a node was marked as Null node
// in the original file.
if(model->IsNull()) {
const std::string& new_name = original_name + MAGIC_NULL_TAG;
RenameNode(original_name, new_name);
name_carrier->mName.Set( new_name.c_str() );
}
nodes.push_back(nodes_chain.front()); nodes.push_back(nodes_chain.front());
nodes_chain.clear(); nodes_chain.clear();
} }
@ -764,20 +761,20 @@ private:
{ {
const PropertyTable& props = model.Props(); const PropertyTable& props = model.Props();
// find user defined properties //create metadata on node
const std::string& userProps = PropertyGet<std::string>(props, "UDP3DSMAX", "");
//setup metadata //TODO: make metadata more friendly (eg. have Add()/Remove() functions to be easier to use)
aiMetadata* data = new aiMetadata(); aiMetadata* data = new aiMetadata();
data->mNumProperties = 1; data->mNumProperties = MetadataKeys_MAXIMUM;
data->mKeys = new aiString[data->mNumProperties](); data->mKeys = new aiString[data->mNumProperties]();
data->mValues = new aiString[data->mNumProperties](); data->mValues = new aiString[data->mNumProperties]();
//add user properties
data->mKeys[0].Set("UserProperties");
data->mValues[0].Set(userProps);
nd.mMetaData = data; nd.mMetaData = data;
// find user defined properties
data->mKeys[MetadataKeys_UserProperties].Set("UserProperties");
data->mValues[MetadataKeys_UserProperties].Set(PropertyGet<std::string>(props, "UDP3DSMAX", ""));
// preserve the info that a node was marked as Null node in the original file.
data->mKeys[MetadataKeys_IsNull].Set("IsNull");
data->mValues[MetadataKeys_IsNull].Set(model.IsNull() ? "true" : "false");
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------