remove the ability to override wrist tracking settings from the wrist tracker component

Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp

@@ -95,9 +95,6 @@ USGWristTrackerComponent::USGWristTrackerComponent(const FObjectInitializer& Obj
     SetReceivesDecals(false);
     SetCanEverAffectNavigation(false);
 
-    bOverridePluginWristTrackingSettings = false;
-    WristTrackingSettings = FSGWristTrackingSettings{};
-
     bRight = true;
 
     DeviceVisualType = EXRVisualType::Controller;
@@ -113,29 +110,16 @@ void USGWristTrackerComponent::SetRight(const bool bInRight)
 
 const FSGWristTrackingSettings& USGWristTrackerComponent::GetWristTrackingSettings() const
 {
-    if (OverridesPluginWristTrackingSettings())
-    {
-        return WristTrackingSettings;
-    }
-
     const USGSettings* Settings{USGSettings::GetInstance()};
     if (!ensureAlwaysMsgf(Settings, TEXT("The settings subsystem has not been initialized!")))
     {
-        return WristTrackingSettings;
+        static const FSGWristTrackingSettings DummySettings;
+        return DummySettings;
     }
 
     return Settings->GetTrackingSettings().WristTrackingSettings;
 }
 
-void USGWristTrackerComponent::SetWristTrackingSettings(const FSGWristTrackingSettings& InWristTrackingSettings)
-{
-    ensureAlwaysMsgf(
-        OverridesPluginWristTrackingSettings(),
-        TEXT( "Setting WristTrackingSettings is only permitted when bOverridePluginWristTrackingSettings is enabled!"));
-
-    WristTrackingSettings = InWristTrackingSettings;
-}
-
 #if WITH_EDITOR
 void USGWristTrackerComponent::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
@@ -182,7 +166,7 @@ void USGWristTrackerComponent::TickComponent(
 
     Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
 
-    if (!!WristTrackingSettings.bDrawDebugGizmo)
+    if (!!GetWristTrackingSettings().bDrawDebugGizmo)
     {
         Pimpl->DrawDebugGizmo();
     }

Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h

@@ -102,19 +102,6 @@ private:
     UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false"))
     uint8 bRight : 1;
 
-    /**
-     * Determines whether to override the plugin's wrist tracking settings or not.
-     */
-    UPROPERTY(EditAnywhere, Category = "SenseGlove", meta=(AllowPrivateAccess="false"))
-    uint8 bOverridePluginWristTrackingSettings : 1;
-
-    /**
-     * Overrides the plugin's wrist tracking settings.
-     */
-    UPROPERTY(EditAnywhere, Category = "SenseGlove",
-        meta=(AllowPrivateAccess="false", EditCondition="bOverridePluginWristTrackingSettings", EditConditionHides))
-    FSGWristTrackingSettings WristTrackingSettings;
-
 private:
     UPROPERTY(Transient)
     EXRVisualType DeviceVisualType;
@@ -138,16 +125,6 @@ public:
 
     void SetRight(const bool bInRight);
 
-    FORCEINLINE bool OverridesPluginWristTrackingSettings() const
-    {
-        return !!bOverridePluginWristTrackingSettings;
-    }
-
-    FORCEINLINE void OverridePluginWristTrackingSettings(const bool bInOverridePluginWristTrackingSettings)
-    {
-        bOverridePluginWristTrackingSettings = bInOverridePluginWristTrackingSettings;
-    }
-
     const FSGWristTrackingSettings& GetWristTrackingSettings() const;
     void SetWristTrackingSettings(const FSGWristTrackingSettings& InWristTrackingSettings);
 

Source/SenseGloveKismet/Private/SGKismet/SGWristTrackerComponentKismetLibrary.cpp

@@ -37,31 +37,12 @@
 
 #include "SenseGlove/Components/SGWristTrackerComponent.h"
 
-bool UWristTrackerComponentKismetLibrary::OverridesPluginWristTrackingSettings(
-    const USGWristTrackerComponent* WristTrackerComponent)
-{
-    return WristTrackerComponent->OverridesPluginWristTrackingSettings();
-}
-
-void UWristTrackerComponentKismetLibrary::OverridePluginWristTrackingSettings(
-    USGWristTrackerComponent* WristTrackerComponent, const bool bInOverridePluginWristTrackingSettings)
-{
-    WristTrackerComponent->OverridePluginWristTrackingSettings(bInOverridePluginWristTrackingSettings);
-}
-
 const FSGWristTrackingSettings& UWristTrackerComponentKismetLibrary::GetWristTrackingSettings(
     const USGWristTrackerComponent* WristTrackerComponent)
 {
     return WristTrackerComponent->GetWristTrackingSettings();
 }
 
-void UWristTrackerComponentKismetLibrary::SetWristTrackingSettings(
-    USGWristTrackerComponent* WristTrackerComponent,
-    const FSGWristTrackingSettings& InWristTrackingSettings)
-{
-    WristTrackerComponent->SetWristTrackingSettings(InWristTrackingSettings);
-}
-
 bool UWristTrackerComponentKismetLibrary::IsLeft(const USGWristTrackerComponent* WristTrackerComponent)
 {
     return WristTrackerComponent->IsLeft();

Source/SenseGloveKismet/Public/SGKismet/SGWristTrackerComponentKismetLibrary.h

@@ -52,21 +52,10 @@ class SENSEGLOVEKISMET_API UWristTrackerComponentKismetLibrary final : public US
     GENERATED_BODY()
 
 public:
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static bool OverridesPluginWristTrackingSettings(const USGWristTrackerComponent* WristTrackerComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void OverridePluginWristTrackingSettings(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                                    bool bInOverridePluginWristTrackingSettings);
-
     UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
     static const FSGWristTrackingSettings& GetWristTrackingSettings(
         const USGWristTrackerComponent* WristTrackerComponent);
 
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void SetWristTrackingSettings(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                         const FSGWristTrackingSettings& InWristTrackingSettings);
-
     UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
     static bool IsLeft(const USGWristTrackerComponent* WristTrackerComponent);