diff --git a/code/AMF/AMFImporter.cpp b/code/AMF/AMFImporter.cpp index f52aa67bc..5bda49dd8 100644 --- a/code/AMF/AMFImporter.cpp +++ b/code/AMF/AMFImporter.cpp @@ -92,6 +92,7 @@ void AMFImporter::Clear() { AMFImporter::~AMFImporter() { if (mReader != nullptr) { delete mReader; + mReader = nullptr; } // Clear() is accounting if data already is deleted. So, just check again if all data is deleted. @@ -157,11 +158,11 @@ void AMFImporter::Throw_IncorrectAttr(const std::string &nodeName, const std::st } void AMFImporter::Throw_IncorrectAttrValue(const std::string &nodeName, const std::string &pAttrName) { - throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + std::string(mReader->getNodeName()) + "> has incorrect value."); + throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + nodeName + "> has incorrect value."); } -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); +void AMFImporter::Throw_MoreThanOnceDefined(const std::string &nodeType, const std::string &nodeName, const std::string &pDescription) { + throw DeadlyImportError("\"" + nodeType + "\" node can be used only once in " + nodeName + ". Description: " + pDescription); } void AMFImporter::Throw_ID_NotFound(const std::string &pID) const { @@ -172,11 +173,14 @@ void AMFImporter::Throw_ID_NotFound(const std::string &pID) const { /************************************************************* Functions: XML set ************************************************************/ /*********************************************************************************************************************************************/ -void AMFImporter::XML_CheckNode_MustHaveChildren() { - if (mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must have children."); +void AMFImporter::XML_CheckNode_MustHaveChildren( XmlNode *node ) { + //if (mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must have children."); + if (node->getNode()->children().begin() == node->getNode()->children().end()) { + throw DeadlyImportError(std::string("Node <") + std::string(node->getNode()->name()) + "> must have children."); + } } -void AMFImporter::XML_CheckNode_SkipUnsupported(const std::string &pParentNodeName) { +/*void AMFImporter::XML_CheckNode_SkipUnsupported(XmlNode *node, const std::string &pParentNodeName) { static const size_t Uns_Skip_Len = 3; const char *Uns_Skip[Uns_Skip_Len] = { "composite", "edge", "normal" }; @@ -216,9 +220,10 @@ casu_cres: ASSIMP_LOG_WARN_F("Skipping node \"", nn, "\" in ", pParentNodeName, "."); } } - +*/ bool AMFImporter::XML_SearchNode(const std::string &pNodeName) { - mReader->while (mReader->read()) { + + mReader->while (mReader->read()) { //if((mReader->getNodeType() == irr::io::EXN_ELEMENT) && XML_CheckNode_NameEqual(pNodeName)) return true; if ((mReader->getNodeType() == pugi::node_element) && XML_CheckNode_NameEqual(pNodeName)) { return true; @@ -594,7 +599,7 @@ void AMFImporter::ParseNode_Object(XmlNode *nodeInst) { for (pugi::xml_attribute_iterator ait = node->attributes_begin(); ait != node->attributes_end(); ++ait) { if (ait->name() == "id") { id = ait->as_string(); - } + } } // Read attributes for node . /*MACRO_ATTRREAD_LOOPBEG; @@ -612,11 +617,13 @@ void AMFImporter::ParseNode_Object(XmlNode *nodeInst) { // Check for child nodes - for (pugi::xml_node_iterator it = node->children().begin(); it != node->children->end(); ++it) { + for (pugi::xml_node_iterator it = node->children().begin(); it != node->children->end(); ++it) { bool col_read = false; if (it->name() == "mesh") { - ParseNode_Mesh( it ); - } + ParseNode_Mesh(*it); + } else if (it->name() == "metadata") { + ParseNode_Metadata(*it); + } } if (!mReader->isEmptyElement()) { bool col_read = false; diff --git a/code/AMF/AMFImporter.hpp b/code/AMF/AMFImporter.hpp index f03bbbf6a..a2ab420f5 100644 --- a/code/AMF/AMFImporter.hpp +++ b/code/AMF/AMFImporter.hpp @@ -272,15 +272,15 @@ private: /// \throw DeadlyImportError. /// \param [in] pNodeType - type of node which defined one more time. /// \param [in] pDescription - message about error. E.g. what the node defined while exception raised. - void Throw_MoreThanOnceDefined(const std::string& pNodeType, const std::string& pDescription); + void Throw_MoreThanOnceDefined(const std::string &nodeType, const std::string &nodeName, const std::string &pDescription); /// Call that function when referenced element ID are not found in graph and exception must be raised. /// \param [in] pID - ID of of element which not found. /// \throw DeadlyImportError. void Throw_ID_NotFound(const std::string& pID) const; - /// Check if current node have children: .... If not then exception will throwed. - void XML_CheckNode_MustHaveChildren(); + /// Check if current node have children: .... If not then exception will thrown. + void XML_CheckNode_MustHaveChildren(XmlNode *node); /// Check if current node name is equal to pNodeName. /// \param [in] pNodeName - name for checking. @@ -292,7 +292,7 @@ private: /// Skip unsupported node and report about that. Depend on node name can be skipped begin tag of node all whole node. /// \param [in] pParentNodeName - parent node name. Used for reporting. - void XML_CheckNode_SkipUnsupported(const std::string& pParentNodeName); + //void XML_CheckNode_SkipUnsupported(XmlNode *node, const std::string &pParentNodeName); /// Search for specified node in file. XML file read pointer(mReader) will point to found node or file end after search is end. /// \param [in] pNodeName - requested node name. diff --git a/code/Irr/IRRMeshLoader.cpp b/code/Irr/IRRMeshLoader.cpp index 13db70e91..6129abf6a 100644 --- a/code/Irr/IRRMeshLoader.cpp +++ b/code/Irr/IRRMeshLoader.cpp @@ -43,493 +43,470 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Implementation of the IrrMesh importer class */ - - #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER #include "IRRMeshLoader.h" #include #include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include using namespace Assimp; -using namespace irr; -using namespace irr::io; static const aiImporterDesc desc = { - "Irrlicht Mesh Reader", - "", - "", - "http://irrlicht.sourceforge.net/", - aiImporterFlags_SupportTextFlavour, - 0, - 0, - 0, - 0, - "xml irrmesh" + "Irrlicht Mesh Reader", + "", + "", + "http://irrlicht.sourceforge.net/", + aiImporterFlags_SupportTextFlavour, + 0, + 0, + 0, + 0, + "xml irrmesh" }; // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer -IRRMeshImporter::IRRMeshImporter() -{} +IRRMeshImporter::IRRMeshImporter() {} // ------------------------------------------------------------------------------------------------ // Destructor, private as well -IRRMeshImporter::~IRRMeshImporter() -{} +IRRMeshImporter::~IRRMeshImporter() {} // ------------------------------------------------------------------------------------------------ // Returns whether the class can handle the format of the given file. -bool IRRMeshImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const -{ - /* NOTE: A simple check for the file extension is not enough +bool IRRMeshImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const { + /* NOTE: A simple check for the file extension is not enough * here. Irrmesh and irr are easy, but xml is too generic * and could be collada, too. So we need to open the file and * search for typical tokens. */ - const std::string extension = GetExtension(pFile); + const std::string extension = GetExtension(pFile); - if (extension == "irrmesh")return true; - else if (extension == "xml" || checkSig) - { - /* If CanRead() is called to check whether the loader + if (extension == "irrmesh") + return true; + else if (extension == "xml" || checkSig) { + /* If CanRead() is called to check whether the loader * supports a specific file extension in general we * must return true here. */ - if (!pIOHandler)return true; - const char* tokens[] = {"irrmesh"}; - return SearchFileHeaderForToken(pIOHandler,pFile,tokens,1); - } - return false; + if (!pIOHandler) return true; + const char *tokens[] = { "irrmesh" }; + return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1); + } + return false; } // ------------------------------------------------------------------------------------------------ // Get a list of all file extensions which are handled by this class -const aiImporterDesc* IRRMeshImporter::GetInfo () const -{ - return &desc; +const aiImporterDesc *IRRMeshImporter::GetInfo() const { + return &desc; } -static void releaseMaterial( aiMaterial **mat ) { - if(*mat!= nullptr) { - delete *mat; - *mat = nullptr; - } +static void releaseMaterial(aiMaterial **mat) { + if (*mat != nullptr) { + delete *mat; + *mat = nullptr; + } } -static void releaseMesh( aiMesh **mesh ) { - if (*mesh != nullptr){ - delete *mesh; - *mesh = nullptr; - } +static void releaseMesh(aiMesh **mesh) { + if (*mesh != nullptr) { + delete *mesh; + *mesh = nullptr; + } } // ------------------------------------------------------------------------------------------------ // Imports the given file into the given scene structure. -void IRRMeshImporter::InternReadFile( const std::string& pFile, - aiScene* pScene, IOSystem* pIOHandler) -{ - std::unique_ptr file( pIOHandler->Open( pFile)); - - // Check whether we can read from the file - if( file.get() == NULL) - throw DeadlyImportError( "Failed to open IRRMESH file " + pFile + ""); - - // Construct the irrXML parser - CIrrXML_IOStreamReader st(file.get()); - reader = createIrrXMLReader((IFileReadCallBack*) &st); - - // final data - std::vector materials; - std::vector meshes; - materials.reserve (5); - meshes.reserve(5); - - // temporary data - current mesh buffer - aiMaterial* curMat = nullptr; - aiMesh* curMesh = nullptr; - unsigned int curMatFlags = 0; - - std::vector curVertices,curNormals,curTangents,curBitangents; - std::vector curColors; - std::vector curUVs,curUV2s; - - // some temporary variables - int textMeaning = 0; - int vertexFormat = 0; // 0 = normal; 1 = 2 tcoords, 2 = tangents - bool useColors = false; - - // Parse the XML file - while (reader->read()) { - switch (reader->getNodeType()) { - case EXN_ELEMENT: - - if (!ASSIMP_stricmp(reader->getNodeName(),"buffer") && (curMat || curMesh)) { - // end of previous buffer. A material and a mesh should be there - if ( !curMat || !curMesh) { - ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material"); - releaseMaterial( &curMat ); - releaseMesh( &curMesh ); - } else { - materials.push_back(curMat); - meshes.push_back(curMesh); - } - curMat = nullptr; - curMesh = nullptr; - - curVertices.clear(); - curColors.clear(); - curNormals.clear(); - curUV2s.clear(); - curUVs.clear(); - curTangents.clear(); - curBitangents.clear(); - } - - - if (!ASSIMP_stricmp(reader->getNodeName(),"material")) { - if (curMat) { - ASSIMP_LOG_WARN("IRRMESH: Only one material description per buffer, please"); - releaseMaterial( &curMat ); - } - curMat = ParseMaterial(curMatFlags); - } - /* no else here! */ if (!ASSIMP_stricmp(reader->getNodeName(),"vertices")) - { - int num = reader->getAttributeValueAsInt("vertexCount"); - - if (!num) { - // This is possible ... remove the mesh from the list and skip further reading - ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero vertices"); - - releaseMaterial( &curMat ); - releaseMesh( &curMesh ); - textMeaning = 0; - continue; - } - - curVertices.reserve(num); - curNormals.reserve(num); - curColors.reserve(num); - curUVs.reserve(num); - - // Determine the file format - const char* t = reader->getAttributeValueSafe("type"); - if (!ASSIMP_stricmp("2tcoords", t)) { - curUV2s.reserve (num); - vertexFormat = 1; - - if (curMatFlags & AI_IRRMESH_EXTRA_2ND_TEXTURE) { - // ********************************************************* - // We have a second texture! So use this UV channel - // for it. The 2nd texture can be either a normal - // texture (solid_2layer or lightmap_xxx) or a normal - // map (normal_..., parallax_...) - // ********************************************************* - int idx = 1; - aiMaterial* mat = ( aiMaterial* ) curMat; - - if (curMatFlags & AI_IRRMESH_MAT_lightmap){ - mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_LIGHTMAP(0)); - } - else if (curMatFlags & AI_IRRMESH_MAT_normalmap_solid){ - mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_NORMALS(0)); - } - else if (curMatFlags & AI_IRRMESH_MAT_solid_2layer) { - mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_DIFFUSE(1)); - } - } - } - else if (!ASSIMP_stricmp("tangents", t)) { - curTangents.reserve (num); - curBitangents.reserve (num); - vertexFormat = 2; - } - else if (ASSIMP_stricmp("standard", t)) { - releaseMaterial( &curMat ); - ASSIMP_LOG_WARN("IRRMESH: Unknown vertex format"); - } - else vertexFormat = 0; - textMeaning = 1; - } - else if (!ASSIMP_stricmp(reader->getNodeName(),"indices")) { - if (curVertices.empty() && curMat) { - releaseMaterial( &curMat ); - throw DeadlyImportError("IRRMESH: indices must come after vertices"); - } - - textMeaning = 2; - - // start a new mesh - curMesh = new aiMesh(); - - // allocate storage for all faces - curMesh->mNumVertices = reader->getAttributeValueAsInt("indexCount"); - if (!curMesh->mNumVertices) { - // This is possible ... remove the mesh from the list and skip further reading - ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero indices"); - - // mesh - away - releaseMesh( &curMesh ); - - // material - away - releaseMaterial( &curMat ); - - textMeaning = 0; - continue; - } - - if (curMesh->mNumVertices % 3) { - ASSIMP_LOG_WARN("IRRMESH: Number if indices isn't divisible by 3"); - } - - curMesh->mNumFaces = curMesh->mNumVertices / 3; - curMesh->mFaces = new aiFace[curMesh->mNumFaces]; - - // setup some members - curMesh->mMaterialIndex = (unsigned int)materials.size(); - curMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; - - // allocate storage for all vertices - curMesh->mVertices = new aiVector3D[curMesh->mNumVertices]; - - if (curNormals.size() == curVertices.size()) { - curMesh->mNormals = new aiVector3D[curMesh->mNumVertices]; - } - if (curTangents.size() == curVertices.size()) { - curMesh->mTangents = new aiVector3D[curMesh->mNumVertices]; - } - if (curBitangents.size() == curVertices.size()) { - curMesh->mBitangents = new aiVector3D[curMesh->mNumVertices]; - } - if (curColors.size() == curVertices.size() && useColors) { - curMesh->mColors[0] = new aiColor4D[curMesh->mNumVertices]; - } - if (curUVs.size() == curVertices.size()) { - curMesh->mTextureCoords[0] = new aiVector3D[curMesh->mNumVertices]; - } - if (curUV2s.size() == curVertices.size()) { - curMesh->mTextureCoords[1] = new aiVector3D[curMesh->mNumVertices]; - } - } - break; - - case EXN_TEXT: - { - const char* sz = reader->getNodeData(); - if (textMeaning == 1) { - textMeaning = 0; - - // read vertices - do { - SkipSpacesAndLineEnd(&sz); - aiVector3D temp;aiColor4D c; - - // Read the vertex position - sz = fast_atoreal_move(sz,(float&)temp.x); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.y); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.z); - SkipSpaces(&sz); - curVertices.push_back(temp); - - // Read the vertex normals - sz = fast_atoreal_move(sz,(float&)temp.x); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.y); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.z); - SkipSpaces(&sz); - curNormals.push_back(temp); - - // read the vertex colors - uint32_t clr = strtoul16(sz,&sz); - ColorFromARGBPacked(clr,c); - - if (!curColors.empty() && c != *(curColors.end()-1)) - useColors = true; - - curColors.push_back(c); - SkipSpaces(&sz); - - - // read the first UV coordinate set - sz = fast_atoreal_move(sz,(float&)temp.x); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.y); - SkipSpaces(&sz); - temp.z = 0.f; - temp.y = 1.f - temp.y; // DX to OGL - curUVs.push_back(temp); - - // read the (optional) second UV coordinate set - if (vertexFormat == 1) { - sz = fast_atoreal_move(sz,(float&)temp.x); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.y); - temp.y = 1.f - temp.y; // DX to OGL - curUV2s.push_back(temp); - } - // read optional tangent and bitangent vectors - else if (vertexFormat == 2) { - // tangents - sz = fast_atoreal_move(sz,(float&)temp.x); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.z); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.y); - SkipSpaces(&sz); - temp.y *= -1.0f; - curTangents.push_back(temp); - - // bitangents - sz = fast_atoreal_move(sz,(float&)temp.x); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.z); - SkipSpaces(&sz); - - sz = fast_atoreal_move(sz,(float&)temp.y); - SkipSpaces(&sz); - temp.y *= -1.0f; - curBitangents.push_back(temp); - } - } - - /* IMPORTANT: We assume that each vertex is specified in one - line. So we can skip the rest of the line - unknown vertex - elements are ignored. - */ - - while (SkipLine(&sz)); - } - else if (textMeaning == 2) { - textMeaning = 0; - - // read indices - aiFace* curFace = curMesh->mFaces; - aiFace* const faceEnd = curMesh->mFaces + curMesh->mNumFaces; - - aiVector3D* pcV = curMesh->mVertices; - aiVector3D* pcN = curMesh->mNormals; - aiVector3D* pcT = curMesh->mTangents; - aiVector3D* pcB = curMesh->mBitangents; - aiColor4D* pcC0 = curMesh->mColors[0]; - aiVector3D* pcT0 = curMesh->mTextureCoords[0]; - aiVector3D* pcT1 = curMesh->mTextureCoords[1]; - - unsigned int curIdx = 0; - unsigned int total = 0; - while(SkipSpacesAndLineEnd(&sz)) { - if (curFace >= faceEnd) { - ASSIMP_LOG_ERROR("IRRMESH: Too many indices"); - break; - } - if (!curIdx) { - curFace->mNumIndices = 3; - curFace->mIndices = new unsigned int[3]; - } - - unsigned int idx = strtoul10(sz,&sz); - if (idx >= curVertices.size()) { - ASSIMP_LOG_ERROR("IRRMESH: Index out of range"); - idx = 0; - } - - curFace->mIndices[curIdx] = total++; - - *pcV++ = curVertices[idx]; - if (pcN)*pcN++ = curNormals[idx]; - if (pcT)*pcT++ = curTangents[idx]; - if (pcB)*pcB++ = curBitangents[idx]; - if (pcC0)*pcC0++ = curColors[idx]; - if (pcT0)*pcT0++ = curUVs[idx]; - if (pcT1)*pcT1++ = curUV2s[idx]; - - if (++curIdx == 3) { - ++curFace; - curIdx = 0; - } - } - - if (curFace != faceEnd) - ASSIMP_LOG_ERROR("IRRMESH: Not enough indices"); - - // Finish processing the mesh - do some small material workarounds - if (curMatFlags & AI_IRRMESH_MAT_trans_vertex_alpha && !useColors) { - // Take the opacity value of the current material - // from the common vertex color alpha - aiMaterial* mat = (aiMaterial*)curMat; - mat->AddProperty(&curColors[0].a,1,AI_MATKEY_OPACITY); - } - }} - break; - - default: - // GCC complains here ... - break; - - }; - } - - // End of the last buffer. A material and a mesh should be there - if (curMat || curMesh) { - if ( !curMat || !curMesh) { - ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material"); - releaseMaterial( &curMat ); - releaseMesh( &curMesh ); - } - else { - materials.push_back(curMat); - meshes.push_back(curMesh); - } - } - - if (materials.empty()) - throw DeadlyImportError("IRRMESH: Unable to read a mesh from this file"); - - - // now generate the output scene - pScene->mNumMeshes = (unsigned int)meshes.size(); - pScene->mMeshes = new aiMesh*[pScene->mNumMeshes]; - for (unsigned int i = 0; i < pScene->mNumMeshes;++i) { - pScene->mMeshes[i] = meshes[i]; - - // clean this value ... - pScene->mMeshes[i]->mNumUVComponents[3] = 0; - } - - pScene->mNumMaterials = (unsigned int)materials.size(); - pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials]; - ::memcpy(pScene->mMaterials,&materials[0],sizeof(void*)*pScene->mNumMaterials); - - pScene->mRootNode = new aiNode(); - pScene->mRootNode->mName.Set(""); - pScene->mRootNode->mNumMeshes = pScene->mNumMeshes; - pScene->mRootNode->mMeshes = new unsigned int[pScene->mNumMeshes]; - - for (unsigned int i = 0; i < pScene->mNumMeshes;++i) - pScene->mRootNode->mMeshes[i] = i; - - // clean up and return - delete reader; - AI_DEBUG_INVALIDATE_PTR(reader); +void IRRMeshImporter::InternReadFile(const std::string &pFile, + aiScene *pScene, IOSystem *pIOHandler) { + std::unique_ptr file(pIOHandler->Open(pFile)); + + // Check whether we can read from the file + if (file.get() == NULL) + throw DeadlyImportError("Failed to open IRRMESH file " + pFile + ""); + + // Construct the irrXML parser + XmlParser parser; + pugi::xml_node *root = parser.parse(file.get()); + /*CIrrXML_IOStreamReader st(file.get()); + reader = createIrrXMLReader((IFileReadCallBack*) &st);*/ + + // final data + std::vector materials; + std::vector meshes; + materials.reserve(5); + meshes.reserve(5); + + // temporary data - current mesh buffer + aiMaterial *curMat = nullptr; + aiMesh *curMesh = nullptr; + unsigned int curMatFlags = 0; + + std::vector curVertices, curNormals, curTangents, curBitangents; + std::vector curColors; + std::vector curUVs, curUV2s; + + // some temporary variables + int textMeaning = 0; + int vertexFormat = 0; // 0 = normal; 1 = 2 tcoords, 2 = tangents + bool useColors = false; + + // Parse the XML file + for (pugi::xml_node child : root->children()) { + if (child.type() == pugi::node_element) { + if (!ASSIMP_stricmp(child.name(), "buffer") && (curMat || curMesh)) { + // end of previous buffer. A material and a mesh should be there + if (!curMat || !curMesh) { + ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material"); + releaseMaterial(&curMat); + releaseMesh(&curMesh); + } else { + materials.push_back(curMat); + meshes.push_back(curMesh); + } + curMat = nullptr; + curMesh = nullptr; + + curVertices.clear(); + curColors.clear(); + curNormals.clear(); + curUV2s.clear(); + curUVs.clear(); + curTangents.clear(); + curBitangents.clear(); + } + + if (!ASSIMP_stricmp(child.name(), "material")) { + if (curMat) { + ASSIMP_LOG_WARN("IRRMESH: Only one material description per buffer, please"); + releaseMaterial(&curMat); + } + curMat = ParseMaterial(curMatFlags); + } + /* no else here! */ if (!ASSIMP_stricmp(child.name(), "vertices")) { + pugi::xml_attribute attr = child.attribute("vertexCount"); + int num = attr.as_int(); + //int num = reader->getAttributeValueAsInt("vertexCount"); + + if (!num) { + // This is possible ... remove the mesh from the list and skip further reading + ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero vertices"); + + releaseMaterial(&curMat); + releaseMesh(&curMesh); + textMeaning = 0; + continue; + } + + curVertices.reserve(num); + curNormals.reserve(num); + curColors.reserve(num); + curUVs.reserve(num); + + // Determine the file format + //const char *t = reader->getAttributeValueSafe("type"); + pugi::xml_attribute t = child.attribute("type"); + if (!ASSIMP_stricmp("2tcoords", t.name())) { + curUV2s.reserve(num); + vertexFormat = 1; + + if (curMatFlags & AI_IRRMESH_EXTRA_2ND_TEXTURE) { + // ********************************************************* + // We have a second texture! So use this UV channel + // for it. The 2nd texture can be either a normal + // texture (solid_2layer or lightmap_xxx) or a normal + // map (normal_..., parallax_...) + // ********************************************************* + int idx = 1; + aiMaterial *mat = (aiMaterial *)curMat; + + if (curMatFlags & AI_IRRMESH_MAT_lightmap) { + mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_LIGHTMAP(0)); + } else if (curMatFlags & AI_IRRMESH_MAT_normalmap_solid) { + mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_NORMALS(0)); + } else if (curMatFlags & AI_IRRMESH_MAT_solid_2layer) { + mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_DIFFUSE(1)); + } + } + } else if (!ASSIMP_stricmp("tangents", t.name())) { + curTangents.reserve(num); + curBitangents.reserve(num); + vertexFormat = 2; + } else if (ASSIMP_stricmp("standard", t.name())) { + releaseMaterial(&curMat); + ASSIMP_LOG_WARN("IRRMESH: Unknown vertex format"); + } else + vertexFormat = 0; + textMeaning = 1; + } else if (!ASSIMP_stricmp(child.name(), "indices")) { + if (curVertices.empty() && curMat) { + releaseMaterial(&curMat); + throw DeadlyImportError("IRRMESH: indices must come after vertices"); + } + + textMeaning = 2; + + // start a new mesh + curMesh = new aiMesh(); + + // allocate storage for all faces + pugi::xml_attribute attr = child.attribute("indexCount"); + curMesh->mNumVertices = attr.as_int(); + if (!curMesh->mNumVertices) { + // This is possible ... remove the mesh from the list and skip further reading + ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero indices"); + + // mesh - away + releaseMesh(&curMesh); + + // material - away + releaseMaterial(&curMat); + + textMeaning = 0; + continue; + } + + if (curMesh->mNumVertices % 3) { + ASSIMP_LOG_WARN("IRRMESH: Number if indices isn't divisible by 3"); + } + + curMesh->mNumFaces = curMesh->mNumVertices / 3; + curMesh->mFaces = new aiFace[curMesh->mNumFaces]; + + // setup some members + curMesh->mMaterialIndex = (unsigned int)materials.size(); + curMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; + + // allocate storage for all vertices + curMesh->mVertices = new aiVector3D[curMesh->mNumVertices]; + + if (curNormals.size() == curVertices.size()) { + curMesh->mNormals = new aiVector3D[curMesh->mNumVertices]; + } + if (curTangents.size() == curVertices.size()) { + curMesh->mTangents = new aiVector3D[curMesh->mNumVertices]; + } + if (curBitangents.size() == curVertices.size()) { + curMesh->mBitangents = new aiVector3D[curMesh->mNumVertices]; + } + if (curColors.size() == curVertices.size() && useColors) { + curMesh->mColors[0] = new aiColor4D[curMesh->mNumVertices]; + } + if (curUVs.size() == curVertices.size()) { + curMesh->mTextureCoords[0] = new aiVector3D[curMesh->mNumVertices]; + } + if (curUV2s.size() == curVertices.size()) { + curMesh->mTextureCoords[1] = new aiVector3D[curMesh->mNumVertices]; + } + } + //break; + + //case EXN_TEXT: { + const char *sz = child.child_value(); + if (textMeaning == 1) { + textMeaning = 0; + + // read vertices + do { + SkipSpacesAndLineEnd(&sz); + aiVector3D temp; + aiColor4D c; + + // Read the vertex position + sz = fast_atoreal_move(sz, (float &)temp.x); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.y); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.z); + SkipSpaces(&sz); + curVertices.push_back(temp); + + // Read the vertex normals + sz = fast_atoreal_move(sz, (float &)temp.x); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.y); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.z); + SkipSpaces(&sz); + curNormals.push_back(temp); + + // read the vertex colors + uint32_t clr = strtoul16(sz, &sz); + ColorFromARGBPacked(clr, c); + + if (!curColors.empty() && c != *(curColors.end() - 1)) + useColors = true; + + curColors.push_back(c); + SkipSpaces(&sz); + + // read the first UV coordinate set + sz = fast_atoreal_move(sz, (float &)temp.x); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.y); + SkipSpaces(&sz); + temp.z = 0.f; + temp.y = 1.f - temp.y; // DX to OGL + curUVs.push_back(temp); + + // read the (optional) second UV coordinate set + if (vertexFormat == 1) { + sz = fast_atoreal_move(sz, (float &)temp.x); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.y); + temp.y = 1.f - temp.y; // DX to OGL + curUV2s.push_back(temp); + } + // read optional tangent and bitangent vectors + else if (vertexFormat == 2) { + // tangents + sz = fast_atoreal_move(sz, (float &)temp.x); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.z); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.y); + SkipSpaces(&sz); + temp.y *= -1.0f; + curTangents.push_back(temp); + + // bitangents + sz = fast_atoreal_move(sz, (float &)temp.x); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.z); + SkipSpaces(&sz); + + sz = fast_atoreal_move(sz, (float &)temp.y); + SkipSpaces(&sz); + temp.y *= -1.0f; + curBitangents.push_back(temp); + } + } + + /* IMPORTANT: We assume that each vertex is specified in one + line. So we can skip the rest of the line - unknown vertex + elements are ignored. + */ + + while (SkipLine(&sz)); + } else if (textMeaning == 2) { + textMeaning = 0; + + // read indices + aiFace *curFace = curMesh->mFaces; + aiFace *const faceEnd = curMesh->mFaces + curMesh->mNumFaces; + + aiVector3D *pcV = curMesh->mVertices; + aiVector3D *pcN = curMesh->mNormals; + aiVector3D *pcT = curMesh->mTangents; + aiVector3D *pcB = curMesh->mBitangents; + aiColor4D *pcC0 = curMesh->mColors[0]; + aiVector3D *pcT0 = curMesh->mTextureCoords[0]; + aiVector3D *pcT1 = curMesh->mTextureCoords[1]; + + unsigned int curIdx = 0; + unsigned int total = 0; + while (SkipSpacesAndLineEnd(&sz)) { + if (curFace >= faceEnd) { + ASSIMP_LOG_ERROR("IRRMESH: Too many indices"); + break; + } + if (!curIdx) { + curFace->mNumIndices = 3; + curFace->mIndices = new unsigned int[3]; + } + + unsigned int idx = strtoul10(sz, &sz); + if (idx >= curVertices.size()) { + ASSIMP_LOG_ERROR("IRRMESH: Index out of range"); + idx = 0; + } + + curFace->mIndices[curIdx] = total++; + + *pcV++ = curVertices[idx]; + if (pcN) *pcN++ = curNormals[idx]; + if (pcT) *pcT++ = curTangents[idx]; + if (pcB) *pcB++ = curBitangents[idx]; + if (pcC0) *pcC0++ = curColors[idx]; + if (pcT0) *pcT0++ = curUVs[idx]; + if (pcT1) *pcT1++ = curUV2s[idx]; + + if (++curIdx == 3) { + ++curFace; + curIdx = 0; + } + } + + if (curFace != faceEnd) + ASSIMP_LOG_ERROR("IRRMESH: Not enough indices"); + + // Finish processing the mesh - do some small material workarounds + if (curMatFlags & AI_IRRMESH_MAT_trans_vertex_alpha && !useColors) { + // Take the opacity value of the current material + // from the common vertex color alpha + aiMaterial *mat = (aiMaterial *)curMat; + mat->AddProperty(&curColors[0].a, 1, AI_MATKEY_OPACITY); + } + } + } + } + + // End of the last buffer. A material and a mesh should be there + if (curMat || curMesh) { + if (!curMat || !curMesh) { + ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material"); + releaseMaterial(&curMat); + releaseMesh(&curMesh); + } else { + materials.push_back(curMat); + meshes.push_back(curMesh); + } + } + + if (materials.empty()) { + throw DeadlyImportError("IRRMESH: Unable to read a mesh from this file"); + } + + // now generate the output scene + pScene->mNumMeshes = (unsigned int)meshes.size(); + pScene->mMeshes = new aiMesh *[pScene->mNumMeshes]; + for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) { + pScene->mMeshes[i] = meshes[i]; + + // clean this value ... + pScene->mMeshes[i]->mNumUVComponents[3] = 0; + } + + pScene->mNumMaterials = (unsigned int)materials.size(); + pScene->mMaterials = new aiMaterial *[pScene->mNumMaterials]; + ::memcpy(pScene->mMaterials, &materials[0], sizeof(void *) * pScene->mNumMaterials); + + pScene->mRootNode = new aiNode(); + pScene->mRootNode->mName.Set(""); + pScene->mRootNode->mNumMeshes = pScene->mNumMeshes; + pScene->mRootNode->mMeshes = new unsigned int[pScene->mNumMeshes]; + + for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) { + pScene->mRootNode->mMeshes[i] = i; + } + } #endif // !! ASSIMP_BUILD_NO_IRRMESH_IMPORTER diff --git a/include/assimp/XmlParser.h b/include/assimp/XmlParser.h index 237b3af3b..c10cbcb34 100644 --- a/include/assimp/XmlParser.h +++ b/include/assimp/XmlParser.h @@ -141,43 +141,55 @@ private: }; // ! class CIrrXML_IOStreamReader */ -class XmlNode { -public: - XmlNode() - : mNode(nullptr){ - // empty - } - XmlNode(pugi::xml_node *node) - : mNode(node) { +struct find_node_by_name_predicate { + std::string mName; + find_node_by_name_predicate(const std::string &name) : + mName(name) { // empty } - pugi::xml_node *getNode() const { - return mNode; + bool operator()(pugi::xml_node node) const { + return node.name() == mName; } - -private: - pugi::xml_node *mNode; }; -class XmlParser { + +template +class TXmlParser { public: - XmlParser() : + TXmlParser() : mDoc(nullptr), mRoot(nullptr), mData() { // empty } - ~XmlParser() { + ~TXmlParser() { clear(); } void clear() { mData.resize(0); + mRoot = nullptr; delete mDoc; mDoc = nullptr; } - XmlNode *parse(IOStream *stream) { + TNodeType *findNode(const std::string &name) { + if (name.empty()) { + return nullptr; + } + if (nullptr == mDoc) { + return nullptr; + } + + find_node_by_name_predicate predicate(name); + pugi::xml_node node = mDoc->find_node(predicate); + if (node.empty()) { + return nullptr; + } + + } + + TNodeType *parse(IOStream *stream) { if (nullptr == stream) { return nullptr; } @@ -187,8 +199,7 @@ public: mDoc = new pugi::xml_document(); pugi::xml_parse_result result = mDoc->load_string(&mData[0]); if (result.status == pugi::status_ok) { - pugi::xml_node *root = &mDoc->root(); - mRoot = new XmlNode(root); + mRoot = &mDoc->root(); } return mRoot; @@ -198,12 +209,18 @@ public: return mDoc; } + TNodeType *getRootNode() const { + return mRoot; + } + private: pugi::xml_document *mDoc; - XmlNode *mRoot; + TNodeType *mRoot; std::vector mData; }; +using XmlParser = TXmlParser; + } // namespace Assimp #endif // !! INCLUDED_AI_IRRXML_WRAPPER