zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-23 21:22:07 +00:00
Code Activity

chore: use std vector for std arrays

Browse Source
This commit is contained in:
Jan Laupetin
2025-11-10 21:32:32 +01:00
parent 5bfa161769
commit 86ee478273
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ObjLoading/Game/T6/BSP/BSPCreator.cpp
View File

@@ -209,8 +209,8 @@ namespace BSP
return nullptr; return nullptr;
} }
std::unique_ptr<char> gfxMapData(new char[static_cast<size_t>(gfxFile.m_length)]); std::vector<char> gfxMapData(static_cast<size_t>(gfxFile.m_length));
gfxFile.m_stream->read(gfxMapData.get(), gfxFile.m_length); gfxFile.m_stream->read(gfxMapData.data(), gfxFile.m_length);
if (gfxFile.m_stream->gcount() != gfxFile.m_length) if (gfxFile.m_stream->gcount() != gfxFile.m_length)
{ {
con::error("Read error of gfx fbx file: {}", gfxFbxPath); con::error("Read error of gfx fbx file: {}", gfxFbxPath);
@@ -222,7 +222,7 @@ namespace BSP
optsGfx.target_axes = ufbx_axes_right_handed_y_up; optsGfx.target_axes = ufbx_axes_right_handed_y_up;
optsGfx.generate_missing_normals = true; optsGfx.generate_missing_normals = true;
optsGfx.allow_missing_vertex_position = false; optsGfx.allow_missing_vertex_position = false;
ufbx_scene* gfxScene = ufbx_load_memory(gfxMapData.get(), static_cast<size_t>(gfxFile.m_length), &optsGfx, &errorGfx); ufbx_scene* gfxScene = ufbx_load_memory(gfxMapData.data(), static_cast<size_t>(gfxFile.m_length), &optsGfx, &errorGfx);
if (!gfxScene) if (!gfxScene)
{ {
con::error("Failed to load map gfx fbx file: {}", errorGfx.description.data); con::error("Failed to load map gfx fbx file: {}", errorGfx.description.data);
@@ -239,9 +239,9 @@ namespace BSP
} }
else else
{ {
std::unique_ptr<char> colMapData(new char[static_cast<size_t>(colFile.m_length)]); std::vector<char> colMapData(static_cast<size_t>(colFile.m_length));
colFile.m_stream->seekg(0); colFile.m_stream->seekg(0);
colFile.m_stream->read(colMapData.get(), colFile.m_length); colFile.m_stream->read(colMapData.data(), colFile.m_length);
if (colFile.m_stream->gcount() != colFile.m_length) if (colFile.m_stream->gcount() != colFile.m_length)
{ {
con::error("Read error of collision fbx file: {}", colFbxPath); con::error("Read error of collision fbx file: {}", colFbxPath);
@@ -253,7 +253,7 @@ namespace BSP
optsCol.target_axes = ufbx_axes_right_handed_y_up; optsCol.target_axes = ufbx_axes_right_handed_y_up;
optsCol.generate_missing_normals = true; optsCol.generate_missing_normals = true;
optsCol.allow_missing_vertex_position = false; optsCol.allow_missing_vertex_position = false;
colScene = ufbx_load_memory(colMapData.get(), static_cast<size_t>(colFile.m_length), &optsCol, &errorCol); colScene = ufbx_load_memory(colMapData.data(), static_cast<size_t>(colFile.m_length), &optsCol, &errorCol);
if (!colScene) if (!colScene)
{ {
con::error("Failed to load map collision fbx file: {}", errorCol.description.data); con::error("Failed to load map collision fbx file: {}", errorCol.description.data);