Keep manual alignment & update CONTRIBUTING.md

wopss · Jan 19, 2025 · a6e38c1 · a6e38c1
1 parent c569af3
commit a6e38c1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -106,14 +106,7 @@ one:
     static constexpr const char* NAME = "vehicleBaseObject";
 ```
 
-3. Remove `__declspec()` declaration:
-
-```diff
-- struct __declspec(align(0x10)) BaseObject : game::Object
-+ struct BaseObject : game::Object
-```
-
-4. Declare the new member based on its offset and type:
+3. Declare the new member based on its offset and type:
 
 ```diff
 {
@@ -131,7 +124,7 @@ one:
 };
 ```
 
-5. Assert the offset of known members:
+4. Assert the offset of known members:
 
 ```diff
 };
@@ -145,7 +138,7 @@ using VehicleObject = vehicle::BaseObject;
 } // namespace RED4ext
 ```
 
-6. Remove these comments:
+5. Remove these comments:
 
 ```diff
 -// clang-format off

diff --git a/include/RED4ext/Scripting/Natives/CMesh.hpp b/include/RED4ext/Scripting/Natives/CMesh.hpp
@@ -28,7 +28,7 @@ struct MeshAppearance;
 struct MeshParameter;
 } // namespace mesh
 
-struct CMesh : res::StreamedResource
+struct __declspec(align(0x10)) CMesh : res::StreamedResource
 {
     static constexpr const char* NAME = "CMesh";
     static constexpr const char* ALIAS = NAME;

diff --git a/include/RED4ext/Scripting/Natives/MorphTargetMesh.hpp b/include/RED4ext/Scripting/Natives/MorphTargetMesh.hpp
@@ -18,7 +18,7 @@ struct CMesh;
 struct IRenderResourceBlob;
 struct ITexture;
 
-struct MorphTargetMesh : res::StreamedResource
+struct __declspec(align(0x10)) MorphTargetMesh : res::StreamedResource
 {
     static constexpr const char* NAME = "MorphTargetMesh";
     static constexpr const char* ALIAS = NAME;

diff --git a/include/RED4ext/Scripting/Natives/entMorphTargetSkinnedMeshComponent.hpp b/include/RED4ext/Scripting/Natives/entMorphTargetSkinnedMeshComponent.hpp
@@ -16,7 +16,7 @@ struct MorphTargetMesh;
 
 namespace ent
 {
-struct MorphTargetSkinnedMeshComponent : ent::ISkinTargetComponent
+struct __declspec(align(0x10)) MorphTargetSkinnedMeshComponent : ent::ISkinTargetComponent
 {
     static constexpr const char* NAME = "entMorphTargetSkinnedMeshComponent";
     static constexpr const char* ALIAS = NAME;

diff --git a/include/RED4ext/Scripting/Natives/entSkinnedMeshComponent.hpp b/include/RED4ext/Scripting/Natives/entSkinnedMeshComponent.hpp
@@ -17,7 +17,7 @@ namespace RED4ext
 {
 namespace ent
 {
-struct SkinnedMeshComponent : ent::ISkinTargetComponent
+struct __declspec(align(0x10)) SkinnedMeshComponent : ent::ISkinTargetComponent
 {
     static constexpr const char* NAME = "entSkinnedMeshComponent";
     static constexpr const char* ALIAS = NAME;