refactor: physpreset codestyle (#928)

* chore: adjust phys preset code to use similar code style

* fix: infinity friction for t6

* fix: t6 phys preset canFloat qboolean

* chore: move iw5 phys preset enum strings to enum strings header

* chore: add phys preset tests for all games

* chore: rename PhysPresetFields headers

src/ObjCommon/Game/IW5/InfoString/EnumStrings.h

@@ -1,9 +0,0 @@
-#pragma once
-
-namespace IW5
-{
-    inline const char* szPhysPresetScalingNames[]{
-        "linear",
-        "quadratic",
-    };
-} // namespace IW5

src/ObjCommon/Game/IW5/PhysPreset/PhysPresetFieldsIW5.h

@@ -23,4 +23,10 @@ namespace IW5
         {"tempDefaultToCylinder", offsetof(PhysPresetInfo, tempDefaultToCylinder), CSPFT_QBOOLEAN},
         {"perSurfaceSndAlias",    offsetof(PhysPresetInfo, perSurfaceSndAlias),    CSPFT_QBOOLEAN},
     };
-}
+
+    inline const char* szPhysPresetScalingNames[]{
+        "linear",
+        "quadratic",
+    };
+    static_assert(std::extent_v<decltype(szPhysPresetScalingNames)> == PHYSPRESET_SCALING_COUNT);
+} // namespace IW5

src/ObjCommon/Game/T5/ObjConstantsT5.h

@@ -11,5 +11,5 @@ namespace T5
     static constexpr auto GDF_FILENAME_PHYS_PRESET = "physpreset.gdf";
     static constexpr auto GDF_FILENAME_WEAPON = "weapon.gdf";
 
-    static constexpr float MAX_FRICTION = 1e+10;
+    static constexpr float PHYS_PRESET_MAX_FRICTION = 1e+10;
 } // namespace T5

src/ObjCommon/Game/T6/ObjConstantsT6.h

@@ -20,4 +20,6 @@ namespace T6
     static constexpr auto GDF_FILENAME_WEAPON_ATTACHMENT = "attachment.gdf";
     static constexpr auto GDF_FILENAME_WEAPON_ATTACHMENT_UNIQUE = "attachmentunique.gdf";
     static constexpr auto GDF_FILENAME_ZBARRIER = "zbarrier.gdf";
+
+    static constexpr float PHYS_PRESET_MAX_FRICTION = 1e+10;
 } // namespace T6

src/ObjCommon/Game/T6/PhysPreset/PhysPresetFieldsT6.h

@@ -12,7 +12,7 @@ namespace T6
         {"explosiveForceScale",  offsetof(PhysPresetInfo, explosiveForceScale),  CSPFT_FLOAT   },
         {"piecesSpreadFraction", offsetof(PhysPresetInfo, piecesSpreadFraction), CSPFT_FLOAT   },
         {"piecesUpwardVelocity", offsetof(PhysPresetInfo, piecesUpwardVelocity), CSPFT_FLOAT   },
-        {"canFloat",             offsetof(PhysPresetInfo, canFloat),             CSPFT_INT     },
+        {"canFloat",             offsetof(PhysPresetInfo, canFloat),             CSPFT_QBOOLEAN},
         {"gravityScale",         offsetof(PhysPresetInfo, gravityScale),         CSPFT_FLOAT   },
         {"massOffsetX",          offsetof(PhysPresetInfo, centerOfMassOffset.x), CSPFT_FLOAT   },
         {"massOffsetY",          offsetof(PhysPresetInfo, centerOfMassOffset.y), CSPFT_FLOAT   },

src/ObjLoading/Game/IW3/PhysPreset/InfoStringLoaderPhysPresetIW3.cpp

@@ -2,14 +2,10 @@
 
 #include "Game/IW3/IW3.h"
 #include "Game/IW3/InfoString/InfoStringToStructConverter.h"
-#include "Game/IW3/PhysPreset/PhysPresetFields.h"
+#include "Game/IW3/PhysPreset/PhysPresetFieldsIW3.h"
 #include "Utils/Logging/Log.h"
 
-#include <algorithm>
 #include <cassert>
-#include <cstring>
-#include <format>
-#include <iostream>
 #include <limits>
 
 using namespace IW3;
@@ -20,14 +16,14 @@ namespace
     {
     public:
         InfoStringToPhysPresetConverter(const InfoString& infoString,
-                                        void* structure,
+                                        PhysPresetInfo& physPreset,
                                         ZoneScriptStrings& zoneScriptStrings,
                                         MemoryManager& memory,
                                         AssetCreationContext& context,
-                                        GenericAssetRegistration& registration,
+                                        AssetRegistration<AssetPhysPreset>& registration,
                                         const cspField_t* fields,
-                                        size_t fieldCount)
+                                        const size_t fieldCount)
-            : InfoStringToStructConverter(infoString, structure, zoneScriptStrings, memory, context, registration, fields, fieldCount)
+            : InfoStringToStructConverter(infoString, &physPreset, zoneScriptStrings, memory, context, registration, fields, fieldCount)
         {
         }
 
