Skip to content

Commit 6645885

Browse files
committed
feat!: 🎉 PREPARE FOR THE SPLITTENING
1 parent 0e3b148 commit 6645885

7 files changed

Lines changed: 33 additions & 28 deletions

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "1.0.2",
6+
"version": "1.1.2",
77
"commands": ["csharpier"]
88
}
99
}

‎Directory.Build.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717
<!-- Common Build Properties -->
1818
<PropertyGroup>
19-
<TargetFramework>net472</TargetFramework>
19+
<TargetFramework>net9.0</TargetFramework>
2020
<LangVersion>latest</LangVersion>
2121
<Nullable>enable</Nullable>
2222
<Platforms>x64</Platforms>
@@ -70,7 +70,6 @@
7070
</PropertyGroup>
7171
<!-- Derived Resonite Paths -->
7272
<PropertyGroup>
73-
<ResoniteManagedPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'Resonite_Data', 'Managed'))</ResoniteManagedPath>
7473
<ResoniteModsPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'rml_mods'))</ResoniteModsPath>
7574
<ResoniteHotReloadPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'rml_mods', 'HotReloadMods'))</ResoniteHotReloadPath>
7675
<ResoniteLibsPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'rml_libs'))</ResoniteLibsPath>
@@ -88,15 +87,15 @@
8887
</Reference>
8988
<!-- Core Resonite Engine References (Managed) -->
9089
<Reference Include="FrooxEngine">
91-
<HintPath>$([System.IO.Path]::Combine('$(ResoniteManagedPath)', 'FrooxEngine.dll'))</HintPath>
90+
<HintPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'FrooxEngine.dll'))</HintPath>
9291
<Private>$(IsTestProject)</Private>
9392
</Reference>
9493
<Reference Include="Elements.Core">
95-
<HintPath>$([System.IO.Path]::Combine('$(ResoniteManagedPath)', 'Elements.Core.dll'))</HintPath>
94+
<HintPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'Elements.Core.dll'))</HintPath>
9695
<Private>$(IsTestProject)</Private>
9796
</Reference>
9897
<Reference Include="Elements.Assets">
99-
<HintPath>$([System.IO.Path]::Combine('$(ResoniteManagedPath)', 'Elements.Assets.dll'))</HintPath>
98+
<HintPath>$([System.IO.Path]::Combine('$(ResonitePath)', 'Elements.Assets.dll'))</HintPath>
10099
<Private>$(IsTestProject)</Private>
101100
</Reference>
102101
<!-- System Packages - Aligned with FrooxEngine -->

‎ViveStreamingFaceTrackingForResonite/ViveStreamingFaceTrackingConfigManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ public ViveStreamingFaceTrackingConfigManager(
155155
ModConfigurationKey<string> mouthTrackingStatusKey,
156156
ModConfigurationKey<int> eyeDataCountKey,
157157
ModConfigurationKey<int> mouthDataCountKey,
158-
ModConfigurationKey<int> frameRateKey)
158+
ModConfigurationKey<int> frameRateKey
159+
)
159160
{
160161
_config = config;
161162
_connectionStatusKey = connectionStatusKey;

‎ViveStreamingFaceTrackingForResonite/ViveStreamingFaceTrackingDriver.cs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public StatusChangedEventArgs(
6363
string mouthTrackingStatus,
6464
int eyeDataCount,
6565
int mouthDataCount,
66-
int frameRate)
66+
int frameRate
67+
)
6768
{
6869
ConnectionStatus = connectionStatus;
6970
HmdModel = hmdModel;
@@ -306,14 +307,18 @@ private static void NotifyStatusChanged()
306307
var mouthTrackingStatus = GetMouthTrackingStatus();
307308
var frameRate = GetFrameRate();
308309

309-
StatusChanged?.Invoke(null, new StatusChangedEventArgs(
310-
connectionStatus,
311-
hmdModel,
312-
eyeTrackingStatus,
313-
mouthTrackingStatus,
314-
eyeDataCount,
315-
mouthDataCount,
316-
frameRate));
310+
StatusChanged?.Invoke(
311+
null,
312+
new StatusChangedEventArgs(
313+
connectionStatus,
314+
hmdModel,
315+
eyeTrackingStatus,
316+
mouthTrackingStatus,
317+
eyeDataCount,
318+
mouthDataCount,
319+
frameRate
320+
)
321+
);
317322
}
318323

319324
private static string GetEyeTrackingStatus()

‎ViveStreamingFaceTrackingForResonite/ViveStreamingFaceTrackingForResonite.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
</ItemGroup>
2121
<!-- Project-specific references -->
2222
<ItemGroup>
23-
<Reference Include="System.Memory">
24-
<HintPath>$(ResoniteManagedPath)\System.Memory.dll</HintPath>
25-
<Private>$(IsTestProject)</Private>
26-
</Reference>
23+
<!-- No explicit System.Memory reference needed on .NET 9 -->
2724
</ItemGroup>
2825
</Project>

‎ViveStreamingFaceTrackingForResonite/ViveStreamingFaceTrackingMod.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,28 @@ public partial class ViveStreamingFaceTrackingMod : ResoniteMod
1818
private static Assembly ModAssembly => typeof(ViveStreamingFaceTrackingMod).Assembly;
1919

2020
/// <inheritdoc />
21-
public override string Name => ModAssembly.GetCustomAttribute<AssemblyTitleAttribute>().Title;
21+
public override string Name =>
22+
ModAssembly.GetCustomAttribute<AssemblyTitleAttribute>()?.Title
23+
?? nameof(ViveStreamingFaceTrackingMod);
2224

2325
/// <inheritdoc />
2426
public override string Author =>
25-
ModAssembly.GetCustomAttribute<AssemblyCompanyAttribute>().Company;
27+
ModAssembly.GetCustomAttribute<AssemblyCompanyAttribute>()?.Company ?? "Unknown";
2628

2729
/// <inheritdoc />
2830
public override string Version =>
2931
ModAssembly
3032
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
31-
.InformationalVersion;
33+
?.InformationalVersion
34+
?? ModAssembly.GetName().Version?.ToString() ?? "0.0.0";
3235

3336
/// <inheritdoc />
3437
public override string Link =>
3538
ModAssembly
3639
.GetCustomAttributes<AssemblyMetadataAttribute>()
37-
.First(meta => meta.Key == "RepositoryUrl")
38-
.Value;
40+
.FirstOrDefault(meta => meta.Key == "RepositoryUrl")
41+
?.Value
42+
?? "";
3943

4044
private static ModConfiguration? config;
4145
private static readonly ViveStreamingFaceTrackingDriver driver = new();
@@ -131,7 +135,7 @@ private static void Init(ResoniteMod modInstance)
131135
driver.IsActive = config?.GetValue(enabledkey) ?? true;
132136
};
133137

134-
if (config != null)
138+
if (config is not null)
135139
{
136140
configManager = new ViveStreamingFaceTrackingConfigManager(
137141
config,

‎ViveStreamingFaceTrackingForResonite/ViveStreamingMouth.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ public ViveStreamingMouth(InputInterface input)
5353
MouthParameterGroup.CheekPuffSuck,
5454
]
5555
)
56-
{
57-
}
56+
{ }
5857

5958
public void UpdateInputs(bool connected, ref string? newMouthData)
6059
{

0 commit comments

Comments
 (0)