Tools/mmaps_generator: Replace G3D::Array with std::vector

Author: Shauren

src/tools/mmaps_generator/IntermediateValues.cpp

@@ -200,24 +200,24 @@ namespace MMAP
             return;
         }
 
-        G3D::Array<float> allVerts;
-        G3D::Array<int> allTris;
+        std::vector<float> allVerts;
+        std::vector<int> allTris;
 
-        allTris.append(meshData.liquidTris);
-        allVerts.append(meshData.liquidVerts);
+        allTris.insert(allTris.end(), meshData.liquidTris.begin(), meshData.liquidTris.end());
+        allVerts.insert(allVerts.end(), meshData.liquidVerts.begin(), meshData.liquidVerts.end());
         TerrainBuilder::copyIndices(meshData.solidTris, allTris, allVerts.size() / 3);
-        allVerts.append(meshData.solidVerts);
+        allVerts.insert(allVerts.end(), meshData.solidVerts.begin(), meshData.solidVerts.end());
 
-        float* verts = allVerts.getCArray();
+        float* verts = allVerts.data();
         int vertCount = allVerts.size() / 3;
-        int* tris = allTris.getCArray();
+        int* tris = allTris.data();
         int triCount = allTris.size() / 3;
 
-        for (int i = 0; i < allVerts.size() / 3; i++)
-            fprintf(objFile.get(), "v %f %f %f\n", verts[i*3], verts[i*3 + 1], verts[i*3 + 2]);
+        for (std::size_t i = 0; i < allVerts.size() / 3; i++)
+            fprintf(objFile.get(), "v %f %f %f\n", verts[i * 3], verts[i * 3 + 1], verts[i * 3 + 2]);
 
-        for (int i = 0; i < allTris.size() / 3; i++)
-            fprintf(objFile.get(), "f %i %i %i\n", tris[i*3] + 1, tris[i*3 + 1] + 1, tris[i*3 + 2] + 1);
+        for (std::size_t i = 0; i < allTris.size() / 3; i++)
+            fprintf(objFile.get(), "f %i %i %i\n", tris[i * 3] + 1, tris[i * 3 + 1] + 1, tris[i * 3 + 2] + 1);
 
         TC_LOG_INFO("maps.mmapgen.debug", "[Map {:04}] [{:02},{:02}]: Writing debug output object file...", mapID, tileY, tileX);
 

src/tools/mmaps_generator/MapBuilder.cpp

@@ -310,26 +310,20 @@ namespace MMAP
         if (fread(&indicesCount, sizeof(uint32), 1, file.get()) != 1)
             return;
 
-        std::unique_ptr<float[]> verts = std::make_unique<float[]>(verticesCount);
-        if (fread(verts.get(), sizeof(float), verticesCount, file.get()) != verticesCount)
-            return;
-
-        std::unique_ptr<int[]> inds = std::make_unique<int[]>(indicesCount);
-        if (fread(inds.get(), sizeof(int), indicesCount, file.get()) != indicesCount)
-            return;
-
         MeshData data;
 
-        for (uint32 i = 0; i < verticesCount; ++i)
-            data.solidVerts.append(verts[i]);
+        data.solidVerts.resize(verticesCount);
+        if (fread(data.solidVerts.data(), sizeof(float), verticesCount, file.get()) != verticesCount)
+            return;
 
-        for (uint32 i = 0; i < indicesCount; ++i)
-            data.solidTris.append(inds[i]);
+        data.solidTris.resize(indicesCount);
+        if (fread(data.solidTris.data(), sizeof(int), indicesCount, file.get()) != indicesCount)
+            return;
 
         TerrainBuilder::cleanVertices(data.solidVerts, data.solidTris);
         // get bounds of current tile
         float bmin[3], bmax[3];
-        TileBuilder::getTileBounds(tileX, tileY, data.solidVerts.getCArray(), data.solidVerts.size() / 3, bmin, bmax);
+        TileBuilder::getTileBounds(tileX, tileY, data.solidVerts.data(), data.solidVerts.size() / 3, bmin, bmax);
 
         // build navmesh tile
         MapTileBuilder tileBuilder(this, m_maxWalkableAngle, m_maxWalkableAngleNotSteep,