@@ -68,22 +64,27 @@ namespace phys_preset
 
     AssetCreationResult InfoStringLoaderIW3::CreateAsset(const std::string& assetName, const InfoString& infoString, AssetCreationContext& context)
     {
-        PhysPresetInfo presetInfo;
-        std::memset(&presetInfo, 0, sizeof(presetInfo));
-
         auto* physPreset = m_memory.Alloc<PhysPreset>();
+        physPreset->name = m_memory.Dup(assetName.c_str());
+
         AssetRegistration<AssetPhysPreset> registration(assetName, physPreset);
 
-        InfoStringToPhysPresetConverter converter(
+        PhysPresetInfo physPresetInfo{};
-            infoString, &presetInfo, m_zone.m_script_strings, m_memory, context, registration, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
+        InfoStringToPhysPresetConverter converter(infoString,
+                                                  physPresetInfo,
+                                                  m_zone.m_script_strings,
+                                                  m_memory,
+                                                  context,
+                                                  registration,
+                                                  phys_preset_fields,
+                                                  std::extent_v<decltype(phys_preset_fields)>);
         if (!converter.Convert())
         {
             con::error("Failed to parse phys preset: \"{}\"", assetName);
             return AssetCreationResult::Failure();
         }
 
-        CopyFromPhysPresetInfo(presetInfo, *physPreset);
+        CopyFromPhysPresetInfo(physPresetInfo, *physPreset);
-        physPreset->name = m_memory.Dup(assetName.c_str());
 
         return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
     }

src/ObjLoading/Game/IW4/PhysPreset/InfoStringLoaderPhysPresetIW4.cpp

@@ -2,14 +2,10 @@
 
 #include "Game/IW4/IW4.h"
 #include "Game/IW4/InfoString/InfoStringToStructConverter.h"
-#include "Game/IW4/PhysPreset/PhysPresetFields.h"
+#include "Game/IW4/PhysPreset/PhysPresetFieldsIW4.h"
 #include "Utils/Logging/Log.h"
 
-#include <algorithm>
 #include <cassert>
-#include <cstring>
-#include <format>
-#include <iostream>
 #include <limits>
 
 using namespace IW4;
@@ -20,14 +16,14 @@ namespace
     {
     public:
         InfoStringToPhysPresetConverter(const InfoString& infoString,
-                                        void* structure,
+                                        PhysPresetInfo& physPreset,
                                         ZoneScriptStrings& zoneScriptStrings,
                                         MemoryManager& memory,
                                         AssetCreationContext& context,
-                                        GenericAssetRegistration& registration,
+                                        AssetRegistration<AssetPhysPreset>& registration,
                                         const cspField_t* fields,
-                                        size_t fieldCount)
+                                        const size_t fieldCount)
-            : InfoStringToStructConverter(infoString, structure, zoneScriptStrings, memory, context, registration, fields, fieldCount)
+            : InfoStringToStructConverter(infoString, &physPreset, zoneScriptStrings, memory, context, registration, fields, fieldCount)
         {
         }
 
@@ -69,22 +65,27 @@ namespace phys_preset
 
     AssetCreationResult InfoStringLoaderIW4::CreateAsset(const std::string& assetName, const InfoString& infoString, AssetCreationContext& context)
     {
-        PhysPresetInfo presetInfo;
-        std::memset(&presetInfo, 0, sizeof(presetInfo));
-
         auto* physPreset = m_memory.Alloc<PhysPreset>();
+        physPreset->name = m_memory.Dup(assetName.c_str());
+
         AssetRegistration<AssetPhysPreset> registration(assetName, physPreset);
 
-        InfoStringToPhysPresetConverter converter(
+        PhysPresetInfo physPresetInfo{};
-            infoString, &presetInfo, m_zone.m_script_strings, m_memory, context, registration, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
+        InfoStringToPhysPresetConverter converter(infoString,
+                                                  physPresetInfo,
+                                                  m_zone.m_script_strings,
+                                                  m_memory,
+                                                  context,
+                                                  registration,
+                                                  phys_preset_fields,
+                                                  std::extent_v<decltype(phys_preset_fields)>);
         if (!converter.Convert())
         {
             con::error("Failed to parse phys preset: \"{}\"", assetName);
             return AssetCreationResult::Failure();
         }
 
-        CopyFromPhysPresetInfo(presetInfo, *physPreset);
+        CopyFromPhysPresetInfo(physPresetInfo, *physPreset);
-        physPreset->name = m_memory.Dup(assetName.c_str());
 
         return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
     }

src/ObjLoading/Game/IW5/PhysPreset/InfoStringLoaderPhysPresetIW5.cpp

@@ -1,13 +1,11 @@
 #include "InfoStringLoaderPhysPresetIW5.h"
 
 #include "Game/IW5/IW5.h"
-#include "Game/IW5/InfoString/EnumStrings.h"
 #include "Game/IW5/InfoString/InfoStringToStructConverter.h"
-#include "Game/IW5/PhysPreset/PhysPresetFields.h"
+#include "Game/IW5/PhysPreset/PhysPresetFieldsIW5.h"
 #include "Utils/Logging/Log.h"
 
 #include <cassert>
-#include <cstring>
 #include <limits>
 
 using namespace IW5;
@@ -18,14 +16,14 @@ namespace
     {
     public:
         InfoStringToPhysPresetConverter(const InfoString& infoString,
-                                        void* structure,
+                                        PhysPresetInfo& physPreset,
                                         ZoneScriptStrings& zoneScriptStrings,
                                         MemoryManager& memory,
                                         AssetCreationContext& context,
-                                        GenericAssetRegistration& registration,
+                                        AssetRegistration<AssetPhysPreset>& registration,
                                         const cspField_t* fields,
-                                        size_t fieldCount)
+                                        const size_t fieldCount)
-            : InfoStringToStructConverter(infoString, structure, zoneScriptStrings, memory, context, registration, fields, fieldCount)
+            : InfoStringToStructConverter(infoString, &physPreset, zoneScriptStrings, memory, context, registration, fields, fieldCount)
         {
         }
 
@@ -80,22 +78,27 @@ namespace phys_preset
 
     AssetCreationResult InfoStringLoaderIW5::CreateAsset(const std::string& assetName, const InfoString& infoString, AssetCreationContext& context)
     {
-        PhysPresetInfo presetInfo;
-        std::memset(&presetInfo, 0, sizeof(presetInfo));
-
         auto* physPreset = m_memory.Alloc<PhysPreset>();
+        physPreset->name = m_memory.Dup(assetName.c_str());
+
         AssetRegistration<AssetPhysPreset> registration(assetName, physPreset);
 
-        InfoStringToPhysPresetConverter converter(
+        PhysPresetInfo physPresetInfo{};
-            infoString, &presetInfo, m_zone.m_script_strings, m_memory, context, registration, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
+        InfoStringToPhysPresetConverter converter(infoString,
+                                                  physPresetInfo,
+                                                  m_zone.m_script_strings,
+                                                  m_memory,
+                                                  context,
+                                                  registration,
+                                                  phys_preset_fields,
+                                                  std::extent_v<decltype(phys_preset_fields)>);
         if (!converter.Convert())
         {
             con::error("Failed to parse phys preset: \"{}\"", assetName);
             return AssetCreationResult::Failure();
         }
 
-        CopyFromPhysPresetInfo(presetInfo, *physPreset);
+        CopyFromPhysPresetInfo(physPresetInfo, *physPreset);
-        physPreset->name = m_memory.Dup(assetName.c_str());
 
         return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
     }

src/ObjLoading/Game/T4/PhysPreset/InfoStringLoaderPhysPresetT4.cpp

@@ -2,7 +2,7 @@
 
 #include "Game/T4/InfoString/InfoStringToStructConverter.h"
 #include "Game/T4/ObjConstantsT4.h"
-#include "Game/T4/PhysPreset/PhysPresetFields.h"
+#include "Game/T4/PhysPreset/PhysPresetFieldsT4.h"
 #include "Game/T4/T4.h"
 #include "Utils/Logging/Log.h"
 

src/ObjLoading/Game/T5/PhysPreset/InfoStringLoaderPhysPresetT5.cpp

@@ -2,16 +2,13 @@
 
 #include "Game/T5/InfoString/InfoStringToStructConverter.h"
 #include "Game/T5/ObjConstantsT5.h"
-#include "Game/T5/PhysPreset/PhysPresetFields.h"
+#include "Game/T5/PhysPreset/PhysPresetFieldsT5.h"
 #include "Game/T5/T5.h"
 #include "Utils/Logging/Log.h"
 
 #include <algorithm>
 #include <cassert>
-#include <cstring>
+#include <type_traits>
-#include <format>
-#include <iostream>
-#include <limits>
 
 using namespace T5;
 
@@ -46,7 +43,7 @@ namespace
         physPreset.bounce = physPresetInfo.bounce;
 
         if (physPresetInfo.isFrictionInfinity != 0)
-            physPreset.friction = MAX_FRICTION;
+            physPreset.friction = PHYS_PRESET_MAX_FRICTION;
         else
             physPreset.friction = physPresetInfo.friction;
 
@@ -77,8 +74,7 @@ namespace phys_preset
 
         AssetRegistration<AssetPhysPreset> registration(assetName, physPreset);
 
-        PhysPresetInfo physPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        memset(&physPresetInfo, 0, sizeof(physPresetInfo));
         InfoStringToPhysPresetConverter converter(infoString,
                                                   physPresetInfo,
                                                   m_zone.m_script_strings,

src/ObjLoading/Game/T6/PhysPreset/InfoStringLoaderPhysPresetT6.cpp

@@ -1,16 +1,14 @@
 #include "InfoStringLoaderPhysPresetT6.h"
 
 #include "Game/T6/InfoString/InfoStringToStructConverter.h"
-#include "Game/T6/PhysPreset/PhysPresetFields.h"
+#include "Game/T6/ObjConstantsT6.h"
+#include "Game/T6/PhysPreset/PhysPresetFieldsT6.h"
 #include "Game/T6/T6.h"
 #include "Utils/Logging/Log.h"
 
 #include <algorithm>
 #include <cassert>
-#include <cstring>
+#include <type_traits>
-#include <format>
-#include <iostream>
-#include <limits>
 
 using namespace T6;
 
@@ -45,7 +43,7 @@ namespace
         physPreset.bounce = physPresetInfo.bounce;
 
         if (physPresetInfo.isFrictionInfinity != 0)
-            physPreset.friction = std::numeric_limits<float>::infinity();
+            physPreset.friction = PHYS_PRESET_MAX_FRICTION;
         else
             physPreset.friction = physPresetInfo.friction;
 
@@ -76,8 +74,7 @@ namespace phys_preset
 
         AssetRegistration<AssetPhysPreset> registration(assetName, physPreset);
 
-        PhysPresetInfo physPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        memset(&physPresetInfo, 0, sizeof(physPresetInfo));
         InfoStringToPhysPresetConverter converter(infoString,
                                                   physPresetInfo,
                                                   m_zone.m_script_strings,

src/ObjWriting/Game/IW3/PhysPreset/PhysPresetInfoStringDumperIW3.cpp

@@ -2,7 +2,7 @@
 
 #include "Game/IW3/InfoString/InfoStringFromStructConverter.h"
 #include "Game/IW3/ObjConstantsIW3.h"
-#include "Game/IW3/PhysPreset/PhysPresetFields.h"
+#include "Game/IW3/PhysPreset/PhysPresetFieldsIW3.h"
 #include "PhysPreset/PhysPresetCommon.h"
 
 #include <cassert>
@@ -22,56 +22,42 @@ namespace
         }
 
     public:
-        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure,
+        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure, const cspField_t* fields, const size_t fieldCount)
-                                          const cspField_t* fields,
+            : InfoStringFromStructConverter(structure, fields, fieldCount)
-                                          const size_t fieldCount,
-                                          std::function<std::string(scr_string_t)> scriptStringValueCallback)
-            : InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback))
         {
         }
     };
 
-    void CopyToPhysPresetInfo(const PhysPreset* physPreset, PhysPresetInfo* physPresetInfo)
+    void CopyToPhysPresetInfo(const PhysPreset& physPreset, PhysPresetInfo& physPresetInfo)
     {
-        physPresetInfo->mass = physPreset->mass;
+        physPresetInfo.mass = physPreset.mass;
-        physPresetInfo->bounce = physPreset->bounce;
+        physPresetInfo.bounce = physPreset.bounce;
 
-        if (physPreset->friction >= std::numeric_limits<float>::max())
+        if (physPreset.friction >= std::numeric_limits<float>::max())
         {
-            physPresetInfo->isFrictionInfinity = 1;
+            physPresetInfo.isFrictionInfinity = 1;
-            physPresetInfo->friction = 0;
+            physPresetInfo.friction = 0;
         }
         else
         {
-            physPresetInfo->isFrictionInfinity = 0;
+            physPresetInfo.isFrictionInfinity = 0;
-            physPresetInfo->friction = physPreset->friction;
+            physPresetInfo.friction = physPreset.friction;
         }
 
-        physPresetInfo->bulletForceScale = physPreset->bulletForceScale;
+        physPresetInfo.bulletForceScale = physPreset.bulletForceScale;
-        physPresetInfo->explosiveForceScale = physPreset->explosiveForceScale;
+        physPresetInfo.explosiveForceScale = physPreset.explosiveForceScale;
-        physPresetInfo->sndAliasPrefix = physPreset->sndAliasPrefix;
+        physPresetInfo.sndAliasPrefix = physPreset.sndAliasPrefix;
-        physPresetInfo->piecesSpreadFraction = physPreset->piecesSpreadFraction;
+        physPresetInfo.piecesSpreadFraction = physPreset.piecesSpreadFraction;
-        physPresetInfo->piecesUpwardVelocity = physPreset->piecesUpwardVelocity;
+        physPresetInfo.piecesUpwardVelocity = physPreset.piecesUpwardVelocity;
-        physPresetInfo->tempDefaultToCylinder = physPreset->tempDefaultToCylinder ? 1 : 0;
+        physPresetInfo.tempDefaultToCylinder = physPreset.tempDefaultToCylinder ? 1 : 0;
     }
 
-    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
+    InfoString CreateInfoString(const PhysPreset& physPreset)
     {
-        auto* physPresetInfo = new PhysPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(physPreset, physPresetInfo);
-
-        InfoStringFromPhysPresetConverter converter(physPresetInfo,
-                                                    phys_preset_fields,
-                                                    std::extent_v<decltype(phys_preset_fields)>,
-                                                    [asset](const scr_string_t scrStr) -> std::string
-                                                    {
-                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
-                                                            return "";
-
-                                                        return asset.m_zone->m_script_strings[scrStr];
-                                                    });
 
+        InfoStringFromPhysPresetConverter converter(&physPresetInfo, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
         return converter.Convert();
     }
 } // namespace
@@ -83,7 +69,7 @@ namespace phys_preset
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
@@ -96,7 +82,7 @@ namespace phys_preset
                 return;
 
             auto& stream = *assetFile;
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_PHYS_PRESET);
             stream.write(stringValue.c_str(), stringValue.size());
         }

src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.cpp

@@ -2,12 +2,11 @@
 
 #include "Game/IW4/InfoString/InfoStringFromStructConverter.h"
 #include "Game/IW4/ObjConstantsIW4.h"
-#include "Game/IW4/PhysPreset/PhysPresetFields.h"
+#include "Game/IW4/PhysPreset/PhysPresetFieldsIW4.h"
 #include "PhysPreset/PhysPresetCommon.h"
 
-#include <algorithm>
 #include <cassert>
-#include <cmath>
+#include <limits>
 #include <type_traits>
 
 using namespace IW4;
@@ -23,57 +22,43 @@ namespace
         }
 
     public:
-        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure,
+        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure, const cspField_t* fields, const size_t fieldCount)
-                                          const cspField_t* fields,
+            : InfoStringFromStructConverter(structure, fields, fieldCount)
-                                          const size_t fieldCount,
-                                          std::function<std::string(scr_string_t)> scriptStringValueCallback)
-            : InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback))
         {
         }
     };
 
-    void CopyToPhysPresetInfo(const PhysPreset* physPreset, PhysPresetInfo* physPresetInfo)
+    void CopyToPhysPresetInfo(const PhysPreset& physPreset, PhysPresetInfo& physPresetInfo)
     {
-        physPresetInfo->mass = physPreset->mass;
+        physPresetInfo.mass = physPreset.mass;
-        physPresetInfo->bounce = physPreset->bounce;
+        physPresetInfo.bounce = physPreset.bounce;
 
-        if (physPreset->friction >= std::numeric_limits<float>::max())
+        if (physPreset.friction >= std::numeric_limits<float>::max())
         {
-            physPresetInfo->isFrictionInfinity = 1;
+            physPresetInfo.isFrictionInfinity = 1;
-            physPresetInfo->friction = 0;
+            physPresetInfo.friction = 0;
         }
         else
         {
-            physPresetInfo->isFrictionInfinity = 0;
+            physPresetInfo.isFrictionInfinity = 0;
-            physPresetInfo->friction = physPreset->friction;
+            physPresetInfo.friction = physPreset.friction;
         }
 
-        physPresetInfo->bulletForceScale = physPreset->bulletForceScale;
+        physPresetInfo.bulletForceScale = physPreset.bulletForceScale;
-        physPresetInfo->explosiveForceScale = physPreset->explosiveForceScale;
+        physPresetInfo.explosiveForceScale = physPreset.explosiveForceScale;
-        physPresetInfo->sndAliasPrefix = physPreset->sndAliasPrefix;
+        physPresetInfo.sndAliasPrefix = physPreset.sndAliasPrefix;
-        physPresetInfo->piecesSpreadFraction = physPreset->piecesSpreadFraction;
+        physPresetInfo.piecesSpreadFraction = physPreset.piecesSpreadFraction;
-        physPresetInfo->piecesUpwardVelocity = physPreset->piecesUpwardVelocity;
+        physPresetInfo.piecesUpwardVelocity = physPreset.piecesUpwardVelocity;
-        physPresetInfo->tempDefaultToCylinder = physPreset->tempDefaultToCylinder ? 1 : 0;
+        physPresetInfo.tempDefaultToCylinder = physPreset.tempDefaultToCylinder ? 1 : 0;
-        physPresetInfo->perSurfaceSndAlias = physPreset->perSurfaceSndAlias ? 1 : 0;
+        physPresetInfo.perSurfaceSndAlias = physPreset.perSurfaceSndAlias ? 1 : 0;
     }
 
-    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
+    InfoString CreateInfoString(const PhysPreset& physPreset)
     {
-        auto* physPresetInfo = new PhysPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(physPreset, physPresetInfo);
-
-        InfoStringFromPhysPresetConverter converter(physPresetInfo,
-                                                    phys_preset_fields,
-                                                    std::extent_v<decltype(phys_preset_fields)>,
-                                                    [asset](const scr_string_t scrStr) -> std::string
-                                                    {
-                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
-                                                            return "";
-
-                                                        return asset.m_zone->m_script_strings[scrStr];
-                                                    });
 
+        InfoStringFromPhysPresetConverter converter(&physPresetInfo, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
         return converter.Convert();
     }
 } // namespace
@@ -85,7 +70,7 @@ namespace phys_preset
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
@@ -98,7 +83,7 @@ namespace phys_preset
                 return;
 
             auto& stream = *assetFile;
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_PHYS_PRESET);
             stream.write(stringValue.c_str(), stringValue.size());
         }

src/ObjWriting/Game/IW5/PhysPreset/PhysPresetInfoStringDumperIW5.cpp

@@ -1,14 +1,12 @@
 #include "PhysPresetInfoStringDumperIW5.h"
 
-#include "Game/IW5/InfoString/EnumStrings.h"
 #include "Game/IW5/InfoString/InfoStringFromStructConverter.h"
 #include "Game/IW5/ObjConstantsIW5.h"
-#include "Game/IW5/PhysPreset/PhysPresetFields.h"
+#include "Game/IW5/PhysPreset/PhysPresetFieldsIW5.h"
 #include "PhysPreset/PhysPresetCommon.h"
 
-#include <algorithm>
 #include <cassert>
-#include <cmath>
+#include <limits>
 #include <type_traits>
 
 using namespace IW5;
@@ -34,63 +32,49 @@ namespace
         }
 
     public:
-        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure,
+        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure, const cspField_t* fields, const size_t fieldCount)
-                                          const cspField_t* fields,
+            : InfoStringFromStructConverter(structure, fields, fieldCount)
-                                          const size_t fieldCount,
-                                          std::function<std::string(scr_string_t)> scriptStringValueCallback)
-            : InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback))
         {
         }
     };
 
-    void CopyToPhysPresetInfo(const PhysPreset* physPreset, PhysPresetInfo* physPresetInfo)
+    void CopyToPhysPresetInfo(const PhysPreset& physPreset, PhysPresetInfo& physPresetInfo)
     {
-        physPresetInfo->mass = physPreset->mass;
+        physPresetInfo.mass = physPreset.mass;
-        physPresetInfo->bounce = physPreset->bounce;
+        physPresetInfo.bounce = physPreset.bounce;
 
-        if (physPreset->friction >= std::numeric_limits<float>::max())
+        if (physPreset.friction >= std::numeric_limits<float>::max())
         {
-            physPresetInfo->isFrictionInfinity = 1;
+            physPresetInfo.isFrictionInfinity = 1;
-            physPresetInfo->friction = 0;
+            physPresetInfo.friction = 0;
         }
         else
         {
-            physPresetInfo->isFrictionInfinity = 0;
+            physPresetInfo.isFrictionInfinity = 0;
-            physPresetInfo->friction = physPreset->friction;
+            physPresetInfo.friction = physPreset.friction;
         }
 
-        physPresetInfo->bulletForceScale = physPreset->bulletForceScale;
+        physPresetInfo.bulletForceScale = physPreset.bulletForceScale;
-        physPresetInfo->explosiveForceScale = physPreset->explosiveForceScale;
+        physPresetInfo.explosiveForceScale = physPreset.explosiveForceScale;
-        physPresetInfo->sndAliasPrefix = physPreset->sndAliasPrefix;
+        physPresetInfo.sndAliasPrefix = physPreset.sndAliasPrefix;
-        physPresetInfo->piecesSpreadFraction = physPreset->piecesSpreadFraction;
+        physPresetInfo.piecesSpreadFraction = physPreset.piecesSpreadFraction;
-        physPresetInfo->piecesUpwardVelocity = physPreset->piecesUpwardVelocity;
+        physPresetInfo.piecesUpwardVelocity = physPreset.piecesUpwardVelocity;
-        physPresetInfo->minMomentum = physPreset->minMomentum;
+        physPresetInfo.minMomentum = physPreset.minMomentum;
-        physPresetInfo->maxMomentum = physPreset->maxMomentum;
+        physPresetInfo.maxMomentum = physPreset.maxMomentum;
-        physPresetInfo->minPitch = physPreset->minPitch;
+        physPresetInfo.minPitch = physPreset.minPitch;
-        physPresetInfo->maxPitch = physPreset->maxPitch;
+        physPresetInfo.maxPitch = physPreset.maxPitch;
-        physPresetInfo->volumeType = physPreset->volumeType;
+        physPresetInfo.volumeType = physPreset.volumeType;
-        physPresetInfo->pitchType = physPreset->pitchType;
+        physPresetInfo.pitchType = physPreset.pitchType;
-        physPresetInfo->tempDefaultToCylinder = physPreset->tempDefaultToCylinder ? 1 : 0;
+        physPresetInfo.tempDefaultToCylinder = physPreset.tempDefaultToCylinder ? 1 : 0;
-        physPresetInfo->perSurfaceSndAlias = physPreset->perSurfaceSndAlias ? 1 : 0;
+        physPresetInfo.perSurfaceSndAlias = physPreset.perSurfaceSndAlias ? 1 : 0;
     }
 
