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

- Removed dead code. 

- Fixed some compiler warnings ( occurred with warning level 4 ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@467 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2009-08-19 20:45:51 +00:00
parent 12070a1d52
commit d3ff282987
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
code/ObjFileImporter.cpp
View File

@ -77,10 +77,10 @@ ObjFileImporter::~ObjFileImporter()
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Returns true, fi file is an obj file // Returns true, fi file is an obj file
bool ObjFileImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const bool ObjFileImporter::CanRead( const std::string& pFile, IOSystem* /* pIOHandler */, bool /*checkSig */) const
{ {
// fixme: auto detection // fixme: auto detection
return SimpleExtensionCheck(pFile,"obj"); return SimpleExtensionCheck( pFile,"obj" );
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -390,7 +390,7 @@ void ObjFileImporter::countObjects(const std::vector<ObjFile::Object*> &rObjects
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Creates tha material // Creates the material
void ObjFileImporter::createMaterial(const ObjFile::Model* pModel, const ObjFile::Object* pData, void ObjFileImporter::createMaterial(const ObjFile::Model* pModel, const ObjFile::Object* pData,
aiScene* pScene) aiScene* pScene)
{ {
@ -420,19 +420,20 @@ void ObjFileImporter::createMaterial(const ObjFile::Model* pModel, const ObjFile
// convert illumination model // convert illumination model
int sm; int sm;
switch (pCurrentMaterial->illumination_model) { switch (pCurrentMaterial->illumination_model)
case 0: {
sm = aiShadingMode_NoShading; case 0:
break; sm = aiShadingMode_NoShading;
case 1: break;
sm = aiShadingMode_Gouraud; case 1:
break; sm = aiShadingMode_Gouraud;
case 2: break;
sm = aiShadingMode_Phong; case 2:
break; sm = aiShadingMode_Phong;
default: break;
sm = aiShadingMode_Gouraud; default:
DefaultLogger::get()->error("OBJ/MTL: Unexpected illumination model (0-2 recognized)"); sm = aiShadingMode_Gouraud;
DefaultLogger::get()->error("OBJ/MTL: Unexpected illumination model (0-2 recognized)");
} }
mat->AddProperty<int>( &sm, 1, AI_MATKEY_SHADING_MODEL); mat->AddProperty<int>( &sm, 1, AI_MATKEY_SHADING_MODEL);

9
code/ObjFileMtlImporter.cpp
View File

@ -52,7 +52,7 @@ namespace Assimp {
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Constructor // Constructor
ObjFileMtlImporter::ObjFileMtlImporter( std::vector<char> &buffer, ObjFileMtlImporter::ObjFileMtlImporter( std::vector<char> &buffer,
const std::string &strAbsPath, const std::string & /*strAbsPath*/,
ObjFile::Model *pModel ) : ObjFile::Model *pModel ) :
m_DataIt( buffer.begin() ), m_DataIt( buffer.begin() ),
m_DataItEnd( buffer.end() ), m_DataItEnd( buffer.end() ),
@ -77,15 +77,14 @@ ObjFileMtlImporter::~ObjFileMtlImporter()
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Private copy constructor // Private copy constructor
ObjFileMtlImporter::ObjFileMtlImporter(const ObjFileMtlImporter &rOther) ObjFileMtlImporter::ObjFileMtlImporter(const ObjFileMtlImporter & /* rOther */ )
{ {
// empty // empty
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Private copy constructor // Private copy constructor
ObjFileMtlImporter &ObjFileMtlImporter::operator = ( ObjFileMtlImporter &ObjFileMtlImporter::operator = ( const ObjFileMtlImporter & /*rOther */ )
const ObjFileMtlImporter &rOther)
{ {
return *this; return *this;
} }
@ -245,7 +244,7 @@ void ObjFileMtlImporter::createMaterial()
// Gets a texture name from data. // Gets a texture name from data.
void ObjFileMtlImporter::getTexture() void ObjFileMtlImporter::getTexture()
{ {
aiString* out = NULL; aiString *out = NULL;
// FIXME: just a quick'n'dirty hack, consider cleanup later // FIXME: just a quick'n'dirty hack, consider cleanup later

12
code/ObjFileParser.cpp
View File

@ -411,9 +411,10 @@ void ObjFileParser::getMaterialDesc()
// Get a comment, values will be skipped // Get a comment, values will be skipped
void ObjFileParser::getComment() void ObjFileParser::getComment()
{ {
while (true) bool running = true;
while (running)
{ {
if ('\n' == (*m_DataIt) || m_DataIt == m_DataItEnd) if ( '\n' == (*m_DataIt) || m_DataIt == m_DataItEnd )
{ {
++m_DataIt; ++m_DataIt;
break; break;
@ -587,13 +588,8 @@ void ObjFileParser::getObjectName()
} }
// Allocate a new object, if current one wasn´t found before // Allocate a new object, if current one wasn´t found before
if (m_pModel->m_pCurrent == NULL) if ( NULL == m_pModel->m_pCurrent )
{
createObject(strObjectName); createObject(strObjectName);
/*m_pModel->m_pCurrent = new ObjFile::Object();
m_pModel->m_pCurrent->m_strObjName = strObjectName;
m_pModel->m_Objects.push_back(m_pModel->m_pCurrent);*/
}
} }
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine ); m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
} }