sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Used smart pointers to handle new-allocated array 

Former-commit-id: b346e191c56655dd1f3d7fd46208d879bccfcf9d
This commit is contained in:
Lynix 2012-12-09 18:39:29 +01:00
parent 8c37c92c16
commit 70b1047f72
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Nazara/Utility/Loaders/MD2/Loader.cpp
View File

@ -158,7 +158,7 @@ namespace
// Pour que le modèle soit correctement aligné, on génère un quaternion que nous appliquerons à chacune des vertices // Pour que le modèle soit correctement aligné, on génère un quaternion que nous appliquerons à chacune des vertices
NzQuaternionf rotationQuat = NzEulerAnglesf(-90.f, 90.f, 0.f); NzQuaternionf rotationQuat = NzEulerAnglesf(-90.f, 90.f, 0.f);
md2_vertex* vertices = new md2_vertex[header.num_vertices]; std::unique_ptr<md2_vertex[]> vertices(new md2_vertex[header.num_vertices]);
for (unsigned int f = 0; f < header.num_frames; ++f) for (unsigned int f = 0; f < header.num_frames; ++f)
{ {
NzVector3f scale, translate; NzVector3f scale, translate;
@ -166,7 +166,7 @@ namespace
stream.Read(scale, sizeof(NzVector3f)); stream.Read(scale, sizeof(NzVector3f));
stream.Read(translate, sizeof(NzVector3f)); stream.Read(translate, sizeof(NzVector3f));
stream.Read(nullptr, 16*sizeof(char)); stream.Read(nullptr, 16*sizeof(char));
stream.Read(vertices, header.num_vertices*sizeof(md2_vertex)); stream.Read(vertices.get(), header.num_vertices*sizeof(md2_vertex));
#ifdef NAZARA_BIG_ENDIAN #ifdef NAZARA_BIG_ENDIAN
NzByteSwap(&scale.x, sizeof(float)); NzByteSwap(&scale.x, sizeof(float));
@ -208,7 +208,6 @@ namespace
subMesh->SetAABB(f, aabb); subMesh->SetAABB(f, aabb);
} }
delete[] vertices;
subMesh->Unlock(); subMesh->Unlock();