Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.25 #89

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

4.25 #89

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 125 additions & 0 deletions Source/NDDS.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28315.86
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{94A6C6F3-99B3-346E-9557-ABF9D4064DBD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{8E2F6A87-1826-34F4-940C-CC23A48F9FE4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{D75B4297-A21D-482C-8306-186037F851F5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NDDS", "Intermediate\ProjectFiles\NDDS.vcxproj", "{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizers", "Visualizers", "{1CCEC849-CC72-4C59-8C36-2F7C38706D4C}"
ProjectSection(SolutionItems) = preProject
C:\Program Files\Epic Games\UE_4.25\Engine\Extras\VisualStudioDebugging\UE4.natvis = C:\Program Files\Epic Games\UE_4.25\Engine\Extras\VisualStudioDebugging\UE4.natvis
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DebugGame Editor|IOS = DebugGame Editor|IOS
DebugGame Editor|Linux = DebugGame Editor|Linux
DebugGame Editor|LinuxAArch64 = DebugGame Editor|LinuxAArch64
DebugGame Editor|Win32 = DebugGame Editor|Win32
DebugGame Editor|Win64 = DebugGame Editor|Win64
DebugGame|IOS = DebugGame|IOS
DebugGame|Linux = DebugGame|Linux
DebugGame|LinuxAArch64 = DebugGame|LinuxAArch64
DebugGame|Win32 = DebugGame|Win32
DebugGame|Win64 = DebugGame|Win64
Development Editor|IOS = Development Editor|IOS
Development Editor|Linux = Development Editor|Linux
Development Editor|LinuxAArch64 = Development Editor|LinuxAArch64
Development Editor|Win32 = Development Editor|Win32
Development Editor|Win64 = Development Editor|Win64
Development|IOS = Development|IOS
Development|Linux = Development|Linux
Development|LinuxAArch64 = Development|LinuxAArch64
Development|Win32 = Development|Win32
Development|Win64 = Development|Win64
Shipping|IOS = Shipping|IOS
Shipping|Linux = Shipping|Linux
Shipping|LinuxAArch64 = Shipping|LinuxAArch64
Shipping|Win32 = Shipping|Win32
Shipping|Win64 = Shipping|Win64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame Editor|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame Editor|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame Editor|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development Editor|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development Editor|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development Editor|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Shipping|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Shipping|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Shipping|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{D75B4297-A21D-482C-8306-186037F851F5}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|IOS.ActiveCfg = Invalid|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|Linux.ActiveCfg = Linux_DebugGame_Editor|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|Linux.Build.0 = Linux_DebugGame_Editor|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|LinuxAArch64.ActiveCfg = Invalid|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|IOS.ActiveCfg = IOS_DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|IOS.Build.0 = IOS_DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|Linux.ActiveCfg = Linux_DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|Linux.Build.0 = Linux_DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|LinuxAArch64.ActiveCfg = LinuxAArch64_DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|LinuxAArch64.Build.0 = LinuxAArch64_DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|Win32.ActiveCfg = DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|Win32.Build.0 = DebugGame|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|Win64.ActiveCfg = DebugGame|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.DebugGame|Win64.Build.0 = DebugGame|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|IOS.ActiveCfg = Invalid|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|Linux.ActiveCfg = Linux_Development_Editor|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|Linux.Build.0 = Linux_Development_Editor|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|LinuxAArch64.ActiveCfg = Invalid|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|Win32.ActiveCfg = Invalid|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|Win64.ActiveCfg = Development_Editor|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development Editor|Win64.Build.0 = Development_Editor|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|IOS.ActiveCfg = IOS_Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|IOS.Build.0 = IOS_Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|Linux.ActiveCfg = Linux_Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|Linux.Build.0 = Linux_Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|LinuxAArch64.ActiveCfg = LinuxAArch64_Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|LinuxAArch64.Build.0 = LinuxAArch64_Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|Win32.ActiveCfg = Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|Win32.Build.0 = Development|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|Win64.ActiveCfg = Development|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Development|Win64.Build.0 = Development|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|IOS.ActiveCfg = IOS_Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|IOS.Build.0 = IOS_Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|Linux.ActiveCfg = Linux_Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|Linux.Build.0 = Linux_Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|LinuxAArch64.ActiveCfg = LinuxAArch64_Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|LinuxAArch64.Build.0 = LinuxAArch64_Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|Win32.ActiveCfg = Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|Win32.Build.0 = Shipping|Win32
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|Win64.ActiveCfg = Shipping|x64
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620}.Shipping|Win64.Build.0 = Shipping|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D75B4297-A21D-482C-8306-186037F851F5} = {94A6C6F3-99B3-346E-9557-ABF9D4064DBD}
{B3FD0025-2DAA-4C0D-BEDD-64DF94AE3620} = {8E2F6A87-1826-34F4-940C-CC23A48F9FE4}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Source/NDDS.uproject
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "4.22",
"EngineAssociation": "4.25",
"Category": "",
"Description": "",
"Modules": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ void URandomMaterialComponent::BeginPlay()
{
OwnerMeshComponents = DRUtils::GetValidChildMeshComponents(OwnerActor);

TArray<UActorComponent*> ChildDecalComps = OwnerActor->GetComponentsByClass(UDecalComponent::StaticClass());
TArray<UDecalComponent*> ChildDecalComps;
OwnerActor->GetComponents<UDecalComponent>(ChildDecalComps);
OwnerDecalComponents.Reset();
for (UActorComponent* CheckComp : ChildDecalComps)
for (auto* CheckComp : ChildDecalComps)
{
UDecalComponent* CheckDecalComp = Cast<UDecalComponent>(CheckComp);
if (CheckDecalComp)
if (CheckComp)
{
OwnerDecalComponents.Add(CheckDecalComp);
OwnerDecalComponents.Add(CheckComp);
}
}
}
Expand Down Expand Up @@ -105,7 +106,7 @@ void URandomMaterialComponent::OnRandomization_Implementation()

if (bAffectDecalComponents && (OwnerDecalComponents.Num() > 0))
{
for (UDecalComponent* CheckDecalComp : OwnerDecalComponents)
for (auto CheckDecalComp : OwnerDecalComponents)
{
if (CheckDecalComp)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ void URandomMaterialParameterComponentBase::BeginPlay()
{
OwnerMeshComponents = DRUtils::GetValidChildMeshComponents(OwnerActor);

TArray<UActorComponent*> ChildDecalComps = OwnerActor->GetComponentsByClass(UDecalComponent::StaticClass());
TArray<UDecalComponent*> ChildDecalComps;
OwnerActor->GetComponents<UDecalComponent>(ChildDecalComps);
OwnerDecalComponents.Reset();
for (UActorComponent* CheckComp : ChildDecalComps)
for (auto* CheckComp : ChildDecalComps)
{
UDecalComponent* CheckDecalComp = Cast<UDecalComponent>(CheckComp);
if (CheckDecalComp)
if (CheckComp)
{
OwnerDecalComponents.Add(CheckDecalComp);
OwnerDecalComponents.Add(CheckComp);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void URandomVisibilityComponent::OnRandomization_Implementation()
AActor* OwnerActor = GetOwner();
if (OwnerActor)
{
bool bNewHidden = !OwnerActor->bHidden;
bool bNewHidden = !OwnerActor->IsHidden();

OwnerActor->SetActorHiddenInGame(bNewHidden);
OwnerActor->SetActorEnableCollision(!bNewHidden);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -708,14 +708,14 @@ namespace DRUtils
return FoundMeshComp;
}

TArray<UActorComponent*> ChildMeshComps = OwnerActor->GetComponentsByClass(UMeshComponent::StaticClass());
for (UActorComponent* CheckComp : ChildMeshComps)
TArray<UMeshComponent*> ChildMeshComps;
OwnerActor->GetComponents<UMeshComponent>(ChildMeshComps);
for (auto ChildMeshComp : ChildMeshComps)
{
UMeshComponent* CheckMeshComp = Cast<UMeshComponent>(CheckComp);
if (CheckMeshComp)
if (ChildMeshComp)
{
USkinnedMeshComponent* SkinnedMeshComp = Cast<USkeletalMeshComponent>(CheckMeshComp);
if (SkinnedMeshComp)
USkinnedMeshComponent* SkinnedMeshComp = Cast<USkeletalMeshComponent>(ChildMeshComp);
if (SkinnedMeshComp)
{
if (SkinnedMeshComp->SkeletalMesh)
{
Expand All @@ -725,7 +725,7 @@ namespace DRUtils
}
else
{
UStaticMeshComponent* StaticMeshComp = Cast<UStaticMeshComponent>(CheckMeshComp);
UStaticMeshComponent* StaticMeshComp = Cast<UStaticMeshComponent>(ChildMeshComp);
if (StaticMeshComp && StaticMeshComp->GetStaticMesh())
{
FoundMeshComp = StaticMeshComp;
Expand All @@ -748,13 +748,13 @@ namespace DRUtils
return ValidMeshComps;
}

TArray<UActorComponent*> ChildMeshComps = OwnerActor->GetComponentsByClass(UMeshComponent::StaticClass());
for (UActorComponent* CheckComp : ChildMeshComps)
TArray<UMeshComponent*> ChildMeshComps;
OwnerActor->GetComponents<UMeshComponent>(ChildMeshComps);
for (auto ChildMeshComp : ChildMeshComps)
{
UMeshComponent* CheckMeshComp = Cast<UMeshComponent>(CheckComp);
if (CheckMeshComp)
if (ChildMeshComp)
{
USkinnedMeshComponent* SkinnedMeshComp = Cast<USkeletalMeshComponent>(CheckMeshComp);
USkinnedMeshComponent* SkinnedMeshComp = Cast<USkeletalMeshComponent>(ChildMeshComp);
if (SkinnedMeshComp)
{
if (SkinnedMeshComp->SkeletalMesh)
Expand All @@ -764,7 +764,7 @@ namespace DRUtils
}
else
{
UStaticMeshComponent* StaticMeshComp = Cast<UStaticMeshComponent>(CheckMeshComp);
UStaticMeshComponent* StaticMeshComp = Cast<UStaticMeshComponent>(ChildMeshComp);
if (StaticMeshComp && StaticMeshComp->GetStaticMesh())
{
ValidMeshComps.Add(StaticMeshComp);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,9 @@ void AGroupActorManager::UpdateProxyMeshes()
NewProxyMeshComponent->bIsEditorOnly = true;
NewProxyMeshComponent->SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
NewProxyMeshComponent->bHiddenInGame = true;
NewProxyMeshComponent->bVisible = !bShouldHideProxyMesh;
NewProxyMeshComponent->SetVisibility(!bShouldHideProxyMesh);
NewProxyMeshComponent->CastShadow = false;
NewProxyMeshComponent->PostPhysicsComponentTick.bCanEverTick = false;
//NewProxyMeshComponent->PostPhysicsComponentTick.bCanEverTick = false;
NewProxyMeshComponent->CreationMethod = EComponentCreationMethod::Instance;
NewProxyMeshComponent->RegisterComponentWithWorld(World);

Expand Down Expand Up @@ -455,7 +455,8 @@ void AGroupActorManager::UpdateProxyMeshesVisibility()
if (CheckMesh)
{
CheckMesh->bHiddenInGame = bShouldHideProxyMesh;
CheckMesh->bVisible = !bShouldHideProxyMesh;
//CheckMesh->bVisible = !bShouldHideProxyMesh;
CheckMesh->SetVisibility(!bShouldHideProxyMesh);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ public NVDataObject(ReadOnlyTargetRules Target) : base(Target)

PrivatePCHHeaderFile = "Public/NVDataObjectModule.h";

bFasterWithoutUnity = true;
bUseUnity = true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ public NVDataObjectEditor(ReadOnlyTargetRules Target) : base(Target)

PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;

bFasterWithoutUnity = true;
bUseUnity = true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public NVSceneCapturer(ReadOnlyTargetRules Target) : base(Target)

PrivatePCHHeaderFile = "Public/NVSceneCapturerModule.h";

bFasterWithoutUnity = true;
bUseUnity = true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ uint32 FNVImageExporter_Thread::Run()
ExportingImageCounterPtr->Increment();
auto TempExportingImageCounterPtr = ExportingImageCounterPtr;
auto TempImageWrapperModule = ImageWrapperModule;
Async<void>(AsyncExecution, [TempExportingImageCounterPtr, TempImageWrapperModule, CheckImageData = MoveTemp(TmpImageData)]
Async(AsyncExecution, [TempExportingImageCounterPtr, TempImageWrapperModule, CheckImageData = MoveTemp(TmpImageData)]
{
FNVImageExporter::ExportImage(TempImageWrapperModule, CheckImageData);
if (TempExportingImageCounterPtr.IsValid())
Expand Down
Loading