diff --git a/FLESH.uplugin b/FLESH.uplugin index c70ac9f..863b252 100644 --- a/FLESH.uplugin +++ b/FLESH.uplugin @@ -54,6 +54,10 @@ { "Name": "PhysicsControl", "Enabled": true + }, + { + "Name": "ProceduralMeshComponent", + "Enabled": true } ] } diff --git a/Source/FLESH/Private/BloodPool.cpp b/Source/FLESH/Private/BloodPool.cpp index d28748d..e623809 100644 --- a/Source/FLESH/Private/BloodPool.cpp +++ b/Source/FLESH/Private/BloodPool.cpp @@ -66,9 +66,9 @@ void ABloodPool::SetPoolColor(const FLinearColor& NewColor) } } -void ABloodPool::StartExpansion(float ExpansionRate, float MaxSize) +void ABloodPool::StartExpansion(float InExpansionRate, float MaxSize) { - this->ExpansionRate = ExpansionRate; + ExpansionRate = InExpansionRate; MaxPoolSize = MaxSize; bIsExpanding = true; diff --git a/Source/FLESH/Private/DismembermentGraph/DismembermentGraph.cpp b/Source/FLESH/Private/DismembermentGraph/DismembermentGraph.cpp new file mode 100644 index 0000000..5eeefeb --- /dev/null +++ b/Source/FLESH/Private/DismembermentGraph/DismembermentGraph.cpp @@ -0,0 +1,50 @@ +#include "DismembermentGraph/DismembermentGraph.h" +#include "EdGraph/EdGraphNode.h" +#include "EdGraph/EdGraphPin.h" + +UDismembermentGraph::UDismembermentGraph() + : bCompiled(false) +{ +} + +void UDismembermentGraph::ClearGraph() +{ + // Clear all nodes + Nodes.Empty(); + bCompiled = false; +} + +UEdGraphNode* UDismembermentGraph::AddNode(TSubclassOf NodeClass, const FVector2D& Position) +{ + // Create new node + UEdGraphNode* NewNode = NewObject(this, NodeClass); + if (NewNode) + { + // Set node position + NewNode->NodePosX = Position.X; + NewNode->NodePosY = Position.Y; + + // Add to node list + Nodes.Add(NewNode); + } + + return NewNode; +} + +void UDismembermentGraph::RemoveNode(UEdGraphNode* Node) +{ + // Remove from node list + if (Node) + { + Nodes.Remove(Node); + } +} + +void UDismembermentGraph::CreateConnection(UEdGraphPin* A, UEdGraphPin* B) +{ + // Create connection + if (A && B) + { + A->MakeLinkTo(B); + } +} diff --git a/Source/FLESH/Public/BloodPool.h b/Source/FLESH/Public/BloodPool.h index 5fa13f1..461288d 100644 --- a/Source/FLESH/Public/BloodPool.h +++ b/Source/FLESH/Public/BloodPool.h @@ -42,11 +42,11 @@ public: /** * Start blood pool expansion - * @param ExpansionRate - Rate of expansion + * @param InExpansionRate - Rate of expansion * @param MaxSize - Maximum size */ UFUNCTION(BlueprintCallable, Category = "FLESH|Blood") - void StartExpansion(float ExpansionRate = 1.0f, float MaxSize = 3.0f); + void StartExpansion(float InExpansionRate = 1.0f, float MaxSize = 3.0f); private: // Collision component for surface detection diff --git a/Source/FLESH/Public/DismembermentGraph/DismembermentGraph.h b/Source/FLESH/Public/DismembermentGraph/DismembermentGraph.h new file mode 100644 index 0000000..a0a915c --- /dev/null +++ b/Source/FLESH/Public/DismembermentGraph/DismembermentGraph.h @@ -0,0 +1,38 @@ +#pragma once + +#include "CoreMinimal.h" +#include "UObject/NoExportTypes.h" +#include "DismembermentGraph.generated.h" + +/** + * Dismemberment graph class + * Used for visual programming of dismemberment logic + */ +UCLASS() +class FLESH_API UDismembermentGraph : public UObject +{ + GENERATED_BODY() + +public: + UDismembermentGraph(); + + // Graph nodes + UPROPERTY() + TArray Nodes; + + // Compilation status + UPROPERTY() + bool bCompiled; + + // Clear graph + void ClearGraph(); + + // Add node + class UEdGraphNode* AddNode(TSubclassOf NodeClass, const FVector2D& Position); + + // Remove node + void RemoveNode(class UEdGraphNode* Node); + + // Create connection + void CreateConnection(class UEdGraphPin* A, class UEdGraphPin* B); +}; diff --git a/Source/FLESH/Public/DismembermentGraph/DismembermentGraphAsset.h b/Source/FLESH/Public/DismembermentGraph/DismembermentGraphAsset.h index d9c4d0f..4ff3939 100644 --- a/Source/FLESH/Public/DismembermentGraph/DismembermentGraphAsset.h +++ b/Source/FLESH/Public/DismembermentGraph/DismembermentGraphAsset.h @@ -2,6 +2,10 @@ #include "CoreMinimal.h" #include "UObject/NoExportTypes.h" + +// Forward declaration +class UDismembermentGraph; + #include "DismembermentGraphAsset.generated.h" /** diff --git a/Source/FLESHEditor/FLESHEditor.Build.cs b/Source/FLESHEditor/FLESHEditor.Build.cs index 7499a06..69c4f70 100644 --- a/Source/FLESHEditor/FLESHEditor.Build.cs +++ b/Source/FLESHEditor/FLESHEditor.Build.cs @@ -38,7 +38,8 @@ public class FLESHEditor : ModuleRules "SlateCore", "UnrealEd", "PropertyEditor", - "EditorStyle", + "ApplicationCore", + "AppFramework", "LevelEditor", "GeometryCore", "GeometryFramework", diff --git a/Source/FLESHEditor/Private/DismembermentEditor.cpp b/Source/FLESHEditor/Private/DismembermentEditor.cpp index 9dfca30..6185f3d 100644 --- a/Source/FLESHEditor/Private/DismembermentEditor.cpp +++ b/Source/FLESHEditor/Private/DismembermentEditor.cpp @@ -4,7 +4,7 @@ #include "Modules/ModuleManager.h" #include "IDetailsView.h" #include "Widgets/Layout/SBorder.h" -#include "EditorStyleSet.h" +#include "Styling/AppStyle.h" #include "Engine/SkeletalMesh.h" #include "Framework/Commands/UICommandList.h" #include "Framework/MultiBox/MultiBoxBuilder.h" @@ -178,7 +178,7 @@ void FDismembermentEditor::CreateEditorToolbar() NAME_None, FText::FromString("Boolean Cut"), FText::FromString("Perform a boolean cut operation"), - FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.CurveBase"), + FSlateIcon(FAppStyle::GetAppStyleSetName(), "ClassIcon.CurveBase"), EUserInterfaceActionType::Button ); @@ -187,7 +187,7 @@ void FDismembermentEditor::CreateEditorToolbar() NAME_None, FText::FromString("Add Layer"), FText::FromString("Add a new anatomical layer"), - FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.Layer"), + FSlateIcon(FAppStyle::GetAppStyleSetName(), "ClassIcon.Layer"), EUserInterfaceActionType::Button ); @@ -196,7 +196,7 @@ void FDismembermentEditor::CreateEditorToolbar() NAME_None, FText::FromString("Preview"), FText::FromString("Preview the dismemberment effects"), - FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.ParticleSystem"), + FSlateIcon(FAppStyle::GetAppStyleSetName(), "ClassIcon.ParticleSystem"), EUserInterfaceActionType::Button ); @@ -205,7 +205,7 @@ void FDismembermentEditor::CreateEditorToolbar() NAME_None, FText::FromString("Save"), FText::FromString("Save the dismemberment setup"), - FSlateIcon(FEditorStyle::GetStyleSetName(), "AssetEditor.SaveAsset"), + FSlateIcon(FAppStyle::GetAppStyleSetName(), "AssetEditor.SaveAsset"), EUserInterfaceActionType::Button ); } @@ -227,22 +227,22 @@ void FDismembermentEditor::RegisterTabSpawners(const TSharedRef& In InTabManager->RegisterTabSpawner(ViewportTabId, FOnSpawnTab::CreateSP(this, &FDismembermentEditor::SpawnTab_Viewport)) .SetDisplayName(FText::FromString("Viewport")) .SetGroup(WorkspaceMenuCategory.ToSharedRef()) - .SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Viewports")); + .SetIcon(FSlateIcon(FAppStyle::GetAppStyleSetName(), "LevelEditor.Tabs.Viewports")); InTabManager->RegisterTabSpawner(DetailsTabId, FOnSpawnTab::CreateSP(this, &FDismembermentEditor::SpawnTab_Details)) .SetDisplayName(FText::FromString("Details")) .SetGroup(WorkspaceMenuCategory.ToSharedRef()) - .SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Details")); + .SetIcon(FSlateIcon(FAppStyle::GetAppStyleSetName(), "LevelEditor.Tabs.Details")); InTabManager->RegisterTabSpawner(LayerSystemTabId, FOnSpawnTab::CreateSP(this, &FDismembermentEditor::SpawnTab_LayerSystem)) .SetDisplayName(FText::FromString("Layer System")) .SetGroup(WorkspaceMenuCategory.ToSharedRef()) - .SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.Layer")); + .SetIcon(FSlateIcon(FAppStyle::GetAppStyleSetName(), "ClassIcon.Layer")); InTabManager->RegisterTabSpawner(PhysicsSettingsTabId, FOnSpawnTab::CreateSP(this, &FDismembermentEditor::SpawnTab_PhysicsSettings)) .SetDisplayName(FText::FromString("Physics Settings")) .SetGroup(WorkspaceMenuCategory.ToSharedRef()) - .SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.PhysicsAsset")); + .SetIcon(FSlateIcon(FAppStyle::GetAppStyleSetName(), "ClassIcon.PhysicsAsset")); } // Unregister tab spawners @@ -263,7 +263,7 @@ TSharedRef FDismembermentEditor::SpawnTab_Viewport(const FSpawnTabArgs { // Create the viewport widget ViewportWidget = SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder")) + .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder")) .Padding(FMargin(4.0f)) [ SNew(STextBlock) @@ -307,7 +307,7 @@ TSharedRef FDismembermentEditor::SpawnTab_LayerSystem(const FSpawnTabA { // Create the layer system widget LayerSystemWidget = SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder")) + .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder")) .Padding(FMargin(4.0f)) [ SNew(STextBlock) @@ -327,7 +327,7 @@ TSharedRef FDismembermentEditor::SpawnTab_PhysicsSettings(const FSpawn { // Create the physics settings widget PhysicsSettingsWidget = SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder")) + .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder")) .Padding(FMargin(4.0f)) [ SNew(STextBlock) diff --git a/Source/FLESHEditor/Private/DismembermentGraph/DismembermentPreviewManager.cpp b/Source/FLESHEditor/Private/DismembermentGraph/DismembermentPreviewManager.cpp index efb35fb..5618462 100644 --- a/Source/FLESHEditor/Private/DismembermentGraph/DismembermentPreviewManager.cpp +++ b/Source/FLESHEditor/Private/DismembermentGraph/DismembermentPreviewManager.cpp @@ -213,7 +213,7 @@ bool UDismembermentPreviewManager::PreviewCutNode(TObjectPtr WoundEffectComponent = nullptr; if (WoundEffect) { - WoundEffectComponent = UNiagaraComponent::SpawnSystemAttached( + WoundEffectComponent = UNiagaraFunctionLibrary::SpawnSystemAttached( WoundEffect, TargetSkeletalMesh, NAME_None, @@ -544,7 +544,7 @@ TObjectPtr UDismembermentPreviewManager::CreatePreviewBloodEf } // Create a Niagara component for the blood effect - TObjectPtr BloodEffectComponent = UNiagaraComponent::SpawnSystemAttached( + TObjectPtr BloodEffectComponent = UNiagaraFunctionLibrary::SpawnSystemAttached( BloodEffect, TargetSkeletalMesh, NAME_None, diff --git a/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentGraphNode.cpp b/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentGraphNode.cpp index 94400f5..c1c8dcd 100644 --- a/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentGraphNode.cpp +++ b/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentGraphNode.cpp @@ -34,7 +34,7 @@ void SDismembermentGraphNode::UpdateGraphNode() .VAlign(VAlign_Center) [ SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("Graph.StateNode.Body")) + .BorderImage(FAppStyle::GetBrush("Graph.StateNode.Body")) .BorderBackgroundColor(this, &SDismembermentGraphNode::GetNodeColor) .HAlign(HAlign_Fill) .VAlign(VAlign_Fill) @@ -52,7 +52,7 @@ void SDismembermentGraphNode::UpdateGraphNode() .AutoHeight() [ SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("Graph.StateNode.ColorSpill")) + .BorderImage(FAppStyle::GetBrush("Graph.StateNode.ColorSpill")) .BorderBackgroundColor(this, &SDismembermentGraphNode::GetNodeTitleColor) .HAlign(HAlign_Fill) .VAlign(VAlign_Center) @@ -65,7 +65,7 @@ void SDismembermentGraphNode::UpdateGraphNode() [ SNew(STextBlock) .Text(this, &SDismembermentGraphNode::GetNodeTitle) - .TextStyle(FEditorStyle::Get(), "Graph.StateNode.NodeTitle") + .TextStyle(FAppStyle::Get(), "Graph.StateNode.NodeTitle") .Margin(FMargin(0.0f, 0.0f, 4.0f, 0.0f)) ] // Node category @@ -74,7 +74,7 @@ void SDismembermentGraphNode::UpdateGraphNode() [ SNew(STextBlock) .Text(this, &SDismembermentGraphNode::GetNodeCategory) - .TextStyle(FEditorStyle::Get(), "Graph.StateNode.NodeTitle") + .TextStyle(FAppStyle::Get(), "Graph.StateNode.NodeTitle") .ColorAndOpacity(FLinearColor(0.8f, 0.8f, 0.8f)) .Margin(FMargin(4.0f, 0.0f, 0.0f, 0.0f)) ] @@ -86,7 +86,7 @@ void SDismembermentGraphNode::UpdateGraphNode() .AutoHeight() [ SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("NoBorder")) + .BorderImage(FAppStyle::GetBrush("NoBorder")) .HAlign(HAlign_Fill) .VAlign(VAlign_Fill) .Padding(FMargin(10.0f, 0.0f)) @@ -260,7 +260,7 @@ TSharedRef SDismembermentGraphNode::GetNodeTitleWidget() return SNew(STextBlock) .Text(DismembermentNode->GetNodeTitle(ENodeTitleType::FullTitle)) - .TextStyle(FEditorStyle::Get(), "Graph.StateNode.NodeTitle"); + .TextStyle(FAppStyle::Get(), "Graph.StateNode.NodeTitle"); } TSharedRef SDismembermentGraphNode::GetNodeBodyWidget() @@ -287,7 +287,7 @@ TSharedRef SDismembermentGraphNode::GetNodePreviewWidget() .VAlign(VAlign_Center) [ SNew(SBorder) - .BorderImage(FEditorStyle::GetBrush("Graph.StateNode.Body")) + .BorderImage(FAppStyle::GetBrush("Graph.StateNode.Body")) .BorderBackgroundColor(FLinearColor(0.1f, 0.1f, 0.1f, 0.5f)) .HAlign(HAlign_Center) .VAlign(VAlign_Center) diff --git a/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentPreviewViewport.cpp b/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentPreviewViewport.cpp index b0d5ccf..8ead602 100644 --- a/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentPreviewViewport.cpp +++ b/Source/FLESHEditor/Private/DismembermentGraph/SDismembermentPreviewViewport.cpp @@ -18,7 +18,7 @@ class ADismembermentPreviewActor : public AActor { public: ADismembermentPreviewActor(const FObjectInitializer& ObjectInitializer) - : Super(ObjectInitializer) + : AActor(ObjectInitializer) { // Create a skeletal mesh component SkeletalMeshComponent = CreateDefaultSubobject(TEXT("SkeletalMeshComponent")); @@ -60,11 +60,12 @@ void SDismembermentPreviewViewport::Construct(const FArguments& InArgs) if (ProfileIndex != INDEX_NONE) { Settings->Profiles[ProfileIndex].bRotateLightingRig = false; - PreviewScene->SetLightDirection(Settings->Profiles[ProfileIndex].LightingRigRotation); - PreviewScene->SetSkyBrightness(Settings->Profiles[ProfileIndex].EnvironmentCubeMapBrightness); - PreviewScene->SetLightColor(Settings->Profiles[ProfileIndex].LightColor); - PreviewScene->SetLightIntensity(Settings->Profiles[ProfileIndex].LightBrightness); - PreviewScene->SetEnvironmentCubeMap(Settings->Profiles[ProfileIndex].EnvironmentCubeMap); + PreviewScene->SetLightDirection(FRotator(Settings->Profiles[ProfileIndex].LightingRigRotation, 0, 0)); + // The following methods may not exist in UE5.5.4, temporarily commented out + // PreviewScene->SetSkyBrightness(Settings->Profiles[ProfileIndex].EnvironmentCubeMapBrightness); + // PreviewScene->SetLightColor(Settings->Profiles[ProfileIndex].LightColor); + // PreviewScene->SetLightIntensity(Settings->Profiles[ProfileIndex].LightBrightness); + // PreviewScene->SetEnvironmentCubeMap(Settings->Profiles[ProfileIndex].EnvironmentCubeMap); } // Create the preview actor @@ -79,7 +80,11 @@ SDismembermentPreviewViewport::~SDismembermentPreviewViewport() // Clean up the preview scene if (PreviewScene.IsValid()) { - PreviewScene->RemoveComponent(PreviewActor); + // Cannot remove Actor directly, need to remove the Actor's root component + if (PreviewActor && PreviewActor->GetRootComponent()) + { + PreviewScene->RemoveComponent(PreviewActor->GetRootComponent()); + } PreviewScene.Reset(); } @@ -193,10 +198,11 @@ TSharedRef SDismembermentPreviewViewport::MakeEditorViewp ViewportClient->EngineShowFlags.SetVertexColors(false); ViewportClient->EngineShowFlags.SetLightComplexity(false); ViewportClient->EngineShowFlags.SetShaderComplexity(false); - ViewportClient->EngineShowFlags.SetStaticMeshLODColoration(false); + // The following methods may not exist in UE5.5.4, temporarily commented out + // ViewportClient->EngineShowFlags.SetStaticMeshLODColoration(false); ViewportClient->EngineShowFlags.SetLightMapDensity(false); ViewportClient->EngineShowFlags.SetLightInfluences(false); - ViewportClient->EngineShowFlags.SetOptimizeVizibility(false); + // ViewportClient->EngineShowFlags.SetOptimizeVizibility(false); ViewportClient->EngineShowFlags.SetTextRender(true); ViewportClient->EngineShowFlags.SetTestImage(false); ViewportClient->EngineShowFlags.SetVisualizeLightCulling(false); @@ -208,7 +214,8 @@ TSharedRef SDismembermentPreviewViewport::MakeEditorViewp ViewportClient->EngineShowFlags.SetHitProxies(false); ViewportClient->EngineShowFlags.SetGBufferHints(false); ViewportClient->EngineShowFlags.SetVisualizeShadingModels(false); - ViewportClient->EngineShowFlags.SetVisualizeAdaptiveDOF(false); + // The following methods may not exist in UE5.5.4, temporarily commented out + // ViewportClient->EngineShowFlags.SetVisualizeAdaptiveDOF(false); ViewportClient->EngineShowFlags.SetVisualizeSSR(false); ViewportClient->EngineShowFlags.SetVisualizeSSS(false); ViewportClient->EngineShowFlags.SetVolumetricLightmap(true); @@ -219,8 +226,8 @@ TSharedRef SDismembermentPreviewViewport::MakeEditorViewp ViewportClient->EngineShowFlags.SetTonemapper(true); ViewportClient->EngineShowFlags.SetLumenReflections(true); ViewportClient->EngineShowFlags.SetLumenGlobalIllumination(true); - ViewportClient->EngineShowFlags.SetVirtualShadowMaps(true); - ViewportClient->EngineShowFlags.SetNanite(true); + // ViewportClient->EngineShowFlags.SetVirtualShadowMaps(true); + // ViewportClient->EngineShowFlags.SetNanite(true); return ViewportClient.ToSharedRef(); } @@ -295,8 +302,14 @@ SDismembermentPreviewViewportClient::SDismembermentPreviewViewportClient(FPrevie { // Set up the viewport client SetRealtime(true); + + // In UE5.5.4, these variables may no longer be members of FEditorViewportClient + // We only keep the necessary settings, others are commented out bSetListenerPosition = false; bShouldCheckHitProxy = true; + + // The following settings may no longer be supported in UE5.5.4, temporarily commented out + /* bShowGrid = false; bDisableInput = false; bAllowMatineePreview = false; @@ -334,81 +347,29 @@ SDismembermentPreviewViewportClient::SDismembermentPreviewViewportClient(FPrevie bDrawPreviewShadowsInGame = false; bEnableDirectLightMap = true; bEnableIndirectLightMap = true; - bEnableColorizeDistancefieldLightingMask = false; - bEnableColorizeDistanceFieldLightingMaskGrayscale = false; - bEnableColorizeDistanceFieldLightingMaskColor = false; - bEnableColorizeDistanceFieldOcclusion = false; - bEnableColorizeDistanceFieldOcclusionGrayscale = false; - bEnableColorizeDistanceFieldOcclusionColor = false; - bEnableColorizeDistanceFieldLightingMaskGrayscale = false; - bEnableColorizeDistanceFieldLightingMaskColor = false; - bEnableColorizeDistanceFieldOcclusionGrayscale = false; - bEnableColorizeDistanceFieldOcclusionColor = false; - bEnableColorizeDistanceFieldLightingMask = false; - bEnableColorizeDistanceFieldOcclusion = false; - bEnableColorizeDistanceFieldGradient = false; - bEnableColorizeDistanceFieldGradientGrayscale = false; - bEnableColorizeDistanceFieldGradientColor = false; - bEnableColorizeDistanceFieldGradientGrayscale = false; - bEnableColorizeDistanceFieldGradientColor = false; - bEnableColorizeDistanceFieldGradient = false; - bEnableColorizeDistanceField = false; - bEnableColorizeDistanceFieldGrayscale = false; - bEnableColorizeDistanceFieldColor = false; - bEnableColorizeDistanceFieldGrayscale = false; - bEnableColorizeDistanceFieldColor = false; - bEnableColorizeDistanceField = false; - bEnableColorizeDistanceFieldMeshSDF = false; - bEnableColorizeDistanceFieldMeshSDFGrayscale = false; - bEnableColorizeDistanceFieldMeshSDFColor = false; - bEnableColorizeDistanceFieldMeshSDFGrayscale = false; - bEnableColorizeDistanceFieldMeshSDFColor = false; - bEnableColorizeDistanceFieldMeshSDF = false; - bEnableColorizeVolumetricLightmap = false; - bEnableColorizeVolumetricLightmapDensity = false; - bEnableColorizeVolumetricLightmapSamples = false; - bEnableColorizeGlobalDistanceField = false; - bEnableColorizeGlobalDistanceFieldGrayscale = false; - bEnableColorizeGlobalDistanceFieldColor = false; - bEnableColorizeGlobalDistanceFieldGrayscale = false; - bEnableColorizeGlobalDistanceFieldColor = false; - bEnableColorizeGlobalDistanceField = false; - bEnableColorizeGlobalDistanceFieldMeshSDF = false; - bEnableColorizeGlobalDistanceFieldMeshSDFGrayscale = false; - bEnableColorizeGlobalDistanceFieldMeshSDFColor = false; - bEnableColorizeGlobalDistanceFieldMeshSDFGrayscale = false; - bEnableColorizeGlobalDistanceFieldMeshSDFColor = false; - bEnableColorizeGlobalDistanceFieldMeshSDF = false; - bEnableColorizeVolumetricLightmapDirectionalOcclusion = false; - bEnableColorizeVolumetricLightmapDirectionalOcclusionGrayscale = false; - bEnableColorizeVolumetricLightmapDirectionalOcclusionColor = false; - bEnableColorizeVolumetricLightmapDirectionalOcclusionGrayscale = false; - bEnableColorizeVolumetricLightmapDirectionalOcclusionColor = false; - bEnableColorizeVolumetricLightmapDirectionalOcclusion = false; - bEnableColorizeVolumetricLightmapDirectionalIndirectIntensity = false; - bEnableColorizeVolumetricLightmapDirectionalIndirectIntensityGrayscale = false; - bEnableColorizeVolumetricLightmapDirectionalIndirectIntensityColor = false; - bEnableColorizeVolumetricLightmapDirectionalIndirectIntensityGrayscale = false; - bEnableColorizeVolumetricLightmapDirectionalIndirectIntensityColor = false; - bEnableColorizeVolumetricLightmapDirectionalIndirectIntensity = false; - bEnableColorizeVolumetricLightmapIndirectIntensity = false; + // All bEnableColorize related variables are commented out + */ + // Continue to comment out more bEnableColorize related variables + /* bEnableColorizeVolumetricLightmapIndirectIntensityGrayscale = false; bEnableColorizeVolumetricLightmapIndirectIntensityColor = false; bEnableColorizeVolumetricLightmapIndirectIntensityGrayscale = false; bEnableColorizeVolumetricLightmapIndirectIntensityColor = false; bEnableColorizeVolumetricLightmapIndirectIntensity = false; - bEnableColorizeVolumetricLightmapEnvironmentIntensity = false; - bEnableColorizeVolumetricLightmapEnvironmentIntensityGrayscale = false; - bEnableColorizeVolumetricLightmapEnvironmentIntensityColor = false; - bEnableColorizeVolumetricLightmapEnvironmentIntensityGrayscale = false; - bEnableColorizeVolumetricLightmapEnvironmentIntensityColor = false; - bEnableColorizeVolumetricLightmapEnvironmentIntensity = false; + bEnableColorizeVolumetricLightmapAmbientOcclusion = false; + bEnableColorizeVolumetricLightmapAmbientOcclusionGrayscale = false; + bEnableColorizeVolumetricLightmapAmbientOcclusionColor = false; + bEnableColorizeVolumetricLightmapAmbientOcclusionGrayscale = false; + bEnableColorizeVolumetricLightmapAmbientOcclusionColor = false; + bEnableColorizeVolumetricLightmapAmbientOcclusion = false; + */ + // Continue to comment out all remaining bEnableColorize related variables + /* bEnableColorizeVolumetricLightmapSHBand0 = false; bEnableColorizeVolumetricLightmapSHBand0Grayscale = false; bEnableColorizeVolumetricLightmapSHBand0Color = false; bEnableColorizeVolumetricLightmapSHBand0Grayscale = false; bEnableColorizeVolumetricLightmapSHBand0Color = false; - bEnableColorizeVolumetricLightmapSHBand0 = false; bEnableColorizeVolumetricLightmapSHBand1 = false; bEnableColorizeVolumetricLightmapSHBand1Grayscale = false; bEnableColorizeVolumetricLightmapSHBand1Color = false; @@ -427,6 +388,7 @@ SDismembermentPreviewViewportClient::SDismembermentPreviewViewportClient(FPrevie bEnableColorizeVolumetricLightmapSHBand3Grayscale = false; bEnableColorizeVolumetricLightmapSHBand3Color = false; bEnableColorizeVolumetricLightmapSHBand3 = false; + */ } SDismembermentPreviewViewportClient::~SDismembermentPreviewViewportClient() diff --git a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentCompiler.h b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentCompiler.h index 87c2171..96f44c5 100644 --- a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentCompiler.h +++ b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentCompiler.h @@ -2,6 +2,7 @@ #include "CoreMinimal.h" #include "UObject/NoExportTypes.h" +#include "NiagaraSystem.h" #include "DismembermentCompiler.generated.h" class UDismembermentGraphNode; diff --git a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentExecutor.h b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentExecutor.h index f5989b4..f26fbb3 100644 --- a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentExecutor.h +++ b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentExecutor.h @@ -3,6 +3,7 @@ #include "CoreMinimal.h" #include "UObject/NoExportTypes.h" #include "DismembermentCompiler.h" +#include "NiagaraSystem.h" #include "DismembermentExecutor.generated.h" class AActor; diff --git a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNode.h b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNode.h index c0ceeac..3f3de22 100644 --- a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNode.h +++ b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNode.h @@ -32,7 +32,7 @@ public: virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override; virtual FLinearColor GetNodeTitleColor() const override; virtual FText GetTooltipText() const override; - virtual FText GetMenuCategory() const override; + virtual FText GetMenuCategory() const; // End of UEdGraphNode interface // Compile this node into executable logic diff --git a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeBloodEffect.h b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeBloodEffect.h index d01b1e1..54a369a 100644 --- a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeBloodEffect.h +++ b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeBloodEffect.h @@ -2,6 +2,7 @@ #include "CoreMinimal.h" #include "DismembermentGraphNode.h" +#include "NiagaraSystem.h" #include "DismembermentGraphNodeBloodEffect.generated.h" /** diff --git a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeWound.h b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeWound.h index 56df991..150086b 100644 --- a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeWound.h +++ b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentGraphNodeWound.h @@ -2,6 +2,7 @@ #include "CoreMinimal.h" #include "DismembermentGraphNode.h" +#include "NiagaraSystem.h" #include "DismembermentGraphNodeWound.generated.h" /** diff --git a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentPreviewManager.h b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentPreviewManager.h index 76d8e0d..5567112 100644 --- a/Source/FLESHEditor/Public/DismembermentGraph/DismembermentPreviewManager.h +++ b/Source/FLESHEditor/Public/DismembermentGraph/DismembermentPreviewManager.h @@ -2,6 +2,9 @@ #include "CoreMinimal.h" #include "UObject/NoExportTypes.h" +#include "NiagaraSystem.h" +#include "NiagaraComponent.h" +#include "NiagaraFunctionLibrary.h" #include "DismembermentPreviewManager.generated.h" // Add a log category declaration