diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap index 80aa7c2..f082dfe 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe9f4d1924c699b46411fb0e950b2dd9e7eef32ba4e032f40f67ebdf5a311ca6 -size 43954997 +oid sha256:ef9d23251341723edf0cd4528122a737989f4663c04dc79df5029fa15cdbaa15 +size 43958378 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 28be197..49a12d6 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:c98ffaffad0717ae74df332a88c52f5771255d8c8b2a9f3619e9a13b440fcb7a -size 11617 +oid sha256:a2ceca7d34685f1e3ffb03d56b91e7db14e362464e6170f2339e2aaef990b3f9 +size 11654 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 f92c9e2..280838b 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:c1f8d61231174585571961f6da7c9f2679ea20647af055707bdd6c1f48f0375f -size 2043 +oid sha256:d84ce1c9b70ad8ea489e47222b233d0c6a85a13ed6b4c1fb5517116bef715cf7 +size 2080 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 f7bee29..8c80cd9 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:c75d1bfa4e15eec5570bc2b646e59c8b7de397f271f33a1464a137c2fb9adfec -size 972 +oid sha256:792b181d212d99a6a0e39a69b9aa1e0bd59979f0f2281db8ab553e37e3928bfe +size 1005 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 46615c8..871a008 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:71a3bdd993447680d0ae9346a564bbbf16aaed559231ebc0db6a9d1f36c118ab -size 1424 +oid sha256:8c1bd1f012d230b98824baacf4c223f7535e5bcd7256cbb9a04085d9c95f7550 +size 1457 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 9bf1e96..40b6071 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs @@ -7,12 +7,18 @@ 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", - "AssetRegistry", "UnrealEd", "LevelEditor" }); // "Slate", "SlateCore" + "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape", }); // "Slate", "SlateCore" + + if (Target.bBuildEditor) + { + PrivateDependencyModuleNames.AddRange(new string[] { "UnrealEd", "LevelEditor", + "MeshDescription", "StaticMeshDescription", "AssetRegistry" }); + } // UE_LOG(LogTemp, Log, TEXT("capture: %s"), (capture ? TEXT("true") : TEXT("false"))); // GEngine->AddOnScreenDebugMessage(-1, 5.0f, FColor::Yellow, TEXT("1")); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp index 40da12f..af83f1c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp @@ -2,19 +2,21 @@ #include "GrassGenerator.h" -#include "AssetRegistry/AssetRegistryModule.h" #include "Components/BoxComponent.h" -#include "Editor/EditorEngine.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" +#include "Editor/EditorEngine.h" +#include "LevelEditorSubsystem.h" +#include "Landscape.h" +#include "LandscapeComponent.h" +#endif AGrassGenerator::AGrassGenerator() { @@ -32,6 +34,7 @@ void AGrassGenerator::PostLoad() Update(); } +#if WITH_EDITOR void AGrassGenerator::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) { Super::PostEditChangeProperty(PropertyChangedEvent); @@ -41,9 +44,11 @@ void AGrassGenerator::PostEditChangeProperty(FPropertyChangedEvent& PropertyChan // || PropertyChangedEvent.GetPropertyName() == TEXT("Tile Size")) // Update(); } +#endif void AGrassGenerator::Generate() { +#if WITH_EDITOR Clear(); FVector loc = GetActorLocation(); @@ -177,16 +182,20 @@ void AGrassGenerator::Generate() mesh->CreateMeshSection(sectionsCount++, vertices, triangles, normals, UVs, {}, {}, false); Update(); +#endif } void AGrassGenerator::Clear() { +#if WITH_EDITOR mesh->ClearAllMeshSections(); sectionsCount = 0; +#endif } void AGrassGenerator::Export() { +#if WITH_EDITOR const FString actorName = GetName(); const FString levelName = GetWorld()->GetMapName().RightChop(2); const FString levelPath = FPaths::GetPath(GEditor->GetEditorSubsystem()->GetCurrentLevel()->GetPathName()); @@ -205,9 +214,7 @@ void AGrassGenerator::Export() smeshDesc->SetMeshDescription(meshDesc); smesh->BuildFromStaticMeshDescriptions({ smeshDesc }, false, true); smesh->GetStaticMaterials().Add({ grassMaterial.LoadSynchronous() }); -#if WITH_EDITOR smesh->PostEditChange(); -#endif smesh->MarkPackageDirty(); FAssetRegistryModule::AssetCreated(smesh); @@ -225,12 +232,15 @@ void AGrassGenerator::Export() GEditor->SelectNone(false, true); GEditor->SelectActor(smeshActor, true, true); GEditor->RedrawAllViewports(); +#endif } 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 } 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 116b1bc..dfe2864 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs +++ b/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",