Move GDT and info string prefix constants into objconstants file

src/ObjCommon/Game/T6/ObjConstantsT6.h

@@ -0,0 +1,28 @@
+#pragma once
+
+namespace T6
+{
+    class ObjConstants
+    {
+        ObjConstants() = default;
+
+    public:
+        static constexpr const char* INFO_STRING_PREFIX_PHYS_CONSTRAINTS = "PHYSCONSTRAINTS";
+        static constexpr const char* INFO_STRING_PREFIX_PHYS_PRESET = "PHYSIC";
+        static constexpr const char* INFO_STRING_PREFIX_TRACER = "TRACER";
+        static constexpr const char* INFO_STRING_PREFIX_VEHICLE = "VEHICLEFILE";
+        static constexpr const char* INFO_STRING_PREFIX_WEAPON = "WEAPONFILE";
+        static constexpr const char* INFO_STRING_PREFIX_WEAPON_ATTACHMENT = "ATTACHMENTFILE";
+        static constexpr const char* INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE = "ATTACHMENTUNIQUEFILE";
+        static constexpr const char* INFO_STRING_PREFIX_ZBARRIER = "ZBARRIER";
+
+        static constexpr const char* GDF_FILENAME_PHYS_CONSTRAINTS = "physconstraints.gdf";
+        static constexpr const char* GDF_FILENAME_PHYS_PRESET = "physpreset.gdf";
+        static constexpr const char* GDF_FILENAME_TRACER = "tracer.gdf";
+        static constexpr const char* GDF_FILENAME_VEHICLE = "vehicle.gdf";
+        static constexpr const char* GDF_FILENAME_WEAPON = "weapon.gdf";
+        static constexpr const char* GDF_FILENAME_WEAPON_ATTACHMENT = "attachment.gdf";
+        static constexpr const char* GDF_FILENAME_WEAPON_ATTACHMENT_UNIQUE = "attachmentunique.gdf";
+        static constexpr const char* GDF_FILENAME_ZBARRIER = "zbarrier.gdf";
+    };
+}

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

@@ -3,6 +3,7 @@
 #include <cassert>
 #include <type_traits>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/EnumStrings.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/PhysConstraintsFields.h"
@@ -75,8 +76,8 @@ std::string AssetDumperPhysConstraints::GetFileNameForAsset(Zone* zone, XAssetIn
 GdtEntry AssetDumperPhysConstraints::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_CONSTRAINTS);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_CONSTRAINTS, gdtEntry);
 
     return gdtEntry;
 }
@@ -84,6 +85,6 @@ GdtEntry AssetDumperPhysConstraints::DumpGdtEntry(AssetDumpingContext& context,
 void AssetDumperPhysConstraints::DumpRaw(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_PHYS_CONSTRAINTS);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperPhysConstraints final : public AbstractAssetDumper<PhysConstraints>
     {
-        static constexpr const char* FILE_TYPE_STR = "PHYSCONSTRAINTS";
-        static constexpr const char* GDF_NAME = "physconstraints.gdf";
-
         static InfoString CreateInfoString(XAssetInfo<PhysConstraints>* asset);
 
     protected:

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

@@ -5,6 +5,7 @@
 #include <cmath>
 #include <type_traits>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/PhysPresetFields.h"
 
@@ -95,8 +96,8 @@ std::string AssetDumperPhysPreset::GetFileNameForAsset(Zone* zone, XAssetInfo<Ph
 GdtEntry AssetDumperPhysPreset::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_PRESET);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
 
     return gdtEntry;
 }
@@ -104,6 +105,6 @@ GdtEntry AssetDumperPhysPreset::DumpGdtEntry(AssetDumpingContext& context, XAsse
 void AssetDumperPhysPreset::DumpRaw(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperPhysPreset final : public AbstractAssetDumper<PhysPreset>
     {
-        static constexpr const char* FILE_TYPE_STR = "PHYSIC";
-        static constexpr const char* GDF_NAME = "physpreset.gdf";
-
         static void CopyToPhysPresetInfo(const PhysPreset* physPreset, PhysPresetInfo* physPresetInfo);
         static InfoString CreateInfoString(XAssetInfo<PhysPreset>* asset);
 

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

@@ -3,6 +3,7 @@
 #include <cassert>
 #include <type_traits>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/EnumStrings.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/TracerFields.h"
@@ -74,8 +75,8 @@ std::string AssetDumperTracer::GetFileNameForAsset(Zone* zone, XAssetInfo<Tracer
 GdtEntry AssetDumperTracer::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_TRACER);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_TRACER, gdtEntry);
 
     return gdtEntry;
 }
@@ -83,6 +84,6 @@ GdtEntry AssetDumperTracer::DumpGdtEntry(AssetDumpingContext& context, XAssetInf
 void AssetDumperTracer::DumpRaw(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString("TRACER");
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_TRACER);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperTracer final : public AbstractAssetDumper<TracerDef>
     {
-        static constexpr const char* FILE_TYPE_STR = "TRACER";
-        static constexpr const char* GDF_NAME = "tracer.gdf";
-
         static InfoString CreateInfoString(XAssetInfo<TracerDef>* asset);
 
     protected:

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

@@ -3,6 +3,7 @@
 #include <cassert>
 #include <type_traits>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/EnumStrings.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/VehicleFields.h"
@@ -120,8 +121,8 @@ std::string AssetDumperVehicle::GetFileNameForAsset(Zone* zone, XAssetInfo<Vehic
 GdtEntry AssetDumperVehicle::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_VEHICLE);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_VEHICLE, gdtEntry);
 
     return gdtEntry;
 }
@@ -129,6 +130,6 @@ GdtEntry AssetDumperVehicle::DumpGdtEntry(AssetDumpingContext& context, XAssetIn
 void AssetDumperVehicle::DumpRaw(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_VEHICLE);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperVehicle final : public AbstractAssetDumper<VehicleDef>
     {
-        static constexpr const char* FILE_TYPE_STR = "VEHICLEFILE";
-        static constexpr const char* GDF_NAME = "vehicle.gdf";
-
         static InfoString CreateInfoString(XAssetInfo<VehicleDef>* asset);
 
     protected:

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

@@ -5,6 +5,7 @@
 #include <type_traits>
 #include <cstring>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/EnumStrings.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/WeaponFields.h"
@@ -390,8 +391,8 @@ std::string AssetDumperWeapon::GetFileNameForAsset(Zone* zone, XAssetInfo<Weapon
 GdtEntry AssetDumperWeapon::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON, gdtEntry);
 
     return gdtEntry;
 }
@@ -399,6 +400,6 @@ GdtEntry AssetDumperWeapon::DumpGdtEntry(AssetDumpingContext& context, XAssetInf
 void AssetDumperWeapon::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_WEAPON);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperWeapon final : public AbstractAssetDumper<WeaponVariantDef>
     {
-        static constexpr const char* FILE_TYPE_STR = "WEAPONFILE";
-        static constexpr const char* GDF_NAME = "weapon.gdf";
-
         static void CopyToFullDef(const WeaponVariantDef* weapon, WeaponFullDef* fullDef);
         static InfoString CreateInfoString(XAssetInfo<WeaponVariantDef>* asset);
 

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

@@ -1,10 +1,9 @@
 #include "AssetDumperWeaponAttachment.h"
 
 #include <cassert>
-#include <sstream>
 #include <type_traits>
-#include <cstring>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/EnumStrings.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/WeaponAttachmentFields.h"
@@ -82,8 +81,8 @@ std::string AssetDumperWeaponAttachment::GetFileNameForAsset(Zone* zone, XAssetI
 GdtEntry AssetDumperWeaponAttachment::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT, gdtEntry);
 
     return gdtEntry;
 }
@@ -91,6 +90,6 @@ GdtEntry AssetDumperWeaponAttachment::DumpGdtEntry(AssetDumpingContext& context,
 void AssetDumperWeaponAttachment::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperWeaponAttachment final : public AbstractAssetDumper<WeaponAttachment>
     {
-        static constexpr const char* FILE_TYPE_STR = "ATTACHMENTFILE";
-        static constexpr const char* GDF_NAME = "attachment.gdf";
-        
         static InfoString CreateInfoString(XAssetInfo<WeaponAttachment>* asset);
 
     protected:

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

@@ -5,6 +5,7 @@
 #include <type_traits>
 #include <cstring>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/EnumStrings.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/WeaponAttachmentUniqueFields.h"
@@ -148,8 +149,8 @@ std::string AssetDumperWeaponAttachmentUnique::GetFileNameForAsset(Zone* zone, X
 GdtEntry AssetDumperWeaponAttachmentUnique::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT_UNIQUE);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE, gdtEntry);
 
     return gdtEntry;
 }
@@ -157,6 +158,6 @@ GdtEntry AssetDumperWeaponAttachmentUnique::DumpGdtEntry(AssetDumpingContext& co
 void AssetDumperWeaponAttachmentUnique::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperWeaponAttachmentUnique final : public AbstractAssetDumper<WeaponAttachmentUnique>
     {
-        static constexpr const char* FILE_TYPE_STR = "ATTACHMENTUNIQUEFILE";
-        static constexpr const char* GDF_NAME = "attachmentunique.gdf";
-
         static void CopyToFullDef(const WeaponAttachmentUnique* attachment, WeaponAttachmentUniqueFull* fullDef);
         static InfoString CreateInfoString(XAssetInfo<WeaponAttachmentUnique>* asset);
 

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

@@ -3,6 +3,7 @@
 #include <cassert>
 #include <type_traits>
 
+#include "Game/T6/ObjConstantsT6.h"
 #include "Game/T6/InfoString/InfoStringFromStructConverter.h"
 #include "Game/T6/InfoString/ZBarrierFields.h"
 
@@ -63,8 +64,8 @@ std::string AssetDumperZBarrier::GetFileNameForAsset(Zone* zone, XAssetInfo<ZBar
 GdtEntry AssetDumperZBarrier::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset)
 {
     const auto infoString = CreateInfoString(asset);
-    GdtEntry gdtEntry(asset->m_name, GDF_NAME);
+    GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_ZBARRIER);
-    infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
+    infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_ZBARRIER, gdtEntry);
 
     return gdtEntry;
 }
@@ -72,6 +73,6 @@ GdtEntry AssetDumperZBarrier::DumpGdtEntry(AssetDumpingContext& context, XAssetI
 void AssetDumperZBarrier::DumpRaw(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset, std::ostream& stream)
 {
     const auto infoString = CreateInfoString(asset);
-    const auto stringValue = infoString.ToString(FILE_TYPE_STR);
+    const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_ZBARRIER);
     stream.write(stringValue.c_str(), stringValue.size());
 }

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

@@ -8,9 +8,6 @@ namespace T6
 {
     class AssetDumperZBarrier final : public AbstractAssetDumper<ZBarrierDef>
     {
-        static constexpr const char* FILE_TYPE_STR = "ZBARRIER";
-        static constexpr const char* GDF_NAME = "zbarrier.gdf";
-
         static InfoString CreateInfoString(XAssetInfo<ZBarrierDef>* asset);
 
     protected: