From 74a0f0b906b09cb7463495d8d4ae312cb81d7577 Mon Sep 17 00:00:00 2001 From: Sara Montecino Date: Sat, 5 Nov 2022 13:50:04 -0700 Subject: [PATCH] Refactor --- Content/PlayerPawn_BP.uasset | Bin 0 -> 23208 bytes PresidentsBrigade.sln | 90 ++++++++++-------------- Source/PresidentsBrigade/BasePawn.cpp | 12 ---- Source/PresidentsBrigade/BasePawn.h | 13 +--- Source/PresidentsBrigade/PlayerPawn.cpp | 21 ++++++ Source/PresidentsBrigade/PlayerPawn.h | 27 +++++++ 6 files changed, 86 insertions(+), 77 deletions(-) create mode 100755 Content/PlayerPawn_BP.uasset create mode 100755 Source/PresidentsBrigade/PlayerPawn.cpp create mode 100755 Source/PresidentsBrigade/PlayerPawn.h diff --git a/Content/PlayerPawn_BP.uasset b/Content/PlayerPawn_BP.uasset new file mode 100755 index 0000000000000000000000000000000000000000..f49db00a7746bec8b5379a862336787cfedebd11 GIT binary patch literal 23208 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 literal 0 HcmV?d00001 diff --git a/PresidentsBrigade.sln b/PresidentsBrigade.sln index 7f8403e..b55fc7e 100755 --- a/PresidentsBrigade.sln +++ b/PresidentsBrigade.sln @@ -3,85 +3,67 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28315.86 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{417AE356-0628-4071-8D33-40C078947CC9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{5103C5E3-315C-4C37-874B-8D40FB0C4DF2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{CDA30B7C-8F9F-48AB-A6AA-CB3B41DCE083}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{EF25ABC6-4E6A-47FF-8F19-D9F362F20975}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresidentsBrigade", "Intermediate\ProjectFiles\PresidentsBrigade.vcxproj", "{F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{D9382F70-7D46-4890-A609-A45B932320FF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{B0F8FF12-D021-4217-B1B9-F5627A14FB59}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresidentsBrigade", "Intermediate\ProjectFiles\PresidentsBrigade.vcxproj", "{2CF5761D-D1F4-42C9-A423-DA654E7A8611}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizers", "Visualizers", "{1AC9C2E0-EF4E-4F8C-9F40-1C4BD6DECBCB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizers", "Visualizers", "{7AC2C1EC-1EDE-4E55-8432-75A0A78B8D96}" ProjectSection(SolutionItems) = preProject - D:\Games\Epic Games\UE_4.24\Engine\Extras\VisualStudioDebugging\UE4.natvis = D:\Games\Epic Games\UE_4.24\Engine\Extras\VisualStudioDebugging\UE4.natvis + ..\..\..\..\..\Program Files\Epic Games\UE_4.24\Engine\Extras\VisualStudioDebugging\UE4.natvis = ..\..\..\..\..\Program Files\Epic Games\UE_4.24\Engine\Extras\VisualStudioDebugging\UE4.natvis EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DebugGame Editor|Android = DebugGame Editor|Android DebugGame Editor|Win32 = DebugGame Editor|Win32 DebugGame Editor|Win64 = DebugGame Editor|Win64 - DebugGame|Android = DebugGame|Android DebugGame|Win32 = DebugGame|Win32 DebugGame|Win64 = DebugGame|Win64 - Development Editor|Android = Development Editor|Android Development Editor|Win32 = Development Editor|Win32 Development Editor|Win64 = Development Editor|Win64 - Development|Android = Development|Android Development|Win32 = Development|Win32 Development|Win64 = Development|Win64 - Shipping|Android = Shipping|Android Shipping|Win32 = Shipping|Win32 Shipping|Win64 = Shipping|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame Editor|Android.ActiveCfg = Invalid|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame|Android.ActiveCfg = Android_DebugGame|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame|Android.Build.0 = Android_DebugGame|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame|Win32.ActiveCfg = DebugGame|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame|Win32.Build.0 = DebugGame|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame|Win64.ActiveCfg = DebugGame|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.DebugGame|Win64.Build.0 = DebugGame|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development Editor|Android.ActiveCfg = Invalid|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development Editor|Win32.ActiveCfg = Invalid|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development Editor|Win64.ActiveCfg = Development_Editor|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development Editor|Win64.Build.0 = Development_Editor|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development|Android.ActiveCfg = Android_Development|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development|Android.Build.0 = Android_Development|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development|Win32.ActiveCfg = Development|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development|Win32.Build.0 = Development|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development|Win64.ActiveCfg = Development|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Development|Win64.Build.0 = Development|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Shipping|Android.ActiveCfg = Android_Shipping|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Shipping|Android.Build.0 = Android_Shipping|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Shipping|Win32.Build.0 = Shipping|Win32 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Shipping|Win64.ActiveCfg = Shipping|x64 - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B}.Shipping|Win64.Build.0 = Shipping|x64 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.DebugGame Editor|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.DebugGame|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Development Editor|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Development|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Shipping|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {B0F8FF12-D021-4217-B1B9-F5627A14FB59}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {D9382F70-7D46-4890-A609-A45B932320FF}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame|Win32.ActiveCfg = DebugGame|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame|Win32.Build.0 = DebugGame|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame|Win64.ActiveCfg = DebugGame|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.DebugGame|Win64.Build.0 = DebugGame|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development Editor|Win32.ActiveCfg = Invalid|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development Editor|Win64.ActiveCfg = Development_Editor|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development Editor|Win64.Build.0 = Development_Editor|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development|Win32.ActiveCfg = Development|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development|Win32.Build.0 = Development|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development|Win64.ActiveCfg = Development|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Development|Win64.Build.0 = Development|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Shipping|Win32.ActiveCfg = Shipping|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Shipping|Win32.Build.0 = Shipping|Win32 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Shipping|Win64.ActiveCfg = Shipping|x64 + {2CF5761D-D1F4-42C9-A423-DA654E7A8611}.Shipping|Win64.Build.0 = Shipping|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B0F8FF12-D021-4217-B1B9-F5627A14FB59} = {417AE356-0628-4071-8D33-40C078947CC9} - {F2C85DE9-5426-412A-8D2E-10FE7F5CF11B} = {CDA30B7C-8F9F-48AB-A6AA-CB3B41DCE083} + {D9382F70-7D46-4890-A609-A45B932320FF} = {5103C5E3-315C-4C37-874B-8D40FB0C4DF2} + {2CF5761D-D1F4-42C9-A423-DA654E7A8611} = {EF25ABC6-4E6A-47FF-8F19-D9F362F20975} EndGlobalSection EndGlobal diff --git a/Source/PresidentsBrigade/BasePawn.cpp b/Source/PresidentsBrigade/BasePawn.cpp index 26b748b..599bafe 100755 --- a/Source/PresidentsBrigade/BasePawn.cpp +++ b/Source/PresidentsBrigade/BasePawn.cpp @@ -2,7 +2,6 @@ #include "BasePawn.h" -#include "Camera/CameraComponent.h" #include "Components/StaticMeshComponent.h" #include "GameFramework/FloatingPawnMovement.h" @@ -12,13 +11,11 @@ ABasePawn::ABasePawn(const FObjectInitializer &object_initializer): { // Create default components. root_component = object_initializer.CreateDefaultSubobject(this, FName("Root")); - main_camera = object_initializer.CreateDefaultSubobject(this, FName("MainCamera")); player_mesh = object_initializer.CreateDefaultSubobject(this, FName("PlayerMesh")); movement_component = object_initializer.CreateDefaultSubobject(this, FName("MovementComponent")); // Setup component hierarchy. RootComponent = root_component; - main_camera->SetupAttachment(root_component); player_mesh->SetupAttachment(root_component); movement_component->UpdatedComponent = player_mesh; @@ -29,7 +26,6 @@ ABasePawn::ABasePawn(const FObjectInitializer &object_initializer): void ABasePawn::BeginPlay() { Super::BeginPlay(); - } UPawnMovementComponent* ABasePawn::GetMovementComponent() const @@ -43,14 +39,6 @@ void ABasePawn::Tick(float DeltaTime) Super::Tick(DeltaTime); } -// Called to bind functionality to input -void ABasePawn::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) -{ - Super::SetupPlayerInputComponent(PlayerInputComponent); - PlayerInputComponent->BindAxis("MoveForward", this, &ABasePawn::handle_move_forward); - PlayerInputComponent->BindAxis("MoveRight", this, &ABasePawn::handle_move_right); -} - void ABasePawn::handle_move_forward(float axis) { FRotator rotation = Controller->GetControlRotation(); diff --git a/Source/PresidentsBrigade/BasePawn.h b/Source/PresidentsBrigade/BasePawn.h index b9d9d4f..cca3d2c 100755 --- a/Source/PresidentsBrigade/BasePawn.h +++ b/Source/PresidentsBrigade/BasePawn.h @@ -6,7 +6,6 @@ #include "GameFramework/Pawn.h" #include "BasePawn.generated.h" -class UCameraComponent; class UFloatingPawnMovement; UCLASS() @@ -20,27 +19,19 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; - - // Called to bind functionality to input - virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + virtual void handle_move_right(float axis); + virtual void handle_move_forward(float axis); protected: // Called when the game starts or when spawned virtual void BeginPlay() override; virtual UPawnMovementComponent* GetMovementComponent() const; - UPROPERTY(EditAnywhere, Category="Player") - UCameraComponent* main_camera; - UPROPERTY(EditAnywhere, Category="Player") UStaticMeshComponent* player_mesh; UPROPERTY(EditAnywhere, Category="Player") UFloatingPawnMovement* movement_component; -private: USceneComponent* root_component; - - void handle_move_right(float axis); - void handle_move_forward(float axis); }; diff --git a/Source/PresidentsBrigade/PlayerPawn.cpp b/Source/PresidentsBrigade/PlayerPawn.cpp new file mode 100755 index 0000000..b8cff03 --- /dev/null +++ b/Source/PresidentsBrigade/PlayerPawn.cpp @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "PlayerPawn.h" +#include "Camera/CameraComponent.h" + + +APlayerPawn::APlayerPawn(const FObjectInitializer &object_initializer): + ABasePawn(object_initializer) +{ + main_camera = object_initializer.CreateDefaultSubobject(this, FName("MainCamera")); + main_camera->SetupAttachment(root_component); +} + +// Called to bind functionality to input +void APlayerPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); + PlayerInputComponent->BindAxis("MoveForward", this, &ABasePawn::handle_move_forward); + PlayerInputComponent->BindAxis("MoveRight", this, &ABasePawn::handle_move_right); +} \ No newline at end of file diff --git a/Source/PresidentsBrigade/PlayerPawn.h b/Source/PresidentsBrigade/PlayerPawn.h new file mode 100755 index 0000000..44cb677 --- /dev/null +++ b/Source/PresidentsBrigade/PlayerPawn.h @@ -0,0 +1,27 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BasePawn.h" +#include "PlayerPawn.generated.h" + +class UCameraComponent; + +/** + * + */ +UCLASS() +class PRESIDENTSBRIGADE_API APlayerPawn : public ABasePawn +{ + GENERATED_BODY() +public: + // Sets default values for this pawn's properties + APlayerPawn(const FObjectInitializer &object_initializer); + + // Called to bind functionality to input + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; +protected: + UPROPERTY(EditAnywhere, Category="Player") + UCameraComponent* main_camera; +};