Merge branch 'master' of github.com:assimp/assimp
acgessler
commit
20204b49c5
|
|
@ -61,14 +61,14 @@ void ExportSceneObj(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene
|
|||
boost::scoped_ptr<IOStream> outfile (pIOSystem->Open(pFile,"wt"));
|
||||
if(outfile == NULL) {
|
||||
throw DeadlyExportError("could not open output .obj file: " + std::string(pFile));
|
||||
}
|
||||
}
|
||||
outfile->Write( exporter.mOutput.str().c_str(), static_cast<size_t>(exporter.mOutput.tellp()),1);
|
||||
}
|
||||
{
|
||||
boost::scoped_ptr<IOStream> outfile (pIOSystem->Open(exporter.GetMaterialLibFileName(),"wt"));
|
||||
if(outfile == NULL) {
|
||||
throw DeadlyExportError("could not open output .mtl file: " + std::string(exporter.GetMaterialLibFileName()));
|
||||
}
|
||||
}
|
||||
outfile->Write( exporter.mOutputMat.str().c_str(), static_cast<size_t>(exporter.mOutputMat.tellp()),1);
|
||||
}
|
||||
}
|
||||
|
|
@ -199,6 +199,7 @@ void ObjExporter :: WriteGeometryFile()
|
|||
AddNode(pScene->mRootNode,mBase);
|
||||
|
||||
// write vertex positions
|
||||
vpMap.getVectors(vp);
|
||||
mOutput << "# " << vp.size() << " vertex positions" << endl;
|
||||
BOOST_FOREACH(const aiVector3D& v, vp) {
|
||||
mOutput << "v " << v.x << " " << v.y << " " << v.z << endl;
|
||||
|
|
@ -206,6 +207,7 @@ void ObjExporter :: WriteGeometryFile()
|
|||
mOutput << endl;
|
||||
|
||||
// write uv coordinates
|
||||
vtMap.getVectors(vt);
|
||||
mOutput << "# " << vt.size() << " UV coordinates" << endl;
|
||||
BOOST_FOREACH(const aiVector3D& v, vt) {
|
||||
mOutput << "vt " << v.x << " " << v.y << " " << v.z << endl;
|
||||
|
|
@ -213,6 +215,7 @@ void ObjExporter :: WriteGeometryFile()
|
|||
mOutput << endl;
|
||||
|
||||
// write vertex normals
|
||||
vnMap.getVectors(vn);
|
||||
mOutput << "# " << vn.size() << " vertex normals" << endl;
|
||||
BOOST_FOREACH(const aiVector3D& v, vn) {
|
||||
mOutput << "vn " << v.x << " " << v.y << " " << v.z << endl;
|
||||
|
|
@ -252,6 +255,31 @@ void ObjExporter :: WriteGeometryFile()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
int ObjExporter::vecIndexMap::getIndex(const aiVector3D& vec)
|
||||
{
|
||||
vecIndexMap::dataType::iterator vertIt = vecMap.find(vec);
|
||||
if(vertIt != vecMap.end()){// vertex already exists, so reference it
|
||||
return vertIt->second;
|
||||
}
|
||||
vecMap[vec] = mNextIndex;
|
||||
int ret = mNextIndex;
|
||||
mNextIndex++;
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ObjExporter::vecIndexMap::getVectors( std::vector<aiVector3D>& vecs )
|
||||
{
|
||||
vecs.resize(vecMap.size());
|
||||
for(vecIndexMap::dataType::iterator it = vecMap.begin(); it != vecMap.end(); it++){
|
||||
vecs[it->second-1] = it->first;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
void ObjExporter :: AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4x4& mat)
|
||||
{
|
||||
|
|
@ -262,6 +290,7 @@ void ObjExporter :: AddMesh(const aiString& name, const aiMesh* m, const aiMatri
|
|||
mesh.matname = GetMaterialName(m->mMaterialIndex);
|
||||
|
||||
mesh.faces.resize(m->mNumFaces);
|
||||
|
||||
for(unsigned int i = 0; i < m->mNumFaces; ++i) {
|
||||
const aiFace& f = m->mFaces[i];
|
||||
|
||||
|
|
@ -281,21 +310,22 @@ void ObjExporter :: AddMesh(const aiString& name, const aiMesh* m, const aiMatri
|
|||
for(unsigned int a = 0; a < f.mNumIndices; ++a) {
|
||||
const unsigned int idx = f.mIndices[a];
|
||||
|
||||
// XXX need a way to check if this is an unique vertex or if we had it already,
|
||||
// in which case we should instead reference the previous occurrence.
|
||||
ai_assert(m->mVertices);
|
||||
vp.push_back( mat * m->mVertices[idx] );
|
||||
face.indices[a].vp = vp.size();
|
||||
aiVector3D vert = mat * m->mVertices[idx];
|
||||
face.indices[a].vp = vpMap.getIndex(vert);
|
||||
|
||||
if (m->mNormals) {
|
||||
vn.push_back( m->mNormals[idx] );
|
||||
face.indices[a].vn = vnMap.getIndex(m->mNormals[idx]);
|
||||
}
|
||||
else{
|
||||
face.indices[a].vn = 0;
|
||||
}
|
||||
face.indices[a].vn = vn.size();
|
||||
|
||||
if (m->mTextureCoords[0]) {
|
||||
vt.push_back( m->mTextureCoords[0][idx] );
|
||||
face.indices[a].vt = vtMap.getIndex(m->mTextureCoords[0][idx]);
|
||||
}
|
||||
else{
|
||||
face.indices[a].vt = 0;
|
||||
}
|
||||
face.indices[a].vt = vt.size();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,36 @@ private:
|
|||
const aiScene* const pScene;
|
||||
|
||||
std::vector<aiVector3D> vp, vn, vt;
|
||||
|
||||
|
||||
struct aiVectorCompare
|
||||
{
|
||||
bool operator() (const aiVector3D& a, const aiVector3D& b) const
|
||||
{
|
||||
if(a.x < b.x) return true;
|
||||
if(a.x > b.x) return false;
|
||||
if(a.y < b.y) return true;
|
||||
if(a.y > b.y) return false;
|
||||
if(a.z < b.z) return true;
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
class vecIndexMap
|
||||
{
|
||||
int mNextIndex;
|
||||
typedef std::map<aiVector3D, int, aiVectorCompare> dataType;
|
||||
dataType vecMap;
|
||||
public:
|
||||
|
||||
vecIndexMap():mNextIndex(1)
|
||||
{}
|
||||
|
||||
int getIndex(const aiVector3D& vec);
|
||||
void getVectors( std::vector<aiVector3D>& vecs );
|
||||
};
|
||||
|
||||
vecIndexMap vpMap, vnMap, vtMap;
|
||||
std::vector<MeshInstance> meshes;
|
||||
|
||||
// this endl() doesn't flush() the stream
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ void ObjFileParser::parseFile()
|
|||
case 'v': // Parse a vertex texture coordinate
|
||||
{
|
||||
++m_DataIt;
|
||||
if (*m_DataIt == ' ')
|
||||
if (*m_DataIt == ' ' || *m_DataIt == '\t')
|
||||
{
|
||||
// Read in vertex definition
|
||||
getVector3(m_pModel->m_Vertices);
|
||||
|
|
@ -290,6 +290,10 @@ void ObjFileParser::getFace(aiPrimitiveType type)
|
|||
std::vector<unsigned int> *pNormalID = new std::vector<unsigned int>;
|
||||
bool hasNormal = false;
|
||||
|
||||
const int vSize = m_pModel->m_Vertices.size();
|
||||
const int vtSize = m_pModel->m_TextureCoord.size();
|
||||
const int vnSize = m_pModel->m_Normals.size();
|
||||
|
||||
const bool vt = (!m_pModel->m_TextureCoord.empty());
|
||||
const bool vn = (!m_pModel->m_Normals.empty());
|
||||
int iStep = 0, iPos = 0;
|
||||
|
|
@ -323,7 +327,11 @@ void ObjFileParser::getFace(aiPrimitiveType type)
|
|||
{
|
||||
//OBJ USES 1 Base ARRAYS!!!!
|
||||
const int iVal = atoi( pPtr );
|
||||
|
||||
// increment iStep position based off of the sign and # of digits
|
||||
int tmp = iVal;
|
||||
if (iVal < 0)
|
||||
++iStep;
|
||||
while ( ( tmp = tmp / 10 )!=0 )
|
||||
++iStep;
|
||||
|
||||
|
|
@ -348,6 +356,27 @@ void ObjFileParser::getFace(aiPrimitiveType type)
|
|||
reportErrorTokenInFace();
|
||||
}
|
||||
}
|
||||
else if ( iVal < 0 )
|
||||
{
|
||||
// Store relatively index
|
||||
if ( 0 == iPos )
|
||||
{
|
||||
pIndices->push_back( vSize + iVal );
|
||||
}
|
||||
else if ( 1 == iPos )
|
||||
{
|
||||
pTexID->push_back( vtSize + iVal );
|
||||
}
|
||||
else if ( 2 == iPos )
|
||||
{
|
||||
pNormalID->push_back( vnSize + iVal );
|
||||
hasNormal = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
reportErrorTokenInFace();
|
||||
}
|
||||
}
|
||||
}
|
||||
pPtr += iStep;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ PlyExporter :: PlyExporter(const char* _filename, const aiScene* pScene)
|
|||
|
||||
mOutput << "ply" << endl;
|
||||
mOutput << "format ascii 1.0" << endl;
|
||||
mOutput << "Created by Open Asset Import Library - http://assimp.sf.net (v"
|
||||
mOutput << "comment Created by Open Asset Import Library - http://assimp.sf.net (v"
|
||||
<< aiGetVersionMajor() << '.' << aiGetVersionMinor() << '.'
|
||||
<< aiGetVersionRevision() << ")" << endl;
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ PlyExporter :: PlyExporter(const char* _filename, const aiScene* pScene)
|
|||
}
|
||||
|
||||
mOutput << "element face " << faces << endl;
|
||||
mOutput << "property list uint uint vertex_indices" << endl;
|
||||
mOutput << "property list uint uint vertex_index" << endl;
|
||||
mOutput << "end_header" << endl;
|
||||
|
||||
for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue