diff --git a/UnrealProject/Lost_Edge/Config/DefaultGame.ini b/UnrealProject/Lost_Edge/Config/DefaultGame.ini index e77086e..1983ff4 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultGame.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultGame.ini @@ -133,3 +133,13 @@ bShouldAcquireMissingChunksOnLoad=False bShouldWarnAboutInvalidAssets=True MetaDataTagsForAssetRegistry=() + + +[/Script/LoadingScreen.LoadingScreenSettings] +startupBackgroundImageA=/Game/Movies/Images/T_StartupImageA.T_StartupImageA +startupBackgroundImageB=/Game/Movies/Images/T_StartupImageB.T_StartupImageB + +[/Script/StartupScreenModule.StartupScreenSettings] +imageA=/Game/Movies/Images/T_StartupImageA.T_StartupImageA +imageB=/Game/Movies/Images/T_StartupImageB.T_StartupImageB + diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset index 9833752..5412ccc 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c9c93e846c0b9f7c8ef0d79047da3cda2eb17550062c0bea1fcfa64a4688ecc -size 54469 +oid sha256:accfe3fc1e69419a339db8a54be9396ed6e1c96249be5e96dd0e9b7fcaf39324 +size 52991 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_BACKUP_1095.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_BACKUP_1095.uasset deleted file mode 100644 index 10a2266..0000000 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_BACKUP_1095.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94b5f403a9ce9a0cc25801cd52d0674af8cd8c6a9739377650e0a17d78b3eb23 -size 288 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_BASE_1095.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_BASE_1095.uasset deleted file mode 100644 index 8efa787..0000000 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_BASE_1095.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb3930a1fcc1e0a639ec3e2d880188bb6cfd24b890d976d8e44c58dc80a23d9b -size 465136 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_LOCAL_1095.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_LOCAL_1095.uasset deleted file mode 100644 index ff43b04..0000000 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_LOCAL_1095.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edce730484d91942f257ae29265f7a5fc69f2ff5c0f0a40d9c6fec1ae2437658 -size 439607 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_REMOTE_1095.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_REMOTE_1095.uasset deleted file mode 100644 index 4885438..0000000 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player_REMOTE_1095.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9c36972b44158530845ea84b827a845d4cf0f220130c2dd58f0b7bd525b505a -size 501099 diff --git a/UnrealProject/Lost_Edge/Content/Movies/Images/T_StartupImageA.uasset b/UnrealProject/Lost_Edge/Content/Movies/Images/T_StartupImageA.uasset deleted file mode 100644 index 4993686..0000000 --- a/UnrealProject/Lost_Edge/Content/Movies/Images/T_StartupImageA.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a81a9ba4522b4772048345abd8c6f0660bdfec4e8d5448be0596ac65ef2eb54 -size 352044 diff --git a/UnrealProject/Lost_Edge/Content/Movies/Images/T_StartupImageB.uasset b/UnrealProject/Lost_Edge/Content/Movies/Images/T_StartupImageB.uasset deleted file mode 100644 index 45eac92..0000000 --- a/UnrealProject/Lost_Edge/Content/Movies/Images/T_StartupImageB.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2956a67cf0df35b558e9b3e7b025b31497a0ea1aa6afd596edeff0b040d0fe52 -size 395171 diff --git a/UnrealProject/Lost_Edge/Lost_Edge.uproject b/UnrealProject/Lost_Edge/Lost_Edge.uproject index 12e3b2c..09012ef 100644 --- a/UnrealProject/Lost_Edge/Lost_Edge.uproject +++ b/UnrealProject/Lost_Edge/Lost_Edge.uproject @@ -22,6 +22,11 @@ "AdditionalDependencies": [ "Engine" ] + }, + { + "Name": "Lost_EdgeStyle", + "Type": "Runtime", + "LoadingPhase": "PostConfigInit" } ], "Plugins": [ diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs index 49a12d6..9e02f45 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2ceca7d34685f1e3ffb03d56b91e7db14e362464e6170f2339e2aaef990b3f9 -size 11654 +oid sha256:e6a12de125c72482954985c58f220fb0723a10114c3f91f920ef139a3f212204 +size 11742 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs index 280838b..64fb4af 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d84ce1c9b70ad8ea489e47222b233d0c6a85a13ed6b4c1fb5517116bef715cf7 -size 2080 +oid sha256:1ab10820dd297408c4c955767c5f0f9ba20888aa90a10405c09a251fd442cd56 +size 2305 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs index 8c80cd9..2124e37 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:792b181d212d99a6a0e39a69b9aa1e0bd59979f0f2281db8ab553e37e3928bfe -size 1005 +oid sha256:70b7603010c7c7ee604413fe1a375af9001f115d67116cb8514acbe8e64abc42 +size 1248 diff --git a/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs b/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs index 871a008..3794c50 100644 --- a/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c1bd1f012d230b98824baacf4c223f7535e5bcd7256cbb9a04085d9c95f7550 -size 1457 +oid sha256:0f5e68f6f9e9b1dbca2c6a28e1525da5300a6a6d7c3f596ad8187caea727919e +size 1700 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Icon128.png b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Icon128.png new file mode 100644 index 0000000..26245f6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Icon128.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7239efaeefbd82de33ebe18518e50de075ea4188a468a9e4991396433d2275f +size 12699 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageA.png b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageA.png new file mode 100644 index 0000000..c7e0c29 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageA.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3b9348e879ab500bb2bd7efefbcd10ea6436646f82836b49354eda99675b944 +size 298380 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageB.png b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageB.png new file mode 100644 index 0000000..a52973e --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageB.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c3c8a99287f49d81b1427b62365b7d76870e6e9df82b6dd07ca5392e72a4f93 +size 319623 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs new file mode 100644 index 0000000..b366fde --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5725b79ae71de50b0f0a4061cb4f4e111dbd28a9134cf27677585b7f0e538872 +size 1329 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp new file mode 100644 index 0000000..f13ca3c --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8f1133695352db75624f959c79dfc6615ad95234642a445863395e5582577b5 +size 991 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp new file mode 100644 index 0000000..e0a3ad4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58cf1439cdc82bee447156482474096071bcb0e8613d175cf4d801d1053dbe63 +size 684 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h new file mode 100644 index 0000000..7ecd63b --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f766d356638ae963e4ebf74868d5dcd0fb94069b4f75ea59b10f8193b0114002 +size 730 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h new file mode 100644 index 0000000..e579b18 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b29d301e7cae3157d66396b86bd9617c7183f1943aff6e8480cc7f9baad16ef5 +size 599 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp new file mode 100644 index 0000000..9e234d4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb8264b40e931ae26fe56268a9047099cee92e093c5dd7fd459bed0dd4a27136 +size 666 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h new file mode 100644 index 0000000..c590b3e --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d79d375b95dd55cd427ffdceb6b8b3a6710629f8a752fbe0e13760cf229dd70b +size 354 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Public/PreStartupScreen.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Public/PreStartupScreen.h new file mode 100644 index 0000000..873c32c --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Public/PreStartupScreen.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4d461f0b9f68948567027a182850ff884f5ea26b770e4bf9acb7d23c0adf602 +size 366 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp new file mode 100644 index 0000000..f00e5ab --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cce3ff15a32902d512b13049f568675dc0d7de5746dd9596a87fe99725c45427 +size 1900 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h new file mode 100644 index 0000000..49b5267 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52b759b16910ac829cd74a06f64577d44925b063233a834eda0388561ff0c78f +size 610 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp new file mode 100644 index 0000000..f753b28 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2486ede5d5e958cea074071afa3b0967cfbb0c045774856b3391703d2a089da0 +size 2389 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp new file mode 100644 index 0000000..29d89f4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f86db28aeca1b58801e620a9e369573079fb8dfd7d380ffa55635b6b303b29a7 +size 669 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h new file mode 100644 index 0000000..a1b4f04 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdc74ad44e44b0e9322a125ecae02eb6d2277770f58d8f8a8382fa3e6c73c425 +size 931 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h new file mode 100644 index 0000000..b47b34a --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb9f69d90378713fb9b0e1dda85f8ddd9e7fccdb19e88105d9f3cb5144f0dc76 +size 927 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Public/StartupScreen.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Public/StartupScreen.h new file mode 100644 index 0000000..2f37636 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Public/StartupScreen.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b40f0a2d117cff3f259a0244154deb29c8d61c3120afc749b49c05bffb47d9bf +size 604 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/StartupScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/StartupScreen.Build.cs new file mode 100644 index 0000000..5bddbb4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/StartupScreen.Build.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc3fd0123686d9ef559772a770bb3b64ec43fe07e3ef75c894605e9e47dcb6c6 +size 1517 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin b/UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin new file mode 100644 index 0000000..28216fd --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f7fc6f98da3295374b28037c179a65f31b143aba32417905b344d27e118e252 +size 642 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs b/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs index 7ca225a..629010e 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs @@ -2,8 +2,10 @@ using UnrealBuildTool; -public class Lost_EdgeTarget : TargetRules { - public Lost_EdgeTarget(TargetInfo Target) : base(Target) { +public class Lost_EdgeTarget : TargetRules +{ + public Lost_EdgeTarget(TargetInfo Target) : base(Target) + { Type = TargetType.Game; DefaultBuildSettings = BuildSettingsVersion.Latest; IncludeOrderVersion = EngineIncludeOrderVersion.Latest; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs index 4dae4b4..9e5bb83 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs @@ -12,7 +12,7 @@ public class Lost_Edge : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OpenCV" }); PrivateDependencyModuleNames.AddRange(new string[] { "EnhancedInput", "UMG", "RHI", "RenderCore", "Lost_EdgeShaders", "PakFile", //"TextureCompressor", - "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape", "MoviePlayer", "Slate", "SlateCore" }); + "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape" }); if (Target.bBuildEditor) { diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.cpp deleted file mode 100644 index f131c28..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#include "Lost_EdgeGameModeBase.h" - diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.h deleted file mode 100644 index 1f1065d..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameModeBase.h" -#include "Lost_EdgeGameModeBase.generated.h" - -/** - * - */ -UCLASS() -class LOST_EDGE_API ALost_EdgeGameModeBase : public AGameModeBase -{ - GENERATED_BODY() - -}; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonData.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonData.h deleted file mode 100644 index 64d7ed8..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonData.h +++ /dev/null @@ -1,24 +0,0 @@ -// Oleg Petruny proprietary. - -#pragma once - -#include "Kismet/BlueprintFunctionLibrary.h" - -#include "CommonData.generated.h" - -/** - * Collection of common/universal/without own scope/specific data values. - */ -UCLASS() -class UCommonData : public UBlueprintFunctionLibrary -{ - GENERATED_BODY() - -public: - static const TSharedPtr KindaBlackColorBrush() - { - static auto brush = MakeShared(FLinearColor(0.01f, 0.01f, 0.01f)); - return brush; - } - -}; \ No newline at end of file diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp index 7e56715..8f9040c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp @@ -24,7 +24,7 @@ namespace const auto pakFileSavePath = FString::Printf(TEXT("%sDownloaded/"), *FPaths::ProjectDir()); } -void UContentLoader::BeginDestroy() +void UContentLoader::Deinitialize() { //if(mountedFiles.Num() > 0) //{ @@ -34,7 +34,7 @@ void UContentLoader::BeginDestroy() // FPlatformFileManager::Get().RemovePlatformFile(GetPakPlatformFile()); //} - UObject::BeginDestroy(); + Super::Deinitialize(); } void UContentLoader::HttpGet(const FString& url, FHttpRequestCompleteDelegate requestCompleteCallback) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h index ba774d9..50e9dae 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h @@ -3,7 +3,7 @@ #pragma once #include "Http.h" -#include "UObject/Object.h" +#include "Subsystems/GameInstanceSubsystem.h" #include "ContentLoader.generated.h" @@ -21,7 +21,7 @@ DECLARE_DYNAMIC_DELEGATE_OneParam(FContentDownloadedCallback, FString, pakFilePa * High language wrapper for Paks(Assets) download and loading. */ UCLASS(BlueprintType) -class UContentLoader : public UObject +class UContentLoader : public UGameInstanceSubsystem { GENERATED_BODY() @@ -36,7 +36,7 @@ public: bool UnloadPak(const FString& pakFilePath); protected: - virtual void BeginDestroy() override; + virtual void Deinitialize() override; /** Sends http get request */ void HttpGet(const FString& url, FHttpRequestCompleteDelegate requestCompleteCallback); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp index cedf822..8c97f6a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp @@ -8,7 +8,6 @@ #include "ContentLoader.h" #include "CustomGameSettings.h" #include "Levels/LevelBase.h" -#include "LoadingScreen/LoadingScreen.h" #include "PlayerBase.h" #include "SaveData.h" @@ -26,9 +25,6 @@ void UCustomGameInstance::Init() UGameInstance::Init(); instance = this; - // setup content loader - contentLoader = NewObject(this); - // setup global singletons for(auto& _class : globalInstancesClasses) { @@ -44,10 +40,13 @@ void UCustomGameInstance::Init() else saveData = Cast(UGameplayStatics::CreateSaveGameObject(USaveData::StaticClass())); - // setup loading screen - loadingScreen = NewObject(this); - FCoreUObjectDelegates::PreLoadMap.AddUObject(loadingScreen, &ULoadingScreen::BeginLoadingScreen); - FCoreUObjectDelegates::PostLoadMapWithWorld.AddUObject(loadingScreen, &ULoadingScreen::EndLoadingScreen); + //FCoreUObjectDelegates::PreLoadMap.AddLambda([&](const FString& mapName) + // { + // if(auto loadingScreen = FModuleManager::LoadModulePtr("LoadingScreen")) + // loadingScreen->StartLoadingScreen(); + // }); + + //FCoreUObjectDelegates::PostLoadMapWithWorld.AddLambda(loadingScreen, &ULoadingScreen::EndLoadingScreen); } void UCustomGameInstance::Shutdown() @@ -66,7 +65,7 @@ UCustomGameInstance* UCustomGameInstance::Get() UContentLoader* UCustomGameInstance::GetContentLoader() { if(auto GI = Get()) - return GI->contentLoader; + return GI->GetSubsystem(); return nullptr; } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h index a78eca2..28f820b 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h @@ -25,7 +25,7 @@ public: UFUNCTION(BlueprintPure, meta = (DisplayName = "Get Custom Game Instance")) static UCustomGameInstance* Get(); - UFUNCTION(BlueprintPure) + UFUNCTION(BlueprintPure, meta = (DeprecatedFunction, DeprecationMessage = "Use original Get Submodule pure function instead.")) static class UContentLoader* GetContentLoader(); UFUNCTION(BlueprintPure) static UObject* GetGlobalInstance(UClass* _class); @@ -50,11 +50,6 @@ public: class USaveData* saveData = nullptr; protected: - UPROPERTY() - class UContentLoader* contentLoader; - UPROPERTY() - class ULoadingScreen* loadingScreen; - UPROPERTY(EditDefaultsOnly) TSet> globalInstancesClasses; TMap globalInstances; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/LoadingScreen.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/LoadingScreen.cpp deleted file mode 100644 index 06621a6..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/LoadingScreen.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// Oleg Petruny proprietary. - -#include "LoadingScreen.h" - -#include "MoviePlayer.h" - -#include "SLoadingScreenWidget.h" - -void ULoadingScreen::BeginLoadingScreen(const FString& mapName) -{ - if(active || IsRunningDedicatedServer()) - return; - active = true; - - FLoadingScreenAttributes params; - params.bAutoCompleteWhenLoadingCompletes = false; - params.MinimumLoadingScreenDisplayTime = 2.0f; - if(first) - { - // Game init loading screen - first = false; - params.bMoviesAreSkippable = true; - params.WidgetLoadingScreen = SNew(SStartupImageWidget) - .FadeDuration(params.MinimumLoadingScreenDisplayTime); - } - else - { - // Game level loading screen - params.WidgetLoadingScreen = SNew(SStartupImageWidget) - .FadeDuration(params.MinimumLoadingScreenDisplayTime); - } - - GetMoviePlayer()->SetupLoadingScreen(params); -} - -void ULoadingScreen::EndLoadingScreen(UWorld* inLoadedWorld) -{ - if(!active) - return; - active = false; - -} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/LoadingScreen.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/LoadingScreen.h deleted file mode 100644 index 98eeacb..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/LoadingScreen.h +++ /dev/null @@ -1,23 +0,0 @@ -// Oleg Petruny proprietary. - -#pragma once - -#include "UObject/Object.h" - -#include "LoadingScreen.generated.h" - -UCLASS() -class ULoadingScreen : public UObject -{ - GENERATED_BODY() - -public: - UFUNCTION() - void BeginLoadingScreen(const FString& mapName); - UFUNCTION() - void EndLoadingScreen(UWorld* inLoadedWorld); - -private: - bool active = false; - bool first = true; -}; \ No newline at end of file diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/SLoadingScreenWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/SLoadingScreenWidget.cpp deleted file mode 100644 index 169abcf..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/SLoadingScreenWidget.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// Oleg Petruny proprietary. - -#include "SLoadingScreenWidget.h" - -#include "Engine/Texture2D.h" -#include "Slate/DeferredCleanupSlateBrush.h" -#include "Widgets/Images/SImage.h" -#include "Widgets/Layout/SBorder.h" -#include "Widgets/Layout/SScaleBox.h" - -#include "CommonData.h" - -namespace -{ - constexpr auto startupImageA = TEXT("/Script/Engine.Texture2D'/Game/Movies/Images/T_StartupImageA.T_StartupImageA'"); - constexpr auto startupImageB = TEXT("/Script/Engine.Texture2D'/Game/Movies/Images/T_StartupImageB.T_StartupImageB'"); -} - -void SStartupImageWidget::Construct(const FArguments& inArgs) -{ - FSoftObjectPath assetA{ startupImageA }; - UTexture2D* imageA = Cast(assetA.TryLoad()); - check(imageA); // image A loading failed - FSoftObjectPath assetB{ startupImageB }; - UTexture2D* imageB = Cast(assetB.TryLoad()); - check(imageB); // image B loading failed - - // cache brushes into memory - imageABrush = FDeferredCleanupSlateBrush::CreateBrush(imageA); - imageBBrush = FDeferredCleanupSlateBrush::CreateBrush(imageB); - imageAWidget = SNew(SImage).Image(imageABrush->GetSlateBrush()).RenderOpacity(1.0f); - imageBWidget = SNew(SImage).Image(imageBBrush->GetSlateBrush()).RenderOpacity(0.0f); - - // construct widget - ChildSlot - [ - SNew(SBorder) - .HAlign(HAlign_Fill) - .VAlign(VAlign_Fill) - .Padding(0) - .BorderImage(UCommonData::KindaBlackColorBrush().Get()) - [ - SNew(SScaleBox) - .HAlign(HAlign_Fill) - .VAlign(VAlign_Fill) - .Stretch(EStretch::ScaleToFitY) - .StretchDirection(EStretchDirection::Both) - [ - SNew(SOverlay) - + SOverlay::Slot() - [ - imageAWidget.ToSharedRef() - ] - + SOverlay::Slot() - [ - imageBWidget.ToSharedRef() - ] - + SOverlay::Slot() - [ - SNew(STextBlock).Text(FText::FromString(TEXT("Loading..."))) - ] - ] - ] - ]; - - // start fading - isFading = true; - fadeDuration = inArgs._FadeDuration; - currentTime = 0.0f; - fadeTickHandle = FTSTicker::GetCoreTicker().AddTicker( - FTickerDelegate::CreateRaw(this, &SStartupImageWidget::FadeTick), - 0.0f); -} - -SStartupImageWidget::~SStartupImageWidget() -{ - isFading = false; - FTSTicker::GetCoreTicker().RemoveTicker(fadeTickHandle); -} - -bool SStartupImageWidget::FadeTick(float deltaTime) -{ - currentTime += deltaTime; - float fade = currentTime / fadeDuration; - - if(fade > 1.0f) - { - fade = 1.0f; - isFading = false; - FTSTicker::GetCoreTicker().RemoveTicker(fadeTickHandle); - } - - imageAWidget->SetRenderOpacity(1.0f - fade); - imageBWidget->SetRenderOpacity(fade); - - return isFading; -} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/SLoadingScreenWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/SLoadingScreenWidget.h deleted file mode 100644 index e344214..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/LoadingScreen/SLoadingScreenWidget.h +++ /dev/null @@ -1,35 +0,0 @@ -// Oleg Petruny proprietary. - -#pragma once - -#include "Widgets/SCompoundWidget.h" - -struct FLoadingScreenWidgetArguments -{ - float fadeDuration = 2.0f; -}; - -class SStartupImageWidget : public SCompoundWidget -{ -public: - SLATE_BEGIN_ARGS(SStartupImageWidget) {} - SLATE_ARGUMENT(float, FadeDuration) - SLATE_END_ARGS() - - void Construct(const FArguments& inArgs); - - virtual ~SStartupImageWidget(); - -private: - bool FadeTick(float deltaTime); - - TSharedPtr imageABrush; - TSharedPtr imageBBrush; - TSharedPtr imageAWidget; - TSharedPtr imageBWidget; - - float fadeDuration; - float currentTime; - bool isFading = false; - FTSTicker::FDelegateHandle fadeTickHandle; -}; \ No newline at end of file diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs index 49b23a9..df60e44 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs @@ -2,8 +2,10 @@ using UnrealBuildTool; -public class Lost_EdgeEditorTarget : TargetRules { - public Lost_EdgeEditorTarget(TargetInfo Target) : base(Target) { +public class Lost_EdgeEditorTarget : TargetRules +{ + public Lost_EdgeEditorTarget(TargetInfo Target) : base(Target) + { Type = TargetType.Editor; DefaultBuildSettings = BuildSettingsVersion.Latest; IncludeOrderVersion = EngineIncludeOrderVersion.Latest; diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs index dfe2864..26b7416 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs @@ -1,13 +1,14 @@ // Oleg Petruny proprietary. +using System.IO; using UnrealBuildTool; public class Lost_EdgeShaders : ModuleRules { public Lost_EdgeShaders(ReadOnlyTargetRules Target) : base(Target) { - //bPrecompile = true; - //bUsePrecompiled = true; + //if (File.Exists($"{PlatformDirectory.FullName}\\..\\..\\Intermediate\\Build\\Win64\\x64\\UnrealEditor\\DebugGame\\{Path.GetFileName(PlatformDirectory.FullName)}\\UnrealEditor-{Path.GetFileName(PlatformDirectory.FullName)}-Win64-DebugGame.lib")) + // bUsePrecompiled = true; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PublicDependencyModuleNames.AddRange(new string[] { }); PrivateDependencyModuleNames.AddRange(new string[] { "Core", diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Lost_EdgeStyle.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Lost_EdgeStyle.Build.cs new file mode 100644 index 0000000..22e46ad --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Lost_EdgeStyle.Build.cs @@ -0,0 +1,23 @@ +// Oleg Petruny proprietary. + +using System; +using System.IO; +using System.Reflection; +using UnrealBuildTool; + +public class Lost_EdgeStyle : ModuleRules +{ + public Lost_EdgeStyle(ReadOnlyTargetRules Target) : base(Target) + { + //if (File.Exists($"{PlatformDirectory.FullName}\\..\\..\\Intermediate\\Build\\Win64\\x64\\UnrealEditor\\DebugGame\\{Path.GetFileName(PlatformDirectory.FullName)}\\UnrealEditor-{Path.GetFileName(PlatformDirectory.FullName)}-Win64-DebugGame.lib")) + // bUsePrecompiled = true; + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + PublicDependencyModuleNames.AddRange(new string[] { }); + PrivateDependencyModuleNames.AddRange(new string[] { + "Core", + "CoreUObject", + "Slate", + "SlateCore" + }); + } +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Private/Lost_EdgeStyle.cpp b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Private/Lost_EdgeStyle.cpp new file mode 100644 index 0000000..96e911d --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Private/Lost_EdgeStyle.cpp @@ -0,0 +1,48 @@ +// Oleg Petruny proprietary. + +#include "Lost_EdgeStyle.h" + +#include "Styling/SlateStyleRegistry.h" + +TUniquePtr FLost_EdgeStyle::style = nullptr; + +void FLost_EdgeStyle::StartupModule() +{ + if(style.IsValid()) + return; + + style = MakeUnique(GetStyleSetName()); + + style->Set(TEXT("BackgroundBlack"), FLinearColor(0.01f, 0.01f, 0.01f, 0)); + style->Set(TEXT("BackgroundBlack"), FSlateColor(style->GetColor(TEXT("BackgroundBlack")))); + style->Set(TEXT("BackgroundBlack"), new FSlateColorBrush(style->GetColor(TEXT("BackgroundBlack")))); + + FSlateStyleRegistry::RegisterSlateStyle(Get()); +} + +void FLost_EdgeStyle::ShutdownModule() +{ + if(!style.IsValid()) + return; + + FSlateStyleRegistry::UnRegisterSlateStyle(Get()); + style.Reset(); +} + +bool FLost_EdgeStyle::IsGameModule() const +{ + return true; +} + +const ISlateStyle& FLost_EdgeStyle::Get() +{ + return *style.Get(); +} + +FName FLost_EdgeStyle::GetStyleSetName() +{ + static const FName name(TEXT("Lost_EdgeStyle")); + return name; +} + +IMPLEMENT_GAME_MODULE(FLost_EdgeStyle, Lost_EdgeStyle); \ No newline at end of file diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Public/Lost_EdgeStyle.h b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Public/Lost_EdgeStyle.h new file mode 100644 index 0000000..b4d8d20 --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Public/Lost_EdgeStyle.h @@ -0,0 +1,21 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Modules/ModuleInterface.h" +#include "Styling/SlateStyle.h" + +class LOST_EDGESTYLE_API FLost_EdgeStyle : public IModuleInterface +{ +public: + virtual void StartupModule() override; + virtual void ShutdownModule() override; + virtual bool IsGameModule() const override; + + static const ISlateStyle& Get(); + static FName GetStyleSetName(); + +private: + static TUniquePtr style; + +};