diff --git a/Binaries/Win64/MasharovDevEditor.target b/Binaries/Win64/MasharovDevEditor.target index 60054af78..0c2f2fead 100644 --- a/Binaries/Win64/MasharovDevEditor.target +++ b/Binaries/Win64/MasharovDevEditor.target @@ -2321,6 +2321,22 @@ "Path": "$(EngineDir)/Plugins/Experimental/ChaosUserDataPT/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, + { + "Path": "$(EngineDir)/Plugins/Experimental/CodeEditor/Binaries/Win64/UnrealEditor-CodeEditor.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Experimental/CodeEditor/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, + { + "Path": "$(EngineDir)/Plugins/Experimental/CodeView/Binaries/Win64/UnrealEditor-CodeView.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Experimental/CodeView/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Plugins/Experimental/Dataflow/Binaries/Win64/UnrealEditor-DataflowEditor.dll", "Type": "DynamicLibrary" @@ -22743,6 +22759,14 @@ "Path": "$(EngineDir)/Plugins/Experimental/ChaosUserDataPT/ChaosUserDataPT.uplugin", "Type": "UFS" }, + { + "Path": "$(EngineDir)/Plugins/Experimental/CodeEditor/CodeEditor.uplugin", + "Type": "UFS" + }, + { + "Path": "$(EngineDir)/Plugins/Experimental/CodeView/CodeView.uplugin", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Plugins/Experimental/Dataflow/Dataflow.uplugin", "Type": "UFS" diff --git a/Binaries/Win64/UnrealEditor-MasharovDev.dll b/Binaries/Win64/UnrealEditor-MasharovDev.dll index 40e8fcd4c..76a3e2f94 100644 Binary files a/Binaries/Win64/UnrealEditor-MasharovDev.dll and b/Binaries/Win64/UnrealEditor-MasharovDev.dll differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev.pdb b/Binaries/Win64/UnrealEditor-MasharovDev.pdb index 7e4898925..608d12f73 100644 Binary files a/Binaries/Win64/UnrealEditor-MasharovDev.pdb and b/Binaries/Win64/UnrealEditor-MasharovDev.pdb differ diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 37020efb6..16d31bca1 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -28,10 +28,11 @@ r.RayTracing.UseTextureLod=True r.DefaultFeature.MotionBlur=False r.TemporalAA.Upsampling=False r.DefaultFeature.AntiAliasing=1 -r.AntiAliasingMethod=4 +r.AntiAliasingMethod=1 r.Lumen.HardwareRayTracing=True r.Lumen.HardwareRayTracing.LightingMode=2 r.RayTracing.Shadows=True +r.DefaultFeature.AmbientOcclusion=False [/Script/Engine.UserInterfaceSettings] UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=2160.000000,Value=1.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None) @@ -44,6 +45,11 @@ s.UseBackgroundLevelStreaming=False [/Script/NavigationSystem.RecastNavMesh] RuntimeGeneration=Dynamic ObservedPathsTickInterval=1.000000 +MaxSimultaneousTileGenerationJobsCount=32 +TileSizeUU=1216.000000 +RegionChunkSplits=4 +LayerChunkSplits=4 +bDoFullyAsyncNavDataGathering=True [/Script/DLSS.DLSSSettings] bEnableDLSSInEditorViewports=False diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset index 5072c7968..7959f9277 100644 Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index b8ace3514..8739e5dd8 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset index 773455865..670ebcebe 100644 Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ diff --git a/Content/Blueprints/Player/myGM.uasset b/Content/Blueprints/Player/myGM.uasset index c0577aa30..31e8d9110 100644 Binary files a/Content/Blueprints/Player/myGM.uasset and b/Content/Blueprints/Player/myGM.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index 0adea2e41..c3345cd01 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/Filter.uasset and b/Content/Blueprints/UI/WBPS/filter/Filter.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP2.uasset b/Content/Blueprints/world/BP_HouseGP2.uasset index 74757b8e3..60376dddb 100644 Binary files a/Content/Blueprints/world/BP_HouseGP2.uasset and b/Content/Blueprints/world/BP_HouseGP2.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP7_1.uasset b/Content/Blueprints/world/BP_HouseGP7_1.uasset index 026c22d51..6de358715 100644 Binary files a/Content/Blueprints/world/BP_HouseGP7_1.uasset and b/Content/Blueprints/world/BP_HouseGP7_1.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP7_2.uasset b/Content/Blueprints/world/BP_HouseGP7_2.uasset index 34bc3d069..b43cb545e 100644 Binary files a/Content/Blueprints/world/BP_HouseGP7_2.uasset and b/Content/Blueprints/world/BP_HouseGP7_2.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP7_3.uasset b/Content/Blueprints/world/BP_HouseGP7_3.uasset index 650aa79f3..3a3e18523 100644 Binary files a/Content/Blueprints/world/BP_HouseGP7_3.uasset and b/Content/Blueprints/world/BP_HouseGP7_3.uasset differ diff --git a/Content/Maps/Masharov_Buildings.umap b/Content/Maps/Masharov_Buildings.umap index 1e1c81ec2..6061cdd05 100644 Binary files a/Content/Maps/Masharov_Buildings.umap and b/Content/Maps/Masharov_Buildings.umap differ diff --git a/Content/Maps/Masharov_Yard.umap b/Content/Maps/Masharov_Yard.umap index 2f4f58d26..9deaf2ca0 100644 Binary files a/Content/Maps/Masharov_Yard.umap and b/Content/Maps/Masharov_Yard.umap differ diff --git a/Content/Maps/mainScene.umap b/Content/Maps/mainScene.umap index 295edef0b..d32fda238 100644 Binary files a/Content/Maps/mainScene.umap and b/Content/Maps/mainScene.umap differ diff --git a/Content/Meshes/Exterior/Main/Instances/M_Metal_stripe.uasset b/Content/Meshes/Exterior/Main/Instances/M_Metal_stripe.uasset new file mode 100644 index 000000000..cd9fb4f7e Binary files /dev/null and b/Content/Meshes/Exterior/Main/Instances/M_Metal_stripe.uasset differ diff --git a/Content/Meshes/Exterior/Main/New/SM_GP_Other_F.uasset b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F.uasset index 4568d48bb..856990dac 100644 Binary files a/Content/Meshes/Exterior/Main/New/SM_GP_Other_F.uasset and b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F.uasset differ diff --git a/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP4.uasset b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP4.uasset new file mode 100644 index 000000000..519387da6 Binary files /dev/null and b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP4.uasset differ diff --git a/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP5.uasset b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP5.uasset new file mode 100644 index 000000000..617e8f2aa Binary files /dev/null and b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP5.uasset differ diff --git a/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP8.uasset b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP8.uasset new file mode 100644 index 000000000..69bdb24b4 Binary files /dev/null and b/Content/Meshes/Exterior/Main/New/SM_GP_Other_F_GP8.uasset differ diff --git a/Content/Meshes/Exterior/Main/New/SM_Genplan_RDY_3.uasset b/Content/Meshes/Exterior/Main/New/SM_Genplan_RDY_3.uasset index 9208e6f32..35f30f469 100644 Binary files a/Content/Meshes/Exterior/Main/New/SM_Genplan_RDY_3.uasset and b/Content/Meshes/Exterior/Main/New/SM_Genplan_RDY_3.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S7_Se01_Fasad.uasset b/Content/Meshes/Exterior/Main/SM_S7_Se01_Fasad.uasset index b6c5e509d..9c30adc3f 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S7_Se01_Fasad.uasset and b/Content/Meshes/Exterior/Main/SM_S7_Se01_Fasad.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S7_Se02_Fasad.uasset b/Content/Meshes/Exterior/Main/SM_S7_Se02_Fasad.uasset index e8612eaf5..98c83341c 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S7_Se02_Fasad.uasset and b/Content/Meshes/Exterior/Main/SM_S7_Se02_Fasad.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S7_Se03_Fasad.uasset b/Content/Meshes/Exterior/Main/SM_S7_Se03_Fasad.uasset index a15a68535..591570616 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S7_Se03_Fasad.uasset and b/Content/Meshes/Exterior/Main/SM_S7_Se03_Fasad.uasset differ diff --git a/Content/Meshes/MAF/EcoStyle_Swing/MI_Chrome_swing_chain.uasset b/Content/Meshes/MAF/EcoStyle_Swing/MI_Chrome_swing_chain.uasset new file mode 100644 index 000000000..e370ec8d5 Binary files /dev/null and b/Content/Meshes/MAF/EcoStyle_Swing/MI_Chrome_swing_chain.uasset differ diff --git a/Content/Meshes/MAF/SM_EcoStyle_Swing.uasset b/Content/Meshes/MAF/EcoStyle_Swing/SM_EcoStyle_Swing.uasset similarity index 91% rename from Content/Meshes/MAF/SM_EcoStyle_Swing.uasset rename to Content/Meshes/MAF/EcoStyle_Swing/SM_EcoStyle_Swing.uasset index 56a4bb98a..818cff831 100644 Binary files a/Content/Meshes/MAF/SM_EcoStyle_Swing.uasset and b/Content/Meshes/MAF/EcoStyle_Swing/SM_EcoStyle_Swing.uasset differ diff --git a/Content/Meshes/MAF/EcoStyle_Swing/T_MAF_SwingCassiopeiaChain_AO.uasset b/Content/Meshes/MAF/EcoStyle_Swing/T_MAF_SwingCassiopeiaChain_AO.uasset new file mode 100644 index 000000000..572cad01f Binary files /dev/null and b/Content/Meshes/MAF/EcoStyle_Swing/T_MAF_SwingCassiopeiaChain_AO.uasset differ diff --git a/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Full_canopy.uasset b/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Full_canopy.uasset index 4392e3782..3e8258ae1 100644 Binary files a/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Full_canopy.uasset and b/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Full_canopy.uasset differ diff --git a/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Half_canopy.uasset b/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Half_canopy.uasset index 1f10d5d08..5ccc65b3b 100644 Binary files a/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Half_canopy.uasset and b/Content/Meshes/MAF/Tree_canopy/MI_Tree_canopy_Half_canopy.uasset differ diff --git a/Content/Meshes/MAF/Tree_canopy/T_Stripe_Mask.uasset b/Content/Meshes/MAF/Tree_canopy/T_Stripe_Mask.uasset new file mode 100644 index 000000000..6774feef4 Binary files /dev/null and b/Content/Meshes/MAF/Tree_canopy/T_Stripe_Mask.uasset differ diff --git a/Content/Textures/Noises/T_Grungemap_01.uasset b/Content/Textures/Noises/T_Grungemap_01.uasset index fa9bfb63d..792964dea 100644 Binary files a/Content/Textures/Noises/T_Grungemap_01.uasset and b/Content/Textures/Noises/T_Grungemap_01.uasset differ diff --git a/MasharovDev.uproject b/MasharovDev.uproject index 272d0e8e5..46a239592 100644 --- a/MasharovDev.uproject +++ b/MasharovDev.uproject @@ -355,6 +355,14 @@ { "Name": "cppFuncLib", "Enabled": true + }, + { + "Name": "CodeEditor", + "Enabled": true + }, + { + "Name": "CodeView", + "Enabled": true } ], "TargetPlatforms": [ diff --git a/Source/MasharovDev/cppGI.cpp b/Source/MasharovDev/cppGI.cpp index c8a09e5f2..25c9efee0 100644 --- a/Source/MasharovDev/cppGI.cpp +++ b/Source/MasharovDev/cppGI.cpp @@ -3,6 +3,7 @@ #include "cppGI.h" #include "Kismet/GameplayStatics.h" +#include "Misc/paths.h" #include "Engine/levelstreamingdynamic.h" /*for working tarray::Contains*/ @@ -32,20 +33,28 @@ void UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, } cpplvlsForLoading.AddUnique(currentCoords); - for (auto& lvl : cpplevelLIst) { + for (FcppLevelStruct& lvl : cpplevelLIst) { + FString tt = lvl.path; if (currentCoords.floor == 100); else { loadthis = false; - for (auto& lvl1 : cpplvlsForLoading) { - bool ceq[6]; - /*cppCoordEq(lvl1,lvl,ceq[0],ceq[1],ceq[2],ceq[3],ceq[4],ceq[5],false,true)*/ - if (((lvl.coords.flat == -1) || ceq[0] || ((lvl1.flat == lvl.anotherLvl) && (lvl.anotherLvl >= 0))) - && ceq[1] + for (Fcppcoords& lvl1 : cpplvlsForLoading) { + bool ceq[7]; + cppCoordsEq(lvl1, lvl.coords,true,false, ceq[0], ceq[1], ceq[2], ceq[3], ceq[4], ceq[5], ceq[6]); + if ( + ( + (lvl.coords.flat == -1) || ceq[0] || + ((lvl1.flat == lvl.anotherLvl) && (lvl.anotherLvl >= 0)) + ) && ceq[2] && ceq[3] - && (ceq[4] || ((lvl1.flat == lvl.anotherLvl) && (lvl.anotherLvl >= 0) && (currentState == 11/*3d tour*/)) || ((lvl1.flat == lvl.anotherLvl) && (lvl.anotherLvl >= 0) && ((currentState == 9) || (currentState == 10)/*sel or view plan*/) && (lvl1.flat > lvl.coords.flat)))) loadthis = true; + && ceq[4] + && (ceq[5] || ((lvl1.flat == lvl.anotherLvl) && (lvl.anotherLvl >= 0) && (currentState == 11/*3d tour*/)) || + ((lvl1.flat == lvl.anotherLvl) && (lvl.anotherLvl >= 0) && ((currentState == 9) || (currentState == 10)/*sel or view plan*/) && (lvl1.flat > lvl.coords.flat)) + ) + ) loadthis = true; } - } + } TArray blya; blya.Add(FString::FromInt(lvl.coords.flat)); blya.Add(FString::FromInt(lvl.coords.zone)); @@ -53,10 +62,7 @@ void UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, blya.Add(FString::FromInt(lvl.coords.section)); blya.Add(FString::FromInt(lvl.coords.floor)); FString instanceStr = FString::Join(blya, L"_"); - FString temp2; - FString* temp3=&temp2; - lvl.path.Split(FString(L"."), nullptr, temp3); - instanceStr.Append(L"_").Append(*temp3); + instanceStr.Append(L"_").Append(FPaths::GetCleanFilename(lvl.path)); FName instanceName = FName(instanceStr); if (loadthis) { @@ -82,7 +88,7 @@ void UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, } } - + cpplvlsForLoading.Empty(); return; }