wip

Reviewed-on: #12
Co-authored-by: Oleg Petruny <oleg.petruny@gmail.com>
Co-committed-by: Oleg Petruny <oleg.petruny@gmail.com>

UnrealProject/Lost_Edge/Config/DefaultEngine.ini

@@ -158,9 +158,6 @@ ManualIPAddress=
 +ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
 +ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor")
 +ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic")
-+ProfileRedirects=(OldName="AgeOfWarUnitComputer",NewName="AgeOfWarUnitPlayerZone")
-+ProfileRedirects=(OldName="AgeOfWarUnit",NewName="AgeOfWarUnitPlayer")
-+ProfileRedirects=(OldName="AgeOfWarUnitPlayerZone",NewName="AgeOfWarUnitComputer")
 -CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic")
 -CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic")
 -CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle")

UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs

@@ -7,16 +7,17 @@ public class Lost_Edge : ModuleRules
     public Lost_Edge(ReadOnlyTargetRules Target) : base(Target)
     {
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+        //MinCpuArchX64 = MinimumCpuArchitectureX64.AVX2;
 
         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", "MeshDescription", "StaticMeshDescription",
+            "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape", "MoviePlayer", "Slate", "SlateCore" });
-            "AssetRegistry", "LevelEditor", "MoviePlayer", "Slate", "SlateCore" });
 
         if (Target.bBuildEditor)
         {
-            PrivateDependencyModuleNames.AddRange(new string[] { "UnrealEd" });
+            PrivateDependencyModuleNames.AddRange(new string[] { "UnrealEd", "LevelEditor",
+                "MeshDescription", "StaticMeshDescription", "AssetRegistry" });
         }
 
         // UE_LOG(LogTemp, Log, TEXT("capture: %s"), (capture ? TEXT("true") : TEXT("false")));

UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.cpp

@@ -3,4 +3,4 @@
 #include "Lost_Edge.h"
 #include "Modules/ModuleManager.h"
 
-IMPLEMENT_PRIMARY_GAME_MODULE(FDefaultGameModuleImpl, Lost_Edge, "Lost_Edge");
+IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, Lost_Edge, "Lost_Edge" );

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonData.h

@@ -21,4 +21,4 @@ public:
         return brush;
     }
 
-};
+};

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp

@@ -2,20 +2,20 @@
 
 #include "GrassGenerator.h"
 
-#include "AssetRegistry/AssetRegistryModule.h"
 #include "Components/BoxComponent.h"
+#include "ProceduralMeshComponent.h"
+#if WITH_EDITOR
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "Engine/SkyLight.h"
 #include "Engine/StaticMeshActor.h"
-#include "Landscape.h"
-#include "LandscapeComponent.h"
-#include "LevelEditorSubsystem.h"
 #include "MeshDescription.h"
 #include "PhysicalMaterials/PhysicalMaterial.h"
-#include "ProceduralMeshComponent.h"
 #include "ProceduralMeshConversion.h"
 #include "StaticMeshDescription.h"
-#if WITH_EDITOR
 #include "Editor/EditorEngine.h"
+#include "LevelEditorSubsystem.h"
+#include "Landscape.h"
+#include "LandscapeComponent.h"
 #endif
 
 AGrassGenerator::AGrassGenerator()
@@ -34,6 +34,7 @@ void AGrassGenerator::PostLoad()
     Update();
 }
 
+#if WITH_EDITOR
 void AGrassGenerator::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
     Super::PostEditChangeProperty(PropertyChangedEvent);
@@ -43,6 +44,7 @@ void AGrassGenerator::PostEditChangeProperty(FPropertyChangedEvent& PropertyChan
     //    || PropertyChangedEvent.GetPropertyName() == TEXT("Tile Size"))
     //    Update();
 }
+#endif
 
 void AGrassGenerator::Generate()
 {
@@ -235,8 +237,10 @@ void AGrassGenerator::Export()
 
 void AGrassGenerator::Update()
 {
+#if WITH_EDITOR
     areaBrush->SetBoxExtent({ tileCount.X * tileSize * 0.5, tileCount.Y * tileSize * 0.5, 200 }, false);
     mesh->SetMaterial(0, grassMaterial.LoadSynchronous());
     //for(int32 i = 0; i < sectionsCount; ++i)
     //    mesh->SetMaterSetMaterial(i, grassMaterial.LoadSynchronous());
+#endif
 }

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp

@@ -22,13 +22,13 @@
 ALevelBase* ALevelBase::Get()
 {
     if(auto GM = AMainGameModeBase::Get())
-        return GM->leadLevel.Get();
+        return GM->leadLevel;
     return nullptr;
 }
 
 void ALevelBase::BeginPlay()
 {
-    AMainGameModeBase::leadLevel = TStrongObjectPtr<ALevelBase>{ this };
+    AMainGameModeBase::leadLevel = this;
 
     ALevelScriptActor::BeginPlay();
 

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp

@@ -19,7 +19,7 @@ TStrongObjectPtr<UWidgetsManager> AMainGameModeBase::widgetsManager = nullptr;
 TStrongObjectPtr<UCutsceneManager> AMainGameModeBase::cutsceneManager = nullptr;
 TStrongObjectPtr<UQuickTimeEventManager> AMainGameModeBase::quickTimeEventManager = nullptr;
 TStrongObjectPtr<UDialogueManager> AMainGameModeBase::dialogueManager = nullptr;
-TStrongObjectPtr<ALevelBase> AMainGameModeBase::leadLevel = nullptr;
+ALevelBase* AMainGameModeBase::leadLevel = nullptr;
 
 void AMainGameModeBase::StartPlay()
 {
@@ -38,11 +38,11 @@ void AMainGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason)
 {
     cutsceneManager->LockCallback(true);
     cutsceneManager->Clear();
-    leadLevel.Reset();
     widgetsManager.Reset();
     cutsceneManager.Reset();
     quickTimeEventManager.Reset();
     dialogueManager.Reset();
+    leadLevel = nullptr;
 
     Super::EndPlay(EndPlayReason);
 }

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h

@@ -44,7 +44,7 @@ public:
 
     void SwitchCameraMode();
 
-    static TStrongObjectPtr<class ALevelBase> leadLevel;
+    static class ALevelBase* leadLevel;
 
     FQuestsUpdateDelegate questsUpdateDelegate;
 

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarUnit.cpp

@@ -66,6 +66,7 @@ void AAgeOfWarUnit::EndPlay(const EEndPlayReason::Type EndPlayReason)
 AAgeOfWarUnit::AAgeOfWarUnit()
 {
     root = CreateDefaultSubobject<UBoxComponent>(TEXT("Collision"));
+    SetRootComponent(root);
     allyblocker = CreateDefaultSubobject<UBoxComponent>(TEXT("AllyBlocker"));
     allyblocker->SetupAttachment(root);
     traceStart = CreateDefaultSubobject<USceneComponent>(TEXT("TraceStart"));

UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs

@@ -6,7 +6,8 @@ public class Lost_EdgeShaders : ModuleRules
 {
     public Lost_EdgeShaders(ReadOnlyTargetRules Target) : base(Target)
     {
-        bUsePrecompiled = true;
+        //bPrecompile = true;
+        //bUsePrecompiled = true;
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
         PublicDependencyModuleNames.AddRange(new string[] { });
         PrivateDependencyModuleNames.AddRange(new string[] { "Core",