This commit is contained in:
2024-04-09 01:20:23 +05:00
parent 7dcddff455
commit ca0ec552eb
24 changed files with 23539 additions and 7 deletions
File diff suppressed because it is too large Load Diff
@@ -3181,6 +3181,26 @@
"Path": "$(EngineDir)/Plugins/Runtime/MsQuic/Binaries/Win64/UnrealEditor.modules", "Path": "$(EngineDir)/Plugins/Runtime/MsQuic/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource" "Type": "RequiredResource"
}, },
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/Binaries/Win64/UnrealEditor-OpenXRAR.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/Binaries/Win64/UnrealEditor-OpenXREditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/Binaries/Win64/UnrealEditor-OpenXRHMD.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/Binaries/Win64/UnrealEditor-OpenXRInput.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{ {
"Path": "$(EngineDir)/Plugins/Runtime/ProceduralMeshComponent/Binaries/Win64/UnrealEditor-ProceduralMeshComponent.dll", "Path": "$(EngineDir)/Plugins/Runtime/ProceduralMeshComponent/Binaries/Win64/UnrealEditor-ProceduralMeshComponent.dll",
"Type": "DynamicLibrary" "Type": "DynamicLibrary"
@@ -23395,6 +23415,10 @@
"Path": "$(EngineDir)/Plugins/Runtime/MsQuic/MsQuic.uplugin", "Path": "$(EngineDir)/Plugins/Runtime/MsQuic/MsQuic.uplugin",
"Type": "UFS" "Type": "UFS"
}, },
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/OpenXR.uplugin",
"Type": "UFS"
},
{ {
"Path": "$(EngineDir)/Plugins/Runtime/ProceduralMeshComponent/ProceduralMeshComponent.uplugin", "Path": "$(EngineDir)/Plugins/Runtime/ProceduralMeshComponent/ProceduralMeshComponent.uplugin",
"Type": "UFS" "Type": "UFS"
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,7 @@
{
"BuildId": "27405482",
"Modules":
{
"FORTIS_Taktika": "UnrealEditor-FORTIS_Taktika-Win64-DebugGame.dll"
}
}
+1 -1
View File
@@ -173,7 +173,7 @@ UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=2160
fx.Niagara.ForceLastTickGroup=1 fx.Niagara.ForceLastTickGroup=1
[/Script/Engine.StreamingSettings] [/Script/Engine.StreamingSettings]
s.UseBackgroundLevelStreaming=True s.UseBackgroundLevelStreaming=False
[/Script/Engine.VirtualTexturePoolConfig] [/Script/Engine.VirtualTexturePoolConfig]
DefaultSizeInMegabyte=512 DefaultSizeInMegabyte=512
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -33,10 +33,14 @@ void AResComFloorManager::AddPack(const FFloorPack& pack)
void AResComFloorManager::AddLevelToPack(FApartmentLocation loc, FFloorLevelStreaming level) void AResComFloorManager::AddLevelToPack(FApartmentLocation loc, FFloorLevelStreaming level)
{ {
FFloorPack pack; FFloorPack pack;
if (GetPack(loc, pack)) FFloorPack* ppack=nullptr;
if (GetPack(loc, ppack))
{ {
UE_LOG(LogTemp, Warning, TEXT("COUNT: %d"), pack.levels.Num()); //UE_LOG(LogTemp, Warning, TEXT("COUNT: %d"), ppack->levels.Num());
pack.levels.Add(level); //UE_LOG(LogTemp, Warning, TEXT("COUNT loc: %d"), ppack->location.locHouse);
ppack->levels.Add(level);
//UE_LOG(LogTemp, Warning, TEXT("COUNT: %d"), ppack->levels.Num());
} }
else else
{ {
@@ -46,13 +50,13 @@ void AResComFloorManager::AddLevelToPack(FApartmentLocation loc, FFloorLevelStre
} }
} }
bool AResComFloorManager::GetPack(FApartmentLocation loc, FFloorPack* pack) bool AResComFloorManager::GetPack(FApartmentLocation loc, FFloorPack *& pack)
{ {
for (int i = 0; i < packs.Num(); ++i) for (int i = 0; i < packs.Num(); ++i)
{ {
if (packs[i].location == loc) if (packs[i].location == loc)
{ {
pack = &(packs[i]); pack = &packs[i];
return true; return true;
} }
} }
@@ -82,7 +82,7 @@ private:
void OnLevelVisible(); void OnLevelVisible();
UFUNCTION() UFUNCTION()
void OnLevelLoaded(); void OnLevelLoaded();
bool GetPack(FApartmentLocation loc, FFloorPack* pack); bool GetPack(FApartmentLocation loc, FFloorPack *& pack);
public: public:
// Sets default values for this actor's properties // Sets default values for this actor's properties
AResComFloorManager(); AResComFloorManager();