Skip to content
Snippets Groups Projects
Commit 8ba88b56 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Made settings a child of DemoConfig.

parent 78d1d19a
No related branches found
No related tags found
2 merge requests!13Draft: Improve walking implementation,!9Draft: LiveLink capabilities and 4.27 config assets.
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
#include "LiveLinkClient.h" #include "LiveLinkClient.h"
#include "RWTHVRToolkitSettings.h" #include "RWTHVRToolkitSettings.h"
#if WITH_EDITOR
#include "ISettingsModule.h"
#include "ISettingsSection.h"
#endif
#define LOCTEXT_NAMESPACE "FRWTHVRToolkitModule" #define LOCTEXT_NAMESPACE "FRWTHVRToolkitModule"
void FRWTHVRToolkitModule::StartupModule () void FRWTHVRToolkitModule::StartupModule ()
...@@ -18,32 +13,13 @@ void FRWTHVRToolkitModule::StartupModule () ...@@ -18,32 +13,13 @@ void FRWTHVRToolkitModule::StartupModule ()
FCoreDelegates::OnFEngineLoopInitComplete.AddRaw(this, &FRWTHVRToolkitModule::OnEngineLoopInitComplete); FCoreDelegates::OnFEngineLoopInitComplete.AddRaw(this, &FRWTHVRToolkitModule::OnEngineLoopInitComplete);
#if WITH_EDITOR #if WITH_EDITOR
if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings")) GetMutableDefault<URWTHVRToolkitSettings>()->OnSettingChanged().AddRaw(this, &FRWTHVRToolkitModule::HandleSettingsSaved);
{
ISettingsSectionPtr SettingsSection = SettingsModule->RegisterSettings(
"Project", "Plugins", "RWTH VR Toolkit",
LOCTEXT("RWTHVRToolkitSettingsName", "RWTH VR Toolkit"),
LOCTEXT("RWTHVRToolkitSettingsDescription", "Configure the RWTH VR Toolkit."),
GetMutableDefault<URWTHVRToolkitSettings>()
);
if (SettingsSection.IsValid())
{
SettingsSection->OnModified().BindRaw(this, &FRWTHVRToolkitModule::HandleSettingsSaved);
}
}
#endif #endif
} }
void FRWTHVRToolkitModule::ShutdownModule() void FRWTHVRToolkitModule::ShutdownModule()
{ {
ConsoleActivation.Unregister(); ConsoleActivation.Unregister();
#if WITH_EDITOR
if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
{
SettingsModule->UnregisterSettings("Project", "Plugins", "RWTH VR Toolkit");
}
#endif
} }
void FRWTHVRToolkitModule::OnEngineLoopInitComplete() void FRWTHVRToolkitModule::OnEngineLoopInitComplete()
...@@ -51,10 +27,9 @@ void FRWTHVRToolkitModule::OnEngineLoopInitComplete() ...@@ -51,10 +27,9 @@ void FRWTHVRToolkitModule::OnEngineLoopInitComplete()
ApplyDefaultPreset(); ApplyDefaultPreset();
} }
bool FRWTHVRToolkitModule::HandleSettingsSaved() void FRWTHVRToolkitModule::HandleSettingsSaved(UObject* Settings, FPropertyChangedEvent& PropertyChangedEvent)
{ {
ApplyDefaultPreset(); ApplyDefaultPreset();
return true;
} }
void FRWTHVRToolkitModule::ApplyDefaultPreset() void FRWTHVRToolkitModule::ApplyDefaultPreset()
......
...@@ -16,7 +16,7 @@ public: ...@@ -16,7 +16,7 @@ public:
private: private:
void OnEngineLoopInitComplete(); void OnEngineLoopInitComplete();
bool HandleSettingsSaved(); void HandleSettingsSaved(UObject* Settings, FPropertyChangedEvent& PropertyChangedEvent);
void ApplyDefaultPreset(); void ApplyDefaultPreset();
FActivateConsoleInShipping ConsoleActivation; FActivateConsoleInShipping ConsoleActivation;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "Engine/EngineTypes.h" #include "Engine/EngineTypes.h"
#include "Templates/SubclassOf.h" #include "Templates/SubclassOf.h"
#include "LiveLinkPreset.h" #include "LiveLinkPreset.h"
#include "Utility/DemoConfig.h"
#include "RWTHVRToolkitSettings.generated.h" #include "RWTHVRToolkitSettings.generated.h"
...@@ -16,11 +17,18 @@ ...@@ -16,11 +17,18 @@
/** /**
* Settings for LiveLink. * Settings for LiveLink.
*/ */
UCLASS(config=Game, defaultconfig) UCLASS(config=RWTHVRToolkit, defaultconfig)
class RWTHVRTOOLKIT_API URWTHVRToolkitSettings : public UObject class RWTHVRTOOLKIT_API URWTHVRToolkitSettings : public UDemoConfig
{ {
GENERATED_BODY() GENERATED_BODY()
virtual FName GetCategoryName() const override { return "Plugins"; };
#if WITH_EDITOR
virtual FText GetSectionText() const override { return FText::FromString("RWTH VR Toolkit"); };
#endif
public: public:
URWTHVRToolkitSettings() = default; URWTHVRToolkitSettings() = default;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment