CHANGE: Bugfixes for ObjFile material import
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@53 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -58,7 +58,7 @@ struct Model;
|
||||
}
|
||||
|
||||
/// \class ObjFileImporter
|
||||
/// \brief IMports a waveform obj file
|
||||
/// \brief Imports a waveform obj file
|
||||
class ObjFileImporter :
|
||||
BaseImporter
|
||||
{
|
||||
@@ -81,46 +81,51 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
//! brief
|
||||
void GetExtensionList(std::string& append)
|
||||
{
|
||||
append.append("*.obj");
|
||||
}
|
||||
//! \brief Appends the supported extention.
|
||||
void GetExtensionList(std::string& append);
|
||||
|
||||
//! \brief
|
||||
//! \brief File import implementation.
|
||||
void InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler);
|
||||
|
||||
//! \brief
|
||||
//! \brief Create the data from imported content.
|
||||
void CreateDataFromImport(const ObjFile::Model* pModel, aiScene* pScene);
|
||||
|
||||
//! \brief
|
||||
//! \brief Creates all nodes stored in imported content.
|
||||
aiNode *createNodes(const ObjFile::Model* pModel, const ObjFile::Object* pData,
|
||||
aiNode *pParent, aiScene* pScene, std::vector<aiMesh*> &MeshArray);
|
||||
|
||||
//! \brief
|
||||
//! \brief Creates topology data like faces and meshes for the geometry.
|
||||
void createTopology(const ObjFile::Model* pModel, const ObjFile::Object* pData,
|
||||
aiMesh* pMesh);
|
||||
|
||||
//! \brief
|
||||
//! \brief Creates vertices from model.
|
||||
void createVertexArray(const ObjFile::Model* pModel,
|
||||
const ObjFile::Object* pCurrentObject, aiMesh* pMesh);
|
||||
|
||||
//! \brief
|
||||
//! \brief Object counter helper method.
|
||||
void countObjects(const std::vector<ObjFile::Object*> &rObjects, int &iNumMeshes);
|
||||
|
||||
//! \brief
|
||||
//! \brief Material creation.
|
||||
void createMaterial(const ObjFile::Model* pModel, const ObjFile::Object* pData,
|
||||
aiScene* pScene);
|
||||
|
||||
//! \brief
|
||||
//! \brief Appends a child node to a parentnode and updates the datastructures.
|
||||
void appendChildToParentNode(aiNode *pParent, aiNode *pChild);
|
||||
|
||||
private:
|
||||
//! Data buffer
|
||||
std::vector<char> m_Buffer;
|
||||
//! Pointer to root object instance
|
||||
ObjFile::Object *m_pRootObject;
|
||||
//! Absolute pathname of model in filesystem
|
||||
std::string m_strAbsPath;
|
||||
};
|
||||
|
||||
inline void ObjFileImporter::GetExtensionList(std::string& append)
|
||||
{
|
||||
append.append("*.obj");
|
||||
}
|
||||
|
||||
} // Namespace Assimp
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user