zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-06-06 08:42:35 +00:00
Code Activity

refactor: better implementation of static and script surfaces

Browse Source
This commit is contained in:
LJW-Dev
2026-04-13 13:07:43 +08:00
committed by Jan Laupetin
parent 026109dda7
commit defdc1c813
4 changed files with 76 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/T6/BSP/BSPCreator.cpp
+3 -10
View File
@@ -461,7 +461,7 @@ namespace
vec4_t vertexColour = m_curr_bsp_world->materials.at(surface.materialIndex).materialColour;
CreateVertices(accessorsForVertex, nodeMatrix, surface, vertexColour);
m_curr_bsp_world->surfaces.emplace_back(surface);
m_curr_bsp_world->staticSurfaces.emplace_back(surface);
}
return true;
@@ -678,7 +678,7 @@ namespace
BSPModel model;
model.isGfxModel = m_is_world_gfx;
model.surfaceIndex = m_curr_bsp_world->internal_scriptSurfaces.size();
model.surfaceIndex = m_curr_bsp_world->scriptSurfaces.size();
model.surfaceCount = mesh.primitives.size();
m_bsp->models.emplace_back(model);
@@ -709,7 +709,7 @@ namespace
vec4_t vertexColour = m_curr_bsp_world->materials.at(surface.materialIndex).materialColour;
CreateVertices(accessorsForVertex, nodeMatrix, surface, vertexColour);
m_curr_bsp_world->internal_scriptSurfaces.emplace_back(surface);
m_curr_bsp_world->scriptSurfaces.emplace_back(surface);
}
return m_bsp->models.size(); // script model index starts at 1
@@ -1154,13 +1154,6 @@ namespace
LoadMaterials(jRoot);
TraverseNodes(jRoot); // requires materials and lights
size_t staticSurfaceCount = m_curr_bsp_world->surfaces.size();
for (auto& model : m_bsp->models)
model.surfaceIndex += staticSurfaceCount;
m_curr_bsp_world->staticSurfaceCount = staticSurfaceCount;
m_curr_bsp_world->surfaces.insert(
m_curr_bsp_world->surfaces.end(), m_curr_bsp_world->internal_scriptSurfaces.begin(), m_curr_bsp_world->internal_scriptSurfaces.end());
}
catch (const GltfLoadException& e)
{