Add camera bounds visual (#11)

* Fix camera bounds logic, wasn't calling the function :( * Add a CameraBoundsVolume class * Create drag and drop visual camera bounds * Use a thinner map border * Give up on trying to submit readme
HeyZoos · Jun 4, 2022 · acd329b · acd329b
1 parent 9c11035
commit acd329b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/Config/FilterPlugin.ini b/Config/FilterPlugin.ini
@@ -6,4 +6,3 @@
 ;    /README.txt
 ;    /Extras/...
 ;    /Binaries/ThirdParty/*.dll
-/README.md
diff --git a/Content/BP_CameraBoundsVolume.uasset b/Content/BP_CameraBoundsVolume.uasset
diff --git a/Content/Materials/M_CameraBounds.uasset b/Content/Materials/M_CameraBounds.uasset
diff --git a/Content/Materials/T_SolidBorder.uasset b/Content/Materials/T_SolidBorder.uasset
diff --git a/OpenRTSCamera.uplugin b/OpenRTSCamera.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.11.2",
+	"VersionName": "0.12.0",
 	"FriendlyName": "OpenRTSCamera",
 	"Description": "An Unreal Engine 5 open-source RTS/MOBA camera implementation that aims to be fully featured, customizable and dependable",
 	"Category": "Gameplay",
@@ -11,9 +11,7 @@
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/94e9872ad3754e798b6ec53f4494f5de",
 	"SupportURL": "https://github.com/HeyZoos/OpenRTSCamera/issues",
 	"CanContainContent": true,
-	"IsBetaVersion": true,
-	"IsExperimentalVersion": false,
-	"EngineVersion": "5.0.1",
+	"EngineVersion": "5.0.0",
 	"Installed": false,
 	"Modules": [
 		{
@@ -31,4 +29,4 @@
 			"Enabled": true
 		}
 	]
-}
+}
diff --git a/Source/OpenRTSCamera/Private/RTSCamera.cpp b/Source/OpenRTSCamera/Private/RTSCamera.cpp
@@ -15,7 +15,7 @@
 URTSCamera::URTSCamera()
 {
 	PrimaryComponentTick.bCanEverTick = true;
-	this->CameraBlockingVolumeTag = "@CameraBounds";
+	this->CameraBlockingVolumeTag = FName("OpenRTSCamera#CameraBounds");
 	this->EdgeScrollSpeed = 50;
 	this->DistanceFromEdgeThreshold = 0.1f;
 	this->EnableCameraLag = true;
@@ -80,6 +80,7 @@ void URTSCamera::TickComponent(
 	this->ConditionallyKeepCameraAtDesiredZoomAboveGround();
 	this->SmoothTargetArmLengthToDesiredZoom();
 	this->FollowTargetIfSet();
+	this->ConditionallyApplyCameraBounds();
 }
 
 void URTSCamera::FollowTarget(AActor* Target)
@@ -203,14 +204,14 @@ void URTSCamera::TryToFindBoundaryVolumeReference()
 	TArray<AActor*> BlockingVolumes;
 	UGameplayStatics::GetAllActorsOfClassWithTag(
 		this->GetWorld(),
-		ABlockingVolume::StaticClass(),
+		AActor::StaticClass(),
 		this->CameraBlockingVolumeTag,
 		BlockingVolumes
 	);
 
 	if (BlockingVolumes.Num() > 0)
 	{
-		this->BoundaryVolume = Cast<ABlockingVolume>(BlockingVolumes[0]);
+		this->BoundaryVolume = BlockingVolumes[0];
 	}
 }
 

diff --git a/Source/OpenRTSCamera/Public/RTSCamera.h b/Source/OpenRTSCamera/Public/RTSCamera.h
@@ -6,7 +6,6 @@
 #include "InputMappingContext.h"
 #include "Camera/CameraComponent.h"
 #include "Components/ActorComponent.h"
-#include "Engine/BlockingVolume.h"
 #include "GameFramework/SpringArmComponent.h"
 #include "RTSCamera.generated.h"
 
@@ -31,9 +30,6 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	UFUNCTION(BlueprintCallable, Category = "RTSCamera")
 	void UnFollowTarget();
 
-	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera")
-	FName CameraBlockingVolumeTag;
-
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera - Zoom Settings")
 	float MinimumZoomLength;
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera - Zoom Settings")
@@ -58,7 +54,7 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	bool EnableCameraLag;
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera")
 	bool EnableCameraRotationLag;
-	
+
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RTSCamera - Dynamic Camera Height Settings")
 	bool EnableDynamicCameraHeight;
 	UPROPERTY(
@@ -124,7 +120,7 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	UPROPERTY()
 	APlayerController* PlayerController;
 	UPROPERTY()
-	ABlockingVolume* BoundaryVolume;
+	AActor* BoundaryVolume;
 
 	float DesiredZoomLength;
 
@@ -133,7 +129,7 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	void ConfigureSpringArm();
 	void TryToFindBoundaryVolumeReference();
 	void ConditionallyEnableEdgeScrolling() const;
-	void CheckForEnhancedInputComponent() const;	
+	void CheckForEnhancedInputComponent() const;
 	void BindInputMappingContext() const;
 	void BindInputActions();
 
@@ -149,7 +145,9 @@ class OPENRTSCAMERA_API URTSCamera : public UActorComponent
 	void ConditionallyApplyCameraBounds() const;
 
 	UPROPERTY()
-	float DeltaSeconds;
+	FName CameraBlockingVolumeTag;
 	UPROPERTY()
 	AActor* CameraFollowTarget;
+	UPROPERTY()
+	float DeltaSeconds;
 };