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

fix unittest.

pull/1598/head
Kim Kulling 2017-11-27 22:46:57 +01:00
parent 3dfca3bc84
commit 7280dec838
3 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
code/D3MFExporter.cpp
View File

@ -104,46 +104,54 @@ bool D3MFExporter::exportArchive( const char *file ) {
if ( nullptr == m_zipArchive ) { if ( nullptr == m_zipArchive ) {
return false; return false;
} }
ok |= exportRelations();
ok |= export3DModel(); ok |= export3DModel();
ok |= exportRelations();
zip_close( m_zipArchive );
m_zipArchive = nullptr;
return ok; return ok;
} }
bool D3MFExporter::exportRelations() { bool D3MFExporter::exportRelations() {
mOutput.clear(); mRelOutput.clear();
mOutput << "<?xml version = \"1.0\" encoding = \"UTF-8\"?>\n"; mRelOutput << "<?xml version = \"1.0\" encoding = \"UTF-8\"?>\n";
mOutput << "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\n"; mRelOutput << "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\n";
for ( size_t i = 0; i < mRelations.size(); ++i ) { for ( size_t i = 0; i < mRelations.size(); ++i ) {
mOutput << "<Relationship Target =\"/3D/" << mRelations[ i ]->target << " "; mRelOutput << "<Relationship Target =\"/3D/" << mRelations[ i ]->target << "\" ";
mOutput << "id=\"" << mRelations[i]->id << " "; mRelOutput << "id=\"" << mRelations[i]->id << "\" ";
mOutput << "Type=\"" << mRelations[ i ]->type << "/>\n"; mRelOutput << "Type=\"" << mRelations[ i ]->type << "/>";
mRelOutput << std::endl;
} }
mOutput << "</Relationships>\n"; mRelOutput << "</Relationships>";
mRelOutput << std::endl;
writeRelInfoToFile( "_rels", ".rels" ); writeRelInfoToFile( "_rels", ".rels" );
mRelOutput.flush();
return true; return true;
} }
bool D3MFExporter::export3DModel() { bool D3MFExporter::export3DModel() {
mOutput.clear(); mModelOutput.clear();
writeHeader(); writeHeader();
mOutput << "<" << XmlTag::model << " " << XmlTag::model_unit << "=\"millimeter\"" mModelOutput << "<" << XmlTag::model << " " << XmlTag::model_unit << "=\"millimeter\""
<< "xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\">" << "xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\">"
<< "\n"; << std::endl;
mOutput << "<" << XmlTag::resources << ">\n"; mModelOutput << "<" << XmlTag::resources << ">";
mModelOutput << std::endl;
writeObjects(); writeObjects();
mOutput << "</" << XmlTag::resources << ">\n"; mModelOutput << "</" << XmlTag::resources << ">";
mModelOutput << std::endl;
writeBuild(); writeBuild();
mOutput << "</" << XmlTag::model << ">\n"; mModelOutput << "</" << XmlTag::model << ">\n";
OpcPackageRelationship *info = new OpcPackageRelationship; OpcPackageRelationship *info = new OpcPackageRelationship;
info->id = mArchiveName; info->id = mArchiveName;
@ -151,15 +159,15 @@ bool D3MFExporter::export3DModel() {
info->type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel"; info->type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel";
mRelations.push_back( info ); mRelations.push_back( info );
writeModelToArchive( "3D", mArchiveName ); writeModelToArchive( "3D", "3DModel.model" );
mModelOutput.flush();
mOutput.clear();
return true; return true;
} }
void D3MFExporter::writeHeader() { void D3MFExporter::writeHeader() {
mOutput << "<?xml version=\"1.0\" encoding=\"UTF - 8\"?>" << "\n"; mModelOutput << "<?xml version=\"1.0\" encoding=\"UTF - 8\"?>";
mModelOutput << std::endl;
} }
void D3MFExporter::writeObjects() { void D3MFExporter::writeObjects() {
@ -173,7 +181,8 @@ void D3MFExporter::writeObjects() {
if ( nullptr == currentNode ) { if ( nullptr == currentNode ) {
continue; continue;
} }
mOutput << "<" << XmlTag::object << " id=\"" << currentNode->mName.C_Str() << "\" type=\"model\">\n"; mModelOutput << "<" << XmlTag::object << " id=\"" << currentNode->mName.C_Str() << "\" type=\"model\">";
mModelOutput << std::endl;
for ( unsigned int j = 0; j < currentNode->mNumMeshes; ++j ) { for ( unsigned int j = 0; j < currentNode->mNumMeshes; ++j ) {
aiMesh *currentMesh = mScene->mMeshes[ currentNode->mMeshes[ j ] ]; aiMesh *currentMesh = mScene->mMeshes[ currentNode->mMeshes[ j ] ];
if ( nullptr == currentMesh ) { if ( nullptr == currentMesh ) {
@ -183,7 +192,8 @@ void D3MFExporter::writeObjects() {
} }
mBuildItems.push_back( i ); mBuildItems.push_back( i );
mOutput << "</" << XmlTag::object << ">\n"; mModelOutput << "</" << XmlTag::object << ">";
mModelOutput << std::endl;
} }
} }
@ -192,19 +202,20 @@ void D3MFExporter::writeMesh( aiMesh *mesh ) {
return; return;
} }
mOutput << "<" << XmlTag::mesh << ">\n"; mModelOutput << "<" << XmlTag::mesh << ">" << std::endl;
mOutput << "<" << XmlTag::vertices << ">\n"; mModelOutput << "<" << XmlTag::vertices << ">" << std::endl;
for ( unsigned int i = 0; i < mesh->mNumVertices; ++i ) { for ( unsigned int i = 0; i < mesh->mNumVertices; ++i ) {
writeVertex( mesh->mVertices[ i ] ); writeVertex( mesh->mVertices[ i ] );
} }
mOutput << "</" << XmlTag::vertices << ">\n"; mModelOutput << "</" << XmlTag::vertices << ">" << std::endl;
mOutput << "</" << XmlTag::mesh << ">\n"; mModelOutput << "</" << XmlTag::mesh << ">" << std::endl;
writeFaces( mesh ); writeFaces( mesh );
} }
void D3MFExporter::writeVertex( const aiVector3D &pos ) { void D3MFExporter::writeVertex( const aiVector3D &pos ) {
mOutput << "<" << XmlTag::vertex << " x=\"" << pos.x << "\" y=\"" << pos.y << "\" z=\"" << pos.z << "\">\n"; mModelOutput << "<" << XmlTag::vertex << " x=\"" << pos.x << "\" y=\"" << pos.y << "\" z=\"" << pos.z << "\">";
mModelOutput << std::endl;
} }
void D3MFExporter::writeFaces( aiMesh *mesh ) { void D3MFExporter::writeFaces( aiMesh *mesh ) {
@ -215,39 +226,45 @@ void D3MFExporter::writeFaces( aiMesh *mesh ) {
if ( !mesh->HasFaces() ) { if ( !mesh->HasFaces() ) {
return; return;
} }
mOutput << "<" << XmlTag::triangles << ">\n"; mModelOutput << "<" << XmlTag::triangles << ">" << std::endl;
for ( unsigned int i = 0; i < mesh->mNumFaces; ++i ) { for ( unsigned int i = 0; i < mesh->mNumFaces; ++i ) {
aiFace &currentFace = mesh->mFaces[ i ]; aiFace &currentFace = mesh->mFaces[ i ];
mOutput << "<" << XmlTag::triangle << " v1=\"" << currentFace.mIndices[ 0 ] << "\" v2=\"" mModelOutput << "<" << XmlTag::triangle << " v1=\"" << currentFace.mIndices[ 0 ] << "\" v2=\""
<< currentFace.mIndices[ 1 ] << "\" v3=\"" << currentFace.mIndices[ 2 ] << "\"/>\n"; << currentFace.mIndices[ 1 ] << "\" v3=\"" << currentFace.mIndices[ 2 ] << "\"/>";
mModelOutput << std::endl;
} }
mOutput << "</" << XmlTag::triangles << ">\n"; mModelOutput << "</" << XmlTag::triangles << ">";
mModelOutput << std::endl;
} }
void D3MFExporter::writeBuild() { void D3MFExporter::writeBuild() {
mOutput << "<" << XmlTag::build << ">\n"; mModelOutput << "<" << XmlTag::build << ">" << std::endl;
for ( size_t i = 0; i < mBuildItems.size(); ++i ) { for ( size_t i = 0; i < mBuildItems.size(); ++i ) {
mOutput << "<" << XmlTag::item << " objectid=\"" << i + 1 << "\"/>\n"; mModelOutput << "<" << XmlTag::item << " objectid=\"" << i + 1 << "\"/>";
mModelOutput << std::endl;
} }
mOutput << "</" << XmlTag::build << ">\n"; mModelOutput << "</" << XmlTag::build << ">";
mModelOutput << std::endl;
} }
void D3MFExporter::writeModelToArchive( const std::string &folder, const std::string &modelName ) { void D3MFExporter::writeModelToArchive( const std::string &folder, const std::string &modelName ) {
const std::string entry = folder + "/" + mArchiveName; const std::string entry = folder + "/" + modelName;
zip_entry_open( m_zipArchive, entry.c_str() ); zip_entry_open( m_zipArchive, entry.c_str() );
const std::string &exportTxt( mOutput.str() ); const std::string &exportTxt( mModelOutput.str() );
zip_entry_write( m_zipArchive, exportTxt.c_str(), exportTxt.size() ); zip_entry_write( m_zipArchive, exportTxt.c_str(), exportTxt.size() );
zip_entry_close( m_zipArchive ); zip_entry_close( m_zipArchive );
} }
void D3MFExporter::writeRelInfoToFile( const std::string &folder, const std::string &relName ) { void D3MFExporter::writeRelInfoToFile( const std::string &folder, const std::string &relName ) {
const std::string entry = folder + "/" + "_rels"; const std::string entry = folder + "/" + relName;
zip_entry_open( m_zipArchive, entry.c_str() ); zip_entry_open( m_zipArchive, entry.c_str() );
const std::string &exportTxt( mOutput.str() );
const std::string &exportTxt( mRelOutput.str() );
zip_entry_write( m_zipArchive, exportTxt.c_str(), exportTxt.size() ); zip_entry_write( m_zipArchive, exportTxt.c_str(), exportTxt.size() );
zip_entry_close( m_zipArchive ); zip_entry_close( m_zipArchive );
} }

4
code/D3MFExporter.h
View File

@ -81,14 +81,14 @@ protected:
void writeBuild(); void writeBuild();
void writeModelToArchive( const std::string &folder, const std::string &modelName ); void writeModelToArchive( const std::string &folder, const std::string &modelName );
void writeRelInfoToFile( const std::string &folder, const std::string &relName ); void writeRelInfoToFile( const std::string &folder, const std::string &relName );
void createZipArchiveFromeFileStructure( const char* pFile );
private: private:
IOSystem *mIOSystem; IOSystem *mIOSystem;
std::string mArchiveName; std::string mArchiveName;
zip_t *m_zipArchive; zip_t *m_zipArchive;
const aiScene *mScene; const aiScene *mScene;
std::ostringstream mOutput; std::ostringstream mModelOutput;
std::ostringstream mRelOutput;
std::vector<unsigned int> mBuildItems; std::vector<unsigned int> mBuildItems;
std::vector<OpcPackageRelationship*> mRelations; std::vector<OpcPackageRelationship*> mRelations;
}; };

2
test/unit/utD3MFImportExport.cpp
View File

@ -67,7 +67,7 @@ public:
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/3MF/box.3mf", 0 ); const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/3MF/box.3mf", 0 );
Assimp::Exporter exporter; Assimp::Exporter exporter;
return nullptr != exporter.ExportToBlob( scene, "3mf", 0 ); return AI_SUCCESS == exporter.Export( scene, "3mf", "test.3mf" );
} }
}; };