- Moved Init function from BeginPlay to PostLoad and OnComponentCreated. This...

- Moved Init function from BeginPlay to PostLoad and OnComponentCreated. This means the Init function is going to be called a multitude of times unfortunately. Seems to work so far.
- Added basic support for lines in the editor.

InstancedMeshLines/Plugins/InstancedMeshLineRendering/Source/InstancedMeshLineRendering/Private/GPUInstancedLineComponent.cpp

@@ -68,6 +68,41 @@ void UGPUInstancedLineComponent::UpdateWholeTexture()
 	});
 }
 
+void UGPUInstancedLineComponent::Init()
+{
+	UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::Init Creating Texture"));
+	PositionTexture = UTexture2D::CreateTransient(TextureWidth, TextureHeight, PF_A32B32G32R32F);
+	// Allocate the texture RHI
+	PositionTexture->UpdateResource();
+
+	UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::Init Creating MID"));
+	DynamicLineMaterial = CreateAndSetMaterialInstanceDynamic(0);// UMaterialInstanceDynamic::Create(LineMat, this, "DynamicLineMaterialMID");
+	if(DynamicLineMaterial)
+	{
+		DynamicLineMaterial->SetTextureParameterValue("PositionTexture", PositionTexture);
+		DynamicLineMaterial->SetScalarParameterValue("TextureWidth", TextureWidth);
+	}
+	else
+		UE_LOG(LogTemp, Error, TEXT("UGPUInstancedLineComponent::Init DynamicLineMaterial was nullptr"));
+
+	UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::Init Resetting Data"));
+	LineMap.Empty();
+	LinearLineData.Empty();
+	NextFreeId = 0;
+	CurrentTextureIndex = 0;
+	CurrentTextureMarker = FIntPoint(0, 0);
+	ClearInstances();
+
+	bIsInitialized = true;
+
+
+	for (FEditorLineData& EditorLine : EditorLines)
+	{
+		AddLineFromEditorData(EditorLine);
+	}
+	
+}
+
 FUpdateTextureRegion2D* UGPUInstancedLineComponent::CalculateTextureRegions(const FIntPoint& StartIndex,
                                                                             int32 NumberOfPoints, int32& NumberOfRegionsOut)
 {	
@@ -132,48 +167,20 @@ void UGPUInstancedLineComponent::BeginPlay()
 {
 	Super::BeginPlay();
 
-	//if (PositionTexture == nullptr)
+	//Init();
+	if(!bIsInitialized)
 	{
-		UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::BeginPlay Creating Texture"));
-
-		PositionTexture = UTexture2D::CreateTransient(TextureWidth, TextureHeight, PF_A32B32G32R32F); // TODO Hardcoded values
-		// Allocate the texture RHI
-		PositionTexture->UpdateResource();
+		UE_LOG(LogTemp, Fatal, TEXT("UGPUInstancedLineComponent::BeginPlay: FATAL ERROR - Component is not initialized on BeginPlay!"));
 	}
-
-	//if (DynamicLineMaterial == nullptr)
-	{
-		UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::BeginPlay Creating MID"));
-
-		//UMaterial* LineMat = LoadObject<UMaterial>(GetTransientPackage(), TEXT("Material'/InstancedMeshLineRendering/DynamicLineMaterial.DynamicLineMaterial'"));
-		DynamicLineMaterial = CreateAndSetMaterialInstanceDynamic(0);// UMaterialInstanceDynamic::Create(LineMat, this, "DynamicLineMaterialMID");
-
-		//GetStaticMesh()->SetMaterial(0, DynamicLineMaterial);
-
-		DynamicLineMaterial->SetTextureParameterValue("PositionTexture", PositionTexture);
-		DynamicLineMaterial->SetScalarParameterValue("TextureWidth", TextureWidth);
-
-	}
-	// TODO
-
-	LineMap.Empty();
-	LinearLineData.Empty();
-	NextFreeId = 0;
-	CurrentTextureIndex = 0;
-	CurrentTextureMarker = FIntPoint(0, 0);
-	ClearInstances();
 }
 
 // Doesn't do anything yet, just as a testing function to see execution order on Unreal startup.
 void UGPUInstancedLineComponent::PostInitProperties()
 {
 	Super::PostInitProperties();
-	
-	UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::PostInitProperties"));
 	if (FApp::CanEverRender() && !HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
-	{
 		UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::PostInitProperties IF"));
-	}
+
 }
 
 void UGPUInstancedLineComponent::PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
@@ -226,6 +233,9 @@ void UGPUInstancedLineComponent::PostLoad()
 	if (FApp::CanEverRender() && !HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
 	{
 		UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::PostLoad IF"));
+
+		if (!bIsInitialized)
+			Init();
 	}
 }
 
@@ -237,6 +247,9 @@ void UGPUInstancedLineComponent::OnComponentCreated()
 	if (FApp::CanEverRender() && !HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
 	{
 		UE_LOG(LogTemp, Display, TEXT("UGPUInstancedLineComponent::OnComponentCreated IF"));
+
+		if (!bIsInitialized)
+			Init();
 	}
 }
 
@@ -323,6 +336,14 @@ int32 UGPUInstancedLineComponent::AddLine(const TArray<FVector>& Line, FLinearCo
 	return LineId;	
 }
 
+int32 UGPUInstancedLineComponent::AddLineFromEditorData(const FEditorLineData& LineData)
+{
+	const TArray<FEditorPoint>* EditorLineDataPtr = &LineData.Points;
+	const TArray<FVector>* FVectorLineDataPtr = reinterpret_cast<const TArray<FVector>*>(EditorLineDataPtr);
+	return AddLine(*FVectorLineDataPtr, LineData.Color, LineData.Width);
+}
+
+
 // Add a point to the end of the specified line
 bool UGPUInstancedLineComponent::AddPoint(int32 LineId, const FVector& Point)
 {

InstancedMeshLines/Plugins/InstancedMeshLineRendering/Source/InstancedMeshLineRendering/Public/GPUInstancedLineComponent.h

@@ -3,7 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Components/HierarchicalInstancedStaticMeshComponent.h"
+#include "Components/InstancedStaticMeshComponent.h"
 #include "GPUInstancedLineComponent.generated.h"
 
 /**
@@ -21,7 +21,7 @@ typedef TArray<GPULineIndices>		GPULineArray;
 // Maps a LineId to a LineArray. 
 typedef TMap<int32, GPULineArray>	GPULinesMap; 
 
-USTRUCT()
+USTRUCT(BlueprintType)
 struct FEditorPoint
 {
 	GENERATED_USTRUCT_BODY()
@@ -40,7 +40,7 @@ struct FEditorPoint
 
 };
 
-USTRUCT()
+USTRUCT(BlueprintType)
 struct FEditorLineData
 {
 	GENERATED_USTRUCT_BODY()
@@ -86,8 +86,20 @@ private:
 
 	void UpdateWholeTexture();
 
+	void Init();
+
 	FUpdateTextureRegion2D* CalculateTextureRegions(const FIntPoint& StartIndex, int32 NumberOfPoints, int32& NumberOfRegionsOut);
 
+	GPULinesMap LineMap;
+
+	TArray<FVector4> LinearLineData;
+
+	int32 NextFreeId = 0;
+	int32 CurrentTextureIndex;
+	FIntPoint CurrentTextureMarker;
+
+	bool bIsInitialized = false;
+
 protected:
 	virtual void BeginPlay() override;
 
@@ -97,7 +109,6 @@ protected:
 	virtual void OnComponentCreated() override;
 	virtual void BeginDestroy() override;	
 
-
 public:
 
 	UGPUInstancedLineComponent(const FObjectInitializer& ObjectInitializer);
@@ -124,6 +135,16 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "Components|InstancedLineComponent")
 	int32 AddLine(const TArray<FVector>& Line, FLinearColor Color, float Width = 1.0);
 
+	/**
+	 * Adds a line and returns the respective ID of the line, which can be used to identify it for updating, modifying and removing.
+	 *
+	 * @param	LineData	[in]	The Line data stored in a FEditorLineData struct.
+	 *
+	 * @return	int32				Id of the line, can be used to access it later on.
+	*/
+	UFUNCTION(BlueprintCallable, Category = "Components|InstancedLineComponent")
+	int32 AddLineFromEditorData(const FEditorLineData& LineData);
+
 	/**
 	 * Adds a point at the end of the specified line.
 	 *
@@ -276,16 +297,7 @@ public:
 	UPROPERTY(BlueprintReadOnly, VisibleAnywhere, SkipSerialization)
 	UMaterialInstanceDynamic* DynamicLineMaterial;
 
-	UPROPERTY(EditAnywhere, SkipSerialization, DisplayName = "Lines", meta = (MakeEditWidget = true, EditFixedOrder))
+	UPROPERTY(EditAnywhere, DisplayName = "Lines", meta = (MakeEditWidget = true, EditFixedOrder))
 	TArray<FEditorLineData> EditorLines;
 
-private:
-
-	GPULinesMap LineMap;
-
-	TArray<FVector4> LinearLineData;
-
-	int32 NextFreeId = 0;
-	int32 CurrentTextureIndex;
-	FIntPoint CurrentTextureMarker;	
 };
\ No newline at end of file