diff --git a/.gitignore b/.gitignore index 631ee4d..7edd358 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ Project/Surgo.sln Project/Saved/ShaderDebugInfo Project/Saved/Autosaves Project/Saved/Config/CrashReportClient +Project/Saved/SourceControl +Project/Saved/Crashes diff --git a/Project/Binaries/Win64/SurgoEditor.target b/Project/Binaries/Win64/SurgoEditor.target index 6538318..678b168 100644 --- a/Project/Binaries/Win64/SurgoEditor.target +++ b/Project/Binaries/Win64/SurgoEditor.target @@ -5169,18 +5169,6 @@ "Path": "$(EngineDir)/Plugins/Surgo/Cog/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, - { - "Path": "$(EngineDir)/Plugins/Surgo/UE_ImGui/Binaries/Win64/UnrealEditor-UE_ImGui.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Surgo/UE_ImGui/Binaries/Win64/UnrealEditor-UE_ImGui.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Surgo/UE_ImGui/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Plugins/VirtualProduction/Takes/Binaries/Win64/UnrealEditor-CacheTrackRecorder.dll", "Type": "DynamicLibrary" @@ -28635,10 +28623,6 @@ "Path": "$(EngineDir)/Plugins/Surgo/Cog/Cog.uplugin", "Type": "UFS" }, - { - "Path": "$(EngineDir)/Plugins/Surgo/UE_ImGui/UE_ImGui.uplugin", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Plugins/VirtualProduction/Takes/Takes.uplugin", "Type": "UFS" @@ -28718,7 +28702,6 @@ "StructUtils", "Takes", "TextureFormatOodle", - "UE_ImGui", "VariantManager", "VariantManagerContent", "WaveTable", diff --git a/Project/Binaries/Win64/UnrealEditor-Surgo.dll b/Project/Binaries/Win64/UnrealEditor-Surgo.dll index a40b99d..368b318 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-Surgo.dll and b/Project/Binaries/Win64/UnrealEditor-Surgo.dll differ diff --git a/Project/Binaries/Win64/UnrealEditor-Surgo.pdb b/Project/Binaries/Win64/UnrealEditor-Surgo.pdb index 50b2d5d..bf949c3 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-Surgo.pdb and b/Project/Binaries/Win64/UnrealEditor-Surgo.pdb differ diff --git a/Project/Binaries/Win64/UnrealEditor-SurgoEditor.dll b/Project/Binaries/Win64/UnrealEditor-SurgoEditor.dll index 105fcf4..8f6707c 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-SurgoEditor.dll and b/Project/Binaries/Win64/UnrealEditor-SurgoEditor.dll differ diff --git a/Project/Binaries/Win64/UnrealEditor-SurgoEditor.pdb b/Project/Binaries/Win64/UnrealEditor-SurgoEditor.pdb index e35a0a5..ee614da 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-SurgoEditor.pdb and b/Project/Binaries/Win64/UnrealEditor-SurgoEditor.pdb differ diff --git a/Project/Content/Blueprints/TempGameMode.uasset b/Project/Content/Blueprints/TempGameMode.uasset new file mode 100644 index 0000000..c819bb7 --- /dev/null +++ b/Project/Content/Blueprints/TempGameMode.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aec1f58493353e0783b18c0e7336b187744f97be4767f0cab911ed498da5e0b8 +size 20166 diff --git a/Project/Source/Surgo/SuCommon.h b/Project/Source/Surgo/SuCommon.h new file mode 100644 index 0000000..9dceff6 --- /dev/null +++ b/Project/Source/Surgo/SuCommon.h @@ -0,0 +1,7 @@ +// This is a low-cost header filled mostly with defines or forwards. +// Do not fill this with a bunch of actual definitions. + +#include "CogCommon.h" + +// Cog Forwards +class UCogWindowManager; diff --git a/Project/Source/Surgo/SuGameState.cpp b/Project/Source/Surgo/SuGameState.cpp new file mode 100644 index 0000000..9b1df45 --- /dev/null +++ b/Project/Source/Surgo/SuGameState.cpp @@ -0,0 +1,34 @@ +#include "SuGameState.h" + +#include "CogAll.h" +#include "CogWindowManager.h" + +ASuGameState::ASuGameState() +{ + // Enable ticking + PrimaryActorTick.bCanEverTick = true; + PrimaryActorTick.SetTickFunctionEnable(true); + PrimaryActorTick.bStartWithTickEnabled = true; +} + +#pragma region GameState +void ASuGameState::BeginPlay() +{ +#if ENABLE_COG + CogWindowManager = NewObject(this); + CogWindowManagerRef = CogWindowManager; + + // Add all the built-in windows + Cog::AddAllWindows(*CogWindowManager); +#endif //ENABLE_COG +} + +void ASuGameState::Tick(float DeltaSeconds) +{ + Super::Tick(DeltaSeconds); + +#if ENABLE_COG + CogWindowManager->Tick(DeltaSeconds); +#endif //ENABLE_COG +} +#pragma endregion GameState diff --git a/Project/Source/Surgo/SuGameState.h b/Project/Source/Surgo/SuGameState.h new file mode 100644 index 0000000..1fe9341 --- /dev/null +++ b/Project/Source/Surgo/SuGameState.h @@ -0,0 +1,32 @@ +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/GameState.h" + +#include "SuCommon.h" + +#include "SuGameState.generated.h" + + +UCLASS(BlueprintType) +class SURGO_API ASuGameState : public AGameState +{ + GENERATED_BODY() +public: + + ASuGameState(); + + // To make sure it doesn't get garbage collected. + UPROPERTY() + TObjectPtr CogWindowManagerRef = nullptr; + +#if ENABLE_COG + TObjectPtr CogWindowManager = nullptr; +#endif // ENABLE_COG + +#pragma region GameState + void BeginPlay() override; + + void Tick(float DeltaSeconds) override; +#pragma endregion GameState +}; diff --git a/Project/Source/Surgo/Surgo.Build.cs b/Project/Source/Surgo/Surgo.Build.cs index 4de9fd8..105dd2b 100644 --- a/Project/Source/Surgo/Surgo.Build.cs +++ b/Project/Source/Surgo/Surgo.Build.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using ModuleRules = UnrealBuildTool.ModuleRules; using ReadOnlyTargetRules = UnrealBuildTool.ReadOnlyTargetRules; +using TargetRules = UnrealBuildTool.TargetRules; +using UnrealTargetConfiguration = UnrealBuildTool.UnrealTargetConfiguration; public class Surgo : ModuleRules { @@ -14,9 +16,43 @@ public class Surgo : ModuleRules }); PrivateDependencyModuleNames.AddRange(new string[] { "Core", + + "AIModule", + "CoreUObject", + "Engine", + "EnhancedInput", + "GameplayAbilities", + "GameplayTags", + "GameplayTasks", + "InputCore", + "NetCore", + "Niagara", }); #endregion Engine + #region Plugins + if (Target.Configuration != UnrealTargetConfiguration.Shipping && Target.Type != TargetRules.TargetType.Server) + { + PrivateIncludePathModuleNames.AddRange( new string[] + { + "CogCommon", + }); + PrivateDependencyModuleNames.AddRange(new string[] + { + // "UE_ImGui", + "CogCommon", + "CogAbility", + "CogAI", + "CogAll", + "CogDebug", + "CogEngine", + "CogImgui", + "CogInput", + "CogWindow", + }); + } + #endregion Plugins + PublicIncludePathModuleNames.Add("Surgo"); } } diff --git a/Project/Surgo.uproject b/Project/Surgo.uproject index 504d079..2908582 100644 --- a/Project/Surgo.uproject +++ b/Project/Surgo.uproject @@ -262,10 +262,6 @@ "Name": "SteamAudio", "Enabled": true }, - { - "Name": "UE_ImGui", - "Enabled": true - }, { "Name": "Cog", "Enabled": true @@ -278,12 +274,16 @@ "Name": "CogAI", "Enabled": true }, + { + "Name": "CogInput", + "Enabled": true + }, { "Name": "CogAll", "Enabled": true }, { - "Name": "CogInput", + "Name": "GameplayAbilities", "Enabled": true } ], diff --git a/scripts/update_deps.ps1 b/scripts/update_deps.ps1 index aa27e76..3635f16 100644 --- a/scripts/update_deps.ps1 +++ b/scripts/update_deps.ps1 @@ -322,6 +322,12 @@ function setup-cog } setup-cog +function setup-tracy +{ + $url_ue_tracy = 'https://github.com/Nesquick0/TracyUnrealPlugin.git' +} +# setup_tracy + & .\GenerateProjectFiles.bat pop-location # $path_ue