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

Blender-Importer: fix coverity findings.

pull/1258/head
Kim Kulling 2017-05-06 11:14:04 +02:00
parent d02a4c36a9
commit 98100d8cab
2 changed files with 108 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/BlenderScene.h
View File

@ -638,6 +638,7 @@ struct Base : ElemBase {
Base() Base()
: ElemBase() : ElemBase()
, prev( nullptr )
, next() , next()
, object() { , object() {
// empty // empty
@ -784,10 +785,12 @@ struct Tex : ElemBase {
//char use_nodes; //char use_nodes;
Tex() Tex()
: ElemBase() { : ElemBase()
, imaflag( ImageFlags_INTERPOL )
, type( Type_CLOUDS )
, ima() {
// empty // empty
} }
}; };
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------

151
code/D3MFImporter.cpp
View File

@ -87,28 +87,40 @@ namespace XmlTag {
static const std::string transform = "transform"; static const std::string transform = "transform";
} }
class XmlSerializer {
class XmlSerializer
{
public: public:
XmlSerializer(XmlReader* xmlReader) XmlSerializer(XmlReader* xmlReader)
: xmlReader(xmlReader) { : xmlReader(xmlReader)
// empty {
} }
void ImportXml(aiScene* scene) { void ImportXml(aiScene* scene)
{
scene->mFlags |= AI_SCENE_FLAGS_NON_VERBOSE_FORMAT;
scene->mRootNode = new aiNode(); scene->mRootNode = new aiNode();
std::vector<aiNode*> children; std::vector<aiNode*> children;
while(ReadToEndElement(D3MF::XmlTag::model)) { while(ReadToEndElement(D3MF::XmlTag::model))
if(xmlReader->getNodeName() == D3MF::XmlTag::object) { {
if(xmlReader->getNodeName() == D3MF::XmlTag::object)
{
children.push_back(ReadObject(scene)); children.push_back(ReadObject(scene));
} else if(xmlReader->getNodeName() == D3MF::XmlTag::build) { }
// ??? else if(xmlReader->getNodeName() == D3MF::XmlTag::build)
{
} }
} }
if ( scene->mRootNode->mName.length == 0 ) { if(scene->mRootNode->mName.length == 0)
scene->mRootNode->mName.Set( "3MF" ); scene->mRootNode->mName.Set("3MF");
}
scene->mNumMeshes = static_cast<unsigned int>(meshes.size()); scene->mNumMeshes = static_cast<unsigned int>(meshes.size());
scene->mMeshes = new aiMesh*[scene->mNumMeshes](); scene->mMeshes = new aiMesh*[scene->mNumMeshes]();
@ -119,10 +131,12 @@ public:
scene->mRootNode->mChildren = new aiNode*[scene->mRootNode->mNumChildren](); scene->mRootNode->mChildren = new aiNode*[scene->mRootNode->mNumChildren]();
std::copy(children.begin(), children.end(), scene->mRootNode->mChildren); std::copy(children.begin(), children.end(), scene->mRootNode->mChildren);
} }
private: private:
aiNode* ReadObject(aiScene* scene) { aiNode* ReadObject(aiScene* scene)
{
ScopeGuard<aiNode> node(new aiNode()); ScopeGuard<aiNode> node(new aiNode());
std::vector<unsigned long> meshIds; std::vector<unsigned long> meshIds;
@ -143,14 +157,17 @@ private:
size_t meshIdx = meshes.size(); size_t meshIdx = meshes.size();
while(ReadToEndElement(D3MF::XmlTag::object)) { while(ReadToEndElement(D3MF::XmlTag::object))
if(xmlReader->getNodeName() == D3MF::XmlTag::mesh) { {
if(xmlReader->getNodeName() == D3MF::XmlTag::mesh)
{
auto mesh = ReadMesh(); auto mesh = ReadMesh();
mesh->mName.Set(name); mesh->mName.Set(name);
meshes.push_back(mesh); meshes.push_back(mesh);
meshIds.push_back(static_cast<unsigned long>(meshIdx)); meshIds.push_back(static_cast<unsigned long>(meshIdx));
meshIdx++; meshIdx++;
} }
} }
@ -161,35 +178,49 @@ private:
std::copy(meshIds.begin(), meshIds.end(), node->mMeshes); std::copy(meshIds.begin(), meshIds.end(), node->mMeshes);
return node.dismiss(); return node.dismiss();
} }
aiMesh* ReadMesh() { aiMesh* ReadMesh()
{
aiMesh* mesh = new aiMesh(); aiMesh* mesh = new aiMesh();
while(ReadToEndElement(D3MF::XmlTag::mesh)) {
if(xmlReader->getNodeName() == D3MF::XmlTag::vertices) { while(ReadToEndElement(D3MF::XmlTag::mesh))
{
if(xmlReader->getNodeName() == D3MF::XmlTag::vertices)
{
ImportVertices(mesh); ImportVertices(mesh);
} else if(xmlReader->getNodeName() == D3MF::XmlTag::triangles) { }
else if(xmlReader->getNodeName() == D3MF::XmlTag::triangles)
{
ImportTriangles(mesh); ImportTriangles(mesh);
} }
} }
return mesh; return mesh;
} }
void ImportVertices(aiMesh* mesh) { void ImportVertices(aiMesh* mesh)
{
std::vector<aiVector3D> vertices; std::vector<aiVector3D> vertices;
while ( ReadToEndElement(D3MF::XmlTag::vertices) ) { while(ReadToEndElement(D3MF::XmlTag::vertices))
if(xmlReader->getNodeName() == D3MF::XmlTag::vertex) { {
if(xmlReader->getNodeName() == D3MF::XmlTag::vertex)
{
vertices.push_back(ReadVertex()); vertices.push_back(ReadVertex());
} }
} }
mesh->mNumVertices = static_cast<unsigned int>(vertices.size()); mesh->mNumVertices = static_cast<unsigned int>(vertices.size());
mesh->mVertices = new aiVector3D[mesh->mNumVertices]; mesh->mVertices = new aiVector3D[mesh->mNumVertices];
std::copy(vertices.begin(), vertices.end(), mesh->mVertices);
}
aiVector3D ReadVertex() { std::copy(vertices.begin(), vertices.end(), mesh->mVertices);
}
aiVector3D ReadVertex()
{
aiVector3D vertex; aiVector3D vertex;
vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr); vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr);
@ -199,11 +230,15 @@ private:
return vertex; return vertex;
} }
void ImportTriangles(aiMesh* mesh) { void ImportTriangles(aiMesh* mesh)
{
std::vector<aiFace> faces; std::vector<aiFace> faces;
while(ReadToEndElement(D3MF::XmlTag::triangles)) {
if(xmlReader->getNodeName() == D3MF::XmlTag::triangle) { while(ReadToEndElement(D3MF::XmlTag::triangles))
{
if(xmlReader->getNodeName() == D3MF::XmlTag::triangle)
{
faces.push_back(ReadTriangle()); faces.push_back(ReadTriangle());
} }
} }
@ -212,12 +247,13 @@ private:
mesh->mFaces = new aiFace[mesh->mNumFaces]; mesh->mFaces = new aiFace[mesh->mNumFaces];
mesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; mesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
std::copy(faces.begin(), faces.end(), mesh->mFaces); std::copy(faces.begin(), faces.end(), mesh->mFaces);
} }
aiFace ReadTriangle() { aiFace ReadTriangle()
{
aiFace face; aiFace face;
face.mNumIndices = 3; face.mNumIndices = 3;
face.mIndices = new unsigned int[face.mNumIndices]; face.mIndices = new unsigned int[face.mNumIndices];
face.mIndices[0] = static_cast<unsigned int>(std::atoi(xmlReader->getAttributeValue(D3MF::XmlTag::v1.c_str()))); face.mIndices[0] = static_cast<unsigned int>(std::atoi(xmlReader->getAttributeValue(D3MF::XmlTag::v1.c_str())));
@ -228,25 +264,35 @@ private:
} }
private: private:
bool ReadToStartElement(const std::string& startTag) {
while(xmlReader->read()) { bool ReadToStartElement(const std::string& startTag)
if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT && xmlReader->getNodeName() == startTag) { {
while(xmlReader->read())
{
if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT && xmlReader->getNodeName() == startTag)
{
return true; return true;
} else if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT_END && }
xmlReader->getNodeName() == startTag) { else if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT_END &&
xmlReader->getNodeName() == startTag)
{
return false; return false;
} }
} }
// DefaultLogger::get()->error("unexpected EOF, expected closing <" + closeTag + "> tag"); //DefaultLogger::get()->error("unexpected EOF, expected closing <" + closeTag + "> tag");
return false; return false;
} }
bool ReadToEndElement(const std::string& closeTag) { bool ReadToEndElement(const std::string& closeTag)
while(xmlReader->read()) { {
while(xmlReader->read())
{
if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT) { if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT) {
return true; return true;
} else if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT_END }
&& xmlReader->getNodeName() == closeTag) { else if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT_END
&& xmlReader->getNodeName() == closeTag)
{
return false; return false;
} }
} }
@ -254,6 +300,7 @@ private:
return false; return false;
} }
private: private:
std::vector<aiMesh*> meshes; std::vector<aiMesh*> meshes;
XmlReader* xmlReader; XmlReader* xmlReader;
@ -261,6 +308,7 @@ private:
} //namespace D3MF } //namespace D3MF
static const aiImporterDesc desc = { static const aiImporterDesc desc = {
"3mf Importer", "3mf Importer",
"", "",
@ -274,15 +322,19 @@ static const aiImporterDesc desc = {
"3mf" "3mf"
}; };
D3MFImporter::D3MFImporter() {
// empty D3MFImporter::D3MFImporter()
{
} }
D3MFImporter::~D3MFImporter() { D3MFImporter::~D3MFImporter()
// empty {
} }
bool D3MFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const { bool D3MFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const
{
const std::string extension = GetExtension(pFile); const std::string extension = GetExtension(pFile);
if(extension == "3mf") { if(extension == "3mf") {
return true; return true;
@ -295,15 +347,18 @@ bool D3MFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool
return false; return false;
} }
void D3MFImporter::SetupProperties(const Importer *pImp) { void D3MFImporter::SetupProperties(const Importer *pImp)
// empty {
} }
const aiImporterDesc *D3MFImporter::GetInfo() const { const aiImporterDesc *D3MFImporter::GetInfo() const
{
return &desc; return &desc;
} }
void D3MFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) { void D3MFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler)
{
D3MF::D3MFOpcPackage opcPackage(pIOHandler, pFile); D3MF::D3MFOpcPackage opcPackage(pIOHandler, pFile);
std::unique_ptr<CIrrXML_IOStreamReader> xmlStream(new CIrrXML_IOStreamReader(opcPackage.RootStream())); std::unique_ptr<CIrrXML_IOStreamReader> xmlStream(new CIrrXML_IOStreamReader(opcPackage.RootStream()));