feat: Unify camera speed and implement zoom-based movement scaling

Author: winyunq

Content/BP_RTSCamera.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad0d80f14898ade77d58d545aeb3150e1acc8287d0322c24aa7442cd98dea54e
-size 25195
+oid sha256:0d2e201517cc64e3e555b53bdec3f1705cb8590341e6f9d4c0f9b7448cd39a6c
+size 27303

OpenRTSCamera.uplugin

@@ -1,12 +1,12 @@
-{
+{
 	"CanContainContent": true,
 	"Category": "Gameplay",
 	"CreatedBy": "Jesus Bracho",
 	"CreatedByURL": "https://github.com/HeyZoos",
 	"Description": "An Unreal Engine 5 open-source RTS/MOBA camera implementation that aims to be fully featured, customizable and dependable",
 	"DocsURL": "https://github.com/HeyZoos/OpenRTSCamera/wiki",
 	"EnabledByDefault": true,
-	"EngineVersion": "5.3.0",
+	"EngineVersion": "5.5.0",
 	"FileVersion": 3,
 	"FriendlyName": "OpenRTSCamera",
 	"Installed": false,
@@ -32,4 +32,4 @@
 	"SupportURL": "https://github.com/HeyZoos/OpenRTSCamera/issues",
 	"Version": 1,
 	"VersionName": "0.21.0"
-}
+}

Source/OpenRTSCamera/Private/RTSCamera.cpp

@@ -1,4 +1,4 @@
-// Copyright 2024 Jesus Bracho All Rights Reserved.
+// Copyright 2024 Jesus Bracho All Rights Reserved.
 
 #include "RTSCamera.h"
 
@@ -17,7 +17,6 @@ URTSCamera::URTSCamera()
 	this->CameraBlockingVolumeTag = FName("OpenRTSCamera#CameraBounds");
 	this->CollisionChannel = ECC_WorldStatic;
 	this->DragExtent = 0.6f;
-	this->EdgeScrollSpeed = 50;
 	this->DistanceFromEdgeThreshold = 0.1f;
 	this->EnableCameraLag = true;
 	this->EnableCameraRotationLag = true;
@@ -26,7 +25,9 @@ URTSCamera::URTSCamera()
 	this->FindGroundTraceLength = 100000;
 	this->MaximumZoomLength = 5000;
 	this->MinimumZoomLength = 500;
-	this->MoveSpeed = 50;
+	this->MaxMoveSpeed = 1024.0f;
+	this->MinMoveSpeed = 128.0f;
+	this->NowMoveSpeed = this->MinMoveSpeed; // Initialize NowMoveSpeed to MinMoveSpeed
 	this->RotateSpeed = 45;
 	this->StartingYAngle = -45.0f;
 	this->StartingZAngle = 0;
@@ -74,6 +75,8 @@ void URTSCamera::BeginPlay()
 		this->CheckForEnhancedInputComponent();
 		this->BindInputMappingContext();
 		this->BindInputActions();
+
+
 	}
 }
 
@@ -88,6 +91,9 @@ void URTSCamera::TickComponent(
 	if (NetMode != NM_DedicatedServer && this->PlayerController->GetViewTarget() == this->Owner)
 	{
 		this->DeltaSeconds = DeltaTime;
+
+
+
 		this->ApplyMoveCameraCommands();
 		this->ConditionallyPerformEdgeScrolling();
 		this->ConditionallyKeepCameraAtDesiredZoomAboveGround();
@@ -96,7 +102,6 @@ void URTSCamera::TickComponent(
 		this->ConditionallyApplyCameraBounds();
 	}
 }
-
 void URTSCamera::FollowTarget(AActor* Target)
 {
 	this->CameraFollowTarget = Target;
@@ -114,6 +119,12 @@ void URTSCamera::OnZoomCamera(const FInputActionValue& Value)
 		this->MinimumZoomLength,
 		this->MaximumZoomLength
 	);
+
+	// Calculate Alpha for Lerp (0 at min zoom, 1 at max zoom)
+	float Alpha = (this->DesiredZoomLength - this->MinimumZoomLength) / (this->MaximumZoomLength - this->MinimumZoomLength);
+	
+	// Lerp NowMoveSpeed between MinMoveSpeed and MaxMoveSpeed
+	this->NowMoveSpeed = FMath::Lerp(this->MinMoveSpeed, this->MaxMoveSpeed, Alpha);
 }
 
 void URTSCamera::OnRotateCamera(const FInputActionValue& Value)
@@ -228,7 +239,7 @@ void URTSCamera::ApplyMoveCameraCommands()
 	{
 		auto Movement = FVector2D(X, Y);
 		Movement.Normalize();
-		Movement *= this->MoveSpeed * Scale * this->DeltaSeconds;
+		Movement *= this->NowMoveSpeed * Scale * this->DeltaSeconds;
 		this->Root->SetWorldLocation(
 			this->Root->GetComponentLocation() + FVector(Movement.X, Movement.Y, 0.0f)
 		);
@@ -424,7 +435,7 @@ void URTSCamera::EdgeScrollLeft() const
 	const auto Movement = UKismetMathLibrary::FClamp(NormalizedMousePosition, 0.0, 1.0);
 
 	this->Root->AddRelativeLocation(
-		-1 * this->Root->GetRightVector() * Movement * this->EdgeScrollSpeed * this->DeltaSeconds
+		-1 * this->Root->GetRightVector() * Movement * this->NowMoveSpeed * this->DeltaSeconds
 	);
 }
 
@@ -440,7 +451,7 @@ void URTSCamera::EdgeScrollRight() const
 
 	const auto Movement = UKismetMathLibrary::FClamp(NormalizedMousePosition, 0.0, 1.0);
 	this->Root->AddRelativeLocation(
-		this->Root->GetRightVector() * Movement * this->EdgeScrollSpeed * this->DeltaSeconds
+		this->Root->GetRightVector() * Movement * this->NowMoveSpeed * this->DeltaSeconds
 	);
 }
 
@@ -456,7 +467,7 @@ void URTSCamera::EdgeScrollUp() const
 
 	const auto Movement = 1 - UKismetMathLibrary::FClamp(NormalizedMousePosition, 0.0, 1.0);
 	this->Root->AddRelativeLocation(
-		this->Root->GetForwardVector() * Movement * this->EdgeScrollSpeed * this->DeltaSeconds
+		this->Root->GetForwardVector() * Movement * this->NowMoveSpeed * this->DeltaSeconds
 	);
 }
 
@@ -472,7 +483,7 @@ void URTSCamera::EdgeScrollDown() const
 
 	const auto Movement = UKismetMathLibrary::FClamp(NormalizedMousePosition, 0.0, 1.0);
 	this->Root->AddRelativeLocation(
-		-1 * this->Root->GetForwardVector() * Movement * this->EdgeScrollSpeed * this->DeltaSeconds
+		-1 * this->Root->GetForwardVector() * Movement * this->NowMoveSpeed * this->DeltaSeconds
 	);
 }
 

Source/OpenRTSCamera/Public/RTSCamera.h

@@ -1,8 +1,8 @@
-// Copyright 2024 Jesus Bracho All Rights Reserved.
+// Copyright 2024 Jesus Bracho All Rights Reserved.
 
 #pragma once
 
-#include "CoreMinimal.h"
+#include <CoreMinimal.h>
 #include "InputMappingContext.h"
 #include "Camera/CameraComponent.h"
 #include "Components/ActorComponent.h"
@@ -66,7 +66,9 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	float StartingZAngle;
 
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera")
-	float MoveSpeed;
+	float MaxMoveSpeed;
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera")
+	float MinMoveSpeed;
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera")
 	float RotateSpeed;
 
@@ -104,13 +106,8 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera - Edge Scroll Settings")
 	bool EnableEdgeScrolling;
-	UPROPERTY(
-		BlueprintReadWrite,
-		EditAnywhere,
-		Category = "RTSCamera - Edge Scroll Settings",
-		meta=(EditCondition="EnableEdgeScrolling")
-	)
-	float EdgeScrollSpeed;
+
+
 	UPROPERTY(
 		BlueprintReadWrite,
 		EditAnywhere,
@@ -199,4 +196,6 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	FVector2D DragStartLocation;
 	UPROPERTY()
 	TArray<FMoveCameraCommand> MoveCameraCommands;
+	UPROPERTY()
+	float NowMoveSpeed;
 };

Source/OpenRTSCamera/Public/RTSSelector.h

@@ -1,8 +1,8 @@
-// Copyright 2024 Jesus Bracho All Rights Reserved.
+// Copyright 2024 Jesus Bracho All Rights Reserved.
 
 #pragma once
 
-#include "CoreMinimal.h"
+#include <CoreMinimal.h>
 #include "InputAction.h"
 #include "InputMappingContext.h"
 #include "RTSHUD.h"