-    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
+    InfoString CreateInfoString(const PhysPreset& physPreset)
     {
-        auto* physPresetInfo = new PhysPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(physPreset, physPresetInfo);
-
-        InfoStringFromPhysPresetConverter converter(physPresetInfo,
-                                                    phys_preset_fields,
-                                                    std::extent_v<decltype(phys_preset_fields)>,
-                                                    [asset](const scr_string_t scrStr) -> std::string
-                                                    {
-                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
-                                                            return "";
-
-                                                        return asset.m_zone->m_script_strings[scrStr];
-                                                    });
 
+        InfoStringFromPhysPresetConverter converter(&physPresetInfo, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
         return converter.Convert();
     }
 } // namespace
@@ -102,7 +86,7 @@ namespace phys_preset
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
@@ -115,7 +99,7 @@ namespace phys_preset
                 return;
 
             auto& stream = *assetFile;
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_PHYS_PRESET);
             stream.write(stringValue.c_str(), stringValue.size());
         }

src/ObjWriting/Game/T4/PhysPreset/PhysPresetInfoStringDumperT4.cpp

@@ -2,7 +2,7 @@
 
 #include "Game/T4/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T4/ObjConstantsT4.h"
-#include "Game/T4/PhysPreset/PhysPresetFields.h"
+#include "Game/T4/PhysPreset/PhysPresetFieldsT4.h"
 #include "PhysPreset/PhysPresetCommon.h"
 
 #include <algorithm>

src/ObjWriting/Game/T5/PhysPreset/PhysPresetInfoStringDumperT5.cpp

@@ -2,12 +2,11 @@
 
 #include "Game/T5/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T5/ObjConstantsT5.h"
-#include "Game/T5/PhysPreset/PhysPresetFields.h"
+#include "Game/T5/PhysPreset/PhysPresetFieldsT5.h"
 #include "PhysPreset/PhysPresetCommon.h"
 
 #include <algorithm>
 #include <cassert>
-#include <cmath>
 #include <type_traits>
 
 using namespace T5;
@@ -23,59 +22,45 @@ namespace
         }
 
     public:
-        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure,
+        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure, const cspField_t* fields, const size_t fieldCount)
-                                          const cspField_t* fields,
+            : InfoStringFromStructConverter(structure, fields, fieldCount)
-                                          const size_t fieldCount,
-                                          std::function<std::string(scr_string_t)> scriptStringValueCallback)
-            : InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback))
         {
         }
     };
 
-    void CopyToPhysPresetInfo(const PhysPreset* physPreset, PhysPresetInfo* physPresetInfo)
+    void CopyToPhysPresetInfo(const PhysPreset& physPreset, PhysPresetInfo& physPresetInfo)
     {
-        physPresetInfo->mass = std::clamp(physPreset->mass * 1000.0f, 1.0f, 2000.0f);
+        physPresetInfo.mass = std::clamp(physPreset.mass * 1000.0f, 1.0f, 2000.0f);
-        physPresetInfo->bounce = physPreset->bounce;
+        physPresetInfo.bounce = physPreset.bounce;
 
-        if (physPreset->friction >= MAX_FRICTION)
+        if (physPreset.friction >= PHYS_PRESET_MAX_FRICTION)
         {
-            physPresetInfo->isFrictionInfinity = 1;
+            physPresetInfo.isFrictionInfinity = 1;
-            physPresetInfo->friction = 0;
+            physPresetInfo.friction = 0;
         }
         else
         {
-            physPresetInfo->isFrictionInfinity = 0;
+            physPresetInfo.isFrictionInfinity = 0;
-            physPresetInfo->friction = physPreset->friction;
+            physPresetInfo.friction = physPreset.friction;
         }
 
-        physPresetInfo->bulletForceScale = physPreset->bulletForceScale;
+        physPresetInfo.bulletForceScale = physPreset.bulletForceScale;
-        physPresetInfo->explosiveForceScale = physPreset->explosiveForceScale;
+        physPresetInfo.explosiveForceScale = physPreset.explosiveForceScale;
-        physPresetInfo->piecesSpreadFraction = physPreset->piecesSpreadFraction;
+        physPresetInfo.piecesSpreadFraction = physPreset.piecesSpreadFraction;
-        physPresetInfo->piecesUpwardVelocity = physPreset->piecesUpwardVelocity;
+        physPresetInfo.piecesUpwardVelocity = physPreset.piecesUpwardVelocity;
-        physPresetInfo->canFloat = physPreset->canFloat;
+        physPresetInfo.canFloat = physPreset.canFloat;
-        physPresetInfo->gravityScale = std::clamp(physPreset->gravityScale, 0.01f, 10.0f);
+        physPresetInfo.gravityScale = std::clamp(physPreset.gravityScale, 0.01f, 10.0f);
-        physPresetInfo->centerOfMassOffset = physPreset->centerOfMassOffset;
+        physPresetInfo.centerOfMassOffset = physPreset.centerOfMassOffset;
-        physPresetInfo->buoyancyBoxMin = physPreset->buoyancyBoxMin;
+        physPresetInfo.buoyancyBoxMin = physPreset.buoyancyBoxMin;
-        physPresetInfo->buoyancyBoxMax = physPreset->buoyancyBoxMax;
+        physPresetInfo.buoyancyBoxMax = physPreset.buoyancyBoxMax;
     }
 
-    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
+    InfoString CreateInfoString(const PhysPreset& physPreset)
     {
-        auto* physPresetInfo = new PhysPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(physPreset, physPresetInfo);
-
-        InfoStringFromPhysPresetConverter converter(physPresetInfo,
-                                                    phys_preset_fields,
-                                                    std::extent_v<decltype(phys_preset_fields)>,
-                                                    [asset](const scr_string_t scrStr) -> std::string
-                                                    {
-                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
-                                                            return "";
-
-                                                        return asset.m_zone->m_script_strings[scrStr];
-                                                    });
 
+        InfoStringFromPhysPresetConverter converter(&physPresetInfo, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
         return converter.Convert();
     }
 } // namespace
@@ -87,7 +72,7 @@ namespace phys_preset
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
@@ -100,7 +85,7 @@ namespace phys_preset
                 return;
 
             auto& stream = *assetFile;
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_PHYS_PRESET);
             stream.write(stringValue.c_str(), stringValue.size());
         }

src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp

@@ -2,12 +2,11 @@
 
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/ObjConstantsT6.h"
-#include "Game/T6/PhysPreset/PhysPresetFields.h"
+#include "Game/T6/PhysPreset/PhysPresetFieldsT6.h"
 #include "PhysPreset/PhysPresetCommon.h"
 
 #include <algorithm>
 #include <cassert>
-#include <cmath>
 #include <type_traits>
 
 using namespace T6;
@@ -23,59 +22,45 @@ namespace
         }
 
     public:
-        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure,
+        InfoStringFromPhysPresetConverter(const PhysPresetInfo* structure, const cspField_t* fields, const size_t fieldCount)
-                                          const cspField_t* fields,
+            : InfoStringFromStructConverter(structure, fields, fieldCount)
-                                          const size_t fieldCount,
-                                          std::function<std::string(scr_string_t)> scriptStringValueCallback)
-            : InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback))
         {
         }
     };
 
-    void CopyToPhysPresetInfo(const PhysPreset* physPreset, PhysPresetInfo* physPresetInfo)
+    void CopyToPhysPresetInfo(const PhysPreset& physPreset, PhysPresetInfo& physPresetInfo)
     {
-        physPresetInfo->mass = std::clamp(physPreset->mass * 1000.0f, 1.0f, 2000.0f);
+        physPresetInfo.mass = std::clamp(physPreset.mass * 1000.0f, 1.0f, 2000.0f);
-        physPresetInfo->bounce = physPreset->bounce;
+        physPresetInfo.bounce = physPreset.bounce;
 
-        if (std::isinf(physPreset->friction))
+        if (physPreset.friction >= PHYS_PRESET_MAX_FRICTION)
         {
-            physPresetInfo->isFrictionInfinity = 1;
+            physPresetInfo.isFrictionInfinity = 1;
-            physPresetInfo->friction = 0;
+            physPresetInfo.friction = 0;
         }
         else
         {
-            physPresetInfo->isFrictionInfinity = 0;
+            physPresetInfo.isFrictionInfinity = 0;
-            physPresetInfo->friction = physPreset->friction;
+            physPresetInfo.friction = physPreset.friction;
         }
 
-        physPresetInfo->bulletForceScale = physPreset->bulletForceScale;
+        physPresetInfo.bulletForceScale = physPreset.bulletForceScale;
-        physPresetInfo->explosiveForceScale = physPreset->explosiveForceScale;
+        physPresetInfo.explosiveForceScale = physPreset.explosiveForceScale;
-        physPresetInfo->piecesSpreadFraction = physPreset->piecesSpreadFraction;
+        physPresetInfo.piecesSpreadFraction = physPreset.piecesSpreadFraction;
-        physPresetInfo->piecesUpwardVelocity = physPreset->piecesUpwardVelocity;
+        physPresetInfo.piecesUpwardVelocity = physPreset.piecesUpwardVelocity;
-        physPresetInfo->canFloat = physPreset->canFloat;
+        physPresetInfo.canFloat = physPreset.canFloat;
-        physPresetInfo->gravityScale = std::clamp(physPreset->gravityScale, 0.01f, 10.0f);
+        physPresetInfo.gravityScale = std::clamp(physPreset.gravityScale, 0.01f, 10.0f);
-        physPresetInfo->centerOfMassOffset = physPreset->centerOfMassOffset;
+        physPresetInfo.centerOfMassOffset = physPreset.centerOfMassOffset;
-        physPresetInfo->buoyancyBoxMin = physPreset->buoyancyBoxMin;
+        physPresetInfo.buoyancyBoxMin = physPreset.buoyancyBoxMin;
-        physPresetInfo->buoyancyBoxMax = physPreset->buoyancyBoxMax;
+        physPresetInfo.buoyancyBoxMax = physPreset.buoyancyBoxMax;
     }
 
-    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
+    InfoString CreateInfoString(const PhysPreset& physPreset)
     {
-        auto* physPresetInfo = new PhysPresetInfo;
+        PhysPresetInfo physPresetInfo{};
-        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(physPreset, physPresetInfo);
-
-        InfoStringFromPhysPresetConverter converter(physPresetInfo,
-                                                    phys_preset_fields,
-                                                    std::extent_v<decltype(phys_preset_fields)>,
-                                                    [asset](const scr_string_t scrStr) -> std::string
-                                                    {
-                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
-                                                            return "";
-
-                                                        return asset.m_zone->m_script_strings[scrStr];
-                                                    });
 
+        InfoStringFromPhysPresetConverter converter(&physPresetInfo, phys_preset_fields, std::extent_v<decltype(phys_preset_fields)>);
         return converter.Convert();
     }
 } // namespace
@@ -87,7 +72,7 @@ namespace phys_preset
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
@@ -100,7 +85,7 @@ namespace phys_preset
                 return;
 
             auto& stream = *assetFile;
-            const auto infoString = CreateInfoString(asset);
+            const auto infoString = CreateInfoString(*asset.Asset());
             const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_PHYS_PRESET);
             stream.write(stringValue.c_str(), stringValue.size());
         }

test/ObjLoadingTests/Game/IW3/PhysPreset/RawLoaderPhysPresetIW3Test.cpp

@@ -0,0 +1,46 @@
+#include "Game/IW3/PhysPreset/RawLoaderPhysPresetIW3.h"
+
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace IW3;
+using namespace Catch;
+
+namespace
+{
+    TEST_CASE("PhysPreset loader restores stock raw fields (IW3)", "[iw3][physpreset][system]")
+    {
+        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1.25\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
+                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
+                                         R"(\sndAliasPrefix\physics_metal)"
+                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
+                                         R"(\tempDefaultToCylinder\1)";
+
+        MockSearchPath loadingSearchPath;
+        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
+
+        Zone loadingZone("LoadingZone", 0, GameId::IW3, GamePlatform::PC);
+        AssetCreatorCollection creatorCollection(loadingZone);
+        IgnoredAssetLookup ignoredAssetLookup;
+        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
+        const auto loader = phys_preset::CreateRawLoaderIW3(loadingZone.Memory(), loadingSearchPath, loadingZone);
+        const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
+
+        REQUIRE(result.HasBeenSuccessful());
+        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
+        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
+
+        REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
+        REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
+        REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
+        REQUIRE(loadedPhysPreset->friction == Approx(std::numeric_limits<float>::max()));
+        REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
+        REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
+        REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
+        REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
+        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
+        REQUIRE(loadedPhysPreset->tempDefaultToCylinder == true);
+    }
+} // namespace

test/ObjLoadingTests/Game/IW4/PhysPreset/RawLoaderPhysPresetIW4Test.cpp

@@ -0,0 +1,47 @@
+#include "Game/IW4/PhysPreset/RawLoaderPhysPresetIW4.h"
+
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace IW4;
+using namespace Catch;
+
+namespace
+{
+    TEST_CASE("PhysPreset loader restores stock raw fields (IW4)", "[iw4][physpreset][system]")
+    {
+        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1.25\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
+                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
+                                         R"(\sndAliasPrefix\physics_metal)"
+                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
+                                         R"(\tempDefaultToCylinder\1\perSurfaceSndAlias\1)";
+
+        MockSearchPath loadingSearchPath;
+        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
+
+        Zone loadingZone("LoadingZone", 0, GameId::IW4, GamePlatform::PC);
+        AssetCreatorCollection creatorCollection(loadingZone);
+        IgnoredAssetLookup ignoredAssetLookup;
+        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
+        const auto loader = phys_preset::CreateRawLoaderIW4(loadingZone.Memory(), loadingSearchPath, loadingZone);
+        const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
+
+        REQUIRE(result.HasBeenSuccessful());
+        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
+        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
+
+        REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
+        REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
+        REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
+        REQUIRE(loadedPhysPreset->friction == Approx(std::numeric_limits<float>::max()));
+        REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
+        REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
+        REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
+        REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
+        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
+        REQUIRE(loadedPhysPreset->tempDefaultToCylinder == true);
+        REQUIRE(loadedPhysPreset->perSurfaceSndAlias == true);
+    }
+} // namespace

test/ObjLoadingTests/Game/IW5/PhysPreset/RawLoaderPhysPresetIW5Test.cpp

@@ -0,0 +1,56 @@
+#include "Game/IW5/PhysPreset/RawLoaderPhysPresetIW5.h"
+
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace IW5;
+using namespace Catch;
+
+namespace
+{
+    TEST_CASE("PhysPreset loader restores stock raw fields (IW5)", "[iw5][physpreset][system]")
+    {
+        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1.25\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
+                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
+                                         R"(\sndAliasPrefix\physics_metal)"
+                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
+                                         R"(\minMomentum\1.0\maxMomentum\2.0)"
+                                         R"(\minPitch\3.0\maxPitch\4.0)"
+                                         R"(\volumeType\linear\pitchType\quadratic)"
+                                         R"(\tempDefaultToCylinder\1\perSurfaceSndAlias\1)";
+
+        MockSearchPath loadingSearchPath;
+        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
+
+        Zone loadingZone("LoadingZone", 0, GameId::IW5, GamePlatform::PC);
+        AssetCreatorCollection creatorCollection(loadingZone);
+        IgnoredAssetLookup ignoredAssetLookup;
+        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
+        const auto loader = phys_preset::CreateRawLoaderIW5(loadingZone.Memory(), loadingSearchPath, loadingZone);
+        const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
+
+        REQUIRE(result.HasBeenSuccessful());
+        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
+        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
+
+        REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
+        REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
+        REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
+        REQUIRE(loadedPhysPreset->friction == Approx(std::numeric_limits<float>::max()));
+        REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
+        REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
+        REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
+        REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
+        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
+        REQUIRE(loadedPhysPreset->minMomentum == Approx(1.0f));
+        REQUIRE(loadedPhysPreset->maxMomentum == Approx(2.0f));
+        REQUIRE(loadedPhysPreset->minPitch == Approx(3.0f));
+        REQUIRE(loadedPhysPreset->maxPitch == Approx(4.0f));
+        REQUIRE(loadedPhysPreset->volumeType == PHYSPRESET_SCALING_LINEAR);
+        REQUIRE(loadedPhysPreset->pitchType == PHYSPRESET_SCALING_QUADRATIC);
+        REQUIRE(loadedPhysPreset->tempDefaultToCylinder == true);
+        REQUIRE(loadedPhysPreset->perSurfaceSndAlias == true);
+    }
+} // namespace

test/ObjLoadingTests/Game/T4/PhysPreset/RawLoaderPhysPresetT4Test.cpp

@@ -0,0 +1,48 @@
+#include "Game/T4/PhysPreset/RawLoaderPhysPresetT4.h"
+
+#include "Game/T4/ObjConstantsT4.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace T4;
+using namespace Catch;
+
+namespace
+{
+    TEST_CASE("PhysPreset loader restores stock raw fields (T4)", "[t4][physpreset][system]")
+    {
+        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\sndAliasPrefix\physics_metal)"
+                                         R"(\mass\1250\friction\0.5\isFrictionInfinity\1\bounce\0.25)"
+                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
+                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
+                                         R"(\tempDefaultToCylinder\1\canFloat\1\gravityScale\2)";
+
+        MockSearchPath loadingSearchPath;
+        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
+
+        Zone loadingZone("LoadingZone", 0, GameId::T4, GamePlatform::PC);
+        AssetCreatorCollection creatorCollection(loadingZone);
+        IgnoredAssetLookup ignoredAssetLookup;
+        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
+        const auto loader = phys_preset::CreateRawLoaderT4(loadingZone.Memory(), loadingSearchPath, loadingZone);
+        const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
+
+        REQUIRE(result.HasBeenSuccessful());
+        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
+        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
+
+        REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
+        REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
+        REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
+        REQUIRE(loadedPhysPreset->friction == Approx(PHYS_PRESET_MAX_FRICTION));
+        REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
+        REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
+        REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
+        REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
+        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
+        REQUIRE(loadedPhysPreset->canFloat == 1);
+        REQUIRE(loadedPhysPreset->gravityScale == Approx(2.0f));
+    }
+} // namespace

test/ObjLoadingTests/Game/T5/PhysPreset/RawLoaderPhysPresetT5Test.cpp

@@ -0,0 +1,58 @@
+#include "Game/T5/PhysPreset/RawLoaderPhysPresetT5.h"
+
+#include "Game/T5/ObjConstantsT5.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace T5;
+using namespace Catch;
+
+namespace
+{
+    TEST_CASE("PhysPreset loader restores stock raw fields (T5)", "[t5][physpreset][system]")
+    {
+        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1250\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
+                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
+                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
+                                         R"(\canFloat\1\gravityScale\2)"
+                                         R"(\massOffsetX\1\massOffsetY\2\massOffsetZ\3)"
+                                         R"(\buoyancyMinX\3\buoyancyMinY\4\buoyancyMinZ\5)"
+                                         R"(\buoyancyMaxX\6\buoyancyMaxY\7\buoyancyMaxZ\8)";
+
+        MockSearchPath loadingSearchPath;
+        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
+
+        Zone loadingZone("LoadingZone", 0, GameId::T5, GamePlatform::PC);
+        AssetCreatorCollection creatorCollection(loadingZone);
+        IgnoredAssetLookup ignoredAssetLookup;
+        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
+        const auto loader = phys_preset::CreateRawLoaderT5(loadingZone.Memory(), loadingSearchPath, loadingZone);
+        const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
+
+        REQUIRE(result.HasBeenSuccessful());
+        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
+        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
+
+        REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
+        REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
+        REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
+        REQUIRE(loadedPhysPreset->friction == Approx(PHYS_PRESET_MAX_FRICTION));
+        REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
+        REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
+        REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
+        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
+        REQUIRE(loadedPhysPreset->canFloat == 1);
+        REQUIRE(loadedPhysPreset->gravityScale == Approx(2.0f));
+        REQUIRE(loadedPhysPreset->centerOfMassOffset.x == Approx(1.0f));
+        REQUIRE(loadedPhysPreset->centerOfMassOffset.y == Approx(2.0f));
+        REQUIRE(loadedPhysPreset->centerOfMassOffset.z == Approx(3.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMin.x == Approx(3.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMin.y == Approx(4.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMin.z == Approx(5.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMax.x == Approx(6.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMax.y == Approx(7.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMax.z == Approx(8.0f));
+    }
+} // namespace

test/ObjLoadingTests/Game/T6/PhysPreset/RawLoaderPhysPresetT6Test.cpp

@@ -0,0 +1,58 @@
+#include "Game/T6/PhysPreset/RawLoaderPhysPresetT6.h"
+
+#include "Game/T6/ObjConstantsT6.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace T6;
+using namespace Catch;
+
+namespace
+{
+    TEST_CASE("PhysPreset loader restores stock raw fields (T6)", "[t6][physpreset][system]")
+    {
+        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1250\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
+                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
+                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
+                                         R"(\canFloat\1\gravityScale\2)"
+                                         R"(\massOffsetX\1\massOffsetY\2\massOffsetZ\3)"
+                                         R"(\buoyancyMinX\3\buoyancyMinY\4\buoyancyMinZ\5)"
+                                         R"(\buoyancyMaxX\6\buoyancyMaxY\7\buoyancyMaxZ\8)";
+
+        MockSearchPath loadingSearchPath;
+        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
+
+        Zone loadingZone("LoadingZone", 0, GameId::T6, GamePlatform::PC);
+        AssetCreatorCollection creatorCollection(loadingZone);
+        IgnoredAssetLookup ignoredAssetLookup;
+        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
+        const auto loader = phys_preset::CreateRawLoaderT6(loadingZone.Memory(), loadingSearchPath, loadingZone);
+        const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
+
+        REQUIRE(result.HasBeenSuccessful());
+        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
+        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
+
+        REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
+        REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
+        REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
+        REQUIRE(loadedPhysPreset->friction == Approx(PHYS_PRESET_MAX_FRICTION));
+        REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
+        REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
+        REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
+        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
+        REQUIRE(loadedPhysPreset->canFloat == 1);
+        REQUIRE(loadedPhysPreset->gravityScale == Approx(2.0f));
+        REQUIRE(loadedPhysPreset->centerOfMassOffset.x == Approx(1.0f));
+        REQUIRE(loadedPhysPreset->centerOfMassOffset.y == Approx(2.0f));
+        REQUIRE(loadedPhysPreset->centerOfMassOffset.z == Approx(3.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMin.x == Approx(3.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMin.y == Approx(4.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMin.z == Approx(5.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMax.x == Approx(6.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMax.y == Approx(7.0f));
+        REQUIRE(loadedPhysPreset->buoyancyBoxMax.z == Approx(8.0f));
+    }
+} // namespace

test/ObjWritingTests/Game/IW3/PhysPreset/PhysPresetInfoStringDumperIW3Test.cpp

@@ -0,0 +1,67 @@
+
+#include "Game/IW3/PhysPreset/PhysPresetInfoStringDumperIW3.h"
+
+#include "Game/IW3/ObjConstantsIW3.h"
+#include "InfoString/InfoString.h"
+#include "SearchPath/MockOutputPath.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_test_macros.hpp>
+
+using namespace IW3;
+
+namespace
+{
+    std::unique_ptr<PhysPreset> CreateTestPhysPreset()
+    {
+        auto physPreset = std::make_unique<PhysPreset>();
+
+        physPreset->name = "test_phys_preset";
+        physPreset->mass = 1.25f;
+        physPreset->bounce = 0.25f;
+        physPreset->friction = std::numeric_limits<float>::max();
+        physPreset->bulletForceScale = 0.5f;
+        physPreset->explosiveForceScale = 0.75f;
+        physPreset->sndAliasPrefix = "physics_metal";
+        physPreset->piecesSpreadFraction = 0.125f;
+        physPreset->piecesUpwardVelocity = 64.0f;
+        physPreset->tempDefaultToCylinder = true;
+
+        return physPreset;
+    }
+
+    std::string DumpPhysPreset(PhysPreset& physPreset)
+    {
+        Zone dumpingZone("DumpingZone", 0, GameId::IW3, GamePlatform::PC);
+        dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
+
+        MockSearchPath dumpingObjPath;
+        MockOutputPath dumpingOutput;
+        AssetDumpingContext dumpingContext(dumpingZone, "", dumpingOutput, dumpingObjPath, std::nullopt);
+        phys_preset::InfoStringDumperIW3 dumper;
+        dumper.Dump(dumpingContext);
+
+        const auto* dumpedFile = dumpingOutput.GetMockedFile("physic/test_phys_preset");
+        REQUIRE(dumpedFile != nullptr);
+        return dumpedFile->AsString();
+    }
+
+    TEST_CASE("PhysPreset dumper serializes raw fields (IW3)", "[iw3][physpreset][system]")
+    {
+        const auto testPhysPreset = CreateTestPhysPreset();
+        std::istringstream dumpedStream(DumpPhysPreset(*testPhysPreset));
+
+        InfoString infoString;
+        REQUIRE(infoString.FromStream(INFO_STRING_PREFIX_PHYS_PRESET, dumpedStream));
+        REQUIRE(infoString.GetValueForKey("mass") == "1.25");
+        REQUIRE(infoString.GetValueForKey("bounce") == "0.25");
+        REQUIRE(infoString.GetValueForKey("friction") == "0");
+        REQUIRE(infoString.GetValueForKey("isFrictionInfinity") == "1");
+        REQUIRE(infoString.GetValueForKey("bulletForceScale") == "0.5");
+        REQUIRE(infoString.GetValueForKey("explosiveForceScale") == "0.75");
+        REQUIRE(infoString.GetValueForKey("sndAliasPrefix") == "physics_metal");
+        REQUIRE(infoString.GetValueForKey("piecesSpreadFraction") == "0.125");
+        REQUIRE(infoString.GetValueForKey("piecesUpwardVelocity") == "64");
+        REQUIRE(infoString.GetValueForKey("tempDefaultToCylinder") == "1");
+    }
+} // namespace

test/ObjWritingTests/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4Test.cpp

@@ -0,0 +1,69 @@
+
+#include "Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.h"
+
+#include "Game/IW4/ObjConstantsIW4.h"
+#include "InfoString/InfoString.h"
+#include "SearchPath/MockOutputPath.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_test_macros.hpp>
+
+using namespace IW4;
+
+namespace
+{
+    std::unique_ptr<PhysPreset> CreateTestPhysPreset()
+    {
+        auto physPreset = std::make_unique<PhysPreset>();
+
+        physPreset->name = "test_phys_preset";
+        physPreset->mass = 1.25f;
+        physPreset->bounce = 0.25f;
+        physPreset->friction = std::numeric_limits<float>::max();
+        physPreset->bulletForceScale = 0.5f;
+        physPreset->explosiveForceScale = 0.75f;
+        physPreset->sndAliasPrefix = "physics_metal";
+        physPreset->piecesSpreadFraction = 0.125f;
+        physPreset->piecesUpwardVelocity = 64.0f;
+        physPreset->tempDefaultToCylinder = true;
+        physPreset->perSurfaceSndAlias = true;
+
+        return physPreset;
+    }
+
+    std::string DumpPhysPreset(PhysPreset& physPreset)
+    {
+        Zone dumpingZone("DumpingZone", 0, GameId::IW4, GamePlatform::PC);
+        dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
+
+        MockSearchPath dumpingObjPath;
+        MockOutputPath dumpingOutput;
+        AssetDumpingContext dumpingContext(dumpingZone, "", dumpingOutput, dumpingObjPath, std::nullopt);
+        phys_preset::InfoStringDumperIW4 dumper;
+        dumper.Dump(dumpingContext);
+
+        const auto* dumpedFile = dumpingOutput.GetMockedFile("physic/test_phys_preset");
+        REQUIRE(dumpedFile != nullptr);
+        return dumpedFile->AsString();
+    }
+
+    TEST_CASE("PhysPreset dumper serializes raw fields (IW4)", "[iw4][physpreset][system]")
+    {
+        const auto testPhysPreset = CreateTestPhysPreset();
+        std::istringstream dumpedStream(DumpPhysPreset(*testPhysPreset));
+
+        InfoString infoString;
+        REQUIRE(infoString.FromStream(INFO_STRING_PREFIX_PHYS_PRESET, dumpedStream));
+        REQUIRE(infoString.GetValueForKey("mass") == "1.25");
+        REQUIRE(infoString.GetValueForKey("bounce") == "0.25");
+        REQUIRE(infoString.GetValueForKey("friction") == "0");
+        REQUIRE(infoString.GetValueForKey("isFrictionInfinity") == "1");
+        REQUIRE(infoString.GetValueForKey("bulletForceScale") == "0.5");
+        REQUIRE(infoString.GetValueForKey("explosiveForceScale") == "0.75");
+        REQUIRE(infoString.GetValueForKey("sndAliasPrefix") == "physics_metal");
+        REQUIRE(infoString.GetValueForKey("piecesSpreadFraction") == "0.125");
+        REQUIRE(infoString.GetValueForKey("piecesUpwardVelocity") == "64");
+        REQUIRE(infoString.GetValueForKey("tempDefaultToCylinder") == "1");
+        REQUIRE(infoString.GetValueForKey("perSurfaceSndAlias") == "1");
+    }
+} // namespace

test/ObjWritingTests/Game/IW5/PhysPreset/PhysPresetInfoStringDumperIW5Test.cpp

@@ -0,0 +1,81 @@
+
+#include "Game/IW5/PhysPreset/PhysPresetInfoStringDumperIW5.h"
+
+#include "Game/IW5/ObjConstantsIW5.h"
+#include "InfoString/InfoString.h"
+#include "SearchPath/MockOutputPath.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_test_macros.hpp>
+
+using namespace IW5;
+
+namespace
+{
+    std::unique_ptr<PhysPreset> CreateTestPhysPreset()
+    {
+        auto physPreset = std::make_unique<PhysPreset>();
+
+        physPreset->name = "test_phys_preset";
+        physPreset->mass = 1.25f;
+        physPreset->bounce = 0.25f;
+        physPreset->friction = std::numeric_limits<float>::max();
+        physPreset->bulletForceScale = 0.5f;
+        physPreset->explosiveForceScale = 0.75f;
+        physPreset->sndAliasPrefix = "physics_metal";
+        physPreset->piecesSpreadFraction = 0.125f;
+        physPreset->piecesUpwardVelocity = 64.0f;
+        physPreset->minMomentum = 1.5f;
+        physPreset->maxMomentum = 2.5f;
+        physPreset->minPitch = 3.5f;
+        physPreset->maxPitch = 4.5f;
+        physPreset->volumeType = PHYSPRESET_SCALING_LINEAR;
+        physPreset->pitchType = PHYSPRESET_SCALING_QUADRATIC;
+        physPreset->tempDefaultToCylinder = true;
+        physPreset->perSurfaceSndAlias = true;
+
+        return physPreset;
+    }
+
+    std::string DumpPhysPreset(PhysPreset& physPreset)
+    {
+        Zone dumpingZone("DumpingZone", 0, GameId::IW5, GamePlatform::PC);
+        dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
+
+        MockSearchPath dumpingObjPath;
+        MockOutputPath dumpingOutput;
+        AssetDumpingContext dumpingContext(dumpingZone, "", dumpingOutput, dumpingObjPath, std::nullopt);
+        phys_preset::InfoStringDumperIW5 dumper;
+        dumper.Dump(dumpingContext);
+
+        const auto* dumpedFile = dumpingOutput.GetMockedFile("physic/test_phys_preset");
+        REQUIRE(dumpedFile != nullptr);
+        return dumpedFile->AsString();
+    }
+
+    TEST_CASE("PhysPreset dumper serializes raw fields (IW5)", "[iw5][physpreset][system]")
+    {
+        const auto testPhysPreset = CreateTestPhysPreset();
+        std::istringstream dumpedStream(DumpPhysPreset(*testPhysPreset));
+
+        InfoString infoString;
+        REQUIRE(infoString.FromStream(INFO_STRING_PREFIX_PHYS_PRESET, dumpedStream));
+        REQUIRE(infoString.GetValueForKey("mass") == "1.25");
+        REQUIRE(infoString.GetValueForKey("bounce") == "0.25");
+        REQUIRE(infoString.GetValueForKey("friction") == "0");
+        REQUIRE(infoString.GetValueForKey("isFrictionInfinity") == "1");
+        REQUIRE(infoString.GetValueForKey("bulletForceScale") == "0.5");
+        REQUIRE(infoString.GetValueForKey("explosiveForceScale") == "0.75");
+        REQUIRE(infoString.GetValueForKey("sndAliasPrefix") == "physics_metal");
+        REQUIRE(infoString.GetValueForKey("piecesSpreadFraction") == "0.125");
+        REQUIRE(infoString.GetValueForKey("piecesUpwardVelocity") == "64");
+        REQUIRE(infoString.GetValueForKey("minMomentum") == "1.5");
+        REQUIRE(infoString.GetValueForKey("maxMomentum") == "2.5");
+        REQUIRE(infoString.GetValueForKey("minPitch") == "3.5");
+        REQUIRE(infoString.GetValueForKey("maxPitch") == "4.5");
+        REQUIRE(infoString.GetValueForKey("volumeType") == "linear");
+        REQUIRE(infoString.GetValueForKey("pitchType") == "quadratic");
+        REQUIRE(infoString.GetValueForKey("tempDefaultToCylinder") == "1");
+        REQUIRE(infoString.GetValueForKey("perSurfaceSndAlias") == "1");
+    }
+} // namespace

test/ObjWritingTests/Game/T4/PhysPreset/PhysPresetInfoStringDumperT4Test.cpp

@@ -1,37 +1,33 @@
-#include "Game/T4/ObjConstantsT4.h"
+
 #include "Game/T4/PhysPreset/PhysPresetInfoStringDumperT4.h"
-#include "Game/T4/PhysPreset/RawLoaderPhysPresetT4.h"
+
+#include "Game/T4/ObjConstantsT4.h"
 #include "InfoString/InfoString.h"
 #include "SearchPath/MockOutputPath.h"
 #include "SearchPath/MockSearchPath.h"
-#include "ZoneLoading.h"
 
 #include <catch2/catch_test_macros.hpp>
-#include <memory>
-#include <sstream>
-#include <string>
 
 using namespace T4;
 
 namespace
 {
-    constexpr auto PHYS_PRESET_NAME = "test_phys_preset";
-    constexpr auto SOUND_ALIAS_PREFIX = "physics_metal";
-
     std::unique_ptr<PhysPreset> CreateTestPhysPreset()
     {
         auto physPreset = std::make_unique<PhysPreset>();
-        physPreset->name = PHYS_PRESET_NAME;
+
+        physPreset->name = "test_phys_preset";
         physPreset->mass = 1.25f;
         physPreset->bounce = 0.25f;
         physPreset->friction = PHYS_PRESET_MAX_FRICTION;
         physPreset->bulletForceScale = 0.5f;
         physPreset->explosiveForceScale = 0.75f;
-        physPreset->sndAliasPrefix = SOUND_ALIAS_PREFIX;
+        physPreset->sndAliasPrefix = "physics_metal";
         physPreset->piecesSpreadFraction = 0.125f;
         physPreset->piecesUpwardVelocity = 64.0f;
         physPreset->canFloat = 1;
         physPreset->gravityScale = 2.0f;
+
         return physPreset;
     }
 
@@ -64,7 +60,7 @@ namespace
         REQUIRE(infoString.GetValueForKey("isFrictionInfinity") == "1");
         REQUIRE(infoString.GetValueForKey("bulletForceScale") == "0.5");
         REQUIRE(infoString.GetValueForKey("explosiveForceScale") == "0.75");
-        REQUIRE(infoString.GetValueForKey("sndAliasPrefix") == SOUND_ALIAS_PREFIX);
+        REQUIRE(infoString.GetValueForKey("sndAliasPrefix") == "physics_metal");
         REQUIRE(infoString.GetValueForKey("piecesSpreadFraction") == "0.125");
         REQUIRE(infoString.GetValueForKey("piecesUpwardVelocity") == "64");
         REQUIRE(infoString.GetValueForKey("canFloat") == "1");
@@ -74,39 +70,4 @@ namespace
         infoString.GetValueForKey("tempDefaultToCylinder", &foundObsoleteField);
         REQUIRE_FALSE(foundObsoleteField);
     }
-
-    TEST_CASE("PhysPreset loader restores stock raw fields (T4)", "[t4][physpreset][system]")
-    {
-        constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\sndAliasPrefix\physics_metal)"
-                                         R"(\mass\1250\friction\0.5\isFrictionInfinity\1\bounce\0.25)"
-                                         R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
-                                         R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
-                                         R"(\tempDefaultToCylinder\1\canFloat\1\gravityScale\2)";
-
-        MockSearchPath loadingSearchPath;
-        loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
-
-        Zone loadingZone("LoadingZone", 0, GameId::T4, GamePlatform::PC);
-        AssetCreatorCollection creatorCollection(loadingZone);
-        IgnoredAssetLookup ignoredAssetLookup;
-        AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
-        const auto loader = phys_preset::CreateRawLoaderT4(loadingZone.Memory(), loadingSearchPath, loadingZone);
-        const auto result = loader->CreateAsset(PHYS_PRESET_NAME, loadingContext);
-
-        REQUIRE(result.HasBeenSuccessful());
-        const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
-        const auto* loadedPhysPreset = loadedAssetInfo->Asset();
-
-        REQUIRE(std::string(loadedPhysPreset->name) == PHYS_PRESET_NAME);
-        REQUIRE(loadedPhysPreset->mass == 1.25f);
-        REQUIRE(loadedPhysPreset->bounce == 0.25f);
-        REQUIRE(loadedPhysPreset->friction == PHYS_PRESET_MAX_FRICTION);
-        REQUIRE(loadedPhysPreset->bulletForceScale == 0.5f);
-        REQUIRE(loadedPhysPreset->explosiveForceScale == 0.75f);
-        REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == SOUND_ALIAS_PREFIX);
-        REQUIRE(loadedPhysPreset->piecesSpreadFraction == 0.125f);
-        REQUIRE(loadedPhysPreset->piecesUpwardVelocity == 64.0f);
-        REQUIRE(loadedPhysPreset->canFloat == 1);
-        REQUIRE(loadedPhysPreset->gravityScale == 2.0f);
-    }
 } // namespace

test/ObjWritingTests/Game/T5/PhysPreset/PhysPresetInfoStringDumperT5Test.cpp

@@ -0,0 +1,87 @@
+
+#include "Game/T5/PhysPreset/PhysPresetInfoStringDumperT5.h"
+
+#include "Game/T5/ObjConstantsT5.h"
+#include "InfoString/InfoString.h"
+#include "SearchPath/MockOutputPath.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace T5;
+using namespace Catch;
+
+namespace
+{
+    std::unique_ptr<PhysPreset> CreateTestPhysPreset()
+    {
+        auto physPreset = std::make_unique<PhysPreset>();
+
+        physPreset->name = "test_phys_preset";
+        physPreset->mass = 1.25f;
+        physPreset->bounce = 0.25f;
+        physPreset->friction = PHYS_PRESET_MAX_FRICTION;
+        physPreset->bulletForceScale = 0.5f;
+        physPreset->explosiveForceScale = 0.75f;
+        physPreset->piecesSpreadFraction = 0.125f;
+        physPreset->piecesUpwardVelocity = 64.0f;
+        physPreset->canFloat = 1;
+        physPreset->gravityScale = 2.0f;
+        physPreset->centerOfMassOffset.x = 1.5f;
+        physPreset->centerOfMassOffset.y = 2.5f;
+        physPreset->centerOfMassOffset.z = 3.5f;
+        physPreset->buoyancyBoxMin.x = 4.5f;
+        physPreset->buoyancyBoxMin.y = 5.5f;
+        physPreset->buoyancyBoxMin.z = 6.5f;
+        physPreset->buoyancyBoxMax.x = 7.5f;
+        physPreset->buoyancyBoxMax.y = 8.5f;
+        physPreset->buoyancyBoxMax.z = 9.5f;
+
+        return physPreset;
+    }
+
+    std::string DumpPhysPreset(PhysPreset& physPreset)
+    {
+        Zone dumpingZone("DumpingZone", 0, GameId::T5, GamePlatform::PC);
+        dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
+
+        MockSearchPath dumpingObjPath;
+        MockOutputPath dumpingOutput;
+        AssetDumpingContext dumpingContext(dumpingZone, "", dumpingOutput, dumpingObjPath, std::nullopt);
+        phys_preset::InfoStringDumperT5 dumper;
+        dumper.Dump(dumpingContext);
+
+        const auto* dumpedFile = dumpingOutput.GetMockedFile("physic/test_phys_preset");
+        REQUIRE(dumpedFile != nullptr);
+        return dumpedFile->AsString();
+    }
+
+    TEST_CASE("PhysPreset dumper serializes raw fields (T5)", "[t5][physpreset][system]")
+    {
+        const auto testPhysPreset = CreateTestPhysPreset();
+        std::istringstream dumpedStream(DumpPhysPreset(*testPhysPreset));
+
+        InfoString infoString;
+        REQUIRE(infoString.FromStream(INFO_STRING_PREFIX_PHYS_PRESET, dumpedStream));
+        REQUIRE(infoString.GetValueForKey("mass") == "1250");
+        REQUIRE(infoString.GetValueForKey("bounce") == "0.25");
+        REQUIRE(infoString.GetValueForKey("friction") == "0");
+        REQUIRE(infoString.GetValueForKey("isFrictionInfinity") == "1");
+        REQUIRE(infoString.GetValueForKey("bulletForceScale") == "0.5");
+        REQUIRE(infoString.GetValueForKey("explosiveForceScale") == "0.75");
+        REQUIRE(infoString.GetValueForKey("piecesSpreadFraction") == "0.125");
+        REQUIRE(infoString.GetValueForKey("piecesUpwardVelocity") == "64");
+        REQUIRE(infoString.GetValueForKey("canFloat") == "1");
+        REQUIRE(infoString.GetValueForKey("gravityScale") == "2");
+        REQUIRE(infoString.GetValueForKey("massOffsetX") == "1.5");
+        REQUIRE(infoString.GetValueForKey("massOffsetY") == "2.5");
+        REQUIRE(infoString.GetValueForKey("massOffsetZ") == "3.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMinX") == "4.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMinY") == "5.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMinZ") == "6.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMaxX") == "7.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMaxY") == "8.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMaxZ") == "9.5");
+    }
+} // namespace

test/ObjWritingTests/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6Test.cpp

@@ -0,0 +1,87 @@
+
+#include "Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h"
+
+#include "Game/T6/ObjConstantsT6.h"
+#include "InfoString/InfoString.h"
+#include "SearchPath/MockOutputPath.h"
+#include "SearchPath/MockSearchPath.h"
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+using namespace T6;
+using namespace Catch;
+
+namespace
+{
+    std::unique_ptr<PhysPreset> CreateTestPhysPreset()
+    {
+        auto physPreset = std::make_unique<PhysPreset>();
+
+        physPreset->name = "test_phys_preset";
+        physPreset->mass = 1.25f;
+        physPreset->bounce = 0.25f;
+        physPreset->friction = PHYS_PRESET_MAX_FRICTION;
+        physPreset->bulletForceScale = 0.5f;
+        physPreset->explosiveForceScale = 0.75f;
+        physPreset->piecesSpreadFraction = 0.125f;
+        physPreset->piecesUpwardVelocity = 64.0f;
+        physPreset->canFloat = 1;
+        physPreset->gravityScale = 2.0f;
+        physPreset->centerOfMassOffset.x = 1.5f;
+        physPreset->centerOfMassOffset.y = 2.5f;
+        physPreset->centerOfMassOffset.z = 3.5f;
+        physPreset->buoyancyBoxMin.x = 4.5f;
+        physPreset->buoyancyBoxMin.y = 5.5f;
+        physPreset->buoyancyBoxMin.z = 6.5f;
+        physPreset->buoyancyBoxMax.x = 7.5f;
+        physPreset->buoyancyBoxMax.y = 8.5f;
+        physPreset->buoyancyBoxMax.z = 9.5f;
+
+        return physPreset;
+    }
+
+    std::string DumpPhysPreset(PhysPreset& physPreset)
+    {
+        Zone dumpingZone("DumpingZone", 0, GameId::T6, GamePlatform::PC);
+        dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
+
+        MockSearchPath dumpingObjPath;
+        MockOutputPath dumpingOutput;
+        AssetDumpingContext dumpingContext(dumpingZone, "", dumpingOutput, dumpingObjPath, std::nullopt);
+        phys_preset::InfoStringDumperT6 dumper;
+        dumper.Dump(dumpingContext);
+
+        const auto* dumpedFile = dumpingOutput.GetMockedFile("physic/test_phys_preset");
+        REQUIRE(dumpedFile != nullptr);
+        return dumpedFile->AsString();
+    }
+
+    TEST_CASE("PhysPreset dumper serializes raw fields (T6)", "[t6][physpreset][system]")
+    {
+        const auto testPhysPreset = CreateTestPhysPreset();
+        std::istringstream dumpedStream(DumpPhysPreset(*testPhysPreset));
+
+        InfoString infoString;
+        REQUIRE(infoString.FromStream(INFO_STRING_PREFIX_PHYS_PRESET, dumpedStream));
+        REQUIRE(infoString.GetValueForKey("mass") == "1250");
+        REQUIRE(infoString.GetValueForKey("bounce") == "0.25");
+        REQUIRE(infoString.GetValueForKey("friction") == "0");
+        REQUIRE(infoString.GetValueForKey("isFrictionInfinity") == "1");
+        REQUIRE(infoString.GetValueForKey("bulletForceScale") == "0.5");
+        REQUIRE(infoString.GetValueForKey("explosiveForceScale") == "0.75");
+        REQUIRE(infoString.GetValueForKey("piecesSpreadFraction") == "0.125");
+        REQUIRE(infoString.GetValueForKey("piecesUpwardVelocity") == "64");
+        REQUIRE(infoString.GetValueForKey("canFloat") == "1");
+        REQUIRE(infoString.GetValueForKey("gravityScale") == "2");
+        REQUIRE(infoString.GetValueForKey("massOffsetX") == "1.5");
+        REQUIRE(infoString.GetValueForKey("massOffsetY") == "2.5");
+        REQUIRE(infoString.GetValueForKey("massOffsetZ") == "3.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMinX") == "4.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMinY") == "5.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMinZ") == "6.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMaxX") == "7.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMaxY") == "8.5");
+        REQUIRE(infoString.GetValueForKey("buoyancyMaxZ") == "9.5");
+    }
+} // namespace