Plugin updated for Noesis SDK 3.1.2

Noesis · Dec 22, 2021 · 00aa427 · 00aa427
1 parent 7189ee1
commit 00aa427
Show file tree

Hide file tree

Showing 59 changed files with 1,084 additions and 342 deletions.
diff --git a/Source/NoesisBlueprint/Classes/K2Node_NoesisAssignAndNotify.h b/Source/NoesisBlueprint/Classes/K2Node_NoesisAssignAndNotify.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// BlueprintGraph includes
+#include "K2Node_Variable.h"
+
 // Generated header include
 #include "K2Node_NoesisAssignAndNotify.generated.h"
 

diff --git a/Source/NoesisBlueprint/Private/K2Node_NoesisAssignAndNotify.cpp b/Source/NoesisBlueprint/Private/K2Node_NoesisAssignAndNotify.cpp
@@ -5,6 +5,35 @@
 
 #include "K2Node_NoesisAssignAndNotify.h"
 
+// BlueprintGraph includes
+#include "BlueprintActionDatabaseRegistrar.h"
+#include "BlueprintFieldNodeSpawner.h"
+#include "K2Node_CallFunction.h"
+#include "K2Node_IfThenElse.h"
+#include "K2Node_Self.h"
+#include "K2Node_VariableGet.h"
+#include "K2Node_VariableSet.h"
+
+// EditorStyle includes
+#include "Classes/EditorStyleSettings.h"
+
+// Engine includes
+#include "ObjectEditorUtils.h"
+#include "Kismet/KismetMathLibrary.h"
+#include "Kismet/KismetStringLibrary.h"
+#include "Kismet/KismetTextLibrary.h"
+
+// KismetCompiler includes
+#include "KismetCompiler.h"
+
+// NoesisRuntime includes
+#include "NoesisFunctionLibrary.h"
+
+// UnrealEd includes
+#include "EditorCategoryUtils.h"
+#include "Editor/EditorEngine.h"
+#include "Kismet2/BlueprintEditorUtils.h"
+
 #define LOCTEXT_NAMESPACE "NoesisEditorModule"
 
 static FText GetBaseTooltip(FName VarName)

diff --git a/Source/NoesisBlueprint/Private/NoesisBlueprintModule.cpp b/Source/NoesisBlueprint/Private/NoesisBlueprintModule.cpp
@@ -5,6 +5,9 @@
 
 #include "NoesisBlueprintModule.h"
 
+// Core includes
+#include "Modules/ModuleManager.h"
+
 class FNoesisBlueprintModule : public INoesisBlueprintModuleInterface
 {
 public:

diff --git a/Source/NoesisBlueprint/Private/NoesisBlueprintPrivatePCH.h b/Source/NoesisBlueprint/Private/NoesisBlueprintPrivatePCH.h
@@ -40,8 +40,6 @@
 #include "KismetCompiler.h"
 
 
-DECLARE_LOG_CATEGORY_EXTERN(LogNoesisBlueprint, Verbose, All);
-
 #include "NoesisRuntime.h"
 
 #include "NoesisBlueprintClasses.h"

diff --git a/Source/NoesisBlueprint/Public/NoesisBlueprintModule.h b/Source/NoesisBlueprint/Public/NoesisBlueprintModule.h
@@ -5,6 +5,12 @@
 
 #pragma once
 
+// Core includes
+#include "Logging/LogMacros.h"
+#include "Modules/ModuleInterface.h"
+
+DECLARE_LOG_CATEGORY_EXTERN(LogNoesisBlueprint, VeryVerbose, All);
+
 #define NOESISBLUEPRINT_MODULE_NAME "NoesisBlueprint"
 
 class NOESISBLUEPRINT_API INoesisBlueprintModuleInterface : public IModuleInterface

diff --git a/Source/NoesisEditor/Classes/NoesisBlueprintFactory.h b/Source/NoesisEditor/Classes/NoesisBlueprintFactory.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// UnrealEd includes
+#include "Factories/Factory.h"
+
 // Generated header include
 #include "NoesisBlueprintFactory.generated.h"
 

diff --git a/Source/NoesisEditor/Classes/NoesisXamlFactory.h b/Source/NoesisEditor/Classes/NoesisXamlFactory.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// UnrealEd includes
+#include "Factories/Factory.h"
+
 // Generated header include
 #include "NoesisXamlFactory.generated.h"
 

diff --git a/Source/NoesisEditor/Classes/NoesisXamlReimportFactory.h b/Source/NoesisEditor/Classes/NoesisXamlReimportFactory.h
@@ -5,6 +5,12 @@
 
 #pragma once
 
+// UnrealEd includes
+#include "EditorReimportHandler.h"
+
+// NoesisEditor includes
+#include "NoesisXamlFactory.h"
+
 // Generated header include
 #include "NoesisXamlReimportFactory.generated.h"
 

diff --git a/Source/NoesisEditor/Classes/NoesisXamlThumbnailRenderer.h b/Source/NoesisEditor/Classes/NoesisXamlThumbnailRenderer.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// UnrealEd includes
+#include "ThumbnailRendering/DefaultSizedThumbnailRenderer.h"
+
 // Generated header include
 #include "NoesisXamlThumbnailRenderer.generated.h"
 

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintApplicationMode.h b/Source/NoesisEditor/Private/NoesisBlueprintApplicationMode.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// Kismet includes
+#include "BlueprintEditorModes.h"
+
 class FNoesisBlueprintApplicationMode : public FBlueprintEditorApplicationMode
 {
 public:

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintApplicationModes.h b/Source/NoesisEditor/Private/NoesisBlueprintApplicationModes.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// Core includes
+#include "CoreMinimal.h"
+
 struct FNoesisBlueprintApplicationModes
 {
 	static const FName PreviewMode;

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintAssetTypeActions.cpp b/Source/NoesisEditor/Private/NoesisBlueprintAssetTypeActions.cpp
@@ -5,9 +5,15 @@
 
 #include "NoesisBlueprintAssetTypeActions.h"
 
+// Core includes
+#include "Misc/MessageDialog.h"
+
 // NoesisEditor includes
 #include "NoesisBlueprintEditor.h"
 
+// NoesisRuntime includes
+#include "NoesisBlueprint.h"
+
 #define LOCTEXT_NAMESPACE "NoesisEditorModule"
 
 FNoesisBlueprintAssetTypeActions::FNoesisBlueprintAssetTypeActions(EAssetTypeCategories::Type InCategories)

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintAssetTypeActions.h b/Source/NoesisEditor/Private/NoesisBlueprintAssetTypeActions.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// AssetTools includes
+#include "AssetTypeActions_Base.h"
+
 class FNoesisBlueprintAssetTypeActions : public FAssetTypeActions_Base
 {
 public:

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintCompiler.cpp b/Source/NoesisEditor/Private/NoesisBlueprintCompiler.cpp
@@ -8,6 +8,9 @@
 // NoesisEditor includes
 #include "NoesisBlueprintCompilerContext.h"
 
+// NoesisRuntime includes
+#include "NoesisBlueprint.h"
+
 bool FNoesisBlueprintCompiler::CanCompile(const UBlueprint* Blueprint)
 {
 	return Blueprint->IsA(UNoesisBlueprint::StaticClass());

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintCompiler.h b/Source/NoesisEditor/Private/NoesisBlueprintCompiler.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// KismetCompiler includes
+#include "KismetCompilerModule.h"
+
 class FNoesisBlueprintCompiler : public IBlueprintCompiler
 {
 	// IBlueprintCompiler interface

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintCompilerContext.cpp b/Source/NoesisEditor/Private/NoesisBlueprintCompilerContext.cpp
@@ -8,6 +8,11 @@
 // UnrealEd includes
 #include "Kismet2/KismetReinstanceUtilities.h"
 
+// NoesisRuntime includes
+#include "NoesisBlueprint.h"
+#include "NoesisBlueprintGeneratedClass.h"
+#include "NoesisInstance.h"
+
 FNoesisBlueprintCompilerContext::FNoesisBlueprintCompilerContext(UNoesisBlueprint* NoesisBlueprint, FCompilerResultsLog& Results, const FKismetCompilerOptions& CompilerOptions)
 	: Super(NoesisBlueprint, Results, CompilerOptions)
 {
@@ -33,11 +38,6 @@ void FNoesisBlueprintCompilerContext::SpawnNewClass(const FString& NewClassName)
 	NewClass = NoesisBlueprintGeneratedClass;
 }
 
-void FNoesisBlueprintCompilerContext::CleanAndSanitizeClass(UBlueprintGeneratedClass* ClassToClean, UObject*& InOutOldCDO)
-{
-	Super::CleanAndSanitizeClass(ClassToClean, InOutOldCDO);
-}
-
 void FNoesisBlueprintCompilerContext::EnsureProperGeneratedClass(UClass*& TargetUClass)
 {
 	if (TargetUClass && !((UObject*)TargetUClass)->IsA(UNoesisBlueprintGeneratedClass::StaticClass()))
@@ -47,28 +47,15 @@ void FNoesisBlueprintCompilerContext::EnsureProperGeneratedClass(UClass*& Target
 	}
 }
 
-void FNoesisBlueprintCompilerContext::CreateClassVariablesFromBlueprint()
+void FNoesisBlueprintCompilerContext::CopyTermDefaultsToDefaultObject(UObject* DefaultObject)
 {
-	Super::CreateClassVariablesFromBlueprint();
-}
-
-void FNoesisBlueprintCompilerContext::CreateFunctionList()
-{
-	Super::CreateFunctionList();
-}
+	UNoesisInstance* DefaultInstance = Cast<UNoesisInstance>(DefaultObject);
 
-void FNoesisBlueprintCompilerContext::FinishCompilingClass(UClass* Class)
-{
-	Super::FinishCompilingClass(Class);
-
-	UNoesisBlueprint* NoesisBlueprint = CastChecked<UNoesisBlueprint>(Blueprint);
-	UNoesisBlueprintGeneratedClass* NoesisBlueprintGeneratedClass = CastChecked<UNoesisBlueprintGeneratedClass>(Class);
-	NoesisBlueprintGeneratedClass->BaseXaml = NoesisBlueprint->BaseXaml;
-	NoesisBlueprintGeneratedClass->EnablePPAA = NoesisBlueprint->EnablePPAA;
-	NoesisBlueprintGeneratedClass->TessellationQuality = NoesisBlueprint->TessellationQuality;
-}
-
-bool FNoesisBlueprintCompilerContext::ValidateGeneratedClass(UBlueprintGeneratedClass* Class)
-{
-	return Super::ValidateGeneratedClass(Class);
+	if (DefaultInstance != nullptr)
+	{
+		UNoesisBlueprint* NoesisBlueprint = CastChecked<UNoesisBlueprint>(Blueprint);
+		DefaultInstance->BaseXaml = NoesisBlueprint->BaseXaml;
+		DefaultInstance->EnablePPAA = NoesisBlueprint->EnablePPAA;
+		DefaultInstance->TessellationQuality = NoesisBlueprint->TessellationQuality;
+	}
 }
diff --git a/Source/NoesisEditor/Private/NoesisBlueprintCompilerContext.h b/Source/NoesisEditor/Private/NoesisBlueprintCompilerContext.h
@@ -5,23 +5,22 @@
 
 #pragma once
 
+// KismetCompiler includes
+#include "KismetCompiler.h"
+
 class FNoesisBlueprintCompilerContext : public FKismetCompilerContext
 {
 protected:
 
 	typedef FKismetCompilerContext Super;
 
 public:
-	FNoesisBlueprintCompilerContext(UNoesisBlueprint* SourceSketch, FCompilerResultsLog& InMessageLog, const FKismetCompilerOptions& InCompilerOptions);
+	FNoesisBlueprintCompilerContext(class UNoesisBlueprint* SourceSketch, FCompilerResultsLog& InMessageLog, const FKismetCompilerOptions& InCompilerOptions);
 	virtual ~FNoesisBlueprintCompilerContext();
 
 	// FKismetCompilerContext interface
 	virtual void SpawnNewClass(const FString& NewClassName) override;
-	virtual void CleanAndSanitizeClass(UBlueprintGeneratedClass* ClassToClean, UObject*& OldCDO) override;
 	virtual void EnsureProperGeneratedClass(UClass*& TargetClass) override;
-	virtual void CreateClassVariablesFromBlueprint() override;
-	virtual void CreateFunctionList() override;
-	virtual void FinishCompilingClass(UClass* Class) override;
-	virtual bool ValidateGeneratedClass(UBlueprintGeneratedClass* Class) override;
+	virtual void CopyTermDefaultsToDefaultObject(UObject* DefaultObject) override;
 	// End of FKismetCompilerContext interface
 };
diff --git a/Source/NoesisEditor/Private/NoesisBlueprintEditor.h b/Source/NoesisEditor/Private/NoesisBlueprintEditor.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// Kismet includes
+#include "BlueprintEditor.h"
+
 class FNoesisBlueprintEditor : public FBlueprintEditor
 {
 public:

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintEditorCommands.h b/Source/NoesisEditor/Private/NoesisBlueprintEditorCommands.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+// Slate includes
+#include "Framework/Commands/Commands.h"
+
 class FNoesisBlueprintEditorCommands : public TCommands<FNoesisBlueprintEditorCommands>
 {
 public:

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintEditorToolbar.cpp b/Source/NoesisEditor/Private/NoesisBlueprintEditorToolbar.cpp
@@ -5,12 +5,26 @@
 
 #include "NoesisBlueprintEditorToolbar.h"
 
+// Kismet includes
+#include "BlueprintEditorContext.h"
+#include "WorkflowOrientedApp/SModeWidget.h"
+
 // NoesisEditor includes
 #include "NoesisBlueprintEditor.h"
 #include "NoesisBlueprintApplicationModes.h"
 #include "SBlueprintModeSeparator.h"
 #include "NoesisBlueprintEditorCommands.h"
 
+// Slate includes
+#include "Widgets/Layout/SSpacer.h"
+
+// ToolMenus includes
+#include "ToolMenuSection.h"
+#include "ToolMenu.h"
+
+// UnrealEd includes
+#include "Kismet2/BlueprintEditorUtils.h"
+
 #define LOCTEXT_NAMESPACE "NoesisEditorModule"
 
 FNoesisBlueprintEditorToolbar::FNoesisBlueprintEditorToolbar(TSharedPtr<FNoesisBlueprintEditor>& InBlueprintEditor)

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintEditorToolbar.h b/Source/NoesisEditor/Private/NoesisBlueprintEditorToolbar.h
@@ -5,6 +5,12 @@
 
 #pragma once
 
+// Core includes
+#include "CoreMinimal.h"
+
+// Slate includes
+#include "Framework/MultiBox/MultiBoxExtender.h"
+
 class FNoesisBlueprintEditorToolbar : public TSharedFromThis<FNoesisBlueprintEditorToolbar>
 {
 
@@ -13,7 +19,7 @@ class FNoesisBlueprintEditorToolbar : public TSharedFromThis<FNoesisBlueprintEdi
 
 	void AddNoesisBlueprintEditorModesToolbar(TSharedPtr<FExtender> Extender);
 
-	void AddNoesisControls(UToolMenu* InMenu);
+	void AddNoesisControls(class UToolMenu* InMenu);
 
 public:
 	/**  */

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintFactory.cpp b/Source/NoesisEditor/Private/NoesisBlueprintFactory.cpp
@@ -5,9 +5,20 @@
 
 #include "NoesisBlueprintFactory.h"
 
+// Core includes
+#include "Misc/MessageDialog.h"
+
 // NoesisEditor includes
 #include "NoesisEditorModule.h"
 
+// NoesisRuntime includes
+#include "NoesisBlueprint.h"
+#include "NoesisBlueprintGeneratedClass.h"
+#include "NoesisInstance.h"
+
+// UnrealEd includes
+#include "Kismet2/KismetEditorUtilities.h"
+
 #define LOCTEXT_NAMESPACE "NoesisEditorModule"
 
 UNoesisBlueprintFactory::UNoesisBlueprintFactory(const FObjectInitializer& ObjectInitializer)

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintGraphApplicationMode.cpp b/Source/NoesisEditor/Private/NoesisBlueprintGraphApplicationMode.cpp
@@ -5,6 +5,10 @@
 
 #include "NoesisBlueprintGraphApplicationMode.h"
 
+// Kismet includes
+#include "BlueprintEditorTabs.h"
+#include "SBlueprintEditorToolbar.h"
+
 // NoesisEditor includes
 #include "NoesisBlueprintEditor.h"
 #include "NoesisBlueprintApplicationModes.h"

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintPreviewApplicationMode.cpp b/Source/NoesisEditor/Private/NoesisBlueprintPreviewApplicationMode.cpp
@@ -5,6 +5,9 @@
 
 #include "NoesisBlueprintPreviewApplicationMode.h"
 
+// Kismet includes
+#include "SBlueprintEditorToolbar.h"
+
 // NoesisEditor includes
 #include "NoesisBlueprintEditor.h"
 #include "NoesisBlueprintApplicationModes.h"

diff --git a/Source/NoesisEditor/Private/NoesisBlueprintPreviewApplicationMode.h b/Source/NoesisEditor/Private/NoesisBlueprintPreviewApplicationMode.h
@@ -7,6 +7,9 @@
 
 #include "NoesisBlueprintApplicationMode.h"
 
+// Core includes
+#include "CoreMinimal.h"
+
 class FNoesisBlueprintPreviewApplicationMode : public FNoesisBlueprintApplicationMode
 {
 public: