Merge pull request #343 from RozeDoyanawa/development

feat: compass rose to display grid position
Panakotta00 · Nov 14, 2024 · a676568 · a676568
2 parents d33f9f3 + 45ce145
commit a676568
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 0 deletions.
diff --git a/Content/Buildings/-Shared/BP_ModuleHoloWithCompass_def.uasset b/Content/Buildings/-Shared/BP_ModuleHoloWithCompass_def.uasset
diff --git a/Content/Buildings/-Shared/BP_TestArrow.uasset b/Content/Buildings/-Shared/BP_TestArrow.uasset
diff --git a/Content/Buildings/-Shared/MI_ArrowFont.uasset b/Content/Buildings/-Shared/MI_ArrowFont.uasset
diff --git a/Content/Buildings/-Shared/MI_UpArrow.uasset b/Content/Buildings/-Shared/MI_UpArrow.uasset
diff --git a/Content/Buildings/-Shared/M_ArrowFont.uasset b/Content/Buildings/-Shared/M_ArrowFont.uasset
diff --git a/Content/Buildings/-Shared/M_ArrowMaterial.uasset b/Content/Buildings/-Shared/M_ArrowMaterial.uasset
diff --git a/Source/FicsItNetworksMisc/Private/ModuleSystem/FINModuleSystemHolo.cpp b/Source/FicsItNetworksMisc/Private/ModuleSystem/FINModuleSystemHolo.cpp
@@ -8,6 +8,11 @@
 AFINModuleSystemHolo::AFINModuleSystemHolo() {
 	PrimaryActorTick.bCanEverTick = true;
 	SetActorTickEnabled(true);
+
+	InformationComponent = CreateDefaultSubobject<UTextRenderComponent>(TEXT("InformationDisplay"));
+	InformationComponent->SetupAttachment(RootComponent);
+	InformationComponent->SetMobility(EComponentMobility::Movable);
+	InformationComponent->SetCollisionEnabled(ECollisionEnabled::NoCollision);
 }
 
 AFINModuleSystemHolo::~AFINModuleSystemHolo() {}
@@ -142,6 +147,19 @@ void AFINModuleSystemHolo::SetHologramLocationAndRotation(const FHitResult& hit)
 		//FVector ArrowLocation = {0, }
 		CompassRose->SetRelativeLocation(ActorLocation);
 	}
+	if(EnableInformationDisplay && IsValid(InformationComponent)) {
+		// Roze is having issues getting the Z position correct for the text.
+		const FVector ModuleSize = getModuleSize();
+		InformationComponent->SetMobility(EComponentMobility::Movable);
+		InformationComponent->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+		FVector ActorLocation = { (ModuleSize.X - 1) * 5,  (ModuleSize.Y - 1 ) * 5,0};
+		ActorLocation += InformationDisplayOffset;
+		if(ShowCompass && IsValid(CompassRose)) {
+			ActorLocation.Z = CompassRose->GetRelativeLocation().Z;   // Dunno why this works, but it does. 
+		}
+		InformationComponent->SetRelativeLocation(ActorLocation);
+		OnInformationUpdate(InformationComponent, hit, Snapped, SnappedLoc, SnappedRot);
+	}
 
 	//if(IsValid(CompassComponent)) {
 	//	FVector ActorOrigin = {0, 0, 0};
@@ -192,4 +210,9 @@ void AFINModuleSystemHolo::OnConstruction(const FTransform& MovieSceneBlends) {
 
 		CompassRose->SetRelativeLocation(ActorLocation);
 	}
+	if(EnableInformationDisplay) {
+		InformationComponent->SetVisibility(true);
+	}else{
+		InformationComponent->SetVisibility(false);
+	}
 }
diff --git a/Source/FicsItNetworksMisc/Public/ModuleSystem/FINModuleSystemHolo.h b/Source/FicsItNetworksMisc/Public/ModuleSystem/FINModuleSystemHolo.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "FINModuleSystemPanel.h"
+#include "Components/TextRenderComponent.h"
 #include "Hologram/FGBuildableHologram.h"
 #include "FINModuleSystemHolo.generated.h"
 
@@ -49,9 +51,22 @@ class FICSITNETWORKSMISC_API AFINModuleSystemHolo : public AFGBuildableHologram
 
 	UPROPERTY(EditAnywhere)
 	bool ShowCompass = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
+	UTextRenderComponent* InformationComponent;
+
+	UPROPERTY(EditAnywhere)
+	bool EnableInformationDisplay = false;
+
+	UPROPERTY(EditAnywhere)
+	FVector InformationDisplayOffset = FVector(1,6.5,7);
+
+	UFUNCTION(BlueprintImplementableEvent)
+	void OnInformationUpdate(UTextRenderComponent* Component, const FHitResult& HitResult, UFINModuleSystemPanel* SnappedPanel, const FVector ModuleLocation, const int ModuleRotation);
 
 private:
 	bool checkSpace(FVector min, FVector max);
+
 	FVector getModuleSize();
 
 	UPROPERTY()