From f89b26f6f12a38ab93918ed741fb2014783453c9 Mon Sep 17 00:00:00 2001 From: Maxime Date: Sun, 6 Aug 2023 23:45:26 +0200 Subject: [PATCH] Edit code for build --- Pawn_Unreal/Source/Pawn/Pawn.Build.cs | 11 ++++++++--- Pawn_Unreal/Source/Pawn/PawnModule.cpp | 19 ++----------------- .../PwnInteractableActorCustomization.cpp | 2 +- .../PwnInteractableActorCustomization.h | 2 +- .../Source/PawnEditor/PawnEditor.Build.cs | 4 +++- .../Source/PawnEditor/PawnEditorModule.cpp | 12 ++++++++++++ 6 files changed, 27 insertions(+), 23 deletions(-) rename Pawn_Unreal/Source/{Pawn/Private/Interaction => PawnEditor/Customization}/PwnInteractableActorCustomization.cpp (94%) rename Pawn_Unreal/Source/{Pawn/Public/Interaction => PawnEditor/Customization}/PwnInteractableActorCustomization.h (88%) diff --git a/Pawn_Unreal/Source/Pawn/Pawn.Build.cs b/Pawn_Unreal/Source/Pawn/Pawn.Build.cs index 0f2c38e..39be74e 100644 --- a/Pawn_Unreal/Source/Pawn/Pawn.Build.cs +++ b/Pawn_Unreal/Source/Pawn/Pawn.Build.cs @@ -9,12 +9,17 @@ public class Pawn : ModuleRules { "CoreUObject", "Engine", "InputCore", - "EditorStyle", "Slate", - "SlateCore", - "PropertyEditor" + "SlateCore" }); PrivateDependencyModuleNames.AddRange(new string[] { }); + + if (Target.bBuildEditor) { + PublicDependencyModuleNames.AddRange(new[] { + "EditorStyle", + "PropertyEditor" + }); + } } } \ No newline at end of file diff --git a/Pawn_Unreal/Source/Pawn/PawnModule.cpp b/Pawn_Unreal/Source/Pawn/PawnModule.cpp index 3c7e363..b582c20 100644 --- a/Pawn_Unreal/Source/Pawn/PawnModule.cpp +++ b/Pawn_Unreal/Source/Pawn/PawnModule.cpp @@ -1,24 +1,9 @@ #include "PawnModule.h" -#include "PropertyEditorModule.h" -#include "Interaction/PwnInteractableActor.h" -#include "Interaction/PwnInteractableActorCustomization.h" #include "Modules/ModuleManager.h" IMPLEMENT_PRIMARY_GAME_MODULE(FPawnModule, Pawn, "Pawn"); -void FPawnModule::StartupModule() { - FPropertyEditorModule& PropertyModule = FModuleManager::LoadModuleChecked("PropertyEditor"); - PropertyModule.RegisterCustomPropertyTypeLayout(FPwnInteractableActor::StaticStruct()->GetFName(), - FOnGetPropertyTypeCustomizationInstance::CreateStatic( - &UPwnInteractableActorCustomization::MakeInstance)); - PropertyModule.NotifyCustomizationModuleChanged(); -} +void FPawnModule::StartupModule() {} -void FPawnModule::ShutdownModule() { - if (FModuleManager::Get().IsModuleLoaded("PropertyEditor")) { - FPropertyEditorModule& PropertyModule = FModuleManager::GetModuleChecked("PropertyEditor"); - PropertyModule.UnregisterCustomPropertyTypeLayout(FPwnInteractableActor::StaticStruct()->GetFName()); - PropertyModule.NotifyCustomizationModuleChanged(); - } -} +void FPawnModule::ShutdownModule() {} diff --git a/Pawn_Unreal/Source/Pawn/Private/Interaction/PwnInteractableActorCustomization.cpp b/Pawn_Unreal/Source/PawnEditor/Customization/PwnInteractableActorCustomization.cpp similarity index 94% rename from Pawn_Unreal/Source/Pawn/Private/Interaction/PwnInteractableActorCustomization.cpp rename to Pawn_Unreal/Source/PawnEditor/Customization/PwnInteractableActorCustomization.cpp index 6498490..59c7846 100644 --- a/Pawn_Unreal/Source/Pawn/Private/Interaction/PwnInteractableActorCustomization.cpp +++ b/Pawn_Unreal/Source/PawnEditor/Customization/PwnInteractableActorCustomization.cpp @@ -1,4 +1,4 @@ -#include "Interaction/PwnInteractableActorCustomization.h" +#include "PawnEditor/Customization/PwnInteractableActorCustomization.h" #include "PropertyCustomizationHelpers.h" #include "PropertyHandle.h" diff --git a/Pawn_Unreal/Source/Pawn/Public/Interaction/PwnInteractableActorCustomization.h b/Pawn_Unreal/Source/PawnEditor/Customization/PwnInteractableActorCustomization.h similarity index 88% rename from Pawn_Unreal/Source/Pawn/Public/Interaction/PwnInteractableActorCustomization.h rename to Pawn_Unreal/Source/PawnEditor/Customization/PwnInteractableActorCustomization.h index 400c555..d394c33 100644 --- a/Pawn_Unreal/Source/Pawn/Public/Interaction/PwnInteractableActorCustomization.h +++ b/Pawn_Unreal/Source/PawnEditor/Customization/PwnInteractableActorCustomization.h @@ -2,7 +2,7 @@ #include "IPropertyTypeCustomization.h" -class PAWN_API UPwnInteractableActorCustomization : public IPropertyTypeCustomization { +class UPwnInteractableActorCustomization : public IPropertyTypeCustomization { public: static TSharedRef MakeInstance(); diff --git a/Pawn_Unreal/Source/PawnEditor/PawnEditor.Build.cs b/Pawn_Unreal/Source/PawnEditor/PawnEditor.Build.cs index 9d897c1..37026e0 100644 --- a/Pawn_Unreal/Source/PawnEditor/PawnEditor.Build.cs +++ b/Pawn_Unreal/Source/PawnEditor/PawnEditor.Build.cs @@ -35,7 +35,9 @@ public class PawnEditor : ModuleRules { "MainFrame", "PropertyEditor", "ComponentVisualizers", - "Pawn" + "EditorStyle", + "PropertyEditor", + "Pawn", }); } } \ No newline at end of file diff --git a/Pawn_Unreal/Source/PawnEditor/PawnEditorModule.cpp b/Pawn_Unreal/Source/PawnEditor/PawnEditorModule.cpp index c12fb61..b92799f 100644 --- a/Pawn_Unreal/Source/PawnEditor/PawnEditorModule.cpp +++ b/Pawn_Unreal/Source/PawnEditor/PawnEditorModule.cpp @@ -1,14 +1,26 @@ #include "PawnEditorModule.h" #include "PwnStyle.h" +#include "Customization/PwnInteractableActorCustomization.h" +#include "Interaction/PwnInteractableActor.h" #include "Modules/ModuleManager.h" IMPLEMENT_MODULE(FPawnEditorModule, PawnEditor) void FPawnEditorModule::StartupModule() { FPwnStyle::Initialize(); + FPropertyEditorModule& PropertyModule = FModuleManager::LoadModuleChecked("PropertyEditor"); + PropertyModule.RegisterCustomPropertyTypeLayout(FPwnInteractableActor::StaticStruct()->GetFName(), + FOnGetPropertyTypeCustomizationInstance::CreateStatic( + &UPwnInteractableActorCustomization::MakeInstance)); + PropertyModule.NotifyCustomizationModuleChanged(); } void FPawnEditorModule::ShutdownModule() { FPwnStyle::Shutdown(); + if (FModuleManager::Get().IsModuleLoaded("PropertyEditor")) { + FPropertyEditorModule& PropertyModule = FModuleManager::GetModuleChecked("PropertyEditor"); + PropertyModule.UnregisterCustomPropertyTypeLayout(FPwnInteractableActor::StaticStruct()->GetFName()); + PropertyModule.NotifyCustomizationModuleChanged(); + } } \ No newline at end of file