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

Fix Collada export validated by Schema

pull/298/head
Madrich 2014-06-09 15:17:45 +02:00
parent 77cec96d74
commit c4021fbaaf
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssimpPCH.cpp
View File

@ -89,7 +89,7 @@ ASSIMP_API aiScene::aiScene()
, mCameras(NULL) , mCameras(NULL)
, mPrivate(new Assimp::ScenePrivateData()) , mPrivate(new Assimp::ScenePrivateData())
, author("Assimp") , author("Assimp")
, authoringTool("Assimp Importer/Exporter") , authoringTool("Assimp Importer-Exporter")
{ {
} }

24
code/ColladaExporter.cpp
View File

@ -124,7 +124,7 @@ ColladaExporter::~ColladaExporter()
void ColladaExporter::WriteFile() void ColladaExporter::WriteFile()
{ {
// write the DTD // write the DTD
mOutput << "<?xml version=\"1.0\"?>" << endstr; mOutput << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>" << endstr;
// COLLADA element start // COLLADA element start
mOutput << "<COLLADA xmlns=\"http://www.collada.org/2005/11/COLLADASchema\" version=\"1.4.1\">" << endstr; mOutput << "<COLLADA xmlns=\"http://www.collada.org/2005/11/COLLADASchema\" version=\"1.4.1\">" << endstr;
PushTag(); PushTag();
@ -646,7 +646,7 @@ void ColladaExporter::WriteGeometry( size_t pIndex)
// lines // lines
if (countLines) if (countLines)
{ {
mOutput << startstr << "<lines count=\"" << countLines << "\" material=\"theresonlyone\">" << endstr; mOutput << startstr << "<lines count=\"" << countLines << "\" material=\"defaultMaterial\">" << endstr;
PushTag(); PushTag();
mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << idstr << "-vertices\" />" << endstr; mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << idstr << "-vertices\" />" << endstr;
mOutput << startstr << "<p>"; mOutput << startstr << "<p>";
@ -662,13 +662,13 @@ void ColladaExporter::WriteGeometry( size_t pIndex)
mOutput << startstr << "</lines>" << endstr; mOutput << startstr << "</lines>" << endstr;
} }
// triangles // triangles, note for collada, triangles are defined in a right hand system
if (countTriangles) if (countTriangles)
{ {
mOutput << startstr << "<triangles count=\"" << countTriangles << "\" material=\"theresonlyone\">" << endstr; mOutput << startstr << "<triangles count=\"" << countTriangles << "\" material=\"defaultMaterial\">" << endstr;
PushTag(); PushTag();
mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << idstr << "-vertices\" />" << endstr; mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << idstr << "-vertices\" />" << endstr;
mOutput << startstr << "<input offset=\"0\" semantic=\"NORMAL\" source=\"#" << idstr << "-normals\" />" << endstr; mOutput << startstr << "<input offset=\"1\" semantic=\"NORMAL\" source=\"#" << idstr << "-normals\" />" << endstr;
mOutput << startstr << "<p>"; mOutput << startstr << "<p>";
for( size_t a = 0; a < mesh->mNumFaces; ++a ) for( size_t a = 0; a < mesh->mNumFaces; ++a )
{ {
@ -694,7 +694,7 @@ void ColladaExporter::WriteGeometry( size_t pIndex)
// polygons // polygons
if (countPoly) if (countPoly)
{ {
mOutput << startstr << "<polylist count=\"" << countPoly << "\" material=\"theresonlyone\">" << endstr; mOutput << startstr << "<polylist count=\"" << countPoly << "\" material=\"defaultMaterial\">" << endstr;
PushTag(); PushTag();
mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << idstr << "-vertices\" />" << endstr; mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << idstr << "-vertices\" />" << endstr;
@ -838,8 +838,16 @@ void ColladaExporter::WriteSceneLibrary()
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Recursively writes the given node // Recursively writes the given node
void ColladaExporter::WriteNode( const aiNode* pNode) void ColladaExporter::WriteNode(aiNode* pNode)
{ {
// the must have a name
if (pNode->mName.length == 0)
{
std::stringstream ss;
ss << "Node_" << pNode;
pNode->mName.Set(ss.str());
}
mOutput << startstr << "<node id=\"" << pNode->mName.data << "\" name=\"" << pNode->mName.data << "\">" << endstr; mOutput << startstr << "<node id=\"" << pNode->mName.data << "\" name=\"" << pNode->mName.data << "\">" << endstr;
PushTag(); PushTag();
@ -867,7 +875,7 @@ void ColladaExporter::WriteNode( const aiNode* pNode)
PushTag(); PushTag();
mOutput << startstr << "<technique_common>" << endstr; mOutput << startstr << "<technique_common>" << endstr;
PushTag(); PushTag();
mOutput << startstr << "<instance_material symbol=\"theresonlyone\" target=\"#" << materials[mesh->mMaterialIndex].name << "\" />" << endstr; mOutput << startstr << "<instance_material symbol=\"defaultMaterial\" target=\"#" << materials[mesh->mMaterialIndex].name << "\" />" << endstr;
PopTag(); PopTag();
mOutput << startstr << "</technique_common>" << endstr; mOutput << startstr << "</technique_common>" << endstr;
PopTag(); PopTag();

2
code/ColladaExporter.h
View File

@ -92,7 +92,7 @@ protected:
void WriteSceneLibrary(); void WriteSceneLibrary();
/// Recursively writes the given node /// Recursively writes the given node
void WriteNode( const aiNode* pNode); void WriteNode( aiNode* pNode);
/// Enters a new xml element, which increases the indentation /// Enters a new xml element, which increases the indentation
void PushTag() { startstr.append( " "); } void PushTag() { startstr.append( " "); }