zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-27 15:02:06 +00:00
Code Activity

chore: use enum class for non-game enums

Browse Source
This commit is contained in:
Jan Laupetin
2025-11-10 21:07:48 +01:00
parent 049fa2b8ae
commit f811c14cc2
6 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
View File

@@ -361,18 +361,20 @@ namespace BSP
{
cplane_s plane;
plane.dist = tree.node->distance;
if (tree.node->axis == AXIS_X)
if (tree.node->axis == PlaneAxis::AXIS_X)
{
plane.normal = normalX;
plane.type = 0;
}
else if (tree.node->axis == AXIS_Y)
else if (tree.node->axis == PlaneAxis::AXIS_Y)
{
plane.normal = normalY;
plane.type = 1;
}
else // tree->node->axis == AXIS_Z
else
{
assert(tree.node->axis == PlaneAxis::AXIS_Z);
plane.normal = normalZ;
plane.type = 2;
}

8
src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
View File

@@ -81,7 +81,7 @@ namespace BSP
gfxSurface->tris.vertexDataOffset1 = 0;
std::string surfMaterialName;
if (bspSurface.material.materialType == MATERIAL_TYPE_TEXTURE)
if (bspSurface.material.materialType == BSPMaterialType::MATERIAL_TYPE_TEXTURE)
surfMaterialName = bspSurface.material.materialName;
else // MATERIAL_TYPE_COLOUR || MATERIAL_TYPE_EMPTY
surfMaterialName = BSPLinkingConstants::COLOR_ONLY_IMAGE_NAME;
@@ -200,9 +200,9 @@ namespace BSP
currModelInst->maxs.z = currModel->model->maxs.z + currModel->placement.origin.z;
currModel->cullDist = DEFAULT_SMODEL_CULL_DIST;
currModel->flags = DEFAULT_SMODEL_FLAGS;
currModel->primaryLightIndex = DEFAULT_SMODEL_LIGHT;
currModel->reflectionProbeIndex = DEFAULT_SMODEL_REFLECTION_PROBE;
currModel->flags = BSPEditableConstants::DEFAULT_SMODEL_FLAGS;
currModel->primaryLightIndex = BSPEditableConstants::DEFAULT_SMODEL_LIGHT;
currModel->reflectionProbeIndex = BSPEditableConstants::DEFAULT_SMODEL_REFLECTION_PROBE;
// unknown use / unused
currModel->smid = i;