Merge branch 'dev' into main

Author: VolcanicArts

Logo.png

@@ -6,12 +6,12 @@
     <ApplicationIcon>game.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Version>0.0.0</Version>
-    <FileVersion>2022.1211.1</FileVersion>
+    <FileVersion>2022.1218.0</FileVersion>
     <Title>VRCOSC</Title>
     <Authors>VolcanicArts</Authors>
     <Company>VolcanicArts</Company>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2022.1211.1</AssemblyVersion>
+    <AssemblyVersion>2022.1218.0</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\VRCOSC.Game\VRCOSC.Game.csproj" />

VRCOSC.Desktop/VRCOSC.Desktop.csproj

@@ -28,6 +28,7 @@ protected override void InitialiseDefaults()
         SetDefault(VRCOSCSetting.UpdateRepo, @"https://github.com/VolcanicArts/VRCOSC");
         SetDefault(VRCOSCSetting.Theme, ColourTheme.Dark);
         SetDefault(VRCOSCSetting.ChatBoxTimeSpan, 1500);
+        SetDefault(VRCOSCSetting.AutoStopOpenVR, false);
     }
 }
 
@@ -41,5 +42,6 @@ public enum VRCOSCSetting
     UpdateMode,
     UpdateRepo,
     Theme,
-    ChatBoxTimeSpan
+    ChatBoxTimeSpan,
+    AutoStopOpenVR
 }

VRCOSC.Game.Tests/Tests/TimedTaskTests.cs

@@ -79,9 +79,6 @@ private AttributeCard generateCard(ModuleAttribute attributeData)
 
     private AttributeCard generateListCard(ModuleAttributeList attributeData)
     {
-        if (attributeData.Type == typeof(int))
-            return new IntTextAttributeCardList(attributeData);
-
         if (attributeData.Type == typeof(string))
             return new TextAttributeCardList(attributeData);
 

VRCOSC.Game/Config/VRCOSCConfigManager.cs

@@ -1,6 +1,7 @@
 // Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
 // See the LICENSE file in the repository root for full license text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -134,7 +135,10 @@ protected virtual void SetDefault()
 
     protected void UpdateResetToDefault(bool show)
     {
-        resetToDefault.FadeTo(show ? 1 : 0, 200, Easing.OutQuart);
+        var newAlpha = show ? 1 : 0;
+        if (Math.Abs(resetToDefault.Alpha - newAlpha) < 0.01f) return;
+
+        resetToDefault.FadeTo(newAlpha, 200, Easing.OutQuart);
     }
 
     #region Graphics

VRCOSC.Game/Constants.cs

@@ -1,7 +1,6 @@
 // Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
 // See the LICENSE file in the repository root for full license text.
 
-using System;
 using osu.Framework.Bindables;
 using VRCOSC.Game.Modules;
 
@@ -10,53 +9,34 @@ namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes;
 public abstract partial class AttributeCardSingle : AttributeCard
 {
     protected new readonly ModuleAttributeSingle AttributeData;
-    protected virtual bool ShouldLimitSaves => false;
-
-    private DateTimeOffset lastUpdateTime;
-    private readonly TimeSpan timeUntilSave = TimeSpan.FromSeconds(0.5f);
-
-    private object lastValue = null!;
 
     protected AttributeCardSingle(ModuleAttributeSingle attributeData)
         : base(attributeData)
     {
         AttributeData = attributeData;
-        lastUpdateTime = DateTimeOffset.Now;
     }
 
     protected override void LoadComplete()
     {
-        AttributeData.Attribute.BindValueChanged(e => Schedule(performAttributeUpdate, e), true);
-        lastValue = AttributeData.Attribute.Value;
-    }
-
-    protected override void Update()
-    {
-        if (lastUpdateTime + timeUntilSave < DateTimeOffset.Now && !AttributeData.Attribute.Value.Equals(lastValue))
-        {
-            AttributeData.Attribute.Value = lastValue;
-        }
+        AttributeData.Attribute.BindValueChanged(onAttributeUpdate, true);
     }
 
-    private void performAttributeUpdate(ValueChangedEvent<object> e)
+    private void onAttributeUpdate(ValueChangedEvent<object> e)
     {
-        UpdateValues(e.NewValue);
         UpdateResetToDefault(!AttributeData.IsDefault());
     }
 
-    protected virtual void UpdateValues(object value)
+    protected virtual void UpdateAttribute(object value)
     {
-        lastValue = value;
+        //Specifically check for equal values here to stop memory allocations from setting the bindable's value
+        if (value == AttributeData.Attribute.Value) return;
 
-        if (ShouldLimitSaves)
-            lastUpdateTime = DateTimeOffset.Now;
-        else
-            AttributeData.Attribute.Value = value;
+        AttributeData.Attribute.Value = value;
     }
 
     protected override void Dispose(bool isDisposing)
     {
         base.Dispose(isDisposing);
-        AttributeData.Attribute.ValueChanged -= performAttributeUpdate;
+        AttributeData.Attribute.ValueChanged -= onAttributeUpdate;
     }
 }

VRCOSC.Game/Graphics/ModuleEditing/AttributeFlow.cs

@@ -27,19 +27,20 @@ private void load()
             Anchor = Anchor.TopCentre,
             Origin = Anchor.TopCentre,
             RelativeSizeAxes = Axes.X,
-            Items = Enum.GetValues(typeof(T)).Cast<T>()
+            Items = Enum.GetValues(typeof(T)).Cast<T>(),
+            Current = { Value = (T)AttributeData.Attribute.Value }
         });
     }
 
     protected override void LoadComplete()
     {
         base.LoadComplete();
-        dropdown.Current.ValueChanged += e => UpdateValues(e.NewValue);
+        dropdown.Current.ValueChanged += e => UpdateAttribute(e.NewValue);
     }
 
