From b167dcca01c2c5836f2dbda72ed40e2ca618b1f5 Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Sat, 20 Jan 2024 14:23:05 +0000
Subject: [PATCH] Optimised LandingZone Waypoint Transform Update from BP to
 C++

---
 .../.idea.EndlessVendetta/.idea/workspace.xml | 56 ++++++++++---------
 .../Content/Levels/ControlTutorialLevel.umap  |  2 +-
 .../Content/Ships/LandingZone.uasset          |  4 +-
 .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset  |  2 +-
 .../EndlessVendetta/SpaceShip/LandingZone.cpp | 39 +++++++++++++
 .../EndlessVendetta/SpaceShip/LandingZone.h   | 35 ++++++++++--
 6 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 85b48aee..637c88c3 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -8,12 +8,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Ships/LandingZone.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Ships/LandingZone.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/LandingZone.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/LandingZone.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/LandingZone.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/LandingZone.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,37 +29,37 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 5
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 5
+}</component>
   <component name="ProjectId" id="2bBQ5ZFjKADdlvCf2VePqJdIy1m" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "C++ Project.EndlessVendetta.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "dev",
-    "ignore.virus.scanning.warn.message": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;C++ Project.EndlessVendetta.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;HomeHub-Tutorial&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "rider.external.source.directories": [
-      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
-      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
-      "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src"
+  &quot;keyToStringList&quot;: {
+    &quot;rider.external.source.directories&quot;: [
+      &quot;C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache&quot;,
+      &quot;C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache&quot;,
+      &quot;C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="EndlessVendetta" type="CppProject" factoryName="C++ Project">
       <configuration_1>
@@ -128,7 +131,8 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1705685810960</updated>
-      <workItem from="1705685813496" duration="640000" />
+      <workItem from="1705685813496" duration="6457000" />
+      <workItem from="1705756768038" duration="3221000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
index 3f162a92..3d831401 100644
--- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
+++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0c7c578c43e2605d3764bc7ac575ada04d89043fc837f4c5e942431c460cd24
+oid sha256:0ef5c78925fa5ca9dfc7adfd2ca451aa52aa43d7758e3fd79bd96ec5e2b93e3f
 size 17258870
diff --git a/EndlessVendetta/Content/Ships/LandingZone.uasset b/EndlessVendetta/Content/Ships/LandingZone.uasset
index 32fb9317..240c4ca7 100644
--- a/EndlessVendetta/Content/Ships/LandingZone.uasset
+++ b/EndlessVendetta/Content/Ships/LandingZone.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ea90e487ea5bf751b7573ac6ef2be781c1efdf4e0bae7c8b95f9fbf0c4169dd
-size 113548
+oid sha256:da33d59112579d5b614efe76d99dc035e97c533fdbdaaf6a8a0c01a149c375a1
+size 119821
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 7844ff33..4867a9c1 100644
--- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
+++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed4f40be65e3378a6aa30ae08f1347dc20a31e522d7b5bf73df9a59b7a149dd
+oid sha256:c20a9d0ff7162e4ba047faa465ec75c0f6084b4a4f7afb18958587d60d07d93a
 size 66790690
diff --git a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.cpp b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.cpp
index c8cfc038..879041f9 100644
--- a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.cpp
@@ -14,6 +14,44 @@ ALandingZone::ALandingZone()
 
 }
 
+void ALandingZone::BeginPlay()
+{
+	WaypointWidgetComponent = Cast<UWidgetComponent>(GetComponentByClass(UWidgetComponent::StaticClass()));
+	PlayersPawn = GetWorld()->GetFirstPlayerController()->GetPawn();
+	
+	// Tick updates the waypoints transform base on players location
+	if (!IsValid(WaypointWidgetComponent) || !IsValid(PlayersPawn)) SetActorTickEnabled(false);
+
+	Super::BeginPlay();
+}
+
+void ALandingZone::Tick(float DeltaSeconds)
+{
+	Super::Tick(DeltaSeconds);
+	if (!IsWaypointVisible) return;
+	UpdateWaypointTransform();
+}
+
+void ALandingZone::UpdateWaypointTransform()
+{
+	FVector WaypointLoc = WaypointWidgetComponent->GetComponentLocation();
+	FVector PlayerLoc = PlayersPawn->GetActorLocation();
+    
+	// Update rotation
+	FVector LocationDiffVector = PlayerLoc - WaypointLoc;
+	FRotator LookAtPlayerRotator = LocationDiffVector.Rotation();
+	WaypointWidgetComponent->SetWorldRotation(LookAtPlayerRotator);
+    
+	// Update scale
+	double DistanceFromPlayer = LocationDiffVector.Length();
+	double ScaleMagnitude = (12.f - 0.15f) / (48000.f - 900.f);
+	double ScaleIntercept = 12.f - (48000.f * ScaleMagnitude);
+	double ResultingScale = (DistanceFromPlayer * ScaleMagnitude) + ScaleIntercept;
+	FVector WaypointScale = FVector(1, ResultingScale, ResultingScale);
+	WaypointWidgetComponent->SetWorldScale3D(WaypointScale);
+}
+
+
 void ALandingZone::UpdateAllLandingZones(bool Landing)
 {
 	TArray<AActor*> AllLandingZones;
@@ -22,6 +60,7 @@ void ALandingZone::UpdateAllLandingZones(bool Landing)
 	{
 		ALandingZone* LZ = Cast<ALandingZone>(LZ_Actor);
 		Landing ? LZ->HideWaypoint() : LZ->ShowWaypoint();
+		LZ->IsWaypointVisible = !Landing;
 	}
 }
 
diff --git a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h
index 94314505..5428eaa7 100644
--- a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h
+++ b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "Components/WidgetComponent.h"
 #include "EndlessVendetta/InteractionInterface.h"
 #include "GameFramework/Actor.h"
 #include "LandingZone.generated.h"
@@ -11,29 +12,49 @@ UCLASS()
 class ENDLESSVENDETTA_API ALandingZone : public AActor, public IInteractionInterface
 {
 	GENERATED_BODY()
-	
+
+//	------------------------------ Attributes -------------------------------------------------	
 	UPROPERTY(EditAnywhere, Category = "Landing Zone")
 	FTransform LZ_ExitTransform;
+	
 	UPROPERTY(EditAnywhere, Category = "Landing Zone")
 	FTransform LZ_TakeoffTransform;
-
-	// Hides or shows key aesthetic features of LZ's based on if the player is landing or not
-	void UpdateAllLandingZones(bool Landing);
-
 	
+	UWidgetComponent* WaypointWidgetComponent;
+
+	APawn* PlayersPawn;
 
 protected:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Landing Zone")
 	bool IsHomeBase_LZ = false;
 
+public:
+	bool IsWaypointVisible = false;
+//	------------------------------ Methods -------------------------------------------------
+private:
+	// Runs when game starts or this actor spawns
+	virtual void BeginPlay() override;
+                        	
+	// Runs once per frame
+	virtual void Tick(float DeltaSeconds) override;
+	
+	// Hides or shows key aesthetic features of LZ's based on if the player is landing or not
+	void UpdateAllLandingZones(bool Landing);
+
+	// Updates waypoints rotation and scale based on players location, only if visible
+	void UpdateWaypointTransform();
+
+protected:	
 	// Allows player to enter their ship through a LZ
 	void Interact() override;
+
+	// Used to implement a pop up for interaction
 	void InteractPrompt() override;
 	
 public:	
 	// Sets default values for this actor's properties
 	ALandingZone();
-
+	
 	// Waypoint will display something along the lines of Press F to Land
 	UFUNCTION(BlueprintImplementableEvent)
     void SuggestLandingWidget();
@@ -41,12 +62,14 @@ public:
 	// Ran when a player takes off from any LZ in the world
 	UFUNCTION(BlueprintImplementableEvent)
 	void ShowWaypoint();
+	
 	// Ran when player lands at any LZ in the world
 	UFUNCTION(BlueprintImplementableEvent)
 	void HideWaypoint();
 
 	// Updates all LZ's, then runs exit ship func on player and passes the exit transform
 	void Land();
+	
 	// Updates all LZ's, then runs enter ship func on player passing the correct takeoff transform
 	void Takeoff();
 };