Merge pull request #407 from Laupetin/dependabot/submodules/thirdparty/eigen-33f5f59

chore(deps): bump thirdparty/eigen from `11fd34c` to `33f5f59`

docs/SupportedAssetTypes.md

@@ -177,7 +177,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | ComWorld               | ❌              | ❌              |                                                                                                                                                                |
 | GameWorldSp            | ❌              | ❌              |                                                                                                                                                                |
 | GameWorldMp            | ❌              | ❌              |                                                                                                                                                                |
-| MapEnts                | ❌              | ❌              |                                                                                                                                                                |
+| MapEnts                | ✅              | ❌              |                                                                                                                                                                |
 | GfxWorld               | ❌              | ❌              |                                                                                                                                                                |
 | GfxLightDef            | ❌              | ❌              |                                                                                                                                                                |
 | Font_s                 | ❌              | ❌              |                                                                                                                                                                |

premake5.lua

@@ -16,7 +16,7 @@ workspace "OpenAssetTools"
     objdir "%{wks.location}/obj"
     symbols "On"
     systemversion "latest"
-    cppdialect "C++20"
+    cppdialect "C++23"
     largeaddressaware "on"
 
 	flags {
@@ -54,6 +54,10 @@ workspace "OpenAssetTools"
         symbols "On"
     filter {}
 
+    filter {"system:windows", "configurations:Debug" }
+        buildoptions { "/bigobj" }
+    filter {}
+
     filter "configurations:Release"
         defines "NDEBUG"
         optimize "Full"

scripts/make-clean.sh

@@ -4,4 +4,6 @@
 cd "$(dirname "$0")/.." || exit 2
 
 make -C build -j$(nproc) config=debug_x86 clean
-make -C build -j$(nproc) config=release_x86 clean
+make -C build -j$(nproc) config=release_x86 clean
+make -C build -j$(nproc) config=debug_x64 clean
+make -C build -j$(nproc) config=release_x64 clean

scripts/make-debug-x64.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Go to repository root
+cd "$(dirname "$0")/.." || exit 2
+
+make -C build -j$(nproc) config=debug_x64 all

scripts/make-debug.sh

@@ -3,4 +3,4 @@
 # Go to repository root
 cd "$(dirname "$0")/.." || exit 2
 
-make -C build -j$(nproc) config=debug_x86 all
+make -C build -j$(nproc) config=debug_x86 all

scripts/make-release-x64.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Go to repository root
+cd "$(dirname "$0")/.." || exit 2
+
+echo "Start building with $(nproc) threads"
+make -C build -j$(nproc) config=release_x64 all

scripts/make-release.sh

@@ -4,4 +4,4 @@
 cd "$(dirname "$0")/.." || exit 2
 
 echo "Start building with $(nproc) threads"
-make -C build -j$(nproc) config=release_x86 all
+make -C build -j$(nproc) config=release_x86 all

src/Common/Game/T6/T6_Assets.h

@@ -3814,7 +3814,8 @@ namespace T6
         uint16_t dynEntId;
     };
 
-    union gcc_align(8) __m128
+    // Usually __m128, but that is not portable
+    union gcc_align(8) custom_m128
     {
         float m128_f32[4];
         uint64_t m128_u64[2];
@@ -3827,19 +3828,12 @@ namespace T6
         unsigned int m128_u32[4];
     };
 
-    struct vector3
-    {
-        __m128 x;
-        __m128 y;
-        __m128 z;
-    };
-
     struct vector4
     {
-        __m128 x;
-        __m128 y;
-        __m128 z;
-        __m128 w;
+        custom_m128 x;
+        custom_m128 y;
+        custom_m128 z;
+        custom_m128 w;
     };
 
     struct type_align(16) SSkinInstance

src/Common/Zone/ZoneTypes.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <cstdint>
+#include <limits>
 
 struct ZoneHeader
 {
@@ -7,21 +8,11 @@ struct ZoneHeader
     uint32_t m_version;
 };
 
-#ifdef ARCH_x64
-typedef uint32_t scr_string_t;
-typedef uint64_t xchunk_size_t;
-typedef uint64_t xblock_size_t;
-typedef uint64_t zone_pointer_t;
-
-constexpr uint16_t SCR_STRING_MAX = UINT32_MAX;
-#elif ARCH_x86
 typedef uint16_t scr_string_t;
 typedef uint32_t xchunk_size_t;
 typedef uint32_t xblock_size_t;
-typedef uint32_t zone_pointer_t;
 
-constexpr uint16_t SCR_STRING_MAX = UINT16_MAX;
-#endif
+constexpr uint16_t SCR_STRING_MAX = std::numeric_limits<scr_string_t>::max();
 
 typedef int block_t;
 typedef int asset_type_t;

src/Linker/LinkerPaths.cpp

@@ -3,6 +3,7 @@
 #include "SearchPath/IWD.h"
 #include "SearchPath/SearchPathFilesystem.h"
 #include "SearchPath/SearchPaths.h"
+#include "Utils/StringUtils.h"
 
 #include <cassert>
 #include <cstdint>
@@ -215,7 +216,10 @@ namespace
             {
                 if (!curTemplate.CanRender(PROJECT_MASK) && curTemplate.CanRender(GAME_MASK))
                 {
-                    auto renderedTemplate = curTemplate.Render(m_bin_dir, m_base_dir, projectName, GameId_Names[static_cast<unsigned>(game)]);
+                    std::string gameName(GameId_Names[static_cast<unsigned>(game)]);
+                    utils::MakeStringLowerCase(gameName);
+
+                    auto renderedTemplate = curTemplate.Render(m_bin_dir, m_base_dir, projectName, gameName);
                     if (AddSearchPath(addedSearchPaths, searchPaths, renderedTemplate))
                         hasSearchPath = true;
                 }

src/ObjCommon/ObjContainer/IPak/IPakTypes.h

@@ -16,7 +16,7 @@ namespace ipak_consts
     static constexpr size_t IPAK_CHUNK_SIZE = 0x8000;
     static constexpr size_t IPAK_CHUNK_COUNT_PER_READ = 0x8;
 
-    static constexpr uint32_t IPAK_COMMAND_DEFAULT_SIZE = 0x7F00;
+    static constexpr size_t IPAK_COMMAND_DEFAULT_SIZE = 0x7F00;
     static constexpr uint32_t IPAK_COMMAND_UNCOMPRESSED = 0;
     static constexpr uint32_t IPAK_COMMAND_COMPRESSED = 1;
     static constexpr uint32_t IPAK_COMMAND_SKIP = 0xCF;

src/ObjCommon/Sound/FlacDecoder.cpp

@@ -68,7 +68,7 @@ namespace
                 T result;
             } data{};
 
-            const auto byteCount = utils::Align(bitCount, 8u) / 8u;
+            const auto byteCount = utils::Align(bitCount, 8uz) / 8uz;
             assert(byteCount <= sizeof(T));
 
             const auto shiftCount = (8u - bitCount % 8) % 8;
@@ -83,7 +83,7 @@ namespace
 
             while (remainingBits > 0)
             {
-                const auto curBits = static_cast<uint8_t>(std::min(remainingBits, 8u));
+                const auto curBits = static_cast<uint8_t>(std::min(remainingBits, 8uz));
 
                 if (m_remaining_bits_last_byte > 0)
                 {

src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp

@@ -59,7 +59,7 @@ size_t CommonStructuredDataType::GetSizeInBits(const CommonStructuredDataDef& de
             return 0u;
         }
         const auto& indexedArray = def.m_indexed_arrays[m_info.type_index];
-        return utils::Align(indexedArray.m_element_size_in_bits * indexedArray.m_element_count, 8u);
+        return utils::Align(indexedArray.m_element_size_in_bits * indexedArray.m_element_count, 8uz);
     }
     case CommonStructuredDataTypeCategory::ENUM_ARRAY:
     {
@@ -69,7 +69,7 @@ size_t CommonStructuredDataType::GetSizeInBits(const CommonStructuredDataDef& de
             return 0u;
         }
         const auto& enumedArray = def.m_enumed_arrays[m_info.type_index];
-        return utils::Align(enumedArray.m_element_size_in_bits * enumedArray.m_element_count, 8u);
+        return utils::Align(enumedArray.m_element_size_in_bits * enumedArray.m_element_count, 8uz);
     }
 
     case CommonStructuredDataTypeCategory::UNKNOWN:

src/ObjCompiling/Image/IPak/IPakCreator.cpp

@@ -216,7 +216,7 @@ namespace
                 const auto remainingSize = dataSize - dataOffset;
                 const auto remainingChunkBufferWindowSize = std::max((ipak_consts::IPAK_CHUNK_COUNT_PER_READ * ipak_consts::IPAK_CHUNK_SIZE)
                                                                          - static_cast<size_t>(m_current_offset - m_chunk_buffer_window_start),
-                                                                     0u);
+                                                                     0uz);
 
                 if (remainingChunkBufferWindowSize == 0)
                 {

src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp

@@ -96,7 +96,6 @@ namespace
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSoundCurve>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderLoadedSound>(memory));
-        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMap>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapPvs>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderComWorld>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldSp>(memory));

src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp

@@ -135,8 +135,7 @@ namespace
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory));
         collection.AddAssetCreator(CreateSoundCurveLoader(memory, searchPath));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderLoadedSound>(memory));
-        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapSp>(memory));
-        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapMp>(memory));
+        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMap>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderComWorld>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldSp>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldMp>(memory));

src/ObjLoading/Game/IW4/StructuredDataDef/LoaderStructuredDataDefIW4.cpp

@@ -53,15 +53,15 @@ namespace
             case CommonStructuredDataTypeCategory::SHORT:
                 return {DATA_SHORT, {0}};
             case CommonStructuredDataTypeCategory::STRING:
-                return {DATA_STRING, {inputType.m_info.string_length}};
+                return {DATA_STRING, {static_cast<unsigned>(inputType.m_info.string_length)}};
             case CommonStructuredDataTypeCategory::ENUM:
-                return {DATA_ENUM, {inputType.m_info.type_index}};
+                return {DATA_ENUM, {static_cast<unsigned>(inputType.m_info.type_index)}};
             case CommonStructuredDataTypeCategory::STRUCT:
-                return {DATA_STRUCT, {inputType.m_info.type_index}};
+                return {DATA_STRUCT, {static_cast<unsigned>(inputType.m_info.type_index)}};
             case CommonStructuredDataTypeCategory::INDEXED_ARRAY:
-                return {DATA_INDEXED_ARRAY, {inputType.m_info.type_index}};
+                return {DATA_INDEXED_ARRAY, {static_cast<unsigned>(inputType.m_info.type_index)}};
             case CommonStructuredDataTypeCategory::ENUM_ARRAY:
-                return {DATA_ENUM_ARRAY, {inputType.m_info.type_index}};
+                return {DATA_ENUM_ARRAY, {static_cast<unsigned>(inputType.m_info.type_index)}};
             case CommonStructuredDataTypeCategory::UNKNOWN:
             default:
                 assert(false);
@@ -129,14 +129,14 @@ namespace
         {
             outputIndexedArray.arraySize = static_cast<int>(inputIndexedArray.m_element_count);
             outputIndexedArray.elementType = ConvertType(inputIndexedArray.m_array_type);
-            outputIndexedArray.elementSize = utils::Align(inputIndexedArray.m_element_size_in_bits, 8u) / 8u;
+            outputIndexedArray.elementSize = utils::Align(inputIndexedArray.m_element_size_in_bits, 8uz) / 8uz;
         }
 
         void ConvertEnumedArray(const CommonStructuredDataEnumedArray& inputEnumedArray, StructuredDataEnumedArray& outputEnumedArray)
         {
             outputEnumedArray.enumIndex = static_cast<int>(inputEnumedArray.m_enum_index);
             outputEnumedArray.elementType = ConvertType(inputEnumedArray.m_array_type);
-            outputEnumedArray.elementSize = utils::Align(inputEnumedArray.m_element_size_in_bits, 8u) / 8u;
+            outputEnumedArray.elementSize = utils::Align(inputEnumedArray.m_element_size_in_bits, 8uz) / 8uz;
         }
 
         void ConvertDef(const CommonStructuredDataDef& inputDef, StructuredDataDef& outputDef)

src/ObjLoading/Game/T5/ObjLoaderT5.cpp

@@ -109,7 +109,6 @@ namespace
         // collection.AddAssetCreator(std::make_unique<AssetLoaderImage>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSoundBank>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSoundPatch>(memory));
-        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMap>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapPvs>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderComWorld>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldSp>(memory));

src/ObjLoading/Game/T6/ObjLoaderT6.cpp

@@ -404,7 +404,6 @@ namespace T6
             collection.AddAssetCreator(CreateImageLoader(memory, searchPath));
             collection.AddAssetCreator(CreateSoundBankLoader(memory, searchPath));
             // collection.AddAssetCreator(std::make_unique<AssetLoaderSoundPatch>(memory));
-            // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMap>(memory));
             // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapPvs>(memory));
             // collection.AddAssetCreator(std::make_unique<AssetLoaderComWorld>(memory));
             // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldSp>(memory));

src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp

@@ -131,7 +131,7 @@ public:
             sizeof(SoundAssetBankEntry),
             sizeof(SoundAssetBankChecksum),
             0x40,
-            m_entries.size(),
+            static_cast<unsigned>(m_entries.size()),
             0,
             0,
             m_total_size,
@@ -157,9 +157,9 @@ public:
 
         SoundAssetBankEntry entry{
             sound.m_sound_id,
-            soundSize,
-            static_cast<size_t>(m_current_offset),
-            frameCount,
+            static_cast<unsigned>(soundSize),
+            static_cast<unsigned>(m_current_offset),
+            static_cast<unsigned>(frameCount),
             frameRateIndex,
             static_cast<unsigned char>(header.formatChunk.nChannels),
             sound.m_looping,
@@ -188,8 +188,8 @@ public:
             const auto frameRateIndex = INDEX_FOR_FRAMERATE[metaData.m_sample_rate];
             SoundAssetBankEntry entry{
                 sound.m_sound_id,
-                soundSize,
-                static_cast<size_t>(m_current_offset),
+                static_cast<unsigned>(soundSize),
+                static_cast<unsigned>(m_current_offset),
                 static_cast<unsigned>(metaData.m_total_samples),
                 frameRateIndex,
                 metaData.m_number_of_channels,

src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataStructScopeSequences.cpp

@@ -240,7 +240,7 @@ namespace sdd::struct_scope_sequences
             if (state->m_current_struct_is_root && state->m_current_struct->m_properties.empty())
                 state->m_current_struct_padding_offset -= 64u;
 
-            state->m_current_struct->m_size_in_byte = utils::Align(state->m_current_struct_padding_offset, 8u) / 8;
+            state->m_current_struct->m_size_in_byte = utils::Align(state->m_current_struct_padding_offset, 8uz) / 8;
             state->m_current_struct_padding_offset = 0u;
             state->m_current_struct_is_root = false;
             state->m_current_struct = nullptr;

src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.cpp

@@ -74,7 +74,7 @@ class StructuredDataDefSizeCalculatorInternal
 
         m_type_stack.emplace_back(CommonStructuredDataTypeCategory::STRUCT, index);
 
-        auto currentOffset = 0u;
+        auto currentOffset = 0uz;
         for (auto& property : _struct.m_properties)
         {
             CalculateForType(property.m_type);
@@ -85,7 +85,7 @@ class StructuredDataDefSizeCalculatorInternal
 
             currentOffset += property.m_type.GetSizeInBits(m_def);
         }
-        currentOffset = utils::Align(currentOffset, 8u);
+        currentOffset = utils::Align(currentOffset, 8uz);
         _struct.m_size_in_byte += currentOffset / 8;
 
         m_struct_calculated[index] = true;

src/ObjLoading/XModel/Gltf/GltfLoader.cpp

@@ -286,7 +286,7 @@ namespace
 
                 common.m_vertices.emplace_back(vertex);
 
-                XModelVertexBoneWeights vertexWeights{common.m_bone_weight_data.weights.size(), 0u};
+                XModelVertexBoneWeights vertexWeights{.weightOffset = static_cast<unsigned>(common.m_bone_weight_data.weights.size()), .weightCount = 0u};
                 for (auto i = 0u; i < std::extent_v<decltype(joints)>; i++)
                 {
                     if (std::abs(weights[i]) < std::numeric_limits<float>::epsilon())
@@ -315,12 +315,12 @@ namespace
                 throw GltfLoadException("Requires primitives attribute POSITION");
 
             AccessorsForVertex accessorsForVertex{
-                *primitives.attributes.POSITION,
-                primitives.attributes.NORMAL,
-                primitives.attributes.COLOR_0,
-                primitives.attributes.TEXCOORD_0,
-                primitives.attributes.JOINTS_0,
-                primitives.attributes.WEIGHTS_0,
+                .positionAccessor = *primitives.attributes.POSITION,
+                .normalAccessor = primitives.attributes.NORMAL,
+                .colorAccessor = primitives.attributes.COLOR_0,
+                .uvAccessor = primitives.attributes.TEXCOORD_0,
+                .jointsAccessor = primitives.attributes.JOINTS_0,
+                .weightsAccessor = primitives.attributes.WEIGHTS_0,
             };
 
             const auto existingVertices = m_vertex_offset_for_accessors.find(accessorsForVertex);
@@ -328,7 +328,7 @@ namespace
                 existingVertices == m_vertex_offset_for_accessors.end() ? CreateVertices(common, accessorsForVertex) : existingVertices->second;
 
             // clang-format off
-            auto* indexAccessor = GetAccessorForIndex(
+            const auto* indexAccessor = GetAccessorForIndex(
                 "INDICES",
                 primitives.indices, 
                 {JsonAccessorType::SCALAR}, 
@@ -552,7 +552,7 @@ namespace
             common.m_bones.resize(skinBoneOffset + skin.joints.size());
 
             constexpr float defaultTranslation[3]{0.0f, 0.0f, 0.0f};
-            constexpr XModelQuaternion defaultRotation{0.0f, 0.0f, 0.0f, 1.0f};
+            constexpr XModelQuaternion defaultRotation{.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f};
             constexpr float defaultScale[3]{1.0f, 1.0f, 1.0f};
 
             return ConvertJoint(jRoot, skin, common, skinBoneOffset, rootNode, std::nullopt, defaultTranslation, defaultRotation, defaultScale);

src/ObjLoading/XModel/LoaderXModel.cpp.template

@@ -22,7 +22,6 @@
 #include JSON_HEADER
 
 #include "Asset/AssetRegistration.h"
-#include "ObjLoading.h"
 #include "Utils/QuatInt16.h"
 #include "Utils/StringUtils.h"
 #include "XModel/Gltf/GltfBinInput.h"
@@ -44,7 +43,6 @@
 #include <format>
 #include <iostream>
 #include <numeric>
-#include <set>
 #include <vector>
 
 using namespace GAME;
@@ -146,17 +144,17 @@ namespace
             assert(common.m_vertex_bone_weights.size() == common.m_vertices.size());
 
             XModelBone rootBone{
-                "root",
-                std::nullopt,
-                {1.0f, 1.0f, 1.0f},
-                {0.0f, 0.0f, 0.0f},
-                {0.0f, 0.0f, 0.0f},
-                {0.0f, 0.0f, 0.0f, 1.0f},
-                {0.0f, 0.0f, 0.0f, 1.0f},
+                .name = "root",
+                .parentIndex = std::nullopt,
+                .scale = {1.0f, 1.0f, 1.0f},
+                .globalOffset = {0.0f, 0.0f, 0.0f},
+                .localOffset = {0.0f, 0.0f, 0.0f},
+                .globalRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f},
+                .localRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f},
             };
             common.m_bones.emplace_back(rootBone);
-
-            XModelBoneWeight rootWeight{0, 1.0f};
+            
+            XModelBoneWeight rootWeight{.boneIndex = 0, .weight = 1.0f};
             common.m_bone_weight_data.weights.emplace_back(rootWeight);
 
             for (auto& vertexBoneWeights : common.m_vertex_bone_weights)
@@ -401,7 +399,7 @@ namespace
         }
 
         static std::vector<std::optional<size_t>>
-            GetRigidBoneIndicesForTris(const std::vector<size_t>& vertexIndices, XSurface& surface, const XModelCommon& common)
+            GetRigidBoneIndicesForTris(const std::vector<size_t>& vertexIndices, const XSurface& surface, const XModelCommon& common)
         {
             std::vector<std::optional<size_t>> rigidBoneIndexForTri;
             rigidBoneIndexForTri.reserve(surface.triCount);
@@ -422,7 +420,7 @@ namespace
             return rigidBoneIndexForTri;
         }
 
-        static void ReorderRigidTrisByBoneIndex(const std::vector<size_t>& vertexIndices, XSurface& surface, const XModelCommon& common)
+        static void ReorderRigidTrisByBoneIndex(const std::vector<size_t>& vertexIndices, const XSurface& surface, const XModelCommon& common)
         {
             const auto rigidBoneIndexForTri = GetRigidBoneIndicesForTris(vertexIndices, surface, common);
 
@@ -456,17 +454,17 @@ namespace
             surface.partBits[partBitsIndex] |= 1 << shiftValue;
         }
 
-        void CreateVertListData(XSurface& surface, const std::vector<size_t>& vertexIndices, const XModelCommon& common) const
+        void CreateVertListData(XSurface& surface, const std::vector<size_t>& xmodelToCommonVertexIndexLookup, const XModelCommon& common) const
         {
-            ReorderRigidTrisByBoneIndex(vertexIndices, surface, common);
-            const auto rigidBoneIndexForTri = GetRigidBoneIndicesForTris(vertexIndices, surface, common);
+            ReorderRigidTrisByBoneIndex(xmodelToCommonVertexIndexLookup, surface, common);
+            const auto rigidBoneIndexForTri = GetRigidBoneIndicesForTris(xmodelToCommonVertexIndexLookup, surface, common);
 
             std::vector<XRigidVertList> vertLists;
 
             auto currentVertexTail = 0u;
             auto currentTriTail = 0u;
 
-            const auto vertexCount = vertexIndices.size();
+            const auto vertexCount = xmodelToCommonVertexIndexLookup.size();
             const auto triCount = static_cast<size_t>(surface.triCount);
             const auto boneCount = common.m_bones.size();
             for (auto boneIndex = 0u; boneIndex < boneCount; boneIndex++)
@@ -475,7 +473,7 @@ namespace
                 boneVertList.boneOffset = static_cast<uint16_t>(boneIndex * sizeof(DObjSkelMat));
 
                 auto currentVertexHead = currentVertexTail;
-                while (currentVertexHead < vertexCount && GetRigidBoneForVertex(currentVertexHead, common) == boneIndex)
+                while (currentVertexHead < vertexCount && GetRigidBoneForVertex(xmodelToCommonVertexIndexLookup[currentVertexHead], common) == boneIndex)
                     currentVertexHead++;
 
                 auto currentTriHead = currentTriTail;
@@ -512,7 +510,7 @@ namespace
             // TODO
         }
 
-        static void ReorderVerticesByWeightCount(std::vector<size_t>& vertexIndices, XSurface& surface, const XModelCommon& common)
+        static void ReorderVerticesByWeightCount(std::vector<size_t>& vertexIndices, const XSurface& surface, const XModelCommon& common)
         {
             if (common.m_bone_weight_data.weights.empty())
                 return;
@@ -541,13 +539,21 @@ namespace
                                   return false;
                               });
 
+            std::vector<XSurfaceTri> preSortTris(surface.triCount);
+            std::memcpy(preSortTris.data(), surface.triIndices, sizeof(XSurfaceTri) * surface.triCount);
+
+            std::vector<size_t> reverseLookup(reorderLookup.size());
+            for (auto i = 0u; i < reverseLookup.size(); i++)
+                reverseLookup[reorderLookup[i]] = i;
+
             for (auto triIndex = 0u; triIndex < surface.triCount; triIndex++)
             {
+                const auto& preSortTriIndices = preSortTris[triIndex];
                 auto& triIndices = surface.triIndices[triIndex];
 
-                triIndices.i[0] = static_cast<uint16_t>(reorderLookup[triIndices.i[0]]);
-                triIndices.i[1] = static_cast<uint16_t>(reorderLookup[triIndices.i[1]]);
-                triIndices.i[2] = static_cast<uint16_t>(reorderLookup[triIndices.i[2]]);
+                triIndices.i[0] = static_cast<uint16_t>(reverseLookup[preSortTriIndices.i[0]]);
+                triIndices.i[1] = static_cast<uint16_t>(reverseLookup[preSortTriIndices.i[1]]);
+                triIndices.i[2] = static_cast<uint16_t>(reverseLookup[preSortTriIndices.i[2]]);
             }
 
             for (auto& entry : reorderLookup)
@@ -572,6 +578,7 @@ namespace
             surface.triCount = static_cast<uint16_t>(commonObject.m_faces.size());
             surface.triIndices = m_memory.Alloc<XSurfaceTri>(surface.triCount);
 
+            xmodelToCommonVertexIndexLookup.reserve(static_cast<size_t>(surface.triCount) * std::extent_v<decltype(XModelFace::vertexIndex)>);
             for (auto faceIndex = 0u; faceIndex < surface.triCount; faceIndex++)
             {
                 const auto& face = commonObject.m_faces[faceIndex];
@@ -594,8 +601,6 @@ namespace
                 }
             }
 
-            ReorderVerticesByWeightCount(xmodelToCommonVertexIndexLookup, surface, common);
-
             constexpr auto maxVertices = std::numeric_limits<decltype(XSurface::vertCount)>::max();
             if (vertexOffset + xmodelToCommonVertexIndexLookup.size() > maxVertices)
             {
@@ -603,6 +608,8 @@ namespace
                 return false;
             }
 
+            ReorderVerticesByWeightCount(xmodelToCommonVertexIndexLookup, surface, common);
+
             surface.baseVertIndex = static_cast<uint16_t>(vertexOffset);
             surface.vertCount = static_cast<uint16_t>(xmodelToCommonVertexIndexLookup.size());
             surface.verts0 = m_memory.Alloc<GfxPackedVertex>(surface.vertCount);

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp

@@ -284,7 +284,7 @@ namespace
                     const auto& vertList = surface.vertList[vertListIndex];
                     const auto boneWeightOffset = weightOffset;
 
-                    weightCollection.weights[weightOffset++] = XModelBoneWeight{vertList.boneOffset / sizeof(DObjSkelMat), 1.0f};
+                    weightCollection.weights[weightOffset++] = XModelBoneWeight{static_cast<unsigned>(vertList.boneOffset / sizeof(DObjSkelMat)), 1.0f};
 
                     for (auto vertListVertexOffset = 0u; vertListVertexOffset < vertList.vertCount; vertListVertexOffset++)
                     {
@@ -301,7 +301,7 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[0]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
                     weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex0, 1.0f};
 
                     vertsBlendOffset += 1;
@@ -313,8 +313,8 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[1]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
                     const auto boneWeight0 = 1.0f - boneWeight1;
 
@@ -330,10 +330,10 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[2]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
-                    const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
                     const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]);
                     const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2;
 
@@ -350,12 +350,12 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[3]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
-                    const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
                     const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]);
-                    const auto boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat);
                     const auto boneWeight3 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 6]);
                     const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2 - boneWeight3;
 

src/ObjWriting/Game/IW3/ObjWriterIW3.cpp

