Expose function for getting the parent of the material instance

longde123 · Sep 21, 2020 · 833f130 · 833f130
1 parent de4e536
commit 833f130
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 5 deletions.
diff --git a/API/MaterialInstance-GetParent().md b/API/MaterialInstance-GetParent().md
@@ -0,0 +1,8 @@
+### [UnrealEngine.Framework](./UnrealEngine-Framework.md 'UnrealEngine.Framework').[MaterialInstance](./MaterialInstance.md 'UnrealEngine.Framework.MaterialInstance')
+## MaterialInstance.GetParent() Method
+Returns the parent material or `null` on failure  
+```csharp
+public UnrealEngine.Framework.MaterialInstanceDynamic GetParent();
+```
+#### Returns
+[MaterialInstanceDynamic](./MaterialInstanceDynamic.md 'UnrealEngine.Framework.MaterialInstanceDynamic')  
diff --git a/API/MaterialInstance.md b/API/MaterialInstance.md
@@ -9,4 +9,5 @@ Inheritance [System.Object](https://docs.microsoft.com/en-us/dotnet/api/System.O
 Derived  
 &#8627; [MaterialInstanceDynamic](./MaterialInstanceDynamic.md 'UnrealEngine.Framework.MaterialInstanceDynamic')  
 ### Methods
+- [GetParent()](./MaterialInstance-GetParent().md 'UnrealEngine.Framework.MaterialInstance.GetParent()')
 - [IsChildOf(UnrealEngine.Framework.MaterialInterface)](./MaterialInstance-IsChildOf(MaterialInterface).md 'UnrealEngine.Framework.MaterialInstance.IsChildOf(UnrealEngine.Framework.MaterialInterface)')
diff --git a/API/PrimitiveComponent-GetMaterial(int).md b/API/PrimitiveComponent-GetMaterial(int).md
@@ -1,6 +1,6 @@
 ### [UnrealEngine.Framework](./UnrealEngine-Framework.md 'UnrealEngine.Framework').[PrimitiveComponent](./PrimitiveComponent.md 'UnrealEngine.Framework.PrimitiveComponent')
 ## PrimitiveComponent.GetMaterial(int) Method
-Returns the material at the specified element index  
+Returns the material at the specified element index or `null` on failure  
 ```csharp
 public UnrealEngine.Framework.MaterialInstanceDynamic GetMaterial(int elementIndex);
 ```

diff --git a/Source/Managed/Framework/Codegen.cs b/Source/Managed/Framework/Codegen.cs
@@ -26,7 +26,7 @@ namespace UnrealEngine.Framework {
 	// Automatically generated
 
 	internal static class Shared {
-		internal const int checksum = 0x281;
+		internal const int checksum = 0x282;
 		internal static Dictionary<int, IntPtr> userFunctions = new();
 		private const string dynamicTypesAssemblyName = "UnrealEngine.DynamicTypes";
 		private static readonly ModuleBuilder moduleBuilder = AssemblyBuilder.DefineDynamicAssembly(new(dynamicTypesAssemblyName), AssemblyBuilderAccess.RunAndCollect).DefineDynamicModule(dynamicTypesAssemblyName);
@@ -931,6 +931,7 @@ internal static unsafe Dictionary<int, IntPtr> Load(IntPtr* events, IntPtr funct
 				IntPtr* materialInstanceFunctions = (IntPtr*)buffer[position++];
 
 				MaterialInstance.isChildOf = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr, Bool>)materialInstanceFunctions[head++];
+				MaterialInstance.getParent = (delegate* unmanaged[Cdecl]<IntPtr, IntPtr>)materialInstanceFunctions[head++];
 			}
 
 			unchecked {
@@ -1996,6 +1997,7 @@ unsafe partial class Material {
 
 	unsafe partial class MaterialInstance {
 		internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr, Bool> isChildOf;
+		internal static delegate* unmanaged[Cdecl]<IntPtr, IntPtr> getParent;
 	}
 
 	unsafe partial class MaterialInstanceDynamic {

diff --git a/Source/Managed/Framework/Framework.cs b/Source/Managed/Framework/Framework.cs
@@ -8235,9 +8235,16 @@ public Vector3 GetPhysicsAngularVelocityInRadians(string boneName = null) {
 		}
 
 		/// <summary>
-		/// Returns the material at the specified element index
+		/// Returns the material at the specified element index or <c>null</c> on failure
 		/// </summary>
-		public MaterialInstanceDynamic GetMaterial(int elementIndex) => new(getMaterial(Pointer, elementIndex));
+		public MaterialInstanceDynamic GetMaterial(int elementIndex) {
+			IntPtr pointer = getMaterial(Pointer, elementIndex);
+
+			if (pointer != IntPtr.Zero)
+				return new(pointer);
+
+			return null;
+		}
 
 		/// <summary>
 		/// Retrieves distance to closest collision
@@ -9856,6 +9863,18 @@ public bool IsChildOf(MaterialInterface material) {
 
 			return isChildOf(Pointer, material.Pointer);
 		}
+
+		/// <summary>
+		/// Returns the parent material or <c>null</c> on failure
+		/// </summary>
+		public MaterialInstanceDynamic GetParent() {
+			IntPtr pointer = getParent(Pointer);
+
+			if (pointer != IntPtr.Zero)
+				return new(pointer);
+
+			return null;
+		}
 	}
 
 	/// <summary>

diff --git a/Source/Managed/Tests/DynamicEvents.cs b/Source/Managed/Tests/DynamicEvents.cs
@@ -72,6 +72,8 @@ public void OnBeginPlay() {
 			leftStaticMeshComponent.SetEnableGravity(false);
 			leftStaticMeshComponent.SetSimulatePhysics(true);
 
+			Assert.IsNotNull(leftStaticMeshComponent.GetMaterial(0));
+
 			rightActor.RegisterEvent(ActorEventType.OnActorBeginOverlap);
 			rightActor.RegisterEvent(ActorEventType.OnActorEndOverlap);
 			rightActor.RegisterEvent(ActorEventType.OnActorHit);
@@ -93,6 +95,8 @@ public void OnBeginPlay() {
 			rightStaticMeshComponent.UpdateToWorld(TeleportType.ResetPhysics);
 			rightStaticMeshComponent.SetEnableGravity(false);
 			rightStaticMeshComponent.SetSimulatePhysics(true);
+
+			Assert.IsNotNull(rightStaticMeshComponent.GetMaterial(0));
 		}
 
 		public void OnTick(float deltaTime) {

diff --git a/Source/Managed/Tests/SkeletalMeshes.cs b/Source/Managed/Tests/SkeletalMeshes.cs
@@ -29,7 +29,12 @@ public void OnBeginPlay() {
 			rightSkeletalMeshComponent.SetWorldLocation(new(-700.0f, 70.0f, -100.0f));
 			rightSkeletalMeshComponent.SetWorldRotation(Maths.Euler(0.0f, 0.0f, 90.0f));
 			rightSkeletalMeshComponent.SetAnimationMode(AnimationMode.Asset);
-			rightSkeletalMeshComponent.CreateAndSetMaterialInstanceDynamic(0).SetVectorParameterValue("AccentColor", new(0.0f, 0.5f, 1.0f));
+
+			MaterialInstanceDynamic prototypeMaterial = rightSkeletalMeshComponent.CreateAndSetMaterialInstanceDynamic(0);
+
+			prototypeMaterial.SetVectorParameterValue("AccentColor", new(0.0f, 0.5f, 1.0f));
+
+			Assert.IsNotNull(prototypeMaterial.GetParent());
 
 			AnimationMontage rightPrototypeAnimationMontage = AnimationMontage.Load("/Game/Tests/Characters/Animations/RunAnimationMontage");
 

diff --git a/Source/Native/Source/UnrealCLR/Private/UnrealCLR.cpp b/Source/Native/Source/UnrealCLR/Private/UnrealCLR.cpp
@@ -1121,6 +1121,7 @@ void UnrealCLR::Module::StartupModule() {
 				Shared::Functions[position++] = Shared::MaterialInstanceFunctions;
 
 				Shared::MaterialInstanceFunctions[head++] = (void*)&UnrealCLRFramework::MaterialInstance::IsChildOf;
+				Shared::MaterialInstanceFunctions[head++] = (void*)&UnrealCLRFramework::MaterialInstance::GetParent;
 
 				checksum += head;
 			}

diff --git a/Source/Native/Source/UnrealCLR/Private/UnrealCLRFramework.cpp b/Source/Native/Source/UnrealCLR/Private/UnrealCLRFramework.cpp
@@ -3349,6 +3349,10 @@ namespace UnrealCLRFramework {
 		bool IsChildOf(UMaterialInstance* MaterialInstance, UMaterialInterface* Material) {
 			return MaterialInstance->IsChildOf(Material);
 		}
+
+		UMaterialInstanceDynamic* GetParent(UMaterialInstance* MaterialInstance) {
+			return UMaterialInstanceDynamic::Create(MaterialInstance->Parent, MaterialInstance);
+		}
 	}
 
 	namespace MaterialInstanceDynamic {

diff --git a/Source/Native/Source/UnrealCLR/Public/UnrealCLRFramework.h b/Source/Native/Source/UnrealCLR/Public/UnrealCLRFramework.h
@@ -1085,6 +1085,7 @@ namespace UnrealCLRFramework {
 
 	namespace MaterialInstance {
 		static bool IsChildOf(UMaterialInstance* MaterialInstance, UMaterialInterface* Material);
+		static UMaterialInstanceDynamic* GetParent(UMaterialInstance* MaterialInstance);
 	}
 
 	namespace MaterialInstanceDynamic {