diff --git a/include/RED4ext/Dump/Reflection-inl.hpp b/include/RED4ext/Dump/Reflection-inl.hpp index e4e4055f2..bd5034f7d 100644 --- a/include/RED4ext/Dump/Reflection-inl.hpp +++ b/include/RED4ext/Dump/Reflection-inl.hpp @@ -41,10 +41,20 @@ RED4EXT_INLINE void Dump(std::filesystem::path aOutPath, std::filesystem::path a { size_t i = 0; - // Special case for AI - if (aInput.size() >= 2 && aInput[0] == 'A' && aInput[1] == 'I') + static constexpr std::pair uniqueNamespaces[] = { + {"AI", false}, {"GpuApi", true}, {"GpuWrapApiVertexPacking", true}, {"GpuWrapApi", true}}; + + for (const auto& [name, isSpecialCase] : uniqueNamespaces) { - i = 2; + if (aInput.size() >= name.size() && aInput.starts_with(name)) + { + i = name.size(); + + if (isSpecialCase) + { + return aInput.substr(0, i); + } + } } // Special case of "in", this will break directory layout for "ink", "interop", etc.. diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexLayoutDesc.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexLayoutDesc.hpp similarity index 56% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexLayoutDesc.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexLayoutDesc.hpp index e10b48e21..45565d6f3 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexLayoutDesc.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexLayoutDesc.hpp @@ -7,21 +7,25 @@ #include #include #include -#include +#include namespace RED4ext { -struct GpuWrapApiVertexLayoutDesc +namespace GpuWrapApi +{ +struct VertexLayoutDesc { static constexpr const char* NAME = "GpuWrapApiVertexLayoutDesc"; static constexpr const char* ALIAS = NAME; - StaticArray elements; // 00 + StaticArray elements; // 00 StaticArray slotStrides; // A4 uint32_t slotMask; // B0 uint32_t hash; // B4 }; -RED4EXT_ASSERT_SIZE(GpuWrapApiVertexLayoutDesc, 0xB8); +RED4EXT_ASSERT_SIZE(VertexLayoutDesc, 0xB8); +} // namespace GpuWrapApi +using GpuWrapApiVertexLayoutDesc = GpuWrapApi::VertexLayoutDesc; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingEStreamType.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/EStreamType.hpp similarity index 57% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingEStreamType.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/EStreamType.hpp index 2c4e3c486..580800a11 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingEStreamType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/EStreamType.hpp @@ -7,13 +7,16 @@ #include namespace RED4ext { -enum class GpuWrapApiVertexPackingEStreamType : uint8_t +namespace GpuWrapApi::VertexPacking { +enum class EStreamType : uint8_t { ST_PerVertex = 0, ST_PerInstance = 1, ST_Max = 2, ST_Invalid = 255, }; +} // namespace GpuWrapApi::VertexPacking +using GpuWrapApiVertexPackingEStreamType = GpuWrapApi::VertexPacking::EStreamType; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/PackingElement.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/PackingElement.hpp new file mode 100644 index 000000000..7eb64f5c2 --- /dev/null +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/PackingElement.hpp @@ -0,0 +1,33 @@ +#pragma once + +// clang-format off + +// This file is generated from the Game's Reflection data + +#include +#include +#include +#include +#include + +namespace RED4ext +{ +namespace GpuWrapApi::VertexPacking +{ +struct PackingElement +{ + static constexpr const char* NAME = "GpuWrapApiVertexPackingPackingElement"; + static constexpr const char* ALIAS = NAME; + + GpuWrapApi::VertexPacking::ePackingType type; // 00 + GpuWrapApi::VertexPacking::ePackingUsage usage; // 01 + uint8_t usageIndex; // 02 + uint8_t streamIndex; // 03 + GpuWrapApi::VertexPacking::EStreamType streamType; // 04 +}; +RED4EXT_ASSERT_SIZE(PackingElement, 0x5); +} // namespace GpuWrapApi::VertexPacking +using GpuWrapApiVertexPackingPackingElement = GpuWrapApi::VertexPacking::PackingElement; +} // namespace RED4ext + +// clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingePackingType.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/ePackingType.hpp similarity index 80% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingePackingType.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/ePackingType.hpp index c907c655a..b920f5763 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingePackingType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/ePackingType.hpp @@ -7,7 +7,8 @@ #include namespace RED4ext { -enum class GpuWrapApiVertexPackingePackingType : uint8_t +namespace GpuWrapApi::VertexPacking { +enum class ePackingType : uint8_t { PT_Float1 = 0, PT_Float2 = 1, @@ -43,6 +44,8 @@ enum class GpuWrapApiVertexPackingePackingType : uint8_t PT_Max = 31, PT_Invalid = 255, }; +} // namespace GpuWrapApi::VertexPacking +using GpuWrapApiVertexPackingePackingType = GpuWrapApi::VertexPacking::ePackingType; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingePackingUsage.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/ePackingUsage.hpp similarity index 80% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingePackingUsage.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/ePackingUsage.hpp index ecfc6c3dc..4d2a3132b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingePackingUsage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/VertexPacking/ePackingUsage.hpp @@ -7,7 +7,8 @@ #include namespace RED4ext { -enum class GpuWrapApiVertexPackingePackingUsage : uint8_t +namespace GpuWrapApi::VertexPacking { +enum class ePackingUsage : uint8_t { PS_SysPosition = 0, PS_Position = 1, @@ -36,6 +37,8 @@ enum class GpuWrapApiVertexPackingePackingUsage : uint8_t PS_Max = 24, PS_Invalid = 255, }; +} // namespace GpuWrapApi::VertexPacking +using GpuWrapApiVertexPackingePackingUsage = GpuWrapApi::VertexPacking::ePackingUsage; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieIndexBufferChunkType.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eIndexBufferChunkType.hpp similarity index 59% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApieIndexBufferChunkType.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eIndexBufferChunkType.hpp index 8d0df00a8..a74b98b3d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieIndexBufferChunkType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eIndexBufferChunkType.hpp @@ -7,12 +7,15 @@ #include namespace RED4ext { -enum class GpuWrapApieIndexBufferChunkType : uint8_t +namespace GpuWrapApi { +enum class eIndexBufferChunkType : uint8_t { IBCT_IndexUInt = 0, IBCT_IndexUShort = 1, IBCT_Max = 2, }; +} // namespace GpuWrapApi +using GpuWrapApieIndexBufferChunkType = GpuWrapApi::eIndexBufferChunkType; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureFormat.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureFormat.hpp similarity index 94% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureFormat.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureFormat.hpp index 73cf9f604..a442ac3ee 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureFormat.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureFormat.hpp @@ -7,7 +7,8 @@ #include namespace RED4ext { -enum class GpuWrapApieTextureFormat : uint8_t +namespace GpuWrapApi { +enum class eTextureFormat : uint8_t { TEXFMT_A8_Unorm = 0, TEXFMT_R8_Unorm = 1, @@ -77,6 +78,8 @@ enum class GpuWrapApieTextureFormat : uint8_t TEXFMT_Uint_32 = TEXFMT_R32_Uint, TEXFMT_Uint_R32G32B32A32 = TEXFMT_R16G16B16A16_Uint, }; +} // namespace GpuWrapApi +using GpuWrapApieTextureFormat = GpuWrapApi::eTextureFormat; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureGroup.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureGroup.hpp similarity index 79% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureGroup.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureGroup.hpp index 36c2ec6e1..2fc234d7a 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureGroup.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureGroup.hpp @@ -7,7 +7,8 @@ #include namespace RED4ext { -enum class GpuWrapApieTextureGroup : uint8_t +namespace GpuWrapApi { +enum class eTextureGroup : uint8_t { TEXG_Generic_Color = 1, TEXG_Generic_Grayscale = 2, @@ -22,6 +23,8 @@ enum class GpuWrapApieTextureGroup : uint8_t TEXG_Multilayer_Grayscale = 11, TEXG_Multilayer_Microblend = 12, }; +} // namespace GpuWrapApi +using GpuWrapApieTextureGroup = GpuWrapApi::eTextureGroup; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureType.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureType.hpp similarity index 65% rename from include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureType.hpp rename to include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureType.hpp index 348e843de..61cf44a6b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApieTextureType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApi/eTextureType.hpp @@ -7,13 +7,16 @@ #include namespace RED4ext { -enum class GpuWrapApieTextureType : uint8_t +namespace GpuWrapApi { +enum class eTextureType : uint8_t { TEXTYPE_2D = 0, TEXTYPE_CUBE = 1, TEXTYPE_ARRAY = 2, TEXTYPE_3D = 3, }; +} // namespace GpuWrapApi +using GpuWrapApieTextureType = GpuWrapApi::eTextureType; } // namespace RED4ext // clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingPackingElement.hpp b/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingPackingElement.hpp deleted file mode 100644 index 284da48b1..000000000 --- a/include/RED4ext/Scripting/Natives/Generated/GpuWrapApiVertexPackingPackingElement.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -// clang-format off - -// This file is generated from the Game's Reflection data - -#include -#include -#include -#include -#include - -namespace RED4ext -{ -struct GpuWrapApiVertexPackingPackingElement -{ - static constexpr const char* NAME = "GpuWrapApiVertexPackingPackingElement"; - static constexpr const char* ALIAS = NAME; - - GpuWrapApiVertexPackingePackingType type; // 00 - GpuWrapApiVertexPackingePackingUsage usage; // 01 - uint8_t usageIndex; // 02 - uint8_t streamIndex; // 03 - GpuWrapApiVertexPackingEStreamType streamType; // 04 -}; -RED4EXT_ASSERT_SIZE(GpuWrapApiVertexPackingPackingElement, 0x5); -} // namespace RED4ext - -// clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/PSODescRenderTargetSetup.hpp b/include/RED4ext/Scripting/Natives/Generated/PSODescRenderTargetSetup.hpp index d0e31b70d..12badf384 100644 --- a/include/RED4ext/Scripting/Natives/Generated/PSODescRenderTargetSetup.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/PSODescRenderTargetSetup.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace RED4ext { @@ -16,8 +16,8 @@ struct PSODescRenderTargetSetup static constexpr const char* NAME = "PSODescRenderTargetSetup"; static constexpr const char* ALIAS = NAME; - StaticArray rtFormats; // 00 - GpuWrapApieTextureFormat dsFormat; // 0C + StaticArray rtFormats; // 00 + GpuWrapApi::eTextureFormat dsFormat; // 0C uint8_t unk0D[0x10 - 0xD]; // D }; RED4EXT_ASSERT_SIZE(PSODescRenderTargetSetup, 0x10); diff --git a/include/RED4ext/Scripting/Natives/Generated/STextureGroupSetup.hpp b/include/RED4ext/Scripting/Natives/Generated/STextureGroupSetup.hpp index 9edfbf341..f6dfc0810 100644 --- a/include/RED4ext/Scripting/Natives/Generated/STextureGroupSetup.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/STextureGroupSetup.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace RED4ext { @@ -19,7 +19,7 @@ struct STextureGroupSetup ETextureCompression compression; // 00 ETextureRawFormat rawFormat; // 04 - GpuWrapApieTextureGroup group; // 08 + GpuWrapApi::eTextureGroup group; // 08 uint8_t platformMipBiasPC; // 09 uint8_t platformMipBiasConsole; // 0A bool isStreamable; // 0B diff --git a/include/RED4ext/Scripting/Natives/Generated/game/PhotoModeSystem.hpp b/include/RED4ext/Scripting/Natives/Generated/game/PhotoModeSystem.hpp index bc442d123..e76faf81b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/PhotoModeSystem.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/PhotoModeSystem.hpp @@ -17,9 +17,9 @@ struct __declspec(align(0x10)) PhotoModeSystem : game::IPhotoModeSystem static constexpr const char* NAME = "gamePhotoModeSystem"; static constexpr const char* ALIAS = "PhotoModeSystem"; - uint8_t unk48[0xA40 - 0x48]; // 48 + uint8_t unk48[0xA60 - 0x48]; // 48 }; -RED4EXT_ASSERT_SIZE(PhotoModeSystem, 0xA40); +RED4EXT_ASSERT_SIZE(PhotoModeSystem, 0xA60); } // namespace game using gamePhotoModeSystem = game::PhotoModeSystem; using PhotoModeSystem = game::PhotoModeSystem; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/Vehicle_Record.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/Vehicle_Record.hpp index c66c8b193..bbde20d82 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/Vehicle_Record.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/Vehicle_Record.hpp @@ -17,9 +17,9 @@ struct Vehicle_Record : game::data::SpawnableObject_Record static constexpr const char* NAME = "gamedataVehicle_Record"; static constexpr const char* ALIAS = "Vehicle_Record"; - uint8_t unkF8[0x590 - 0xF8]; // F8 + uint8_t unkF8[0x5A0 - 0xF8]; // F8 }; -RED4EXT_ASSERT_SIZE(Vehicle_Record, 0x590); +RED4EXT_ASSERT_SIZE(Vehicle_Record, 0x5A0); } // namespace game::data using gamedataVehicle_Record = game::data::Vehicle_Record; using Vehicle_Record = game::data::Vehicle_Record; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/ChangeCameraControlHintVisibilityEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/ChangeCameraControlHintVisibilityEvent.hpp index 9185d0dd4..1e22ef14f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/ChangeCameraControlHintVisibilityEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/ChangeCameraControlHintVisibilityEvent.hpp @@ -17,8 +17,9 @@ struct ChangeCameraControlHintVisibilityEvent : red::Event static constexpr const char* NAME = "gameuiChangeCameraControlHintVisibilityEvent"; static constexpr const char* ALIAS = "ChangeCameraControlHintVisibilityEvent"; - bool visible; // 40 - uint8_t unk41[0x48 - 0x41]; // 41 + bool movementVisible; // 40 + bool rotationVisible; // 41 + uint8_t unk42[0x48 - 0x42]; // 42 }; RED4EXT_ASSERT_SIZE(ChangeCameraControlHintVisibilityEvent, 0x48); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotCallback.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotCallback.hpp new file mode 100644 index 000000000..a8adec7b6 --- /dev/null +++ b/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotCallback.hpp @@ -0,0 +1,27 @@ +#pragma once + +// clang-format off + +// This file is generated from the Game's Reflection data + +#include +#include +#include + +namespace RED4ext +{ +namespace ink +{ +struct GameScreenshotCallback : ink::CallbackBase +{ + static constexpr const char* NAME = "inkGameScreenshotCallback"; + static constexpr const char* ALIAS = NAME; + + uint8_t unk28[0x38 - 0x28]; // 28 +}; +RED4EXT_ASSERT_SIZE(GameScreenshotCallback, 0x38); +} // namespace ink +using inkGameScreenshotCallback = ink::GameScreenshotCallback; +} // namespace RED4ext + +// clang-format on diff --git a/include/RED4ext/Scripting/Natives/Generated/rend/IndexBufferChunk.hpp b/include/RED4ext/Scripting/Natives/Generated/rend/IndexBufferChunk.hpp index 02d0be349..7eb01f6be 100644 --- a/include/RED4ext/Scripting/Natives/Generated/rend/IndexBufferChunk.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/rend/IndexBufferChunk.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include namespace RED4ext { @@ -17,7 +17,7 @@ struct IndexBufferChunk static constexpr const char* NAME = "rendIndexBufferChunk"; static constexpr const char* ALIAS = NAME; - GpuWrapApieIndexBufferChunkType pe; // 00 + GpuWrapApi::eIndexBufferChunkType pe; // 00 uint8_t unk01[0x4 - 0x1]; // 1 uint32_t teOffset; // 04 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/rend/RenderTextureBlobTextureInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/rend/RenderTextureBlobTextureInfo.hpp index 2ee924742..a7b1b0441 100644 --- a/include/RED4ext/Scripting/Natives/Generated/rend/RenderTextureBlobTextureInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/rend/RenderTextureBlobTextureInfo.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include namespace RED4ext { @@ -17,7 +17,7 @@ struct RenderTextureBlobTextureInfo static constexpr const char* NAME = "rendRenderTextureBlobTextureInfo"; static constexpr const char* ALIAS = NAME; - GpuWrapApieTextureType type; // 00 + GpuWrapApi::eTextureType type; // 00 uint8_t unk01[0x4 - 0x1]; // 1 uint32_t textureDataSize; // 04 uint32_t sliceSize; // 08 diff --git a/include/RED4ext/Scripting/Natives/Generated/rend/VertexBufferChunk.hpp b/include/RED4ext/Scripting/Natives/Generated/rend/VertexBufferChunk.hpp index 7acfa13f3..a707f5099 100644 --- a/include/RED4ext/Scripting/Natives/Generated/rend/VertexBufferChunk.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/rend/VertexBufferChunk.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace RED4ext { @@ -18,7 +18,7 @@ struct VertexBufferChunk static constexpr const char* NAME = "rendVertexBufferChunk"; static constexpr const char* ALIAS = NAME; - GpuWrapApiVertexLayoutDesc vertexLayout; // 00 + GpuWrapApi::VertexLayoutDesc vertexLayout; // 00 StaticArray byteOffsets; // B8 }; RED4EXT_ASSERT_SIZE(VertexBufferChunk, 0xD0); diff --git a/include/RED4ext/Scripting/Natives/Generated/vehicle/VehicleCustomization.hpp b/include/RED4ext/Scripting/Natives/Generated/vehicle/VehicleCustomization.hpp index cfc59716f..78b7ffd65 100644 --- a/include/RED4ext/Scripting/Natives/Generated/vehicle/VehicleCustomization.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/vehicle/VehicleCustomization.hpp @@ -20,9 +20,9 @@ struct VehicleCustomization : ent::IComponent static constexpr const char* ALIAS = "VehicleCustomizationComponent"; DynArray defaultDecalsPerAppearance; // 90 - uint8_t unkA0[0x148 - 0xA0]; // A0 + uint8_t unkA0[0x158 - 0xA0]; // A0 }; -RED4EXT_ASSERT_SIZE(VehicleCustomization, 0x148); +RED4EXT_ASSERT_SIZE(VehicleCustomization, 0x158); } // namespace vehicle using vehicleVehicleCustomization = vehicle::VehicleCustomization; using VehicleCustomizationComponent = vehicle::VehicleCustomization; diff --git a/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp b/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp index ede18aa03..10d1c34e3 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp @@ -53,37 +53,40 @@ struct BenchmarkSummary : IScriptable int32_t DLSSQuality; // 190 float DLSSSharpness; // 194 bool DLSSFrameGenEnabled; // 198 - bool FSR2Enabled; // 199 + bool DLSSMultiFrameGenEnabled; // 199 uint8_t unk19A[0x19C - 0x19A]; // 19A - int32_t FSR2Quality; // 19C - float FSR2Sharpness; // 1A0 - bool FSR3Enabled; // 1A4 - uint8_t unk1A5[0x1A8 - 0x1A5]; // 1A5 - int32_t FSR3Quality; // 1A8 - float FSR3Sharpness; // 1AC - bool FSR3FrameGenEnabled; // 1B0 - bool XeSSEnabled; // 1B1 - uint8_t unk1B2[0x1B4 - 0x1B2]; // 1B2 - int32_t XeSSQuality; // 1B4 - float XeSSSharpness; // 1B8 - bool DRSEnabled; // 1BC - uint8_t unk1BD[0x1C0 - 0x1BD]; // 1BD - uint32_t DRSTargetFPS; // 1C0 - uint32_t DRSMinimalResolutionPercentage; // 1C4 - uint32_t DRSMaximalResolutionPercentage; // 1C8 - bool CASSharpeningEnabled; // 1CC - bool FSREnabled; // 1CD - uint8_t unk1CE[0x1D0 - 0x1CE]; // 1CE - int32_t FSRQuality; // 1D0 - bool rayTracingEnabled; // 1D4 - bool rayTracedReflections; // 1D5 - bool rayTracedSunShadows; // 1D6 - bool rayTracedLocalShadows; // 1D7 - int32_t rayTracedLightingQuality; // 1D8 - bool rayTracedPathTracingEnabled; // 1DC - uint8_t unk1DD[0x1E0 - 0x1DD]; // 1DD + int32_t DLSSMultiFrameGenFrameToGenerate; // 19C + bool FSR2Enabled; // 1A0 + uint8_t unk1A1[0x1A4 - 0x1A1]; // 1A1 + int32_t FSR2Quality; // 1A4 + float FSR2Sharpness; // 1A8 + bool FSR3Enabled; // 1AC + uint8_t unk1AD[0x1B0 - 0x1AD]; // 1AD + int32_t FSR3Quality; // 1B0 + float FSR3Sharpness; // 1B4 + bool FSR3FrameGenEnabled; // 1B8 + bool XeSSEnabled; // 1B9 + uint8_t unk1BA[0x1BC - 0x1BA]; // 1BA + int32_t XeSSQuality; // 1BC + float XeSSSharpness; // 1C0 + bool DRSEnabled; // 1C4 + uint8_t unk1C5[0x1C8 - 0x1C5]; // 1C5 + uint32_t DRSTargetFPS; // 1C8 + uint32_t DRSMinimalResolutionPercentage; // 1CC + uint32_t DRSMaximalResolutionPercentage; // 1D0 + bool CASSharpeningEnabled; // 1D4 + bool FSREnabled; // 1D5 + uint8_t unk1D6[0x1D8 - 0x1D6]; // 1D6 + int32_t FSRQuality; // 1D8 + bool rayTracingEnabled; // 1DC + bool rayTracedReflections; // 1DD + bool rayTracedSunShadows; // 1DE + bool rayTracedLocalShadows; // 1DF + int32_t rayTracedLightingQuality; // 1E0 + bool rayTracedPathTracingEnabled; // 1E4 + uint8_t unk1E5[0x1E8 - 0x1E5]; // 1E5 }; -RED4EXT_ASSERT_SIZE(BenchmarkSummary, 0x1E0); +RED4EXT_ASSERT_SIZE(BenchmarkSummary, 0x1E8); } // namespace world using worldBenchmarkSummary = world::BenchmarkSummary; } // namespace RED4ext diff --git a/src/Scripting/Natives.cpp b/src/Scripting/Natives.cpp index 4472f4e19..c512308b3 100644 --- a/src/Scripting/Natives.cpp +++ b/src/Scripting/Natives.cpp @@ -251,15 +251,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include