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

[3MF] Improves node naming

pull/3558/head
Jean-Louis 2020-12-29 15:46:28 +01:00
parent 4025c57fd0
commit 37df38f951
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
code/AssetLib/3MF/D3MFImporter.cpp
View File

@ -112,9 +112,11 @@ public:
std::vector<aiMesh*> mMeshes; std::vector<aiMesh*> mMeshes;
std::vector<unsigned int> mMeshIndex; std::vector<unsigned int> mMeshIndex;
std::vector<Component> mComponents; std::vector<Component> mComponents;
std::string mName;
Object(int id) : Object(int id) :
Resource(id) {} Resource(id),
mName (std::string("Object_") + to_string(id)){}
virtual ResourceType getType() { virtual ResourceType getType() {
return ResourceType::RT_Object; return ResourceType::RT_Object;
@ -126,7 +128,6 @@ class XmlSerializer {
public: public:
XmlSerializer(XmlParser *xmlParser) : XmlSerializer(XmlParser *xmlParser) :
mMeshes(),
mResourcesDictionnary(), mResourcesDictionnary(),
mMaterialCount(0), mMaterialCount(0),
mMeshCount(0), mMeshCount(0),
@ -197,13 +198,23 @@ public:
} }
// import the meshes // import the meshes
scene->mNumMeshes = static_cast<unsigned int>(mMeshes.size()); scene->mNumMeshes = static_cast<unsigned int>(mMeshCount);
scene->mMeshes = new aiMesh *[scene->mNumMeshes](); if (scene->mNumMeshes != 0) {
std::copy(mMeshes.begin(), mMeshes.end(), scene->mMeshes); scene->mMeshes = new aiMesh *[scene->mNumMeshes]();
for (auto it = mResourcesDictionnary.begin(); it != mResourcesDictionnary.end(); it++) {
if (it->second->getType() == ResourceType::RT_Object) {
Object *obj = static_cast<Object*>(it->second);
for (unsigned int i = 0; i < obj->mMeshes.size(); ++i) {
scene->mMeshes[obj->mMeshIndex[i]] = obj->mMeshes[i];
}
}
}
}
// import the materials // import the materials
scene->mNumMaterials = static_cast<unsigned int>(mMaterialCount); scene->mNumMaterials = static_cast<unsigned int>(mMaterialCount);
if (0 != scene->mNumMaterials) { if (scene->mNumMaterials != 0) {
scene->mMaterials = new aiMaterial *[scene->mNumMaterials]; scene->mMaterials = new aiMaterial *[scene->mNumMaterials];
for (auto it = mResourcesDictionnary.begin(); it != mResourcesDictionnary.end(); it++) { for (auto it = mResourcesDictionnary.begin(); it != mResourcesDictionnary.end(); it++) {
if (it->second->getType() == ResourceType::RT_BaseMaterials) { if (it->second->getType() == ResourceType::RT_BaseMaterials) {
@ -219,7 +230,7 @@ public:
private: private:
void addObjectToNode(aiNode* parent, Object* obj, aiMatrix4x4 nodeTransform) { void addObjectToNode(aiNode* parent, Object* obj, aiMatrix4x4 nodeTransform) {
aiNode *sceneNode = new aiNode("item"); aiNode *sceneNode = new aiNode(obj->mName);
sceneNode->mNumMeshes = static_cast<unsigned int>(obj->mMeshes.size()); sceneNode->mNumMeshes = static_cast<unsigned int>(obj->mMeshes.size());
sceneNode->mMeshes = new unsigned int[sceneNode->mNumMeshes]; sceneNode->mMeshes = new unsigned int[sceneNode->mNumMeshes];
std::copy(obj->mMeshIndex.begin(), obj->mMeshIndex.end(), sceneNode->mMeshes); std::copy(obj->mMeshIndex.begin(), obj->mMeshIndex.end(), sceneNode->mMeshes);
@ -331,7 +342,6 @@ private:
mesh->mMaterialIndex = materials->mMaterialIndex[pindex]; mesh->mMaterialIndex = materials->mMaterialIndex[pindex];
} }
} }
mMeshes.push_back(mesh);
obj->mMeshes.push_back(mesh); obj->mMeshes.push_back(mesh);
obj->mMeshIndex.push_back(mMeshCount); obj->mMeshIndex.push_back(mMeshCount);
@ -546,7 +556,6 @@ private:
std::string value; std::string value;
}; };
std::vector<MetaEntry> mMetaData; std::vector<MetaEntry> mMetaData;
std::vector<aiMesh *> mMeshes;
std::map<unsigned int, Resource*> mResourcesDictionnary; std::map<unsigned int, Resource*> mResourcesDictionnary;
unsigned int mMaterialCount, mMeshCount; unsigned int mMaterialCount, mMeshCount;
XmlParser *mXmlParser; XmlParser *mXmlParser;