Skip to content
Snippets Groups Projects
Commit 3fda8418 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Added support for custom materials

parent 029456fc
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ UGPUInstancedLineComponent::UGPUInstancedLineComponent(const FObjectInitializer& ...@@ -38,7 +38,7 @@ UGPUInstancedLineComponent::UGPUInstancedLineComponent(const FObjectInitializer&
LineMaterialInterface = LoadObject<UMaterialInterface>(NULL, TEXT("/InstancedMeshLineRendering/DynamicLineMaterial.DynamicLineMaterial"), NULL, LOAD_None, NULL); LineMaterialInterface = LoadObject<UMaterialInterface>(NULL, TEXT("/InstancedMeshLineRendering/DynamicLineMaterial.DynamicLineMaterial"), NULL, LOAD_None, NULL);
//DynamicLineMaterial = UMaterialInstanceDynamic::Create(LineMaterialInterface, GetTransientPackage()); //DynamicLineMaterial = UMaterialInstanceDynamic::Create(LineMaterialInterface, GetTransientPackage());
SetMaterial(0, DynamicLineMaterial); SetMaterial(0, DynamicLineMaterial);
SetMobility(EComponentMobility::Static); //SetMobility(EComponentMobility::Static);
#if WITH_EDITOR #if WITH_EDITOR
bAutoActivate = true; bAutoActivate = true;
...@@ -404,6 +404,14 @@ void UGPUInstancedLineComponent::PostEditChangeProperty(FPropertyChangedEvent& P ...@@ -404,6 +404,14 @@ void UGPUInstancedLineComponent::PostEditChangeProperty(FPropertyChangedEvent& P
UpdateAllEditorLines(); UpdateAllEditorLines();
} }
} }
if (PropertyName == "LineMaterialInterface")
{
DynamicLineMaterial = UMaterialInstanceDynamic::Create(LineMaterialInterface, GetTransientPackage());
SetMaterial(0, DynamicLineMaterial);
DynamicLineMaterial->SetTextureParameterValue("PositionTexture", PositionTexture);
DynamicLineMaterial->SetScalarParameterValue("TextureWidth", TextureWidth);
}
} }
Super::PostEditChangeProperty(PropertyChangedEvent); Super::PostEditChangeProperty(PropertyChangedEvent);
......
...@@ -465,7 +465,7 @@ public: ...@@ -465,7 +465,7 @@ public:
UPROPERTY(EditAnywhere, DisplayName = "Lines", meta = (MakeEditWidget = true, EditFixedOrder)) UPROPERTY(EditAnywhere, DisplayName = "Lines", meta = (MakeEditWidget = true, EditFixedOrder))
TArray<FEditorLineData> EditorLines; TArray<FEditorLineData> EditorLines;
UPROPERTY() UPROPERTY(EditAnywhere)
UMaterialInterface* LineMaterialInterface; UMaterialInterface* LineMaterialInterface;
UPROPERTY() UPROPERTY()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment