removed unused things from FileInterface

This commit is contained in:
Anakin
2017-01-02 15:07:39 +01:00
parent 876c689a1d
commit 24d26cfdfa
3 changed files with 25 additions and 23 deletions

View File

@@ -190,6 +190,8 @@ void MshFile::analyseMsh2Chunks(std::list<ChunkHeader*>& chunkList)
else if (!strcmp("MODL", it->name))
{
Model* new_model = new Model;
m_currentType = ModelTyp::null;
m_currentRenderFlag = -1;
// get all MODL subchunks
std::list<ChunkHeader*> tmp_chunks;
@@ -238,7 +240,7 @@ void MshFile::analyseModlChunks(Model * dataDestination, std::list<ChunkHeader*>
m_file.seekg(it->position);
std::uint32_t tmp_type;
m_file.read(F2V(tmp_type), sizeof(tmp_type));
dataDestination->type = (ModelTyp)tmp_type;
m_currentType = (ModelTyp)tmp_type;
}
// parent name
@@ -267,7 +269,7 @@ void MshFile::analyseModlChunks(Model * dataDestination, std::list<ChunkHeader*>
else if (!strcmp("FLGS", it->name))
{
m_file.seekg(it->position);
m_file.read(F2V(dataDestination->renderFlags), sizeof(dataDestination->renderFlags));
m_file.read(F2V(m_currentRenderFlag), sizeof(m_currentRenderFlag));
}
// translation
@@ -403,10 +405,10 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*>
else if (!strcmp("STRP", it->name))
{
// don't get null, bone, shadowMesh and hidden mesh indices
if (dataDestination->type == null ||
dataDestination->type == bone ||
dataDestination->type == shadowMesh ||
dataDestination->renderFlags == 1)
if (m_currentType == null ||
m_currentType == bone ||
m_currentType == shadowMesh ||
m_currentRenderFlag == 1)
continue;
// jump to the data section and read the size;