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

Fix import of materials.

pull/1793/head
Kim Kulling 2018-02-18 21:30:23 +01:00
parent 331e67c32d
commit 8950504cf0
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/3MFXmlTags.h
View File

@ -62,6 +62,7 @@ namespace XmlTag {
static const std::string v2 = "v2"; static const std::string v2 = "v2";
static const std::string v3 = "v3"; static const std::string v3 = "v3";
static const std::string id = "id"; static const std::string id = "id";
static const std::string pid = "pid";
static const std::string name = "name"; static const std::string name = "name";
static const std::string type = "type"; static const std::string type = "type";
static const std::string build = "build"; static const std::string build = "build";

30
code/D3MFImporter.cpp
View File

@ -79,7 +79,7 @@ public:
} }
void ImportXml(aiScene* scene) { void ImportXml(aiScene* scene) {
if ( nullptr != scene ) { if ( nullptr == scene ) {
return; return;
} }
@ -87,11 +87,12 @@ public:
std::vector<aiNode*> children; std::vector<aiNode*> children;
while(ReadToEndElement(D3MF::XmlTag::model)) { while(ReadToEndElement(D3MF::XmlTag::model)) {
if(xmlReader->getNodeName() == D3MF::XmlTag::object) { const std::string nodeName( xmlReader->getNodeName() );
if( nodeName == D3MF::XmlTag::object) {
children.push_back(ReadObject(scene)); children.push_back(ReadObject(scene));
} else if(xmlReader->getNodeName() == D3MF::XmlTag::build) { } else if( nodeName == D3MF::XmlTag::build) {
// //
} else if ( xmlReader->getNodeName() == D3MF::XmlTag::basematerials ) { } else if ( nodeName == D3MF::XmlTag::basematerials ) {
ReadBaseMaterials(); ReadBaseMaterials();
} }
} }
@ -105,6 +106,11 @@ public:
std::copy( mMeshes.begin(), mMeshes.end(), scene->mMeshes); std::copy( mMeshes.begin(), mMeshes.end(), scene->mMeshes);
scene->mNumMaterials = mMaterials.size();
if ( 0 != scene->mNumMaterials ) {
scene->mMaterials = new aiMaterial*[ scene->mNumMaterials ];
std::copy( mMaterials.begin(), mMaterials.end(), scene->mMaterials );
}
scene->mRootNode->mNumChildren = static_cast<unsigned int>(children.size()); scene->mRootNode->mNumChildren = static_cast<unsigned int>(children.size());
scene->mRootNode->mChildren = new aiNode*[scene->mRootNode->mNumChildren](); scene->mRootNode->mChildren = new aiNode*[scene->mRootNode->mNumChildren]();
@ -196,8 +202,13 @@ private:
std::vector<aiFace> faces; std::vector<aiFace> faces;
while(ReadToEndElement(D3MF::XmlTag::triangles)) { while(ReadToEndElement(D3MF::XmlTag::triangles)) {
const std::string nodeName( xmlReader->getNodeName() );
if(xmlReader->getNodeName() == D3MF::XmlTag::triangle) { if(xmlReader->getNodeName() == D3MF::XmlTag::triangle) {
faces.push_back(ReadTriangle()); faces.push_back(ReadTriangle());
} else if ( nodeName == D3MF::XmlTag::pid ) {
const std::string matId( xmlReader->getAttributeValue( nodeName.c_str() ) );
int matIdx( std::atoi( matId.c_str() ) );
mesh->mMaterialIndex = matIdx;
} }
} }
@ -270,15 +281,17 @@ private:
} }
aiMaterial *readMaterialDef() { aiMaterial *readMaterialDef() {
while ( ReadToEndElement( D3MF::XmlTag::basematerials_base ) ) { aiMaterial *mat( nullptr );
//while ( ReadToEndElement( D3MF::XmlTag::basematerials_base ) ) {
const char *name( nullptr ); const char *name( nullptr );
const char *color( nullptr ); const char *color( nullptr );
if ( xmlReader->getNodeName() == D3MF::XmlTag::basematerials_name ) { const std::string nodeName( xmlReader->getNodeName() );
if ( nodeName == D3MF::XmlTag::basematerials_base ) {
name = xmlReader->getAttributeValue( D3MF::XmlTag::basematerials_name.c_str() ); name = xmlReader->getAttributeValue( D3MF::XmlTag::basematerials_name.c_str() );
aiString matName; aiString matName;
matName.Set( name ); matName.Set( name );
aiMaterial *mat = new aiMaterial; mat = new aiMaterial;
mat->AddProperty( &matName, AI_MATKEY_NAME ); mat->AddProperty( &matName, AI_MATKEY_NAME );
color = xmlReader->getAttributeValue( D3MF::XmlTag::basematerials_displaycolor.c_str() ); color = xmlReader->getAttributeValue( D3MF::XmlTag::basematerials_displaycolor.c_str() );
@ -287,8 +300,9 @@ private:
mat->AddProperty<aiColor4D>( &diffuse, 1, AI_MATKEY_COLOR_DIFFUSE ); mat->AddProperty<aiColor4D>( &diffuse, 1, AI_MATKEY_COLOR_DIFFUSE );
} }
} }
} //}
return mat;
} }
private: private: