just need defs

jackhumbert · Dec 16, 2023 · 2dfc8db · 2dfc8db
1 parent 83bdf08
commit 2dfc8db
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 80 deletions.
diff --git a/compile_commands.json b/compile_commands.json
diff --git a/deps/red4ext.sdk b/deps/red4ext.sdk
diff --git a/src/red4ext/Extensions/InkMaskWidget.cpp b/src/red4ext/Extensions/InkMaskWidget.cpp
@@ -3,6 +3,7 @@
 #include <RED4ext/Common.hpp>
 #include <RED4ext/RTTISystem.hpp>
 #include <RED4ext/Scripting/Natives/Generated/ink/MaskWidget.hpp>
+#include <RED4ext/Scripting/Natives/Generated/red/ResourceReferenceScriptToken.hpp>
 #include <RED4ext/Scripting/Utils.hpp>
 #include <RedLib.hpp>
 

diff --git a/src/red4ext/Extensions/InkShapeWidget.cpp b/src/red4ext/Extensions/InkShapeWidget.cpp
@@ -2,6 +2,7 @@
 #include "LoadResRef.hpp"
 #include <RED4ext/Common.hpp>
 #include <RED4ext/RTTISystem.hpp>
+#include <RED4ext/Scripting/Natives/Generated/red/ResourceReferenceScriptToken.hpp>
 #include <RED4ext/Scripting/Natives/Generated/ink/ShapeWidget.hpp>
 #include <RedLib.hpp>
 

