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

[3MF] Missing file in previous commit + parse object material in the importer

pull/3558/head
Jean-Louis 2020-12-26 14:04:45 +01:00
parent 0952038461
commit 0ec8d6e285
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetLib/3MF/3MFXmlTags.h
View File

@ -67,6 +67,7 @@ namespace XmlTag {
static const std::string v3 = "v3";
static const std::string id = "id";
static const std::string pid = "pid";
static const std::string pindex = "pindex";
static const std::string p1 = "p1";
static const std::string name = "name";
static const std::string type = "type";

9
code/AssetLib/3MF/D3MFExporter.h
View File

@ -82,9 +82,12 @@ protected:
void writeVertex( const aiVector3D &pos );
void writeFaces( aiMesh *mesh, unsigned int matIdx );
void writeBuild();
void exportContentTyp( const std::string &filename );
void writeModelToArchive( const std::string &folder, const std::string &modelName );
void writeRelInfoToFile( const std::string &folder, const std::string &relName );
// Zip the data
void zipContentType( const std::string &filename );
void zipModel( const std::string &folder, const std::string &modelName );
void zipRelInfo( const std::string &folder, const std::string &relName );
void addFileInZip( const std::string &entry, const std::string &content );
private:
std::string mArchiveName;

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

@ -145,23 +145,34 @@ public:
}
private:
bool getNodeAttribute(const XmlNode& node, const std::string& attribute, std::string& value) {
pugi::xml_attribute objectAttribute = node.attribute(attribute.c_str());
if (!objectAttribute.empty()) {
value = objectAttribute.as_string();
return true;
} else {
return false;
}
}
aiNode *ReadObject(XmlNode &node, aiScene *scene) {
std::unique_ptr<aiNode> nodePtr(new aiNode());
std::vector<unsigned long> meshIds;
std::string name, type;
pugi::xml_attribute attr = node.attribute(D3MF::XmlTag::id.c_str());
if (!attr.empty()) {
name = attr.as_string();
}
attr = node.attribute(D3MF::XmlTag::type.c_str());
if (!attr.empty()) {
type = attr.as_string();
std::string id, type, pid, pindex;
bool hasId = getNodeAttribute(node, D3MF::XmlTag::id, id);
//bool hasType = getNodeAttribute(node, D3MF::XmlTag::type, type); not used currently
bool hasPid = getNodeAttribute(node, D3MF::XmlTag::pid, pid);
bool hasPindex = getNodeAttribute(node, D3MF::XmlTag::pindex, pindex);
if (!hasId) {
return nullptr;
}
nodePtr->mParent = scene->mRootNode;
nodePtr->mName.Set(name);
nodePtr->mName.Set(id);
size_t meshIdx = mMeshes.size();
@ -169,7 +180,13 @@ private:
const std::string &currentName = currentNode.name();
if (currentName == D3MF::XmlTag::mesh) {
auto mesh = ReadMesh(currentNode);
mesh->mName.Set(name);
mesh->mName.Set(id);
if (hasPid && hasPindex && mBasematerialsDictionnary.find(atoi(pid.c_str())) != mBasematerialsDictionnary.end()) {
int iPid = atoi(pid.c_str());
int iPindex = atoi(pindex.c_str());
mesh->mMaterialIndex = mBasematerialsDictionnary[iPid][iPindex].first;
std::cout << "Set material " << mesh->mMaterialIndex << " from pid " << iPid << " and pindex " << iPindex << std::endl;
}
mMeshes.push_back(mesh);
meshIds.push_back(static_cast<unsigned long>(meshIdx));
++meshIdx;
@ -245,7 +262,7 @@ private:
faces.push_back(ReadTriangle(currentNode));
const char *pidToken = currentNode.attribute(D3MF::XmlTag::pid.c_str()).as_string();
const char *p1Token = currentNode.attribute(D3MF::XmlTag::p1.c_str()).as_string();
if (nullptr != pidToken && nullptr != p1Token) {
if (nullptr != pidToken && nullptr != p1Token && mBasematerialsDictionnary.find(std::atoi(pidToken)) != mBasematerialsDictionnary.end()) {
int pid(std::atoi(pidToken));
int p1(std::atoi(p1Token));
mesh->mMaterialIndex = mBasematerialsDictionnary[pid][p1].first;