Skip to content

Commit 07b1361

Browse files
committed
fix(osc): Fixed an issue where sometimes null values would be passed into osc serializer, crashing app. Bumped version numbers
1 parent 838cdc5 commit 07b1361

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

VRCFaceTracking.Core/ConfigParser.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Text.Json;
1+
using System.Text.Json;
62
using System.Text.Json.Serialization;
73
using Microsoft.Extensions.Logging;
84
using VRCFaceTracking.Core;
5+
using VRCFaceTracking.Core.OSC.DataTypes;
96
using VRCFaceTracking.Core.Params;
107
using VRCFaceTracking.OSC;
118

@@ -90,7 +87,8 @@ public void ParseNewAvatar(string newId)
9087
return;
9188
}
9289

93-
//_logger.LogInformation("Parsing config file for avatar: " + avatarConfig.name);
90+
_logger.LogInformation("Parsing config file for avatar: " + avatarConfig.name);
91+
ParamSupervisor.SendQueue.Clear();
9492
var parameters = avatarConfig.parameters.Where(param => param.input != null).ToArray();
9593

9694
foreach (var parameter in UnifiedTracking.AllParameters_v2.Concat(UnifiedTracking.AllParameters_v1).ToArray())

VRCFaceTracking.Core/OSC/DataTypes/BaseParameter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public bool AllParametersRelevant
2222
{
2323
if (AllParametersRelevantStatic == value) return;
2424
AllParametersRelevantStatic = value;
25+
SendQueue.Clear();
2526
foreach (var parameter in UnifiedTracking.AllParameters_v2.Concat(UnifiedTracking.AllParameters_v1).ToArray())
2627
parameter.ResetParam(Array.Empty<ConfigParser.Parameter>());
2728
OnPropertyChanged();

VRCFaceTracking.Core/VRCFaceTracking.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platforms>x64</Platforms>
66
<Platforms>x64</Platforms>
77
<ImplicitUsings>enable</ImplicitUsings>
8-
<AssemblyVersion>5.1.0.0</AssemblyVersion>
8+
<AssemblyVersion>5.1.0.1</AssemblyVersion>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<Content Include="..\fti_osc.dll" Link="fti_osc.dll">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<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" />
2+
<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" />

VRCFaceTracking/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Identity
1515
Name="96ba052f-0948-44d8-86c4-a0212e4ae047"
1616
Publisher="[email protected], &quot;Open Source Developer, Benjamin Thomas&quot;, O=Open Source Developer, L=Gloucester, S=Gloucestershire, C=GB"
17-
Version="5.1.0.0" />
17+
Version="5.1.0.1" />
1818

1919
<mp:PhoneIdentity PhoneProductId="96ba052f-0948-44d8-86c4-a0212e4ae047" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
2020

VRCFaceTracking/VRCFaceTracking.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
2222
<GenerateTestArtifacts>True</GenerateTestArtifacts>
2323
<AppxBundle>Never</AppxBundle>
24-
<AssemblyVersion>5.1.0.0</AssemblyVersion>
24+
<AssemblyVersion>5.1.0.1</AssemblyVersion>
2525
<AppInstallerUri>https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/</AppInstallerUri>
2626
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
2727
</PropertyGroup>

0 commit comments

Comments
 (0)