Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[3298060] OBJ: Add support for p and l elements

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1070 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2011-08-23 16:23:13 +00:00
parent 1204c8cdaf
commit df63b4b3ed
8 changed files with 200 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/ObjFileData.h
View File

@@ -64,7 +64,7 @@ struct Face
typedef std::vector<unsigned int> IndexArray;
//! Primitive type
int m_PrimitiveType;
aiPrimitiveType m_PrimitiveType;
//! Vertex indices
IndexArray *m_pVertices;
//! Normal indices
@@ -80,8 +80,9 @@ struct Face
//! \param pTexCoords Pointer to assigned texture indexbuffer
Face( std::vector<unsigned int> *pVertices,
std::vector<unsigned int> *pNormals,
std::vector<unsigned int> *pTexCoords) :
m_PrimitiveType( 2 ),
std::vector<unsigned int> *pTexCoords,
aiPrimitiveType pt = aiPrimitiveType_POLYGON) :
m_PrimitiveType( pt ),
m_pVertices( pVertices ),
m_pNormals( pNormals ),
m_pTexturCoords( pTexCoords ),
@@ -195,7 +196,7 @@ struct Material
//! \brief Data structure to store a mesh
struct Mesh
{
static const unsigned int NoMaterial = 999999999;
static const unsigned int NoMaterial = ~0u;
/// Array with pointer to all stored faces
std::vector<Face*> m_Faces;