Support Mass Framwork

SodaSim.uplugin

@@ -65,6 +65,10 @@
 		{
 			"Name": "GeometryProcessing",
 			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true		
 		}
 	]
 

Source/RuntimeEditor/Private/RuntimeEditorModule.cpp

@@ -257,6 +257,8 @@ void FRuntimeEditorModule::StartupModule()
 	RegisterObjectCustomizations();
 	RegisterPropertyTypeCustomizations();
 
+	StructViewerModule.StartupModule();
+
 	Documentation = soda::FDocumentation::Create();
 	FMultiBoxSettings::ToolTipConstructor = FMultiBoxSettings::FConstructToolTip::CreateLambda([this](const TAttribute<FText>& ToolTipText, const TSharedPtr<SWidget>& OverrideContent, const TSharedPtr<const FUICommandInfo>& Action) 
 	{
@@ -298,6 +300,8 @@ void FRuntimeEditorModule::ShutdownModule()
 	AllSinglePropertyViews.Empty();
 
 	soda::SClassViewer::DestroyClassHierarchy();
+
+	StructViewerModule.ShutdownModule();
 }
 
 TSharedRef<SWindow> FRuntimeEditorModule::CreateFloatingDetailsView(const TArray< UObject* >& InObjects, bool bIsLockable)

Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.cpp

@@ -13,11 +13,13 @@
 #include "UObject/ConstructorHelpers.h"
 //#include "Editor.h"
 
+#include "RuntimeClassViewer/ClassViewerFilter.h"
 #include "RuntimeMetaData.h"
+#include "RuntimeClassViewer/SClassViewer.h"
 
 namespace soda
 {
-/*
+
 class FPropertyEditorInlineClassFilter : public IClassViewerFilter
 {
 public:
@@ -71,7 +73,7 @@ class FPropertyEditorInlineClassFilter : public IClassViewerFilter
 		return false;
 	}
 };
-*/
+
 
 void SPropertyEditorEditInline::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
 {
@@ -83,7 +85,7 @@ void SPropertyEditorEditInline::Construct( const FArguments& InArgs, const TShar
 	[
 		SAssignNew(ComboButton, SComboButton)
 		.IsEnabled(this, &SPropertyEditorEditInline::IsValueEnabled, WeakHandlePtr)
-		//.OnGetMenuContent(this, &SPropertyEditorEditInline::GenerateClassPicker)
+		.OnGetMenuContent(this, &SPropertyEditorEditInline::GenerateClassPicker)
 		.ContentPadding(0)
 		.ToolTipText(InPropertyEditor, &FPropertyEditor::GetValueAsText )
 		.ButtonContent()
@@ -169,7 +171,7 @@ bool SPropertyEditorEditInline::IsClassAllowed( UClass* CheckClass, bool bAllowA
 	check(CheckClass);
 	return PropertyEditorHelpers::IsEditInlineClassAllowed( CheckClass, bAllowAbstract ) &&  CheckClass->HasAnyClassFlags(CLASS_EditInlineNew);
 }
-/*
+
 TSharedRef<SWidget> SPropertyEditorEditInline::GenerateClassPicker()
 {
 	FClassViewerInitializationOptions Options;
@@ -201,9 +203,9 @@ TSharedRef<SWidget> SPropertyEditorEditInline::GenerateClassPicker()
 
 	FOnClassPicked OnPicked( FOnClassPicked::CreateRaw( this, &SPropertyEditorEditInline::OnClassPicked ) );
 
-	return FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassViewer(Options, OnPicked);
+	return SNew(SClassViewer, Options).OnClassPickedDelegate(OnPicked); //FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassViewer(Options, OnPicked);
 }
-*/
+
 void SPropertyEditorEditInline::OnClassPicked(UClass* InClass)
 {
 	TArray<FObjectBaseAddress> ObjectsToModify;

Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h

@@ -70,7 +70,7 @@ class SPropertyEditorEditInline : public SCompoundWidget
 	 *
 	 * @return The Class Picker widget.
 	 */
-	//TSharedRef<SWidget> GenerateClassPicker();
+	TSharedRef<SWidget> GenerateClassPicker();
 
 	/** 
 	 * Callback function from the Class Picker for when a Class is picked.

Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.cpp

@@ -7,8 +7,8 @@
 #include "Widgets/Layout/SBox.h"
 
 //#include "DragAndDrop/AssetDragDropOp.h"
-//#include "StructViewerModule.h"
-//#include "StructViewerFilter.h"
+#include "RuntimeStructViewer/StructViewerModule.h"
+#include "RuntimeStructViewer/StructViewerFilter.h"
 #include "Engine/UserDefinedStruct.h"
 
 #include "RuntimeMetaData.h"
@@ -18,15 +18,15 @@
 namespace soda
 {
 
-class FPropertyEditorStructFilter/* : public IStructViewerFilter*/
+class FPropertyEditorStructFilter : public IStructViewerFilter
 {
 public:
 	/** The meta struct for the property that classes must be a child-of. */
 	const UScriptStruct* MetaStruct = nullptr;
 
 	// TODO: Have a flag controlling whether we allow UserDefinedStructs, even when a MetaClass is set (as they cannot support inheritance, but may still be allowed (eg, data tables))?
 
-	virtual bool IsStructAllowed(/*const FStructViewerInitializationOptions& InInitOptions, */const UScriptStruct* InStruct/*, TSharedRef<FStructViewerFilterFuncs> InFilterFuncs*/) //override
+	virtual bool IsStructAllowed(const FStructViewerInitializationOptions& InInitOptions, const UScriptStruct* InStruct, TSharedRef<FStructViewerFilterFuncs> InFilterFuncs) override
 	{
 		if (InStruct->IsA<UUserDefinedStruct>())
 		{
@@ -38,7 +38,7 @@ class FPropertyEditorStructFilter/* : public IStructViewerFilter*/
 		return !MetaStruct || InStruct->IsChildOf(MetaStruct);
 	}
 
-	virtual bool IsUnloadedStructAllowed(/*const FStructViewerInitializationOptions& InInitOptions, const FName InStructPath, TSharedRef<FStructViewerFilterFuncs> InFilterFuncs*/) //override
+	virtual bool IsUnloadedStructAllowed(const FStructViewerInitializationOptions& InInitOptions, const FSoftObjectPath& InStructPath, TSharedRef<FStructViewerFilterFuncs> InFilterFuncs) override
 	{
 		// User Defined Structs don't support inheritance, so only include them if we have don't a MetaStruct set
 		return MetaStruct == nullptr;
@@ -121,7 +121,7 @@ void SPropertyEditorStruct::Construct(const FArguments& InArgs, const TSharedPtr
 	}
 
 	SAssignNew(ComboButton, SComboButton)
-		//.OnGetMenuContent(this, &SPropertyEditorStruct::GenerateStructPicker)
+		.OnGetMenuContent(this, &SPropertyEditorStruct::GenerateStructPicker)
 		.ContentPadding(FMargin(2.0f, 2.0f))
 		.ToolTipText(this, &SPropertyEditorStruct::GetDisplayValue)
 		.ButtonContent()
@@ -180,7 +180,6 @@ FText SPropertyEditorStruct::GetDisplayValue() const
 	}
 }
 
-/*
 TSharedRef<SWidget> SPropertyEditorStruct::GenerateStructPicker()
 {
 
@@ -210,12 +209,11 @@ TSharedRef<SWidget> SPropertyEditorStruct::GenerateStructPicker()
 			.AutoHeight()
 			.MaxHeight(500)
 			[
-				FModuleManager::LoadModuleChecked<FStructViewerModule>("StructViewer").CreateStructViewer(Options, OnPicked)
+				FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor").GetStructViewer().CreateStructViewer(Options, OnPicked)
 			]			
 		];
 
 }
-*/
 
 void SPropertyEditorStruct::OnStructPicked(const UScriptStruct* InStruct)
 {

Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h

@@ -71,7 +71,7 @@ class SPropertyEditorStruct : public SCompoundWidget
 	 *
 	 * @return The Struct Picker widget.
 	 */
-	//TSharedRef<SWidget> GenerateStructPicker();
+	TSharedRef<SWidget> GenerateStructPicker();
 
 	/** 
 	 * Callback function from the Struct Picker for when a struct is picked.