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

xml-migration: next steps.

pull/2966/head
Kim Kulling 2020-01-27 22:10:42 +01:00
parent 02acb3f8c2
commit 6a471b4390
1 changed files with 270 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
code/AMF/AMFImporter.cpp
View File

@ -52,16 +52,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "AMFImporter.hpp" #include "AMFImporter.hpp"
#include "AMFImporter_Macro.hpp" #include "AMFImporter_Macro.hpp"
#include <assimp/fast_atof.h>
#include <assimp/DefaultIOSystem.h> #include <assimp/DefaultIOSystem.h>
#include <assimp/fast_atof.h>
// Header files, stdlib.
#include <memory> #include <memory>
namespace Assimp { namespace Assimp {
/// \var aiImporterDesc AMFImporter::Description /// \var aiImporterDesc AMFImporter::Description
/// Conastant which hold importer description /// Constant which hold importer description
const aiImporterDesc AMFImporter::Description = { const aiImporterDesc AMFImporter::Description = {
"Additive manufacturing file format(AMF) Importer", "Additive manufacturing file format(AMF) Importer",
"smalcom", "smalcom",
@ -103,12 +102,9 @@ AMFImporter::~AMFImporter() {
/************************************************************ Functions: find set ************************************************************/ /************************************************************ Functions: find set ************************************************************/
/*********************************************************************************************************************************************/ /*********************************************************************************************************************************************/
bool AMFImporter::Find_NodeElement(const std::string& pID, const CAMFImporter_NodeElement::EType pType, CAMFImporter_NodeElement** pNodeElement) const bool AMFImporter::Find_NodeElement(const std::string &pID, const CAMFImporter_NodeElement::EType pType, CAMFImporter_NodeElement **pNodeElement) const {
{ for (CAMFImporter_NodeElement *ne : mNodeElement_List) {
for(CAMFImporter_NodeElement* ne: mNodeElement_List) if ((ne->ID == pID) && (ne->Type == pType)) {
{
if((ne->ID == pID) && (ne->Type == pType))
{
if (pNodeElement != nullptr) *pNodeElement = ne; if (pNodeElement != nullptr) *pNodeElement = ne;
return true; return true;
@ -164,13 +160,11 @@ void AMFImporter::Throw_IncorrectAttrValue(const std::string &nodeName, const st
throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + std::string(mReader->getNodeName()) + "> has incorrect value."); throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + std::string(mReader->getNodeName()) + "> has incorrect value.");
} }
void AMFImporter::Throw_MoreThanOnceDefined(const std::string& pNodeType, const std::string& pDescription) void AMFImporter::Throw_MoreThanOnceDefined(const std::string &pNodeType, const std::string &pDescription) {
{
throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + mReader->getNodeName() + ". Description: " + pDescription); throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + mReader->getNodeName() + ". Description: " + pDescription);
} }
void AMFImporter::Throw_ID_NotFound(const std::string& pID) const void AMFImporter::Throw_ID_NotFound(const std::string &pID) const {
{
throw DeadlyImportError("Not found node with name \"" + pID + "\"."); throw DeadlyImportError("Not found node with name \"" + pID + "\".");
} }
@ -178,13 +172,11 @@ void AMFImporter::Throw_ID_NotFound(const std::string& pID) const
/************************************************************* Functions: XML set ************************************************************/ /************************************************************* Functions: XML set ************************************************************/
/*********************************************************************************************************************************************/ /*********************************************************************************************************************************************/
void AMFImporter::XML_CheckNode_MustHaveChildren() void AMFImporter::XML_CheckNode_MustHaveChildren() {
{
if (mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must have children."); if (mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must have children.");
} }
void AMFImporter::XML_CheckNode_SkipUnsupported(const std::string& pParentNodeName) void AMFImporter::XML_CheckNode_SkipUnsupported(const std::string &pParentNodeName) {
{
static const size_t Uns_Skip_Len = 3; static const size_t Uns_Skip_Len = 3;
const char *Uns_Skip[Uns_Skip_Len] = { "composite", "edge", "normal" }; const char *Uns_Skip[Uns_Skip_Len] = { "composite", "edge", "normal" };
@ -195,22 +187,18 @@ void AMFImporter::XML_CheckNode_SkipUnsupported(const std::string& pParentNodeNa
bool close_found = false; bool close_found = false;
size_t sk_idx; size_t sk_idx;
for(sk_idx = 0; sk_idx < Uns_Skip_Len; sk_idx++) for (sk_idx = 0; sk_idx < Uns_Skip_Len; sk_idx++) {
{
if (nn != Uns_Skip[sk_idx]) continue; if (nn != Uns_Skip[sk_idx]) continue;
found = true; found = true;
if(mReader->isEmptyElement()) if (mReader->isEmptyElement()) {
{
close_found = true; close_found = true;
goto casu_cres; goto casu_cres;
} }
while(mReader->read()) while (mReader->read()) {
{ if ((mReader->getNodeType() == irr::io::EXN_ELEMENT_END) && (nn == mReader->getNodeName())) {
if((mReader->getNodeType() == irr::io::EXN_ELEMENT_END) && (nn == mReader->getNodeName()))
{
close_found = true; close_found = true;
goto casu_cres; goto casu_cres;
@ -223,16 +211,14 @@ casu_cres:
if (!found) throw DeadlyImportError("Unknown node \"" + nn + "\" in " + pParentNodeName + "."); if (!found) throw DeadlyImportError("Unknown node \"" + nn + "\" in " + pParentNodeName + ".");
if (!close_found) Throw_CloseNotFound(nn); if (!close_found) Throw_CloseNotFound(nn);
if(!skipped_before[sk_idx]) if (!skipped_before[sk_idx]) {
{
skipped_before[sk_idx] = true; skipped_before[sk_idx] = true;
ASSIMP_LOG_WARN_F("Skipping node \"", nn, "\" in ", pParentNodeName, "."); ASSIMP_LOG_WARN_F("Skipping node \"", nn, "\" in ", pParentNodeName, ".");
} }
} }
bool AMFImporter::XML_SearchNode(const std::string &pNodeName) { bool AMFImporter::XML_SearchNode(const std::string &pNodeName) {
mReader-> mReader->while (mReader->read()) {
while(mReader->read()) {
//if((mReader->getNodeType() == irr::io::EXN_ELEMENT) && XML_CheckNode_NameEqual(pNodeName)) return true; //if((mReader->getNodeType() == irr::io::EXN_ELEMENT) && XML_CheckNode_NameEqual(pNodeName)) return true;
if ((mReader->getNodeType() == pugi::node_element) && XML_CheckNode_NameEqual(pNodeName)) { if ((mReader->getNodeType() == pugi::node_element) && XML_CheckNode_NameEqual(pNodeName)) {
return true; return true;
@ -242,8 +228,7 @@ bool AMFImporter::XML_SearchNode(const std::string& pNodeName) {
return false; return false;
} }
bool AMFImporter::XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx) bool AMFImporter::XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx) {
{
std::string val(mReader->getAttributeValue(pAttrIdx)); std::string val(mReader->getAttributeValue(pAttrIdx));
if ((val == "false") || (val == "0")) if ((val == "false") || (val == "0"))
@ -254,8 +239,7 @@ bool AMFImporter::XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx)
throw DeadlyImportError("Bool attribute value can contain \"false\"/\"0\" or \"true\"/\"1\" not the \"" + val + "\""); throw DeadlyImportError("Bool attribute value can contain \"false\"/\"0\" or \"true\"/\"1\" not the \"" + val + "\"");
} }
float AMFImporter::XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx) float AMFImporter::XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx) {
{
std::string val; std::string val;
float tvalf; float tvalf;
@ -265,13 +249,11 @@ float AMFImporter::XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx)
return tvalf; return tvalf;
} }
uint32_t AMFImporter::XML_ReadNode_GetAttrVal_AsU32(const int pAttrIdx) uint32_t AMFImporter::XML_ReadNode_GetAttrVal_AsU32(const int pAttrIdx) {
{
return strtoul10(mReader->getAttributeValue(pAttrIdx)); return strtoul10(mReader->getAttributeValue(pAttrIdx));
} }
float AMFImporter::XML_ReadNode_GetVal_AsFloat() float AMFImporter::XML_ReadNode_GetVal_AsFloat() {
{
std::string val; std::string val;
float tvalf; float tvalf;
@ -284,16 +266,14 @@ float AMFImporter::XML_ReadNode_GetVal_AsFloat()
return tvalf; return tvalf;
} }
uint32_t AMFImporter::XML_ReadNode_GetVal_AsU32() uint32_t AMFImporter::XML_ReadNode_GetVal_AsU32() {
{
if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. No data, seems file is corrupt."); if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. No data, seems file is corrupt.");
if (mReader->getNodeType() != irr::io::EXN_TEXT) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. Invalid type of XML element, seems file is corrupt."); if (mReader->getNodeType() != irr::io::EXN_TEXT) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. Invalid type of XML element, seems file is corrupt.");
return strtoul10(mReader->getNodeData()); return strtoul10(mReader->getNodeData());
} }
void AMFImporter::XML_ReadNode_GetVal_AsString(std::string& pValue) void AMFImporter::XML_ReadNode_GetVal_AsString(std::string &pValue) {
{
if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsString. No data, seems file is corrupt."); if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsString. No data, seems file is corrupt.");
if (mReader->getNodeType() != irr::io::EXN_TEXT) if (mReader->getNodeType() != irr::io::EXN_TEXT)
throw DeadlyImportError("XML_ReadNode_GetVal_AsString. Invalid type of XML element, seems file is corrupt."); throw DeadlyImportError("XML_ReadNode_GetVal_AsString. Invalid type of XML element, seems file is corrupt.");
@ -305,20 +285,17 @@ void AMFImporter::XML_ReadNode_GetVal_AsString(std::string& pValue)
/************************************************************ Functions: parse set ***********************************************************/ /************************************************************ Functions: parse set ***********************************************************/
/*********************************************************************************************************************************************/ /*********************************************************************************************************************************************/
void AMFImporter::ParseHelper_Node_Enter(CAMFImporter_NodeElement* pNode) void AMFImporter::ParseHelper_Node_Enter(CAMFImporter_NodeElement *pNode) {
{
mNodeElement_Cur->Child.push_back(pNode); // add new element to current element child list. mNodeElement_Cur->Child.push_back(pNode); // add new element to current element child list.
mNodeElement_Cur = pNode; // switch current element to new one. mNodeElement_Cur = pNode; // switch current element to new one.
} }
void AMFImporter::ParseHelper_Node_Exit() void AMFImporter::ParseHelper_Node_Exit() {
{
// check if we can walk up. // check if we can walk up.
if (mNodeElement_Cur != nullptr) mNodeElement_Cur = mNodeElement_Cur->Parent; if (mNodeElement_Cur != nullptr) mNodeElement_Cur = mNodeElement_Cur->Parent;
} }
void AMFImporter::ParseHelper_FixTruncatedFloatString(const char* pInStr, std::string& pOutString) void AMFImporter::ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString) {
{
size_t instr_len; size_t instr_len;
pOutString.clear(); pOutString.clear();
@ -330,27 +307,21 @@ void AMFImporter::ParseHelper_FixTruncatedFloatString(const char* pInStr, std::s
if (pInStr[0] == '.') pOutString.push_back('0'); if (pInStr[0] == '.') pOutString.push_back('0');
pOutString.push_back(pInStr[0]); pOutString.push_back(pInStr[0]);
for(size_t ci = 1; ci < instr_len; ci++) for (size_t ci = 1; ci < instr_len; ci++) {
{ if ((pInStr[ci] == '.') && ((pInStr[ci - 1] == ' ') || (pInStr[ci - 1] == '-') || (pInStr[ci - 1] == '+') || (pInStr[ci - 1] == '\t'))) {
if((pInStr[ci] == '.') && ((pInStr[ci - 1] == ' ') || (pInStr[ci - 1] == '-') || (pInStr[ci - 1] == '+') || (pInStr[ci - 1] == '\t')))
{
pOutString.push_back('0'); pOutString.push_back('0');
pOutString.push_back('.'); pOutString.push_back('.');
} } else {
else
{
pOutString.push_back(pInStr[ci]); pOutString.push_back(pInStr[ci]);
} }
} }
} }
static bool ParseHelper_Decode_Base64_IsBase64(const char pChar) static bool ParseHelper_Decode_Base64_IsBase64(const char pChar) {
{
return (isalnum(pChar) || (pChar == '+') || (pChar == '/')); return (isalnum(pChar) || (pChar == '+') || (pChar == '/'));
} }
void AMFImporter::ParseHelper_Decode_Base64(const std::string& pInputBase64, std::vector<uint8_t>& pOutputData) const void AMFImporter::ParseHelper_Decode_Base64(const std::string &pInputBase64, std::vector<uint8_t> &pOutputData) const {
{
// With help from // With help from
// René Nyffenegger http://www.adp-gmbh.ch/cpp/common/base64.html // René Nyffenegger http://www.adp-gmbh.ch/cpp/common/base64.html
const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@ -364,70 +335,66 @@ void AMFImporter::ParseHelper_Decode_Base64(const std::string& pInputBase64, std
pOutputData.clear(); pOutputData.clear();
pOutputData.reserve(pInputBase64.size() / 4 * 3); pOutputData.reserve(pInputBase64.size() / 4 * 3);
for(size_t in_len = pInputBase64.size(), in_idx = 0; (in_len > 0) && (pInputBase64[in_idx] != '='); in_len--) for (size_t in_len = pInputBase64.size(), in_idx = 0; (in_len > 0) && (pInputBase64[in_idx] != '='); in_len--) {
{ if (ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx])) {
if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx]))
{
arr4[tidx++] = pInputBase64[in_idx++]; arr4[tidx++] = pInputBase64[in_idx++];
if(tidx == 4) if (tidx == 4) {
{ for (tidx = 0; tidx < 4; tidx++)
for(tidx = 0; tidx < 4; tidx++) arr4[tidx] = (uint8_t)base64_chars.find(arr4[tidx]); arr4[tidx] = (uint8_t)base64_chars.find(arr4[tidx]);
arr3[0] = (arr4[0] << 2) + ((arr4[1] & 0x30) >> 4); arr3[0] = (arr4[0] << 2) + ((arr4[1] & 0x30) >> 4);
arr3[1] = ((arr4[1] & 0x0F) << 4) + ((arr4[2] & 0x3C) >> 2); arr3[1] = ((arr4[1] & 0x0F) << 4) + ((arr4[2] & 0x3C) >> 2);
arr3[2] = ((arr4[2] & 0x03) << 6) + arr4[3]; arr3[2] = ((arr4[2] & 0x03) << 6) + arr4[3];
for(tidx = 0; tidx < 3; tidx++) pOutputData.push_back(arr3[tidx]); for (tidx = 0; tidx < 3; tidx++)
pOutputData.push_back(arr3[tidx]);
tidx = 0; tidx = 0;
} // if(tidx == 4) } // if(tidx == 4)
} // if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx])) } // if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx]))
else else {
{
in_idx++; in_idx++;
} // if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx])) else } // if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx])) else
} }
if(tidx) if (tidx) {
{ for (uint8_t i = tidx; i < 4; i++)
for(uint8_t i = tidx; i < 4; i++) arr4[i] = 0; arr4[i] = 0;
for(uint8_t i = 0; i < 4; i++) arr4[i] = (uint8_t)(base64_chars.find(arr4[i])); for (uint8_t i = 0; i < 4; i++)
arr4[i] = (uint8_t)(base64_chars.find(arr4[i]));
arr3[0] = (arr4[0] << 2) + ((arr4[1] & 0x30) >> 4); arr3[0] = (arr4[0] << 2) + ((arr4[1] & 0x30) >> 4);
arr3[1] = ((arr4[1] & 0x0F) << 4) + ((arr4[2] & 0x3C) >> 2); arr3[1] = ((arr4[1] & 0x0F) << 4) + ((arr4[2] & 0x3C) >> 2);
arr3[2] = ((arr4[2] & 0x03) << 6) + arr4[3]; arr3[2] = ((arr4[2] & 0x03) << 6) + arr4[3];
for(uint8_t i = 0; i < (tidx - 1); i++) pOutputData.push_back(arr3[i]); for (uint8_t i = 0; i < (tidx - 1); i++)
pOutputData.push_back(arr3[i]);
} }
} }
void AMFImporter::ParseFile(const std::string& pFile, IOSystem* pIOHandler) void AMFImporter::ParseFile(const std::string &pFile, IOSystem *pIOHandler) {
{
// irr::io::IrrXMLReader* OldReader = mReader;// store current XMLreader.
std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb")); std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
// Check whether we can read from the file // Check whether we can read from the file
if(file.get() == NULL) throw DeadlyImportError("Failed to open AMF file " + pFile + "."); if (file.get() == nullptr) {
throw DeadlyImportError("Failed to open AMF file " + pFile + ".");
}
mReader = new XmlParser; mReader = new XmlParser;
if (!mReader->parse(file.get())) { XmlNode *root = mReader->parse(file.get());
if (nullptr == root) {
throw DeadlyImportError("Failed to create XML reader for file" + pFile + "."); throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
} }
// generate a XML reader for it
//std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get()));
//mReader = irr::io::createIrrXMLReader(mIOWrapper.get());
//if(!mReader) throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
//
// start reading // start reading
// search for root tag <amf> // search for root tag <amf>
if(XML_SearchNode("amf"))
ParseNode_Root(); if (!root->getNode()->find_child("amf")) {
else
throw DeadlyImportError("Root node \"amf\" not found."); throw DeadlyImportError("Root node \"amf\" not found.");
}
ParseNode_Root(root);
delete mReader; delete mReader;
// restore old XMLreader mReader = nullptr;
mReader = OldReader;
} }
// <amf // <amf
@ -437,42 +404,82 @@ void AMFImporter::ParseFile(const std::string& pFile, IOSystem* pIOHandler)
// </amf> // </amf>
// Root XML element. // Root XML element.
// Multi elements - No. // Multi elements - No.
void AMFImporter::ParseNode_Root() void AMFImporter::ParseNode_Root(XmlNode *root) {
{
std::string unit, version; std::string unit, version;
CAMFImporter_NodeElement *ne(nullptr); CAMFImporter_NodeElement *ne(nullptr);
// Read attributes for node <amf>. // Read attributes for node <amf>.
MACRO_ATTRREAD_LOOPBEG; pugi::xml_node *node(root->getNode());
for (pugi::xml_attribute_iterator ait = node->attributes_begin(); ait != node->attributes_end(); ++ait) {
if (ait->name() == "unit") {
unit = ait->as_string();
} else if (ait->name() == "version") {
version = ait->as_string();
}
}
/*MACRO_ATTRREAD_LOOPBEG;
MACRO_ATTRREAD_CHECK_RET("unit", unit, mReader->getAttributeValue); MACRO_ATTRREAD_CHECK_RET("unit", unit, mReader->getAttributeValue);
MACRO_ATTRREAD_CHECK_RET("version", version, mReader->getAttributeValue); MACRO_ATTRREAD_CHECK_RET("version", version, mReader->getAttributeValue);
MACRO_ATTRREAD_LOOPEND_WSKIP; MACRO_ATTRREAD_LOOPEND_WSKIP;*/
// Check attributes // Check attributes
if(!mUnit.empty()) if (!mUnit.empty()) {
{ if ((mUnit != "inch") && (mUnit != "millimeter") && (mUnit != "meter") && (mUnit != "feet") && (mUnit != "micron")) {
if((mUnit != "inch") && (mUnit != "millimeter") && (mUnit != "meter") && (mUnit != "feet") && (mUnit != "micron")) Throw_IncorrectAttrValue("unit"); Throw_IncorrectAttrValue("unit");
}
} }
// create root node element. // create root node element.
ne = new CAMFImporter_NodeElement_Root(nullptr); ne = new CAMFImporter_NodeElement_Root(nullptr);
mNodeElement_Cur = ne;// set first "current" element
// and assign attribute's values // set first "current" element
mNodeElement_Cur = ne;
// and assign attributes values
((CAMFImporter_NodeElement_Root *)ne)->Unit = unit; ((CAMFImporter_NodeElement_Root *)ne)->Unit = unit;
((CAMFImporter_NodeElement_Root *)ne)->Version = version; ((CAMFImporter_NodeElement_Root *)ne)->Version = version;
// Check for child nodes // Check for child nodes
if(!mReader->isEmptyElement()) for (pugi::xml_node child : node->children()) {
{ if (child.name() == "object") {
ParseNode_Object();
} else if (child.name() == "material") {
ParseNode_Material();
} else if (child.name() == "texture") {
ParseNode_Texture();
} else if (child.name() == "constellation") {
ParseNode_Constellation();
} else if (child.name() == "metadata") {
ParseNode_Metadata();
}
}
/*if (!mReader->isEmptyElement()) {
MACRO_NODECHECK_LOOPBEGIN("amf"); MACRO_NODECHECK_LOOPBEGIN("amf");
if(XML_CheckNode_NameEqual("object")) { ParseNode_Object(); continue; } if (XML_CheckNode_NameEqual("object")) {
if(XML_CheckNode_NameEqual("material")) { ParseNode_Material(); continue; } ParseNode_Object();
if(XML_CheckNode_NameEqual("texture")) { ParseNode_Texture(); continue; } continue;
if(XML_CheckNode_NameEqual("constellation")) { ParseNode_Constellation(); continue; } }
if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; } if (XML_CheckNode_NameEqual("material")) {
ParseNode_Material();
continue;
}
if (XML_CheckNode_NameEqual("texture")) {
ParseNode_Texture();
continue;
}
if (XML_CheckNode_NameEqual("constellation")) {
ParseNode_Constellation();
continue;
}
if (XML_CheckNode_NameEqual("metadata")) {
ParseNode_Metadata();
continue;
}
MACRO_NODECHECK_LOOPEND("amf"); MACRO_NODECHECK_LOOPEND("amf");
mNodeElement_Cur = ne; // force restore "current" element mNodeElement_Cur = ne; // force restore "current" element
}// if(!mReader->isEmptyElement()) } // if(!mReader->isEmptyElement())*/
mNodeElement_List.push_back(ne); // add to node element list because its a new object in graph. mNodeElement_List.push_back(ne); // add to node element list because its a new object in graph.
} }
@ -484,8 +491,7 @@ void AMFImporter::ParseNode_Root()
// A collection of objects or constellations with specific relative locations. // A collection of objects or constellations with specific relative locations.
// Multi elements - Yes. // Multi elements - Yes.
// Parent element - <amf>. // Parent element - <amf>.
void AMFImporter::ParseNode_Constellation() void AMFImporter::ParseNode_Constellation() {
{
std::string id; std::string id;
CAMFImporter_NodeElement *ne(nullptr); CAMFImporter_NodeElement *ne(nullptr);
@ -501,17 +507,21 @@ void AMFImporter::ParseNode_Constellation()
if (!id.empty()) als.ID = id; if (!id.empty()) als.ID = id;
// Check for child nodes // Check for child nodes
if(!mReader->isEmptyElement()) if (!mReader->isEmptyElement()) {
{
ParseHelper_Node_Enter(ne); ParseHelper_Node_Enter(ne);
MACRO_NODECHECK_LOOPBEGIN("constellation"); MACRO_NODECHECK_LOOPBEGIN("constellation");
if(XML_CheckNode_NameEqual("instance")) { ParseNode_Instance(); continue; } if (XML_CheckNode_NameEqual("instance")) {
if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; } ParseNode_Instance();
continue;
}
if (XML_CheckNode_NameEqual("metadata")) {
ParseNode_Metadata();
continue;
}
MACRO_NODECHECK_LOOPEND("constellation"); MACRO_NODECHECK_LOOPEND("constellation");
ParseHelper_Node_Exit(); ParseHelper_Node_Exit();
} // if(!mReader->isEmptyElement()) } // if(!mReader->isEmptyElement())
else else {
{
mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
} // if(!mReader->isEmptyElement()) else } // if(!mReader->isEmptyElement()) else
@ -525,8 +535,7 @@ void AMFImporter::ParseNode_Constellation()
// A collection of objects or constellations with specific relative locations. // A collection of objects or constellations with specific relative locations.
// Multi elements - Yes. // Multi elements - Yes.
// Parent element - <amf>. // Parent element - <amf>.
void AMFImporter::ParseNode_Instance() void AMFImporter::ParseNode_Instance() {
{
std::string objectid; std::string objectid;
CAMFImporter_NodeElement *ne(nullptr); CAMFImporter_NodeElement *ne(nullptr);
@ -544,8 +553,7 @@ void AMFImporter::ParseNode_Instance()
als.ObjectID = objectid; als.ObjectID = objectid;
// Check for child nodes // Check for child nodes
if(!mReader->isEmptyElement()) if (!mReader->isEmptyElement()) {
{
bool read_flag[6] = { false, false, false, false, false, false }; bool read_flag[6] = { false, false, false, false, false, false };
als.Delta.Set(0, 0, 0); als.Delta.Set(0, 0, 0);
@ -565,8 +573,7 @@ void AMFImporter::ParseNode_Instance()
als.Rotation.y = AI_MATH_PI_F * als.Rotation.y / 180.0f; als.Rotation.y = AI_MATH_PI_F * als.Rotation.y / 180.0f;
als.Rotation.z = AI_MATH_PI_F * als.Rotation.z / 180.0f; als.Rotation.z = AI_MATH_PI_F * als.Rotation.z / 180.0f;
} // if(!mReader->isEmptyElement()) } // if(!mReader->isEmptyElement())
else else {
{
mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
} // if(!mReader->isEmptyElement()) else } // if(!mReader->isEmptyElement()) else
@ -580,8 +587,7 @@ void AMFImporter::ParseNode_Instance()
// An object definition. // An object definition.
// Multi elements - Yes. // Multi elements - Yes.
// Parent element - <amf>. // Parent element - <amf>.
void AMFImporter::ParseNode_Object() void AMFImporter::ParseNode_Object() {
{
std::string id; std::string id;
CAMFImporter_NodeElement *ne(nullptr); CAMFImporter_NodeElement *ne(nullptr);
@ -597,14 +603,12 @@ void AMFImporter::ParseNode_Object()
if (!id.empty()) als.ID = id; if (!id.empty()) als.ID = id;
// Check for child nodes // Check for child nodes
if(!mReader->isEmptyElement()) if (!mReader->isEmptyElement()) {
{
bool col_read = false; bool col_read = false;
ParseHelper_Node_Enter(ne); ParseHelper_Node_Enter(ne);
MACRO_NODECHECK_LOOPBEGIN("object"); MACRO_NODECHECK_LOOPBEGIN("object");
if(XML_CheckNode_NameEqual("color")) if (XML_CheckNode_NameEqual("color")) {
{
// Check if color already defined for object. // Check if color already defined for object.
if (col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <object>."); if (col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <object>.");
// read data and set flag about it // read data and set flag about it
@ -614,13 +618,18 @@ void AMFImporter::ParseNode_Object()
continue; continue;
} }
if(XML_CheckNode_NameEqual("mesh")) { ParseNode_Mesh(); continue; } if (XML_CheckNode_NameEqual("mesh")) {
if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; } ParseNode_Mesh();
continue;
}
if (XML_CheckNode_NameEqual("metadata")) {
ParseNode_Metadata();
continue;
}
MACRO_NODECHECK_LOOPEND("object"); MACRO_NODECHECK_LOOPEND("object");
ParseHelper_Node_Exit(); ParseHelper_Node_Exit();
} // if(!mReader->isEmptyElement()) } // if(!mReader->isEmptyElement())
else else {
{
mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
} // if(!mReader->isEmptyElement()) else } // if(!mReader->isEmptyElement()) else
@ -645,8 +654,7 @@ void AMFImporter::ParseNode_Object()
// "Revision" - specifies the revision of the entity // "Revision" - specifies the revision of the entity
// "Tolerance" - specifies the desired manufacturing tolerance of the entity in entity's unit system // "Tolerance" - specifies the desired manufacturing tolerance of the entity in entity's unit system
// "Volume" - specifies the total volume of the entity, in the entity's unit system, to be used for verification (object and volume only) // "Volume" - specifies the total volume of the entity, in the entity's unit system, to be used for verification (object and volume only)
void AMFImporter::ParseNode_Metadata() void AMFImporter::ParseNode_Metadata() {
{
std::string type, value; std::string type, value;
CAMFImporter_NodeElement *ne(nullptr); CAMFImporter_NodeElement *ne(nullptr);
@ -668,16 +676,14 @@ void AMFImporter::ParseNode_Metadata()
/******************************************************** Functions: BaseImporter set ********************************************************/ /******************************************************** Functions: BaseImporter set ********************************************************/
/*********************************************************************************************************************************************/ /*********************************************************************************************************************************************/
bool AMFImporter::CanRead(const std::string& pFile, IOSystem* pIOHandler, bool pCheckSig) const bool AMFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const {
{
const std::string extension = GetExtension(pFile); const std::string extension = GetExtension(pFile);
if (extension == "amf") { if (extension == "amf") {
return true; return true;
} }
if(!extension.length() || pCheckSig) if (!extension.length() || pCheckSig) {
{
const char *tokens[] = { "<amf" }; const char *tokens[] = { "<amf" };
return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1); return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
@ -686,18 +692,15 @@ bool AMFImporter::CanRead(const std::string& pFile, IOSystem* pIOHandler, bool p
return false; return false;
} }
void AMFImporter::GetExtensionList(std::set<std::string>& pExtensionList) void AMFImporter::GetExtensionList(std::set<std::string> &pExtensionList) {
{
pExtensionList.insert("amf"); pExtensionList.insert("amf");
} }
const aiImporterDesc* AMFImporter::GetInfo () const const aiImporterDesc *AMFImporter::GetInfo() const {
{
return &Description; return &Description;
} }
void AMFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) void AMFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
{
Clear(); // delete old graph. Clear(); // delete old graph.
ParseFile(pFile, pIOHandler); ParseFile(pFile, pIOHandler);
Postprocess_BuildScene(pScene); Postprocess_BuildScene(pScene);