Merge pull request #102 from iainmckay/add-playercontroller-setupinpu…

…tcomponent

Adds PlayerController::SetupInputComponent

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/CoreUObject/UObject.cs

@@ -666,6 +666,11 @@ internal virtual void EndPlayInternal(byte endPlayReason)
             // This is eventually implemented in injected classes
         }
 
+        internal virtual void SetupInputComponentInternal()
+        {
+            // This is eventually implemented in injected classes
+        }
+
         /// <summary>
         /// Looks for a given function name
         /// </summary>

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/Classes.cs

@@ -75,6 +75,7 @@ public static class Classes
         public static IntPtr AActor;
         public static IntPtr APawn;
         public static IntPtr UActorComponent;
+        public static IntPtr APlayerController;
 
         // USharp
         public static IntPtr USharpClass;
@@ -158,6 +159,7 @@ internal static void OnNativeFunctionsRegistered()
             AActor = Native_Classes.AActor();
             APawn = Native_Classes.APawn();
             UActorComponent = Native_Classes.UActorComponent();
+            APlayerController = Native_Classes.APlayerController();
 
             // USharp
             USharpClass = Native_Classes.USharpClass();

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/InjectedClasses/Engine/PlayerController_Injected.cs

@@ -0,0 +1,22 @@
+using System;
+using UnrealEngine.Engine;
+using UnrealEngine.Runtime;
+using UnrealEngine.Runtime.Native;
+
+namespace UnrealEngine.Engine
+{
+    public partial class APlayerController : AController
+    {
+        internal override void SetupInputComponentInternal()
+        {
+            SetupInputComponent();
+        }
+
+        /// <summary>
+        /// Allows the PlayerController to set up custom input bindings.
+        /// </summary>
+        protected virtual void SetupInputComponent()
+        {
+        }
+    }
+}

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/Native/Internal/Native_Classes.cs

@@ -68,5 +68,6 @@ static class Native_Classes
         public static Del_StaticClass USharpClass;
         public static Del_StaticClass USharpStruct;
         public static Del_StaticClass UActorComponent;
+        public static Del_StaticClass APlayerController;
     }
 }

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/Native/Native_VTableHacks.cs

@@ -17,6 +17,7 @@ static class Native_VTableHacks
         public delegate void Del_CallOriginal_ActorEndPlay(IntPtr originalFunc, IntPtr obj, byte endPlayReason);
         public delegate void Del_CallOriginal_ActorComponentBeginPlay(IntPtr originalFunc, IntPtr obj);
         public delegate void Del_CallOriginal_ActorComponentEndPlay(IntPtr originalFunc, IntPtr obj, byte endPlayReason);
+        public delegate void Del_CallOriginal_PlayerControllerSetupInputComponent(IntPtr originalFunc, IntPtr obj);
 
         public static Del_Set_VTableCallback Set_VTableCallback;
         public static Del_CallOriginal_GetLifetimeReplicatedProps CallOriginal_GetLifetimeReplicatedProps;
@@ -25,5 +26,6 @@ static class Native_VTableHacks
         public static Del_CallOriginal_ActorEndPlay CallOriginal_ActorEndPlay;
         public static Del_CallOriginal_ActorComponentBeginPlay CallOriginal_ActorComponentBeginPlay;
         public static Del_CallOriginal_ActorComponentEndPlay CallOriginal_ActorComponentEndPlay;
+        public static Del_CallOriginal_PlayerControllerSetupInputComponent CallOriginal_PlayerControllerSetupInputComponent;
     }
 }

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/VTableHacks.cs

@@ -18,13 +18,15 @@ private static void AddVTableRedirects()
             IntPtr pawnClass = Runtime.Classes.APawn;
             IntPtr actorClass = Runtime.Classes.AActor;
             IntPtr actorComponentClass = Runtime.Classes.UActorComponent;
+            IntPtr playerControllerClass = Runtime.Classes.APlayerController;
 
             repProps = AddVTableRedirect(objectClass, "DummyRepProps", new GetLifetimeReplicatedPropsDel(OnGetLifetimeReplicatedProps));
             setupPlayerInput = AddVTableRedirect(pawnClass, "DummySetupPlayerInput", new SetupPlayerInputComponentDel(OnSetupPlayerInputComponent));
             actorBeginPlay = AddVTableRedirect(actorClass, "DummyActorBeginPlay", new ActorBeginPlayDel(OnActorBeginPlay));
             actorEndPlay = AddVTableRedirect(actorClass, "DummyActorEndPlay", new ActorEndPlayDel(OnActorEndPlay));
             actorComponentBeginPlay = AddVTableRedirect(actorComponentClass, "DummyActorComponentBeginPlay", new ActorComponentBeginPlayDel(OnActorComponentBeginPlay));
             actorComponentEndPlay = AddVTableRedirect(actorComponentClass, "DummyActorComponentEndPlay", new ActorComponentEndPlayDel(OnActorComponentEndPlay));
+            playerControllerSetupInputComponent = AddVTableRedirect(playerControllerClass, "DummyPlayerControllerSetupInputComponent", new PlayerControllerSetupInputComponentDel(OnPlayerControllerSetupInputComponent));
         }
 
         private static void LogCallbackException(string functionName, Exception e)
@@ -168,6 +170,28 @@ private static void OnActorComponentEndPlay(IntPtr address, byte endPlayReason)
             }
         }
 
+        private static FunctionRedirect playerControllerSetupInputComponent;
+        delegate void PlayerControllerSetupInputComponentDel(IntPtr address);
+        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+        delegate void PlayerControllerSetupInputComponentDel_ThisCall(IntPtr address);
+        private static void OnPlayerControllerSetupInputComponent(IntPtr address)
+        {
+            try
+            {
+                UObject obj = GCHelper.Find(address);
+
+                PlayerControllerSetupInputComponentDel_ThisCall original = playerControllerSetupInputComponent.GetOriginal<PlayerControllerSetupInputComponentDel_ThisCall>(obj);
+                original(address);
+                //Native_VTableHacks.CallOriginal_PlayerControllerSetupInputComponent(original)
+
+                obj.SetupInputComponentInternal();
+            }
+            catch (Exception e)
+            {
+                LogCallbackException(nameof(OnPlayerControllerSetupInputComponent), e);
+            }
+        }
+
         ////////////////////////////////////////////////////////////////////////////////////////
         // Add vtable redirects above this line
         ////////////////////////////////////////////////////////////////////////////////////////

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/UnrealEngine.Runtime.csproj

@@ -69,6 +69,7 @@
     <None Include="Internal\InjectedClasses\Engine\Actor_Injected.cs" />
     <None Include="Internal\InjectedClasses\Engine\Engine_Injected.cs" />
     <None Include="Internal\InjectedClasses\Engine\GameplayStatics_Injected.cs" />
+    <None Include="Internal\InjectedClasses\Engine\PlayerController_Injected.cs" />
     <None Include="Internal\InjectedClasses\Engine\WorldContext_Extensions.cs" />
     <None Include="Internal\InjectedClasses\Engine\World_Injected.cs" />
     <None Include="Internal\InjectedClasses\Engine\InputComponent_Injected.cs" />

Source/USharp/Private/ExportedFunctions/Internal/Export_Classes.h

@@ -273,6 +273,11 @@ CSEXPORT UClass* CSCONV Export_Classes_UActorComponent()
     return UActorComponent::StaticClass();
 }
 
+CSEXPORT UClass* CSCONV Export_Classes_APlayerController()
+{
+    return APlayerController::StaticClass();
+}
+
 CSEXPORT UClass* CSCONV Export_Classes_USharpClass()
 {
 	return USharpClass::StaticClass();
@@ -343,6 +348,7 @@ CSEXPORT void CSCONV Export_Classes(RegisterFunc registerFunc)
 	REGISTER_FUNC(Export_Classes_AActor);
 	REGISTER_FUNC(Export_Classes_APawn);
 	REGISTER_FUNC(Export_Classes_UActorComponent);
+	REGISTER_FUNC(Export_Classes_APlayerController);
 
 
 	// USharp

Source/USharp/Private/ExportedFunctions/Internal/Export_VTableHacks.h

@@ -6,6 +6,7 @@ ActorBeginPlayCallbackSig ActorBeginPlayCallback = nullptr;
 ActorEndPlayCallbackSig ActorEndPlayCallback = nullptr;
 ActorComponentBeginPlayCallbackSig ActorComponentBeginPlayCallback = nullptr;
 ActorComponentEndPlayCallbackSig ActorComponentEndPlayCallback = nullptr;
+PlayerControllerSetupInputComponentCallbackSig PlayerControllerSetupInputComponentCallback = nullptr;
 
 TMap<FString, void**> DummyNames;
 CSEXPORT void CSCONV Export_VTableHacks_Set_VTableCallback(const FString& DummyName, void* Callback)
@@ -19,6 +20,7 @@ CSEXPORT void CSCONV Export_VTableHacks_Set_VTableCallback(const FString& DummyN
 		DummyNames.Add(TEXT("DummyActorEndPlay"), (void**)&ActorEndPlayCallback);
 		DummyNames.Add(TEXT("DummyActorComponentBeginPlay"), (void**)&ActorComponentBeginPlayCallback);
 		DummyNames.Add(TEXT("DummyActorComponentEndPlay"), (void**)&ActorComponentEndPlayCallback);
+		DummyNames.Add(TEXT("DummyPlayerControllerSetupInputComponent"), (void**)&PlayerControllerSetupInputComponentCallback);
 	}
 
 	void*** Element = DummyNames.Find(DummyName);
@@ -65,6 +67,12 @@ CSEXPORT void CSCONV Export_VTableHacks_CallOriginal_ActorComponentEndPlay(Actor
 	(Obj->*Func)(EndPlayReason);
 }
 
+typedef void (UObject::*PlayerControllerSetupInputComponentFunc)();
+CSEXPORT void CSCONV Export_VTableHacks_CallOriginal_PlayerControllerSetupInputComponent(PlayerControllerSetupInputComponentFunc Func, UObject* Obj)
+{
+	(Obj->*Func)();
+}
+
 CSEXPORT void CSCONV Export_VTableHacks(RegisterFunc registerFunc)
 {
 	REGISTER_FUNC(Export_VTableHacks_Set_VTableCallback);
@@ -74,4 +82,5 @@ CSEXPORT void CSCONV Export_VTableHacks(RegisterFunc registerFunc)
 	REGISTER_FUNC(Export_VTableHacks_CallOriginal_ActorEndPlay);
 	REGISTER_FUNC(Export_VTableHacks_CallOriginal_ActorComponentBeginPlay);
 	REGISTER_FUNC(Export_VTableHacks_CallOriginal_ActorComponentEndPlay);
+	REGISTER_FUNC(Export_VTableHacks_CallOriginal_PlayerControllerSetupInputComponent);
 }

Source/USharp/Private/VTableHacks.h

@@ -3,6 +3,7 @@
 #include "Engine/EngineBaseTypes.h"
 #include "GameFramework/Actor.h"
 #include "GameFramework/Pawn.h"
+#include "GameFramework/PlayerController.h"
 #include "Components/ActorComponent.h"
 #include "ExportedFunctions/ExportedFunctionsConventions.h"
 #include "VTableHacks.generated.h"
@@ -309,4 +310,44 @@ class USHARP_API UDummyActorComponentEndPlay3 : public UDummyActorComponentEndPl
 	{
 		FMsg::Logf("", 0, FName(TEXT("USharp")), ELogVerbosity::Log, TEXT("ADummyActorComponentEndPlay3-EndPlay"));
 	}
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// APlayerController::SetupInputComponent
+/////////////////////////////////////////////////////////////////////////////
+
+typedef void(CSCONV *PlayerControllerSetupInputComponentCallbackSig)(APlayerController* Obj);
+extern PlayerControllerSetupInputComponentCallbackSig PlayerControllerSetupInputComponentCallback;
+
+UCLASS(NotBlueprintable, NotBlueprintType)
+class USHARP_API ADummyPlayerControllerSetupInputComponent1 : public APlayerController
+{
+	GENERATED_BODY()
+
+protected:
+	virtual void SetupInputComponent() override
+	{
+		if (PlayerControllerSetupInputComponentCallback != nullptr)
+		{
+            PlayerControllerSetupInputComponentCallback(this);
+		}
+	}
+};
+
+UCLASS(NotBlueprintable, NotBlueprintType)
+class USHARP_API ADummyPlayerControllerSetupInputComponent2 : public ADummyPlayerControllerSetupInputComponent1
+{
+	GENERATED_BODY()
+};
+
+UCLASS(NotBlueprintable, NotBlueprintType)
+class USHARP_API ADummyPlayerControllerSetupInputComponent3 : public ADummyPlayerControllerSetupInputComponent2
+{
+	GENERATED_BODY()
+
+protected:
+	virtual void SetupInputComponent() override
+	{
+		FMsg::Logf("", 0, FName(TEXT("USharp")), ELogVerbosity::Log, TEXT("ADummyPlayerControllerSetupInputComponent3-SetupInputComponent"));
+	}
 };