fix(osc): Fixed an issue where sometimes null values would be passed …

…into osc serializer, crashing app. Bumped version numbers
benaclejames · Jul 27, 2023 · 07b1361 · 07b1361
1 parent 838cdc5
commit 07b1361
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/VRCFaceTracking.Core/ConfigParser.cs b/VRCFaceTracking.Core/ConfigParser.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
 using VRCFaceTracking.Core;
+using VRCFaceTracking.Core.OSC.DataTypes;
 using VRCFaceTracking.Core.Params;
 using VRCFaceTracking.OSC;
 
@@ -90,7 +87,8 @@ public void ParseNewAvatar(string newId)
                 return;
             }
 
-            //_logger.LogInformation("Parsing config file for avatar: " + avatarConfig.name);
+            _logger.LogInformation("Parsing config file for avatar: " + avatarConfig.name);
+            ParamSupervisor.SendQueue.Clear();
             var parameters = avatarConfig.parameters.Where(param => param.input != null).ToArray();
 
             foreach (var parameter in UnifiedTracking.AllParameters_v2.Concat(UnifiedTracking.AllParameters_v1).ToArray())

diff --git a/VRCFaceTracking.Core/OSC/DataTypes/BaseParameter.cs b/VRCFaceTracking.Core/OSC/DataTypes/BaseParameter.cs
@@ -22,6 +22,7 @@ public bool AllParametersRelevant
         {
             if (AllParametersRelevantStatic == value) return;
             AllParametersRelevantStatic = value;
+            SendQueue.Clear();
             foreach (var parameter in UnifiedTracking.AllParameters_v2.Concat(UnifiedTracking.AllParameters_v1).ToArray())
                 parameter.ResetParam(Array.Empty<ConfigParser.Parameter>());
             OnPropertyChanged();

diff --git a/VRCFaceTracking.Core/VRCFaceTracking.Core.csproj b/VRCFaceTracking.Core/VRCFaceTracking.Core.csproj
@@ -5,7 +5,7 @@
     <Platforms>x64</Platforms>
     <Platforms>x64</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyVersion>5.1.0.0</AssemblyVersion>
+    <AssemblyVersion>5.1.0.1</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="..\fti_osc.dll" Link="fti_osc.dll">

diff --git a/VRCFaceTracking/BundleArtifacts/VRCFaceTracking_x64.appinstaller.xml b/VRCFaceTracking/BundleArtifacts/VRCFaceTracking_x64.appinstaller.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<AppInstaller DisplayName="VRCFaceTracking" IsBundle="false" Version="5.1.0.0" DisplayPublisher="benaclejames" SupportedArchitectures="x64" OutputFolder="bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\AppPackages\" Description="VRChat OSC App to allow AV3 Avatars to interact with eye and lip tracking runtimes" MinOS="10.0.19041.0" CertificateUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.1.0.0_x64_Test/VRCFaceTracking_5.1.0.0_x64.cer" PackageUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.1.0.0_x64_Test/VRCFaceTracking_5.1.0.0_x64.msix" AppInstallerFile="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_x64.appinstaller" LogoPath="C:\Users\Ben\Downloads\VRCFaceTracking-Next\VRCFaceTracking\Assets\StoreLogo.png" TileColor="transparent" />
+<AppInstaller DisplayName="VRCFaceTracking" IsBundle="false" Version="5.1.0.1" DisplayPublisher="benaclejames" SupportedArchitectures="x64" OutputFolder="bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\AppPackages\" Description="VRChat OSC App to allow AV3 Avatars to interact with eye and lip tracking runtimes" MinOS="10.0.19041.0" CertificateUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.1.0.0_x64_Test/VRCFaceTracking_5.1.0.0_x64.cer" PackageUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.1.0.0_x64_Test/VRCFaceTracking_5.1.0.0_x64.msix" AppInstallerFile="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_x64.appinstaller" LogoPath="C:\Users\Ben\Downloads\VRCFaceTracking-Next\VRCFaceTracking\Assets\StoreLogo.png" TileColor="transparent" />
diff --git a/VRCFaceTracking/Package.appxmanifest b/VRCFaceTracking/Package.appxmanifest
@@ -14,7 +14,7 @@
   <Identity
     Name="96ba052f-0948-44d8-86c4-a0212e4ae047"
     Publisher="[email protected], &quot;Open Source Developer, Benjamin Thomas&quot;, O=Open Source Developer, L=Gloucester, S=Gloucestershire, C=GB"
-    Version="5.1.0.0" />
+    Version="5.1.0.1" />
 
   <mp:PhoneIdentity PhoneProductId="96ba052f-0948-44d8-86c4-a0212e4ae047" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/VRCFaceTracking/VRCFaceTracking.csproj b/VRCFaceTracking/VRCFaceTracking.csproj
@@ -21,7 +21,7 @@
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Never</AppxBundle>
-    <AssemblyVersion>5.1.0.0</AssemblyVersion>
+    <AssemblyVersion>5.1.0.1</AssemblyVersion>
     <AppInstallerUri>https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/</AppInstallerUri>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
   </PropertyGroup>