move the model to the center,
clean up variables, use delete[]
This commit is contained in:
@@ -134,6 +134,9 @@ void Object::analyseMsh2Chunks(std::list<ChunkHeader*>& chunkList)
|
||||
fsMesh.read(reinterpret_cast<char*>(&boundingBox.extents[i]), sizeof(float));
|
||||
}
|
||||
}
|
||||
|
||||
for (ChunkHeader* it : tempSinfChunks)
|
||||
delete it;
|
||||
}
|
||||
|
||||
else if (!strcmp("MATL", it->name))
|
||||
@@ -217,7 +220,7 @@ void Object::analyseMatdChunks(std::list<ChunkHeader*>& chunkList)
|
||||
*buffer = { 0 };
|
||||
fsMesh.read(buffer, it->size);
|
||||
vTextures.back() = buffer;
|
||||
delete buffer;
|
||||
delete[] buffer;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -241,7 +244,7 @@ void Object::analyseModlChunks(Modl* dataDestination, std::list<ChunkHeader*>& c
|
||||
*buffer = { 0 };
|
||||
fsMesh.read(buffer, it->size);
|
||||
dataDestination->parent = buffer;
|
||||
delete buffer;
|
||||
delete[] buffer;
|
||||
}
|
||||
|
||||
else if (!strcmp("NAME", it->name))
|
||||
@@ -251,7 +254,7 @@ void Object::analyseModlChunks(Modl* dataDestination, std::list<ChunkHeader*>& c
|
||||
*buffer = { 0 };
|
||||
fsMesh.read(buffer, it->size);
|
||||
dataDestination->name = buffer;
|
||||
delete buffer;
|
||||
delete[] buffer;
|
||||
}
|
||||
|
||||
else if (!strcmp("FLGS", it->name))
|
||||
@@ -515,7 +518,7 @@ void Object::analyseClthChunks(Modl * dataDestination, std::list<ChunkHeader*>&
|
||||
tempData->textureIndex = vTextures.size() - 1;
|
||||
}
|
||||
|
||||
delete buffer;
|
||||
delete[] buffer;
|
||||
}
|
||||
|
||||
else if (!strcmp("CPOS", it->name))
|
||||
@@ -594,6 +597,11 @@ std::vector<std::string> Object::getTextureList() const
|
||||
return vTextures;
|
||||
}
|
||||
|
||||
Bbox Object::getBoundgBox() const
|
||||
{
|
||||
return boundingBox;
|
||||
}
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// public functions
|
||||
|
||||
Reference in New Issue
Block a user