diff --git a/src/red4ext/Extensions/MeshComponent.cpp b/src/red4ext/Extensions/MeshComponent.cpp
@@ -21,7 +21,7 @@ void IPlacedComponent::SetParentTransform(RED4ext::CName bindName, RED4ext::CNam
 }
 
 void Entity::AddComponent(RED4ext::Handle<RED4ext::ent::IComponent> componentToAdd) {
-  RED4ext::ent::VisualControllerComponent *vcc = NULL;
+  RED4ext::ent::VisualControllerComponent *vcc = nullptr;
   auto rtti = RED4ext::CRTTISystem::Get();
   auto vccClass =  rtti->GetClass("entVisualControllerComponent");
 
@@ -68,7 +68,7 @@ void Entity::AddComponent(RED4ext::Handle<RED4ext::ent::IComponent> componentToA
 //}
 
 void Entity::AddSlot(RED4ext::CName boneName, RED4ext::CName slotName, RED4ext::Vector3 relativePosition, RED4ext::Quaternion relativeRotation) {
-  RED4ext::ent::SlotComponent *slotComponent = NULL;
+  RED4ext::ent::SlotComponent *slotComponent = nullptr;
   auto rtti = RED4ext::CRTTISystem::Get();
 
   for (auto const &handle : this->componentsStorage.components) {
@@ -81,7 +81,7 @@ void Entity::AddSlot(RED4ext::CName boneName, RED4ext::CName slotName, RED4ext::
     }
   }
 
-  if (slotComponent != NULL) {
+  if (slotComponent != nullptr) {
     auto slot = reinterpret_cast<RED4ext::ent::Slot *>(rtti->GetClass("entSlot")->CreateInstance());
     slot->boneName = boneName;
     slot->slotName = slotName;

diff --git a/src/red4ext/Extensions/MeshComponent.hpp b/src/red4ext/Extensions/MeshComponent.hpp
@@ -5,6 +5,7 @@
 #include <RED4ext/Scripting/Natives/Generated/ent/MeshComponent.hpp>
 #include <RED4ext/Scripting/Natives/Generated/red/ResourceReferenceScriptToken.hpp>
 #include <RED4ext/Scripting/Natives/vehicleChassisComponent.hpp>
+#include <RED4ext/Scripting/Natives/entEntity.hpp>
 //#include "FlightConfiguration.hpp"
 
 class MeshComponent : public Engine::RTTIExpansion<MeshComponent, RED4ext::ent::MeshComponent> {
@@ -40,7 +41,7 @@ class Entity : public Engine::RTTIExpansion<Entity, RED4ext::ent::Entity> {
   /// AddSlot
   void AddSlot(RED4ext::CName boneName, RED4ext::CName slotName, RED4ext::Vector3 relativePosition,
                        RED4ext::Quaternion relativeRotation);
-  private:
+private:
   friend Descriptor;
 
   inline static void OnExpand(Descriptor *aType, RED4ext::CRTTISystem *) {

diff --git a/src/red4ext/Flight/Log.hpp b/src/red4ext/Flight/Log.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "Utils/FlightModule.hpp"
+#include <RED4ext/Scripting/Natives/Generated/red/ResourceReferenceScriptToken.hpp>
 #include <RedLib.hpp>
 
 struct FlightLog : RED4ext::IScriptable {

diff --git a/src/red4ext/Hooks/VisualEffects.cpp b/src/red4ext/Hooks/VisualEffects.cpp
@@ -12,17 +12,17 @@
 
 // post 2.0
 /// @pattern 48 89 5C 24 08 48 89 54 24 10 57 48 83 EC 50 48 8B F9 45 84 C0 75 09 44 38 81 60 01 00 00 75 6A
-RED4ext::vehicle::MaterialFx * __fastcall GetFxForMaterial(RED4ext::CName material, bool isBackWheel);
+RED4ext::vehicle::MaterialFx * __fastcall GetFxForMaterial(RED4ext::vehicle::Unk570 *unk570, RED4ext::CName material, bool isBackWheel);
 
 // post 2.0
 /// @pattern 48 8B C4 48 89 58 08 48 89 70 10 48 89 78 18 4C 89 48 20 55 41 54 41 55 41 56 41 57 48 8D 68 A8
 /// @nth 0/2
-bool __fastcall TireTrackEffectStart(RED4ext::vehicle::Unk570::Unk30 *a2, RED4ext::vehicle::MaterialFx *fxLookup, RED4ext::Transform *a4, RED4ext::Transform *a5, bool physicalMaterialChange, bool conditionChange, bool condition);
+bool __fastcall TireTrackEffectStart(RED4ext::vehicle::Unk570 *unk570, RED4ext::vehicle::Unk570::Unk30 *a2, RED4ext::vehicle::MaterialFx *fxLookup, RED4ext::Transform *a4, RED4ext::Transform *a5, bool physicalMaterialChange, bool conditionChange, bool condition);
 
 // post 2.0
 /// @pattern 48 8B C4 48 89 58 08 48 89 70 10 48 89 78 18 4C 89 48 20 55 41 54 41 55 41 56 41 57 48 8D 68 A8
 /// @nth 1/2
-bool __fastcall SkidMarkEffectStart(RED4ext::vehicle::Unk570::Unk30 *unk30, RED4ext::vehicle::MaterialFx *fxLookup, RED4ext::Transform *a4, RED4ext::Transform *a5, bool physicalMaterialChange, bool conditionChange, bool condition);
+bool __fastcall SkidMarkEffectStart(RED4ext::vehicle::Unk570 *unk570, RED4ext::vehicle::Unk570::Unk30 *unk30, RED4ext::vehicle::MaterialFx *fxLookup, RED4ext::Transform *a4, RED4ext::Transform *a5, bool physicalMaterialChange, bool conditionChange, bool condition);
 
 struct FlightStatus {
   uint8_t isActive : 1;
@@ -31,7 +31,7 @@ struct FlightStatus {
 
 // replace tire tracks & skid marks with our own effects
 REGISTER_FLIGHT_HOOK(RED4ext::vehicle::MaterialFx * __fastcall, GetFxForMaterial, RED4ext::vehicle::Unk570 *unk570,
-                     RED4ext::CName material, char isBackWheel) {
+                     RED4ext::CName material, bool isBackWheel) {
   auto og = GetFxForMaterial_Original(unk570, material, isBackWheel);
   RED4ext::vehicle::MaterialFx * fx = og;
   auto fc = FlightComponent::Get(unk570->vehicle);
@@ -42,12 +42,13 @@ REGISTER_FLIGHT_HOOK(RED4ext::vehicle::MaterialFx * __fastcall, GetFxForMaterial
     if (fc->active && fc->configuration) {
       fx = new RED4ext::vehicle::MaterialFx();
       // *fx = fc->configuration->ExecuteFunction<RED4ext::vehicle::MaterialFx>("GetEffectForMaterial", material, *og).value();
-      *fx = RED4ext::ExecuteFunction<RED4ext::vehicle::MaterialFx>(
-        fc->configuration, 
+      RED4ext::ExecuteFunction(
+        (RED4ext::ScriptInstance*)fc->configuration.instance, 
         fc->configuration->nativeType->GetFunction("GetEffectForMaterial"), 
+        (void*)fx,
         material, 
         *og
-      ).value();
+      );
 
     }
   }

diff --git a/src/red4ext/Hooks/vehicleTPPCameraComponent_GetLocationFromOffset.cpp b/src/red4ext/Hooks/vehicleTPPCameraComponent_GetLocationFromOffset.cpp
@@ -4,6 +4,7 @@
 #include "FlightSettings.hpp"
 #include <RED4ext/Common.hpp>
 #include <RED4ext/Scripting/Natives/Generated/vehicle/TPPCameraComponent.hpp>
+#include <RED4ext/Scripting/Natives/vehiclePhysics.hpp>
 
 // gets the location for the camera to look at
 

diff --git a/src/red4ext/stdafx.hpp b/src/red4ext/stdafx.hpp
@@ -12,4 +12,4 @@
 
 #include <RED4ext/Common.hpp>
 #include <spdlog/spdlog.h>
-#include <RED4ext/Definitions.hpp>
+// #include <RED4ext/Definitions.hpp>
+2 −6		include/RED4ext/Addresses-Found.hpp
+0 −846		include/RED4ext/Definitions.hpp
+74 −137		include/RED4ext/Scripting/Natives/Generated/game/FPPCameraComponent.hpp
+1 −1		include/RED4ext/Scripting/Natives/entComponentsStorage.hpp
+2 −2		include/RED4ext/Scripting/Natives/entIComponent-inl.hpp
+1 −1		include/RED4ext/Scripting/Natives/entIComponent.hpp
+6 −0		include/RED4ext/Scripting/Natives/vehiclePhysics.hpp
+9 −0		include/RED4ext/Scripting/Utils.hpp