VR (MHWilds): Partial fixes (no more crashes)

praydog · Nov 2, 2024 · ba5f13a · ba5f13a
1 parent 294740f
commit ba5f13a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/shared/sdk/RETransform.cpp b/shared/sdk/RETransform.cpp
@@ -18,7 +18,7 @@ Vector4f sdk::get_transform_position(RETransform* transform) {
 glm::quat sdk::get_transform_rotation(RETransform* transform) {
     static auto get_rotation_method = sdk::find_type_definition("via.Transform")->get_method("get_Rotation");
 
-    glm::quat out{};
+    __declspec(align(16)) glm::quat out{};
     get_rotation_method->call<glm::quat*>(&out, sdk::get_thread_context(), transform);
 
     return out;
@@ -106,19 +106,21 @@ uint32_t get_joint_hash(REJoint* joint) {
 void sdk::set_joint_position(REJoint* joint, const Vector4f& position) {
     static auto set_position_method = sdk::find_type_definition("via.Joint")->get_method("set_Position");
 
-    set_position_method->call<void*>(sdk::get_thread_context(), joint, &position);
+    __declspec(align(16)) Vector4f pos = position;
+    set_position_method->call<void*>(sdk::get_thread_context(), joint, &pos);
 };
 
 void sdk::set_joint_rotation(REJoint* joint, const glm::quat& rotation) {
     static auto set_rotation_method = sdk::find_type_definition("via.Joint")->get_method("set_Rotation");
 
-    set_rotation_method->call<void*>(sdk::get_thread_context(), joint, &rotation);
+    __declspec(align(16)) glm::quat rot = rotation;
+    set_rotation_method->call<void*>(sdk::get_thread_context(), joint, &rot);
 };
 
 glm::quat sdk::get_joint_rotation(REJoint* joint) {
     static auto get_rotation_method = sdk::find_type_definition("via.Joint")->get_method("get_Rotation");
 
-    glm::quat rotation{};
+    __declspec(align(16)) glm::quat rotation{};
     get_rotation_method->call<glm::quat*>(&rotation, sdk::get_thread_context(), joint);
 
     return rotation;
@@ -127,7 +129,7 @@ glm::quat sdk::get_joint_rotation(REJoint* joint) {
 Vector4f sdk::get_joint_position(REJoint* joint) {
     static auto get_position_method = sdk::find_type_definition("via.Joint")->get_method("get_Position");
 
-    Vector4f position{};
+    __declspec(align(16)) Vector4f position{};
     get_position_method->call<Vector4f*>(&position, sdk::get_thread_context(), joint);
 
     return position;
@@ -136,7 +138,7 @@ Vector4f sdk::get_joint_position(REJoint* joint) {
 glm::quat sdk::get_joint_local_rotation(REJoint* joint) {
     static auto get_local_rotation_method = sdk::find_type_definition("via.Joint")->get_method("get_LocalRotation");
 
-    glm::quat rotation{};
+    __declspec(align(16)) glm::quat rotation{};
     get_local_rotation_method->call<glm::quat*>(&rotation, sdk::get_thread_context(), joint);
 
     return rotation;
@@ -145,7 +147,7 @@ glm::quat sdk::get_joint_local_rotation(REJoint* joint) {
 Vector4f sdk::get_joint_local_position(REJoint* joint) {
     static auto get_local_position_method = sdk::find_type_definition("via.Joint")->get_method("get_LocalPosition");
 
-    Vector4f position{};
+    __declspec(align(16)) Vector4f position{};
     get_local_position_method->call<Vector4f*>(&position, sdk::get_thread_context(), joint);
 
     return position;

diff --git a/src/mods/VR.cpp b/src/mods/VR.cpp
@@ -27,7 +27,7 @@
 #elif defined(RE4)
 #include "sdk/regenny/re4/via/Window.hpp"
 #include "sdk/regenny/re4/via/SceneView.hpp"
-#elif defined(DD2)
+#elif defined(DD2) || TDB_VER >= 74
 #include "sdk/regenny/dd2/via/Window.hpp"
 #include "sdk/regenny/dd2/via/SceneView.hpp"
 #else
@@ -3131,7 +3131,7 @@ void VR::on_end_rendering(void* entry) {
                 "EndDynamics",
                 "EndPhysics",
                 "RenderDynamics",
-#ifndef DD2
+#if TDB_VER < 73
                 "RenderLandscape",
 #endif
                 "DevelopRenderer",