@@ -34,7 +34,7 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     // DUMP_ASSET_POOL(AssetDumpersnd_alias_list_t, m_sound, ASSET_TYPE_SOUND)
     // DUMP_ASSET_POOL(AssetDumperSndCurve, m_sound_curve, ASSET_TYPE_SOUND_CURVE)
     DUMP_ASSET_POOL(AssetDumperLoadedSound, m_loaded_sound, ASSET_TYPE_LOADED_SOUND)
-    // DUMP_ASSET_POOL(AssetDumperclipMap_t, m_clip_map, ASSET_TYPE_CLIPMAP)
+    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP_PVS)
     // DUMP_ASSET_POOL(AssetDumperComWorld, m_com_world, ASSET_TYPE_COMWORLD)
     // DUMP_ASSET_POOL(AssetDumperGameWorldSp, m_game_world_sp, ASSET_TYPE_GAMEWORLD_SP)
     // DUMP_ASSET_POOL(AssetDumperGameWorldMp, m_game_world_mp, ASSET_TYPE_GAMEWORLD_MP)

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStructuredDataDefSet.cpp

@@ -37,22 +37,22 @@ CommonStructuredDataType AssetDumperStructuredDataDefSet::ConvertType(const Comm
     case DATA_ENUM:
         assert(!def->m_enums.empty());
         out.m_category = CommonStructuredDataTypeCategory::ENUM;
-        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.enumIndex), def->m_enums.size() - 1u), 0u);
+        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.enumIndex), def->m_enums.size() - 1uz), 0uz);
         break;
     case DATA_STRUCT:
         assert(!def->m_structs.empty());
         out.m_category = CommonStructuredDataTypeCategory::STRUCT;
-        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.structIndex), def->m_structs.size() - 1u), 0u);
+        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.structIndex), def->m_structs.size() - 1uz), 0uz);
         break;
     case DATA_INDEXED_ARRAY:
         assert(!def->m_indexed_arrays.empty());
         out.m_category = CommonStructuredDataTypeCategory::INDEXED_ARRAY;
-        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.indexedArrayIndex), def->m_indexed_arrays.size() - 1u), 0u);
+        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.indexedArrayIndex), def->m_indexed_arrays.size() - 1uz), 0uz);
         break;
     case DATA_ENUM_ARRAY:
         assert(!def->m_enumed_arrays.empty());
         out.m_category = CommonStructuredDataTypeCategory::ENUM_ARRAY;
-        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.enumedArrayIndex), def->m_enumed_arrays.size() - 1u), 0u);
+        out.m_info.type_index = std::max(std::min(static_cast<size_t>(in.u.enumedArrayIndex), def->m_enumed_arrays.size() - 1uz), 0uz);
         break;
     case DATA_COUNT:
     default:
@@ -138,7 +138,7 @@ void AssetDumperStructuredDataDefSet::ConvertEnumedArray(const CommonStructuredD
     assert(!def->m_enums.empty());
     out->m_element_size_in_bits = in->elementType.type == DATA_BOOL ? 1 : in->elementSize * 8;
     out->m_array_type = ConvertType(def, in->elementType);
-    out->m_enum_index = std::max(std::min(static_cast<size_t>(in->enumIndex), def->m_enums.size() - 1u), 0u);
+    out->m_enum_index = std::max(std::min(static_cast<size_t>(in->enumIndex), def->m_enums.size() - 1uz), 0uz);
 
     if (def->m_enums.empty())
     {

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp

@@ -267,7 +267,7 @@ namespace
                     const auto& vertList = surface.vertList[vertListIndex];
                     const auto boneWeightOffset = weightOffset;
 
-                    weightCollection.weights[weightOffset++] = XModelBoneWeight{vertList.boneOffset / sizeof(DObjSkelMat), 1.0f};
+                    weightCollection.weights[weightOffset++] = XModelBoneWeight{static_cast<unsigned>(vertList.boneOffset / sizeof(DObjSkelMat)), 1.0f};
 
                     for (auto vertListVertexOffset = 0u; vertListVertexOffset < vertList.vertCount; vertListVertexOffset++)
                     {
@@ -284,7 +284,7 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[0]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
                     weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex0, 1.0f};
 
                     vertsBlendOffset += 1;
@@ -296,8 +296,8 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[1]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
                     const auto boneWeight0 = 1.0f - boneWeight1;
 
@@ -313,10 +313,10 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[2]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
-                    const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
                     const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]);
                     const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2;
 
@@ -333,12 +333,12 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[3]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
-                    const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
                     const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]);
-                    const auto boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat);
                     const auto boneWeight3 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 6]);
                     const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2 - boneWeight3;
 

src/ObjWriting/Game/IW4/ObjWriterIW4.cpp

@@ -50,7 +50,7 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     // DUMP_ASSET_POOL(AssetDumpersnd_alias_list_t, m_sound, ASSET_TYPE_SOUND)
     DUMP_ASSET_POOL(AssetDumperSndCurve, m_sound_curve, ASSET_TYPE_SOUND_CURVE)
     DUMP_ASSET_POOL(AssetDumperLoadedSound, m_loaded_sound, ASSET_TYPE_LOADED_SOUND)
-    // DUMP_ASSET_POOL(AssetDumperclipMap_t, m_clip_map, ASSET_TYPE_CLIPMAP_MP)
+    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP_MP)
     // DUMP_ASSET_POOL(AssetDumperComWorld, m_com_world, ASSET_TYPE_COMWORLD)
     // DUMP_ASSET_POOL(AssetDumperGameWorldSp, m_game_world_sp, ASSET_TYPE_GAMEWORLD_SP)
     // DUMP_ASSET_POOL(AssetDumperGameWorldMp, m_game_world_mp, ASSET_TYPE_GAMEWORLD_MP)

src/ObjWriting/Game/T5/ObjWriterT5.cpp

@@ -35,7 +35,7 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     DUMP_ASSET_POOL(AssetDumperGfxImage, m_image, ASSET_TYPE_IMAGE)
     // DUMP_ASSET_POOL(AssetDumperSndBank, m_sound_bank, ASSET_TYPE_SOUND)
     // DUMP_ASSET_POOL(AssetDumperSndPatch, m_sound_patch, ASSET_TYPE_SOUND_PATCH)
-    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP)
+    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP_PVS)
     // DUMP_ASSET_POOL(AssetDumperComWorld, m_com_world, ASSET_TYPE_COMWORLD)
     // DUMP_ASSET_POOL(AssetDumperGameWorldSp, m_game_world_sp, ASSET_TYPE_GAMEWORLD_SP)
     // DUMP_ASSET_POOL(AssetDumperGameWorldMp, m_game_world_mp, ASSET_TYPE_GAMEWORLD_MP)

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMapEnts.cpp

@@ -0,0 +1,23 @@
+#include "AssetDumperMapEnts.h"
+
+#include <format>
+
+using namespace T6;
+
+bool AssetDumperMapEnts::ShouldDump(XAssetInfo<MapEnts>* asset)
+{
+    return true;
+}
+
+void AssetDumperMapEnts::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
+{
+    const auto* mapEnts = asset->Asset();
+
+    const auto mapEntsFile = context.OpenAssetFile(std::format("{}.ents", mapEnts->name));
+
+    if (!mapEntsFile)
+        return;
+
+    auto& stream = *mapEntsFile;
+    stream.write(mapEnts->entityString, mapEnts->numEntityChars - 1);
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMapEnts.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "Dumping/AbstractAssetDumper.h"
+#include "Game/T6/T6.h"
+
+namespace T6
+{
+    class AssetDumperMapEnts final : public AbstractAssetDumper<MapEnts>
+    {
+    protected:
+        bool ShouldDump(XAssetInfo<MapEnts>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset) override;
+    };
+} // namespace T6

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp

@@ -110,7 +110,7 @@ namespace
         "devraw/",
     };
 
-    constexpr size_t FRAME_RATE_FOR_INDEX[]{
+    constexpr unsigned FRAME_RATE_FOR_INDEX[]{
         8000,
         12000,
         16000,

src/ObjWriting/Game/T6/ObjWriterT6.cpp

@@ -4,6 +4,7 @@
 #include "AssetDumpers/AssetDumperGfxImage.h"
 #include "AssetDumpers/AssetDumperLeaderboardDef.h"
 #include "AssetDumpers/AssetDumperLocalizeEntry.h"
+#include "AssetDumpers/AssetDumperMapEnts.h"
 #include "AssetDumpers/AssetDumperMaterial.h"
 #include "AssetDumpers/AssetDumperPhysConstraints.h"
 #include "AssetDumpers/AssetDumperPhysPreset.h"
@@ -49,11 +50,11 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     DUMP_ASSET_POOL(AssetDumperGfxImage, m_image, ASSET_TYPE_IMAGE)
     DUMP_ASSET_POOL(AssetDumperSndBank, m_sound_bank, ASSET_TYPE_SOUND)
     // DUMP_ASSET_POOL(AssetDumperSndPatch, m_sound_patch, ASSET_TYPE_SOUND_PATCH)
-    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP)
+    // DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP_PVS)
     // DUMP_ASSET_POOL(AssetDumperComWorld, m_com_world, ASSET_TYPE_COMWORLD)
     // DUMP_ASSET_POOL(AssetDumperGameWorldSp, m_game_world_sp, ASSET_TYPE_GAMEWORLD_SP)
     // DUMP_ASSET_POOL(AssetDumperGameWorldMp, m_game_world_mp, ASSET_TYPE_GAMEWORLD_MP)
-    // DUMP_ASSET_POOL(AssetDumperMapEnts, m_map_ents, ASSET_TYPE_MAP_ENTS)
+    DUMP_ASSET_POOL(AssetDumperMapEnts, m_map_ents, ASSET_TYPE_MAP_ENTS)
     // DUMP_ASSET_POOL(AssetDumperGfxWorld, m_gfx_world, ASSET_TYPE_GFXWORLD)
     // DUMP_ASSET_POOL(AssetDumperGfxLightDef, m_gfx_light_def, ASSET_TYPE_LIGHT_DEF)
     // DUMP_ASSET_POOL(AssetDumperFont, m_font, ASSET_TYPE_FONT)

src/ObjWriting/Sound/WavWriter.cpp

@@ -27,7 +27,7 @@ void WavWriter::WritePcmHeader(const WavMetaData& metaData, const size_t dataLen
     };
     m_stream.write(reinterpret_cast<const char*>(&formatChunk), sizeof(formatChunk));
 
-    const WavChunkHeader dataChunkHeader{WAV_CHUNK_ID_DATA, dataLen};
+    const WavChunkHeader dataChunkHeader{WAV_CHUNK_ID_DATA, static_cast<unsigned>(dataLen)};
     m_stream.write(reinterpret_cast<const char*>(&dataChunkHeader), sizeof(dataChunkHeader));
 }
 

src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.cpp

@@ -139,7 +139,7 @@ void StructuredDataDefDumper::DumpType(const CommonStructuredDataDef& def,
 
 void StructuredDataDefDumper::DumpProperty(const CommonStructuredDataDef& def,
                                            const CommonStructuredDataStructProperty& property,
-                                           unsigned& currentOffsetInBit) const
+                                           size_t& currentOffsetInBit) const
 {
     std::string typeName;
     std::vector<std::string> arraySpecifiers;
@@ -205,11 +205,11 @@ void StructuredDataDefDumper::DumpStruct(const CommonStructuredDataDef& def, con
     IncIndent();
 
     auto currentOffsetInBit =
-        def.m_root_type.m_category == CommonStructuredDataTypeCategory::STRUCT && def.m_root_type.m_info.type_index == structIndex ? 64u : 0u;
+        def.m_root_type.m_category == CommonStructuredDataTypeCategory::STRUCT && def.m_root_type.m_info.type_index == structIndex ? 64uz : 0uz;
     for (const auto& property : _struct.m_properties)
         DumpProperty(def, property, currentOffsetInBit);
 
-    currentOffsetInBit = utils::Align(currentOffsetInBit, 8u);
+    currentOffsetInBit = utils::Align(currentOffsetInBit, 8uz);
     if ((currentOffsetInBit / 8) < _struct.m_size_in_byte)
     {
         Indent();

src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.h

@@ -17,7 +17,7 @@ class StructuredDataDefDumper : AbstractTextDumper
 
     void DumpEnum(const CommonStructuredDataEnum& _enum);
     void DumpType(const CommonStructuredDataDef& def, CommonStructuredDataType type, std::string& typeName, std::vector<std::string>& arraySpecifiers) const;
-    void DumpProperty(const CommonStructuredDataDef& def, const CommonStructuredDataStructProperty& property, unsigned& currentOffsetInBit) const;
+    void DumpProperty(const CommonStructuredDataDef& def, const CommonStructuredDataStructProperty& property, size_t& currentOffsetInBit) const;
     void DumpStruct(const CommonStructuredDataDef& def, const CommonStructuredDataStruct& _struct, size_t structIndex);
 
 public:

src/ObjWriting/XModel/XModelDumper.cpp.template

@@ -393,7 +393,8 @@ namespace
                     const auto& vertList = surface.vertList[vertListIndex];
                     const auto boneWeightOffset = weightOffset;
                     
-                    weightCollection.weights[weightOffset++] = XModelBoneWeight{.boneIndex = vertList.boneOffset / sizeof(DObjSkelMat), .weight = 1.0f};
+                    weightCollection.weights[weightOffset++] = 
+                        XModelBoneWeight{.boneIndex = static_cast<unsigned>(vertList.boneOffset / sizeof(DObjSkelMat)), .weight = 1.0f};
 
                     for (auto vertListVertexOffset = 0u; vertListVertexOffset < vertList.vertCount; vertListVertexOffset++)
                     {
@@ -410,7 +411,7 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[0]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
                     weightCollection.weights[weightOffset++] = XModelBoneWeight{.boneIndex = boneIndex0, .weight = 1.0f};
 
                     vertsBlendOffset += 1;
@@ -422,8 +423,8 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[1]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
                     const auto boneWeight0 = 1.0f - boneWeight1;
                     
@@ -439,10 +440,10 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[2]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
-                    const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
                     const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]);
                     const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2;
                     
@@ -459,12 +460,12 @@ namespace
                 for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[3]; vertIndex++)
                 {
                     const auto boneWeightOffset = weightOffset;
-                    const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
-                    const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat);
                     const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]);
-                    const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat);
                     const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]);
-                    const auto boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat);
+                    const unsigned boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat);
                     const auto boneWeight3 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 6]);
                     const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2 - boneWeight3;
                     
@@ -569,7 +570,7 @@ namespace
     void DumpXModelExportLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>* asset, const unsigned lod)
     {
         const auto* model = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".XMODEL_EXPORT"));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".xmodel_export"));
 
         if (!assetFile)
             return;
@@ -664,13 +665,13 @@ namespace
             switch (ObjWriting::Configuration.ModelOutputFormat)
             {
             case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT:
-                return ".XMODEL_EXPORT";
+                return ".xmodel_export";
             case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ:
-                return ".OBJ";
+                return ".obj";
             case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF:
-                return ".GLTF";
+                return ".gltf";
             case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB:
-                return ".GLB";
+                return ".glb";
             default:
                 assert(false);
                 return "";

src/Parser/Parsing/Impl/AbstractDirectiveStreamProxy.cpp

@@ -1,11 +1,11 @@
 #include "AbstractDirectiveStreamProxy.h"
 
-TokenPos AbstractDirectiveStreamProxy::CreatePos(const ParserLine& line, const unsigned position)
+TokenPos AbstractDirectiveStreamProxy::CreatePos(const ParserLine& line, const size_t position)
 {
     return TokenPos(*line.m_filename, line.m_line_number, static_cast<int>(position + 1));
 }
 
-bool AbstractDirectiveStreamProxy::SkipWhitespace(const ParserLine& line, unsigned& position)
+bool AbstractDirectiveStreamProxy::SkipWhitespace(const ParserLine& line, size_t& position)
 {
     while (true)
     {
@@ -21,7 +21,7 @@ bool AbstractDirectiveStreamProxy::SkipWhitespace(const ParserLine& line, unsign
     return true;
 }
 
-bool AbstractDirectiveStreamProxy::ExtractInteger(const ParserLine& line, unsigned& position, int& value)
+bool AbstractDirectiveStreamProxy::ExtractInteger(const ParserLine& line, size_t& position, int& value)
 {
     if (position >= line.m_line.size())
         return false;
@@ -40,7 +40,7 @@ bool AbstractDirectiveStreamProxy::ExtractInteger(const ParserLine& line, unsign
     return false;
 }
 
-bool AbstractDirectiveStreamProxy::ExtractIdentifier(const ParserLine& line, unsigned& position)
+bool AbstractDirectiveStreamProxy::ExtractIdentifier(const ParserLine& line, size_t& position)
 {
     auto firstChar = true;
     while (true)
@@ -60,7 +60,7 @@ bool AbstractDirectiveStreamProxy::ExtractIdentifier(const ParserLine& line, uns
     }
 }
 
-bool AbstractDirectiveStreamProxy::MatchCharacter(const ParserLine& line, unsigned& position, char c)
+bool AbstractDirectiveStreamProxy::MatchCharacter(const ParserLine& line, size_t& position, char c)
 {
     if (position < line.m_line.size() && line.m_line[position] == c)
     {
@@ -71,12 +71,12 @@ bool AbstractDirectiveStreamProxy::MatchCharacter(const ParserLine& line, unsign
     return false;
 }
 
-bool AbstractDirectiveStreamProxy::MatchNextCharacter(const ParserLine& line, unsigned& position, char c)
+bool AbstractDirectiveStreamProxy::MatchNextCharacter(const ParserLine& line, size_t& position, char c)
 {
     return SkipWhitespace(line, position) && MatchCharacter(line, position, c);
 }
 
-bool AbstractDirectiveStreamProxy::MatchString(const ParserLine& line, unsigned& position, const char* str, unsigned len)
+bool AbstractDirectiveStreamProxy::MatchString(const ParserLine& line, size_t& position, const char* str, size_t len)
 {
     if (line.m_line.compare(position, len, str) == 0)
     {
@@ -87,12 +87,12 @@ bool AbstractDirectiveStreamProxy::MatchString(const ParserLine& line, unsigned&
     return false;
 }
 
-bool AbstractDirectiveStreamProxy::MatchNextString(const ParserLine& line, unsigned& position, const char* str, unsigned len)
+bool AbstractDirectiveStreamProxy::MatchNextString(const ParserLine& line, size_t& position, const char* str, size_t len)
 {
     return SkipWhitespace(line, position) && MatchString(line, position, str, len);
 }
 
-bool AbstractDirectiveStreamProxy::FindDirective(const ParserLine& line, unsigned& directiveStartPosition, unsigned& directiveEndPos)
+bool AbstractDirectiveStreamProxy::FindDirective(const ParserLine& line, size_t& directiveStartPosition, size_t& directiveEndPos)
 {
     directiveStartPosition = 0;
     for (; directiveStartPosition < line.m_line.size(); directiveStartPosition++)

src/Parser/Parsing/Impl/AbstractDirectiveStreamProxy.h

@@ -3,20 +3,22 @@
 #include "Parsing/IParserLineStream.h"
 #include "Parsing/TokenPos.h"
 
+#include <cstddef>
+
 class AbstractDirectiveStreamProxy : public IParserLineStream
 {
 protected:
     AbstractDirectiveStreamProxy() = default;
 
-    static TokenPos CreatePos(const ParserLine& line, unsigned position);
+    static TokenPos CreatePos(const ParserLine& line, size_t position);
 
-    static bool SkipWhitespace(const ParserLine& line, unsigned& position);
-    static bool ExtractInteger(const ParserLine& line, unsigned& position, int& value);
-    static bool ExtractIdentifier(const ParserLine& line, unsigned& position);
-    static bool MatchCharacter(const ParserLine& line, unsigned& position, char c);
-    static bool MatchNextCharacter(const ParserLine& line, unsigned& position, char c);
-    static bool MatchString(const ParserLine& line, unsigned& position, const char* str, unsigned len);
-    static bool MatchNextString(const ParserLine& line, unsigned& position, const char* str, unsigned len);
+    static bool SkipWhitespace(const ParserLine& line, size_t& position);
+    static bool ExtractInteger(const ParserLine& line, size_t& position, int& value);
+    static bool ExtractIdentifier(const ParserLine& line, size_t& position);
+    static bool MatchCharacter(const ParserLine& line, size_t& position, char c);
+    static bool MatchNextCharacter(const ParserLine& line, size_t& position, char c);
+    static bool MatchString(const ParserLine& line, size_t& position, const char* str, size_t len);
+    static bool MatchNextString(const ParserLine& line, size_t& position, const char* str, size_t len);
 
-    static bool FindDirective(const ParserLine& line, unsigned& directiveStartPosition, unsigned& directiveEndPos);
+    static bool FindDirective(const ParserLine& line, size_t& directiveStartPosition, size_t& directiveEndPos);
 };

src/Parser/Parsing/Impl/DefinesStreamProxy.cpp

@@ -14,12 +14,12 @@
 
 namespace
 {
-    bool IsStringizeParameterForwardLookup(const std::string& value, unsigned pos)
+    bool IsStringizeParameterForwardLookup(const std::string& value, size_t pos)
     {
         return pos + 1 && (isalpha(value[pos + 1]) || value[pos + 1] == '_');
     }
 
-    bool IsTokenPastingOperatorForwardLookup(const std::string& value, unsigned pos)
+    bool IsTokenPastingOperatorForwardLookup(const std::string& value, size_t pos)
     {
         return pos + 1 < value.size() && value[pos + 1] == '#';
     }
@@ -32,7 +32,7 @@ DefinesStreamProxy::DefineParameterPosition::DefineParameterPosition()
 {
 }
 
-DefinesStreamProxy::DefineParameterPosition::DefineParameterPosition(const unsigned index, const unsigned position, const bool stringize)
+DefinesStreamProxy::DefineParameterPosition::DefineParameterPosition(const unsigned index, const size_t position, const bool stringize)
     : m_parameter_index(index),
       m_parameter_position(position),
       m_stringize(stringize)
@@ -175,7 +175,7 @@ int DefinesStreamProxy::GetLineEndEscapePos(const ParserLine& line)
     return -1;
 }
 
-void DefinesStreamProxy::ContinueDefine(const ParserLine& line, const unsigned currentPos)
+void DefinesStreamProxy::ContinueDefine(const ParserLine& line, const size_t currentPos)
 {
     const auto lineEndEscapePos = GetLineEndEscapePos(line);
     if (lineEndEscapePos < 0)
@@ -204,7 +204,7 @@ void DefinesStreamProxy::ContinueDefine(const ParserLine& line, const unsigned c
     }
 }
 
-void DefinesStreamProxy::ContinueParameters(const ParserLine& line, unsigned& currentPos)
+void DefinesStreamProxy::ContinueParameters(const ParserLine& line, size_t& currentPos)
 {
     const auto lineEndEscapePos = GetLineEndEscapePos(line);
     while (true)
@@ -241,7 +241,7 @@ void DefinesStreamProxy::ContinueParameters(const ParserLine& line, unsigned& cu
     }
 }
 
-void DefinesStreamProxy::MatchDefineParameters(const ParserLine& line, unsigned& currentPos)
+void DefinesStreamProxy::MatchDefineParameters(const ParserLine& line, size_t& currentPos)
 {
     m_current_define_parameters = std::vector<std::string>();
     if (line.m_line[currentPos] != '(')
@@ -253,7 +253,7 @@ void DefinesStreamProxy::MatchDefineParameters(const ParserLine& line, unsigned&
     ContinueParameters(line, currentPos);
 }
 
-bool DefinesStreamProxy::MatchDefineDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchDefineDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -284,7 +284,7 @@ bool DefinesStreamProxy::MatchDefineDirective(const ParserLine& line, const unsi
     return true;
 }
 
-bool DefinesStreamProxy::MatchUndefDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchUndefDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -323,7 +323,7 @@ std::unique_ptr<ISimpleExpression> DefinesStreamProxy::ParseExpression(std::shar
     return expressionInterpreter.Evaluate();
 }
 
-bool DefinesStreamProxy::MatchIfDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchIfDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -356,7 +356,7 @@ bool DefinesStreamProxy::MatchIfDirective(const ParserLine& line, const unsigned
     return true;
 }
 
-bool DefinesStreamProxy::MatchElIfDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchElIfDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -398,7 +398,7 @@ bool DefinesStreamProxy::MatchElIfDirective(const ParserLine& line, const unsign
     return true;
 }
 
-bool DefinesStreamProxy::MatchIfdefDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchIfdefDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -439,7 +439,7 @@ bool DefinesStreamProxy::MatchIfdefDirective(const ParserLine& line, const unsig
     return true;
 }
 
-bool DefinesStreamProxy::MatchElseDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchElseDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -460,7 +460,7 @@ bool DefinesStreamProxy::MatchElseDirective(const ParserLine& line, const unsign
     return true;
 }
 
-bool DefinesStreamProxy::MatchEndifDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool DefinesStreamProxy::MatchEndifDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto currentPos = directiveStartPosition;
 
@@ -486,8 +486,8 @@ bool DefinesStreamProxy::MatchEndifDirective(const ParserLine& line, const unsig
 
 bool DefinesStreamProxy::MatchDirectives(ParserLine& line)
 {
-    unsigned directiveStartPos;
-    unsigned directiveEndPos;
+    size_t directiveStartPos;
+    size_t directiveEndPos;
 
     if (!FindDirective(line, directiveStartPos, directiveEndPos))
         return false;
@@ -537,9 +537,9 @@ void DefinesStreamProxy::ExtractParametersFromMacroUsage(
     ContinueMacroParameters(line, linePos, state, input, inputPos);
 }
 
-bool DefinesStreamProxy::MatchDefinedExpression(const ParserLine& line, unsigned& pos, std::string& definitionName)
+bool DefinesStreamProxy::MatchDefinedExpression(const ParserLine& line, size_t& pos, std::string& definitionName)
 {
-    unsigned currentPos = pos;
+    auto currentPos = pos;
 
     if (!MatchNextCharacter(line, currentPos, '('))
         return false;
@@ -559,7 +559,7 @@ bool DefinesStreamProxy::MatchDefinedExpression(const ParserLine& line, unsigned
 
 void DefinesStreamProxy::ExpandDefinedExpressions(ParserLine& line) const
 {
-    auto currentPos = 0u;
+    auto currentPos = 0uz;
 
     while (true)
     {
@@ -1094,7 +1094,7 @@ ParserLine DefinesStreamProxy::NextLine()
     {
         if (m_in_define)
         {
-            unsigned currentPos = 0u;
+            auto currentPos = 0uz;
 
             if (m_parameter_state != ParameterState::NOT_IN_PARAMETERS)
             {

src/Parser/Parsing/Impl/DefinesStreamProxy.h

@@ -4,6 +4,7 @@
 #include "Parsing/IParserLineStream.h"
 #include "Parsing/Simple/Expression/ISimpleExpression.h"
 
+#include <cstddef>
 #include <map>
 #include <set>
 #include <sstream>
@@ -29,11 +30,11 @@ public:
     {
     public:
         unsigned m_parameter_index;
-        unsigned m_parameter_position;
+        size_t m_parameter_position;
         bool m_stringize;
 
         DefineParameterPosition();
-        DefineParameterPosition(unsigned index, unsigned position, bool stringize);
+        DefineParameterPosition(unsigned index, size_t position, bool stringize);
     };
 
     class Define
@@ -96,22 +97,22 @@ private:
     MacroParameterState m_multi_line_macro_parameters;
 
     static int GetLineEndEscapePos(const ParserLine& line);
-    void MatchDefineParameters(const ParserLine& line, unsigned& currentPos);
-    void ContinueDefine(const ParserLine& line, unsigned currentPos);
-    void ContinueParameters(const ParserLine& line, unsigned& currentPos);
-    _NODISCARD bool MatchDefineDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
-    _NODISCARD bool MatchUndefDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
-    _NODISCARD bool MatchIfDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
-    _NODISCARD bool MatchElIfDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
-    _NODISCARD bool MatchIfdefDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
-    _NODISCARD bool MatchElseDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
-    _NODISCARD bool MatchEndifDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
+    void MatchDefineParameters(const ParserLine& line, size_t& currentPos);
+    void ContinueDefine(const ParserLine& line, size_t currentPos);
+    void ContinueParameters(const ParserLine& line, size_t& currentPos);
+    _NODISCARD bool MatchDefineDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
+    _NODISCARD bool MatchUndefDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
+    _NODISCARD bool MatchIfDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
+    _NODISCARD bool MatchElIfDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
+    _NODISCARD bool MatchIfdefDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
+    _NODISCARD bool MatchElseDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
+    _NODISCARD bool MatchEndifDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
     _NODISCARD bool MatchDirectives(ParserLine& line);
 
     void ExtractParametersFromMacroUsage(const ParserLine& line, unsigned& linePos, MacroParameterState& state, const std::string& input, unsigned& inputPos);
     bool FindMacroForIdentifier(const std::string& input, unsigned wordStart, unsigned wordEnd, const Define*& value) const;
 
-    static bool MatchDefinedExpression(const ParserLine& line, unsigned& pos, std::string& definitionName);
+    static bool MatchDefinedExpression(const ParserLine& line, size_t& pos, std::string& definitionName);
     void ExpandDefinedExpressions(ParserLine& line) const;
 
     bool FindNextMacro(const std::string& input, unsigned& inputPos, unsigned& defineStart, const DefinesStreamProxy::Define*& define);

src/Parser/Parsing/Impl/IncludingStreamProxy.cpp

@@ -13,9 +13,9 @@ IncludingStreamProxy::IncludingStreamProxy(IParserLineStream* stream)
 }
 
 bool IncludingStreamProxy::ExtractIncludeFilename(const ParserLine& line,
-                                                  const unsigned includeDirectivePosition,
-                                                  unsigned& filenameStartPosition,
-                                                  unsigned& filenameEndPosition)
+                                                  const size_t includeDirectivePosition,
+                                                  size_t& filenameStartPosition,
+                                                  size_t& filenameEndPosition)
 {
     auto currentPos = includeDirectivePosition;
     bool isDoubleQuotes;
@@ -60,7 +60,7 @@ bool IncludingStreamProxy::ExtractIncludeFilename(const ParserLine& line,
     return false;
 }
 
-bool IncludingStreamProxy::MatchIncludeDirective(const ParserLine& line, const unsigned directiveStartPos, const unsigned directiveEndPos) const
+bool IncludingStreamProxy::MatchIncludeDirective(const ParserLine& line, const size_t directiveStartPos, const size_t directiveEndPos) const
 {
     auto currentPos = directiveStartPos;
 
@@ -70,7 +70,7 @@ bool IncludingStreamProxy::MatchIncludeDirective(const ParserLine& line, const u
         return false;
     }
 
-    unsigned filenameStart, filenameEnd;
+    size_t filenameStart, filenameEnd;
 
     if (!ExtractIncludeFilename(line, currentPos, filenameStart, filenameEnd))
         throw ParsingException(TokenPos(*line.m_filename, line.m_line_number, static_cast<int>(currentPos)), INCLUDE_QUOTES_ERROR);
@@ -86,7 +86,7 @@ bool IncludingStreamProxy::MatchIncludeDirective(const ParserLine& line, const u
     return true;
 }
 
-bool IncludingStreamProxy::MatchPragmaOnceDirective(const ParserLine& line, const unsigned directiveStartPos, const unsigned directiveEndPos)
+bool IncludingStreamProxy::MatchPragmaOnceDirective(const ParserLine& line, const size_t directiveStartPos, const size_t directiveEndPos)
 {
     auto currentPos = directiveStartPos;
 
@@ -116,7 +116,7 @@ bool IncludingStreamProxy::MatchPragmaOnceDirective(const ParserLine& line, cons
 
 bool IncludingStreamProxy::MatchDirectives(const ParserLine& line)
 {
-    unsigned directiveStartPos, directiveEndPos;
+    size_t directiveStartPos, directiveEndPos;
 
     if (!FindDirective(line, directiveStartPos, directiveEndPos))
         return false;

src/Parser/Parsing/Impl/IncludingStreamProxy.h

@@ -16,9 +16,9 @@ class IncludingStreamProxy final : public AbstractDirectiveStreamProxy
     std::set<std::string> m_included_files;
 
     _NODISCARD static bool
-        ExtractIncludeFilename(const ParserLine& line, unsigned includeDirectivePosition, unsigned& filenameStartPosition, unsigned& filenameEndPosition);
-    _NODISCARD bool MatchIncludeDirective(const ParserLine& line, unsigned directiveStartPos, unsigned directiveEndPos) const;
-    _NODISCARD bool MatchPragmaOnceDirective(const ParserLine& line, unsigned directiveStartPos, unsigned directiveEndPos);
+        ExtractIncludeFilename(const ParserLine& line, size_t includeDirectivePosition, size_t& filenameStartPosition, size_t& filenameEndPosition);
+    _NODISCARD bool MatchIncludeDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos) const;
+    _NODISCARD bool MatchPragmaOnceDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos);
     _NODISCARD bool MatchDirectives(const ParserLine& line);
 
 public:

src/Parser/Parsing/Impl/PackDefinitionStreamProxy.cpp

@@ -7,7 +7,7 @@ PackDefinitionStreamProxy::PackDefinitionStreamProxy(IParserLineStream* stream)
 {
 }
 
-bool PackDefinitionStreamProxy::MatchPackDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition)
+bool PackDefinitionStreamProxy::MatchPackDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition)
 {
     auto packValue = 0;
     auto currentPosition = directiveStartPosition;
@@ -60,7 +60,7 @@ bool PackDefinitionStreamProxy::MatchPackDirective(const ParserLine& line, const
 
 bool PackDefinitionStreamProxy::MatchDirectives(const ParserLine& line)
 {
-    unsigned directiveStartPos, directiveEndPos;
+    size_t directiveStartPos, directiveEndPos;
 
     if (!FindDirective(line, directiveStartPos, directiveEndPos))
         return false;

src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h

@@ -21,7 +21,7 @@ private:
     IParserLineStream* const m_stream;
     std::stack<int> m_current_pack;
 
-    _NODISCARD bool MatchPackDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition);
+    _NODISCARD bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
     _NODISCARD bool MatchDirectives(const ParserLine& line);
 
 public:

src/RawTemplater/Templating/SetDefineStreamProxy.cpp

@@ -15,7 +15,7 @@ void SetDefineStreamProxy::SetDefinesProxy(DefinesStreamProxy* definesProxy)
     m_defines_proxy = definesProxy;
 }
 
-bool SetDefineStreamProxy::MatchSetDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition) const
+bool SetDefineStreamProxy::MatchSetDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition) const
 {
     auto currentPosition = directiveStartPosition;
 
@@ -59,7 +59,7 @@ bool SetDefineStreamProxy::MatchSetDirective(const ParserLine& line, const unsig
 
 bool SetDefineStreamProxy::MatchDirectives(const ParserLine& line) const
 {
-    unsigned directiveStartPos, directiveEndPos;
+    size_t directiveStartPos, directiveEndPos;
 
     if (!FindDirective(line, directiveStartPos, directiveEndPos))
         return false;

src/RawTemplater/Templating/SetDefineStreamProxy.h

@@ -22,7 +22,7 @@ namespace templating
     private:
         static constexpr const char* SET_DIRECTIVE = "set";
 
-        _NODISCARD bool MatchSetDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition) const;
+        _NODISCARD bool MatchSetDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
         _NODISCARD bool MatchDirectives(const ParserLine& line) const;
 
         IParserLineStream* const m_stream;

src/RawTemplater/Templating/TemplatingStreamProxy.cpp

@@ -18,7 +18,7 @@ void TemplatingStreamProxy::SetDefinesProxy(DefinesStreamProxy* definesProxy)
     m_defines_proxy = definesProxy;
 }
 
-bool TemplatingStreamProxy::MatchSwitchDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition) const
+bool TemplatingStreamProxy::MatchSwitchDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition) const
 {
     auto currentPosition = directiveStartPosition;
 
@@ -43,7 +43,7 @@ bool TemplatingStreamProxy::MatchSwitchDirective(const ParserLine& line, const u
     return true;
 }
 
-bool TemplatingStreamProxy::MatchOptionsDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition) const
+bool TemplatingStreamProxy::MatchOptionsDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition) const
 {
     auto currentPosition = directiveStartPosition;
 
@@ -93,7 +93,7 @@ bool TemplatingStreamProxy::MatchOptionsDirective(const ParserLine& line, const
     return true;
 }
 
-bool TemplatingStreamProxy::MatchFilenameDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition) const
+bool TemplatingStreamProxy::MatchFilenameDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition) const
 {
     auto currentPosition = directiveStartPosition;
 
@@ -128,7 +128,7 @@ bool TemplatingStreamProxy::MatchFilenameDirective(const ParserLine& line, const
     return true;
 }
 
-bool TemplatingStreamProxy::MatchSkipDirective(const ParserLine& line, const unsigned directiveStartPosition, const unsigned directiveEndPosition) const
+bool TemplatingStreamProxy::MatchSkipDirective(const ParserLine& line, const size_t directiveStartPosition, const size_t directiveEndPosition) const
 {
     auto currentPosition = directiveStartPosition;
 
@@ -146,7 +146,7 @@ bool TemplatingStreamProxy::MatchSkipDirective(const ParserLine& line, const uns
 
 bool TemplatingStreamProxy::MatchDirectives(const ParserLine& line) const
 {
-    unsigned directiveStartPos, directiveEndPos;
+    size_t directiveStartPos, directiveEndPos;
 
     if (!FindDirective(line, directiveStartPos, directiveEndPos))
         return false;

src/RawTemplater/Templating/TemplatingStreamProxy.h

@@ -43,10 +43,10 @@ namespace templating
         static constexpr const char* FILENAME_DIRECTIVE = "filename";
         static constexpr const char* SKIP_DIRECTIVE = "skip";
 
-        _NODISCARD bool MatchSwitchDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition) const;
-        _NODISCARD bool MatchOptionsDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition) const;
-        _NODISCARD bool MatchFilenameDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition) const;
-        _NODISCARD bool MatchSkipDirective(const ParserLine& line, unsigned directiveStartPosition, unsigned directiveEndPosition) const;
+        _NODISCARD bool MatchSwitchDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
+        _NODISCARD bool MatchOptionsDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
+        _NODISCARD bool MatchFilenameDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
+        _NODISCARD bool MatchSkipDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
         _NODISCARD bool MatchDirectives(const ParserLine& line) const;
 
         IParserLineStream* const m_stream;

src/ZoneCommon/Game/IW3/GameAssetPoolIW3.cpp

@@ -10,10 +10,10 @@ using namespace IW3;
 namespace
 {
     constexpr const char* ASSET_TYPE_NAMES[]{
-        "xmodelpieces", "physpreset", "xanim",       "xmodel",      "material",         "techniqueset", "image",    "sound",    "soundcurve", "loadedsound",
-        "clipmap",      "clipmap",    "comworld",    "gameworldsp", "gameworldmp",      "mapents",      "gfxworld", "lightdef", "uimap",      "font",
-        "menulist",     "menu",       "localize",    "weapon",      "snddriverglobals", "fx",           "impactfx", "aitype",   "mptype",     "character",
-        "xmodelalias",  "rawfile",    "stringtable",
+        "xmodelpieces",   "physpreset", "xanim",       "xmodel",      "material",         "techniqueset", "image",    "sound",    "soundcurve", "loadedsound",
+        "clipmap_unused", "clipmap",    "comworld",    "gameworldsp", "gameworldmp",      "mapents",      "gfxworld", "lightdef", "uimap",      "font",
+        "menulist",       "menu",       "localize",    "weapon",      "snddriverglobals", "fx",           "impactfx", "aitype",   "mptype",     "character",
+        "xmodelalias",    "rawfile",    "stringtable",
     };
 }
 

src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp

@@ -10,12 +10,15 @@ using namespace IW4;
 namespace
 {
     constexpr const char* ASSET_TYPE_NAMES[]{
-        "physpreset", "physcollmap",  "xanim",        "xmodelsurfs", "xmodel",     "material",         "pixelshader", "vertexshader",
-        "vertexdecl", "techniqueset", "image",        "sound",       "soundcurve", "loadedsound",      "clipmap",     "clipmap",
-        "comworld",   "gameworldsp",  "gameworldmp",  "mapents",     "fxworld",    "gfxworld",         "lightdef",    "uimap",
-        "font",       "menulist",     "menu",         "localize",    "weapon",     "snddriverglobals", "fx",          "impactfx",
-        "aitype",     "mptype",       "character",    "xmodelalias", "rawfile",    "stringtable",      "leaderboard", "structureddatadef",
-        "tracer",     "vehicle",      "addonmapents",
+        "physpreset",   "physcollmap", "xanim",        "xmodelsurfs", "xmodel",
+        "material",     "pixelshader", "vertexshader", "vertexdecl",  "techniqueset",
+        "image",        "sound",       "soundcurve",   "loadedsound", "clipmap_unused",
+        "clipmap_used", "comworld",    "gameworldsp",  "gameworldmp", "mapents",
+        "fxworld",      "gfxworld",    "lightdef",     "uimap",       "font",
+        "menulist",     "menu",        "localize",     "weapon",      "snddriverglobals",
+        "fx",           "impactfx",    "aitype",       "mptype",      "character",
+        "xmodelalias",  "rawfile",     "stringtable",  "leaderboard", "structureddatadef",
+        "tracer",       "vehicle",     "addonmapents",
     };
 }
 

src/ZoneCommon/Game/T5/GameAssetPoolT5.cpp

@@ -10,12 +10,12 @@ using namespace T5;
 namespace
 {
     constexpr const char* ASSET_TYPE_NAMES[]{
-        "xmodelpieces", "physpreset",    "physconstraints", "destructibledef", "xanim",       "xmodel",        "material",
-        "techniqueset", "image",         "soundbank",       "soundpatch",      "clipmap",     "clipmap",       "comworld",
-        "gameworldsp",  "gameworldmp",   "mapents",         "gfxworld",        "gfxlightdef", "uimap",         "font",
-        "menulist",     "menu",          "localize",        "weapon",          "weapondef",   "weaponvariant", "snddriverglobals",
-        "fx",           "fximpacttable", "aitype",          "mptype",          "mpbody",      "mphead",        "character",
-        "xmodelalias",  "rawfile",       "stringtable",     "packindex",       "xglobals",    "ddl",           "glasses",
+        "xmodelpieces", "physpreset",    "physconstraints", "destructibledef", "xanim",          "xmodel",        "material",
+        "techniqueset", "image",         "soundbank",       "soundpatch",      "clipmap_unused", "clipmap",       "comworld",
+        "gameworldsp",  "gameworldmp",   "mapents",         "gfxworld",        "gfxlightdef",    "uimap",         "font",
+        "menulist",     "menu",          "localize",        "weapon",          "weapondef",      "weaponvariant", "snddriverglobals",
+        "fx",           "fximpacttable", "aitype",          "mptype",          "mpbody",         "mphead",        "character",
+        "xmodelalias",  "rawfile",       "stringtable",     "packindex",       "xglobals",       "ddl",           "glasses",
         "emblemset",
     };
 }

src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp

@@ -21,7 +21,7 @@ namespace
         "image",
         "soundbank",
         "soundpatch",
-        "clipmap",
+        "clipmap_unused",
         "clipmap",
         "comworld",
         "gameworldsp",

src/ZoneCommon/Zone/XChunk/AbstractSalsa20Processor.cpp

@@ -22,7 +22,7 @@ uint8_t* AbstractSalsa20Processor::GetHashBlock(const int streamNumber) const
 void AbstractSalsa20Processor::InitStreams(const std::string& zoneName, const uint8_t* salsa20Key, const size_t keySize) const
 {
     // Original buffer must have been 32 bytes because the zoneName can at most be 31 characters be long before being cut off
-    const auto zoneNameLength = std::min(zoneName.length(), 31u);
+    const auto zoneNameLength = std::min(zoneName.length(), 31uz);
 
     const size_t blockHashBufferSize = BLOCK_HASHES_COUNT * m_stream_count * SHA1_HASH_SIZE;
 

test/ObjCommonTestUtils/SearchPath/MockSearchPath.cpp

@@ -14,7 +14,7 @@ SearchPathOpenFile MockSearchPath::Open(const std::string& fileName)
     if (foundFileData == m_file_data_map.end())
         return {};
 
-    return {std::make_unique<std::istringstream>(foundFileData->second), foundFileData->second.size()};
+    return {std::make_unique<std::istringstream>(foundFileData->second), static_cast<int64_t>(foundFileData->second.size())};
 }
 
 const std::string& MockSearchPath::GetPath()

thirdparty/catch2

@@ -1 +1 @@
-Subproject commit 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a
+Subproject commit 4c8671cfbbf0019d3827305d4d1c82a74eeb029a

thirdparty/eigen

@@ -1 +1 @@
-Subproject commit abac563f5dac59b88e4f354e7b092c9cae3871fc
+Subproject commit 33f5f596143d0fce32316ec6fa4bd9f23b4dd9d2

thirdparty/json

@@ -1 +1 @@
-Subproject commit e72046ef9f07f461ec56bc904c5a732e96f8d803
+Subproject commit c67d538274502163b55e8fb54b5c27c17764722d

thirdparty/libtomcrypt

@@ -1 +1 @@
-Subproject commit 2e9f2b5e44dd498dba60e5175c6c7effa5ff3728
+Subproject commit a6b9aff7aab857fe1b491710a5c5b9e2be49cb08

thirdparty/libtommath

@@ -1 +1 @@
-Subproject commit 5809141a3a6ec1bf3443c927c02b955e19224016
+Subproject commit e823b0c34cea291bdb94d672731e1c1f08525557

thirdparty/zlib

@@ -1 +1 @@
-Subproject commit ef24c4c7502169f016dcd2a26923dbaf3216748c
+Subproject commit 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71