Merge pull request 'martin' (#21) from martin into main

Reviewed-on: #21

Source/LuckyWorldV2/LuckyWorldV2.Build.cs

@@ -18,7 +18,8 @@ public class LuckyWorldV2 : ModuleRules
 			"LuckyTextWrite",
 			"SocketIOClient",
 			"VaRest",
-            "SIOJson"
+            "SIOJson",
+            "NavigationSystem"
         });
 
 		PrivateDependencyModuleNames.AddRange(new string[] {  });

Source/LuckyWorldV2/Private/Gameplay/TargetSelector.cpp

@@ -2,6 +2,8 @@
 
 
 #include "Gameplay/TargetSelector.h"
+#include "Kismet/GameplayStatics.h"
+#include "NavigationSystem.h"
 
 // Sets default values
 ATargetSelector::ATargetSelector()
@@ -23,5 +25,25 @@ void ATargetSelector::Tick(float DeltaTime)
 {
 	Super::Tick(DeltaTime);
 
+	if (bIsTracing)
+	{
+		APlayerController* PlayerController = UGameplayStatics::GetPlayerController(this, 0);
+		if (PlayerController)
+		{
+			FHitResult HitResult;
+			PlayerController->GetHitResultUnderCursorByChannel(ETraceTypeQuery::TraceTypeQuery1, true, HitResult);
+			if (HitResult.bBlockingHit)
+			{
+				UNavigationSystemV1* NavSys = FNavigationSystem::GetCurrent<UNavigationSystemV1>(GetWorld());
+				
+				if (NavSys)
+				{
+					FNavLocation NavLocation;
+					NavSys->ProjectPointToNavigation(HitResult.Location, NavLocation);
+					SetActorLocation(NavLocation);
+				}
+			}
+		}
+	}
 }
 

Source/LuckyWorldV2/Private/UI/Settings/CaptureSettingsUserWidget.cpp

@@ -9,6 +9,8 @@ void UCaptureSettingsUserWidget::NativeConstruct()
 {
 	Super::NativeConstruct();
 
+	SetVisibility(ESlateVisibility::Hidden);
+
 	BPRefreshTaskList();
 	ULuckyRobotsGameInstance* GameInstance = Cast<ULuckyRobotsGameInstance>(GetGameInstance());
 	if (GameInstance)

Source/LuckyWorldV2/Public/UI/GameUserWidget.h

@@ -7,6 +7,9 @@
 #include "SharedDef.h"
 #include "GameUserWidget.generated.h"
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnReset);
+
+class UCaptureSettingsUserWidget;
 /**
  * 
  */
@@ -36,6 +39,11 @@ public:
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	FString DownCountStr;
+
+public:
+	UPROPERTY(BlueprintCallable, BlueprintAssignable, Category = "Event")
+	FOnReset OnReset;
+
 public:
 	UFUNCTION(BlueprintCallable)
 	void DoWaitSecond();
@@ -50,4 +58,7 @@ public:
 
 	UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
 	void DoAutoConfirm();
+
+	UFUNCTION(BlueprintPure, BlueprintImplementableEvent)
+	UCaptureSettingsUserWidget* GetCaptureSettingsUserWidget();
 };

Source/LuckyWorldV2/Public/UI/Settings/CaptureSettingsUserWidget.h

@@ -8,6 +8,8 @@
 #include "CaptureSettingsUserWidget.generated.h"
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnOpenMenuStateChanged, bool, Open);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnStartCapture);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnStopCapture);
 
 /**
  * 
@@ -26,6 +28,12 @@ public:
 	UPROPERTY(BlueprintCallable, BlueprintAssignable, Category = "Event")
 	FOnOpenMenuStateChanged OnOpenMenuStateChanged;
 
+	UPROPERTY(BlueprintCallable, BlueprintAssignable, Category = "Event")
+	FOnStartCapture OnStartCapture;
+
+	UPROPERTY(BlueprintCallable, BlueprintAssignable, Category = "Event")
+	FOnStopCapture OnStopCapture;
+
 public:
 	UFUNCTION(BlueprintCallable)
 	void ToggleMenu();
@@ -37,9 +45,15 @@ public:
 	UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
 	void BPOnRandomMeshesUpdated();
 
+	UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
+	void BPSaveSettings();
+
 	UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
 	void BPLoadSettings();
 
 	UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
 	void ToggleMenuDisplay();
+
+	UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
+	void BPChangeCaptureState();
 };