|
@@ -76,41 +76,36 @@ using namespace std;
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
// Default constructor
|
|
|
-ObjFileImporter::ObjFileImporter() :
|
|
|
- m_Buffer(),
|
|
|
- m_pRootObject( NULL ),
|
|
|
- m_strAbsPath( "" )
|
|
|
-{
|
|
|
+ObjFileImporter::ObjFileImporter()
|
|
|
+: m_Buffer()
|
|
|
+, m_pRootObject( nullptr )
|
|
|
+, m_strAbsPath( "" ) {
|
|
|
DefaultIOSystem io;
|
|
|
m_strAbsPath = io.getOsSeparator();
|
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
// Destructor.
|
|
|
-ObjFileImporter::~ObjFileImporter()
|
|
|
-{
|
|
|
+ObjFileImporter::~ObjFileImporter() {
|
|
|
delete m_pRootObject;
|
|
|
- m_pRootObject = NULL;
|
|
|
+ m_pRootObject = nullptr;
|
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
// Returns true, if file is an obj file.
|
|
|
-bool ObjFileImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler , bool checkSig ) const
|
|
|
-{
|
|
|
- if(!checkSig) //Check File Extension
|
|
|
- {
|
|
|
+bool ObjFileImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler , bool checkSig ) const {
|
|
|
+ if(!checkSig) {
|
|
|
+ //Check File Extension
|
|
|
return SimpleExtensionCheck(pFile,"obj");
|
|
|
- }
|
|
|
- else //Check file Header
|
|
|
- {
|
|
|
+ } else {
|
|
|
+ // Check file Header
|
|
|
static const char *pTokens[] = { "mtllib", "usemtl", "v ", "vt ", "vn ", "o ", "g ", "s ", "f " };
|
|
|
return BaseImporter::SearchFileHeaderForToken(pIOHandler, pFile, pTokens, 9 );
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
-const aiImporterDesc* ObjFileImporter::GetInfo () const
|
|
|
-{
|
|
|
+const aiImporterDesc* ObjFileImporter::GetInfo () const {
|
|
|
return &desc;
|
|
|
}
|
|
|
|