-    protected override void UpdateValues(object value)
+    protected override void SetDefault()
     {
-        base.UpdateValues(value);
-        dropdown.Current.Value = (T)value;
+        base.SetDefault();
+        dropdown.Current.Value = (T)AttributeData.Attribute.Value;
     }
 }

VRCOSC.Game/Graphics/ModuleEditing/Attributes/AttributeCard.cs

@@ -17,6 +17,7 @@ public FloatSliderAttributeCard(ModuleAttributeSingleWithBounds attributeData)
     {
         MinValue = (float)AttributeDataWithBounds.MinValue,
         MaxValue = (float)AttributeDataWithBounds.MaxValue,
-        Precision = 0.01f
+        Precision = 0.01f,
+        Value = (float)AttributeData.Attribute.Value
     };
 }

VRCOSC.Game/Graphics/ModuleEditing/Attributes/AttributeCardSingle.cs

@@ -17,6 +17,7 @@ public IntSliderAttributeCard(ModuleAttributeSingleWithBounds attributeData)
     {
         MinValue = (int)AttributeDataWithBounds.MinValue,
         MaxValue = (int)AttributeDataWithBounds.MaxValue,
-        Precision = 1
+        Precision = 1,
+        Value = (int)AttributeData.Attribute.Value
     };
 }

VRCOSC.Game/Graphics/ModuleEditing/Attributes/Dropdown/DropdownAttributeCard.cs

@@ -41,13 +41,13 @@ private void load()
     protected override void LoadComplete()
     {
         base.LoadComplete();
-        slider.SlowedCurrent.ValueChanged += e => UpdateValues(e.NewValue);
+        slider.Current.ValueChanged += e => UpdateAttribute(e.NewValue);
     }
 
-    protected override void UpdateValues(object value)
+    protected override void SetDefault()
     {
-        base.UpdateValues(value);
-        slider.SlowedCurrent.Value = (T)value;
+        base.SetDefault();
+        slider.Current.Value = (T)AttributeData.Attribute.Value;
     }
 
     protected abstract Bindable<T> CreateCurrent();

VRCOSC.Game/Graphics/ModuleEditing/Attributes/Slider/FloatSliderAttributeCard.cs

@@ -13,10 +13,17 @@ public IntTextAttributeCard(ModuleAttributeSingle attributeData)
     {
     }
 
-    protected override object OnTextWrite(ValueChangedEvent<string> e)
+    protected override void OnTextBoxUpdate(ValueChangedEvent<string> e)
     {
-        if (string.IsNullOrEmpty(e.NewValue)) return 0;
+        if (string.IsNullOrEmpty(e.NewValue))
+        {
+            UpdateAttribute(0);
+            TextBox.Current.Value = "0";
+        }
 
-        return int.TryParse(e.NewValue, out var intValue) ? intValue : e.OldValue;
+        if (int.TryParse(e.NewValue, out var intValue))
+            UpdateAttribute(intValue);
+        else
+            TextBox.Current.Value = e.OldValue;
     }
 }