diff --git a/Content/TestMap.umap b/Content/TestMap.umap index e3b6fd5..e4be275 100755 Binary files a/Content/TestMap.umap and b/Content/TestMap.umap differ diff --git a/Content/TestMap_BuiltData.uasset b/Content/TestMap_BuiltData.uasset index adf888a..672df80 100755 Binary files a/Content/TestMap_BuiltData.uasset and b/Content/TestMap_BuiltData.uasset differ diff --git a/PresidentsBrigade.sln b/PresidentsBrigade.sln index 06d68a6..30d3bf7 100755 --- a/PresidentsBrigade.sln +++ b/PresidentsBrigade.sln @@ -7,81 +7,63 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{94A6C6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{8E2F6A87-1826-34F4-940C-CC23A48F9FE4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresidentsBrigade", "Intermediate\ProjectFiles\PresidentsBrigade.vcxproj", "{FC69A341-313C-41FD-9B9D-E37068DDDCED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{52E1ABCB-160A-496E-B0DF-3F45C156D01A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresidentsBrigade", "Intermediate\ProjectFiles\PresidentsBrigade.vcxproj", "{C841ECC2-1D1E-4BBB-AB40-4F3F71586811}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizers", "Visualizers", "{1CCEC849-CC72-4C59-8C36-2F7C38706D4C}" ProjectSection(SolutionItems) = preProject - D:\Games\Epic Games\UE_4.25\Engine\Extras\VisualStudioDebugging\UE4.natvis = D:\Games\Epic Games\UE_4.25\Engine\Extras\VisualStudioDebugging\UE4.natvis + ..\..\..\..\..\Program Files\Epic Games\UE_4.25\Engine\Extras\VisualStudioDebugging\UE4.natvis = ..\..\..\..\..\Program Files\Epic Games\UE_4.25\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 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame Editor|Android.ActiveCfg = Invalid|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame|Android.ActiveCfg = Android_DebugGame|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame|Android.Build.0 = Android_DebugGame|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame|Win32.ActiveCfg = DebugGame|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame|Win32.Build.0 = DebugGame|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame|Win64.ActiveCfg = DebugGame|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.DebugGame|Win64.Build.0 = DebugGame|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development Editor|Android.ActiveCfg = Invalid|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development Editor|Win32.ActiveCfg = Invalid|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development Editor|Win64.ActiveCfg = Development_Editor|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development Editor|Win64.Build.0 = Development_Editor|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development|Android.ActiveCfg = Android_Development|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development|Android.Build.0 = Android_Development|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development|Win32.ActiveCfg = Development|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development|Win32.Build.0 = Development|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development|Win64.ActiveCfg = Development|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Development|Win64.Build.0 = Development|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Shipping|Android.ActiveCfg = Android_Shipping|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Shipping|Android.Build.0 = Android_Shipping|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Shipping|Win32.Build.0 = Shipping|Win32 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Shipping|Win64.ActiveCfg = Shipping|x64 - {FC69A341-313C-41FD-9B9D-E37068DDDCED}.Shipping|Win64.Build.0 = Shipping|x64 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.DebugGame Editor|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.DebugGame|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Development Editor|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Development|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Shipping|Android.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {52E1ABCB-160A-496E-B0DF-3F45C156D01A}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame|Win32.ActiveCfg = DebugGame|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame|Win32.Build.0 = DebugGame|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame|Win64.ActiveCfg = DebugGame|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.DebugGame|Win64.Build.0 = DebugGame|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development Editor|Win32.ActiveCfg = Invalid|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development Editor|Win64.ActiveCfg = Development_Editor|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development Editor|Win64.Build.0 = Development_Editor|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development|Win32.ActiveCfg = Development|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development|Win32.Build.0 = Development|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development|Win64.ActiveCfg = Development|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Development|Win64.Build.0 = Development|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Shipping|Win32.ActiveCfg = Shipping|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Shipping|Win32.Build.0 = Shipping|Win32 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Shipping|Win64.ActiveCfg = Shipping|x64 + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811}.Shipping|Win64.Build.0 = Shipping|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {304B0D85-FD5F-4CE3-A4A9-B5F6E1D396F3} = {94A6C6F3-99B3-346E-9557-ABF9D4064DBD} - {FC69A341-313C-41FD-9B9D-E37068DDDCED} = {8E2F6A87-1826-34F4-940C-CC23A48F9FE4} + {52E1ABCB-160A-496E-B0DF-3F45C156D01A} = {94A6C6F3-99B3-346E-9557-ABF9D4064DBD} + {C841ECC2-1D1E-4BBB-AB40-4F3F71586811} = {8E2F6A87-1826-34F4-940C-CC23A48F9FE4} EndGlobalSection EndGlobal diff --git a/PresidentsBrigade.uproject b/PresidentsBrigade.uproject index 51fb6bd..e81f559 100755 --- a/PresidentsBrigade.uproject +++ b/PresidentsBrigade.uproject @@ -9,7 +9,8 @@ "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ - "Engine" + "Engine", + "AIModule" ] } ] diff --git a/Source/PresidentsBrigade/BaseAIController.cpp b/Source/PresidentsBrigade/BaseAIController.cpp new file mode 100755 index 0000000..cdded33 --- /dev/null +++ b/Source/PresidentsBrigade/BaseAIController.cpp @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "BaseAIController.h" +#include "Util.h" + +#define LogInfo(Msg) Util::log_info(TEXT("ABaseAIController"), Msg) + +void ABaseAIController::BeginPlay() +{ + Super::BeginPlay(); + LogInfo("Hallo"); +} + +void ABaseAIController::Tick(float delta) +{ + Super::Tick(delta); + if (!move_to_location) + { + FVector destination(590, -620, 53); + MoveToLocation(destination); + move_to_location = true; + } +} \ No newline at end of file diff --git a/Source/PresidentsBrigade/BaseAIController.h b/Source/PresidentsBrigade/BaseAIController.h new file mode 100755 index 0000000..99882a8 --- /dev/null +++ b/Source/PresidentsBrigade/BaseAIController.h @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "AIController.h" +#include "BaseAIController.generated.h" + +/** + * + */ +UCLASS() +class PRESIDENTSBRIGADE_API ABaseAIController : public AAIController +{ + GENERATED_BODY() + +public: + virtual void Tick(float delta) override; + +protected: + virtual void BeginPlay() override; + +private: + bool move_to_location = false; +}; diff --git a/Source/PresidentsBrigade/MarkerActor.cpp b/Source/PresidentsBrigade/MarkerActor.cpp new file mode 100755 index 0000000..9988919 --- /dev/null +++ b/Source/PresidentsBrigade/MarkerActor.cpp @@ -0,0 +1,26 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MarkerActor.h" + +// Sets default values +AMarkerActor::AMarkerActor() +{ + PrimaryActorTick.bCanEverTick = false; + SetActorHiddenInGame(true); +} + +// Called when the game starts or when spawned +void AMarkerActor::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void AMarkerActor::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + +} + diff --git a/Source/PresidentsBrigade/MarkerActor.h b/Source/PresidentsBrigade/MarkerActor.h new file mode 100755 index 0000000..f819217 --- /dev/null +++ b/Source/PresidentsBrigade/MarkerActor.h @@ -0,0 +1,26 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "MarkerActor.generated.h" + +UCLASS() +class PRESIDENTSBRIGADE_API AMarkerActor : public AActor +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + AMarkerActor(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + +};