Merge pull request #1 from Chickenbreadlp/vrcft_5

Update to VRCFT 5.0
Chickenbreadlp · Apr 27, 2023 · e551311 · e551311
2 parents 17d3c8f + 8d3e904
commit e551311
Show file tree

Hide file tree

Showing 15 changed files with 228 additions and 528 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 bin/
 obj/
-.vs/VRCFTVarjoModule/v15
+.vs
+VRCFaceTracking.Core.dll
diff --git a/Assets/Aero.png b/Assets/Aero.png
diff --git a/Assets/VR-1.png b/Assets/VR-1.png
diff --git a/Assets/VR-2.png b/Assets/VR-2.png
diff --git a/Assets/VR-3.png b/Assets/VR-3.png
diff --git a/Assets/XR-1.png b/Assets/XR-1.png
diff --git a/Assets/XR-3.png b/Assets/XR-3.png
diff --git a/Assets/unknown.png b/Assets/unknown.png
diff --git a/TrackingLibs/Varjo/VarjoLib.dll → TrackingLibs/VarjoLib.dll b/TrackingLibs/Varjo/VarjoLib.dll → TrackingLibs/VarjoLib.dll
diff --git a/VRCFTVarjoModule.csproj b/VRCFTVarjoModule.csproj
@@ -1,132 +1,27 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{381EDD16-E4AF-4971-B70B-77E3F17A8204}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>VRCFTVarjoModule</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RootNamespace>VRCFTVarjoModule</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>none</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %283rd Gen HMD%29|AnyCPU'">
-    <OutputPath>bin\Release %283rd Gen HMD%29\</OutputPath>
-    <DefineConstants>TRACE;GEN3HMD</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %283rd Gen HMD%29|x64'">
-    <OutputPath>bin\x64\Release %283rd Gen HMD%29\</OutputPath>
-    <DefineConstants>TRACE;GEN3HMD</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %283rd Gen HMD%29|x86'">
-    <OutputPath>bin\x86\Release %283rd Gen HMD%29\</OutputPath>
-    <DefineConstants>TRACE;GEN3HMD</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFramework>net7.0</TargetFramework>
+	<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="VRCFaceTracking, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\osc\VRCFaceTracking\VRCFaceTracking.exe</HintPath>
+    <Compile Include="VarjoTypes.cs" />
+    <Compile Include="VarjoNativeInterface.cs" />
+    <Compile Include="VarjoTrackingModule.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="VRCFaceTracking.Core">
+      <HintPath>VRCFaceTracking.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="VarjoInterface.cs" />
-    <Compile Include="VarjoNativeInterface.cs" />
-    <Compile Include="VarjoTrackingModule.cs" />
-    <Compile Include="VarjoCompanionInterface.cs" />
+    <None Include="TrackingLibs\VarjoLib.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="TrackingLibs\Varjo\VarjoLib.dll" />
+    <EmbeddedResource Include="Assets\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" />
-  <ProjectExtensions>
-    <VisualStudio AllowExistingFolder="true" />
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)$(TargetName)$(TargetExt)" "%APPDATA%\VRCFaceTracking\CustomLibs" /Y</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/VRCFTVarjoModule.sln b/VRCFTVarjoModule.sln
@@ -8,34 +8,13 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release (3rd Gen HMD)|Any CPU = Release (3rd Gen HMD)|Any CPU
-		Release (3rd Gen HMD)|x64 = Release (3rd Gen HMD)|x64
-		Release (3rd Gen HMD)|x86 = Release (3rd Gen HMD)|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Debug|x64.ActiveCfg = Debug|x64
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Debug|x64.Build.0 = Debug|x64
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Debug|x86.ActiveCfg = Debug|x86
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Debug|x86.Build.0 = Debug|x86
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release (3rd Gen HMD)|Any CPU.ActiveCfg = Release (3rd Gen HMD)|Any CPU
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release (3rd Gen HMD)|Any CPU.Build.0 = Release (3rd Gen HMD)|Any CPU
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release (3rd Gen HMD)|x64.ActiveCfg = Release (3rd Gen HMD)|x64
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release (3rd Gen HMD)|x64.Build.0 = Release (3rd Gen HMD)|x64
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release (3rd Gen HMD)|x86.ActiveCfg = Release (3rd Gen HMD)|x86
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release (3rd Gen HMD)|x86.Build.0 = Release (3rd Gen HMD)|x86
 		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release|Any CPU.Build.0 = Release|Any CPU
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release|x64.ActiveCfg = Release|x64
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release|x64.Build.0 = Release|x64
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release|x86.ActiveCfg = Release|x86
-		{381EDD16-E4AF-4971-B70B-77E3F17A8204}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/VarjoCompanionInterface.cs b/VarjoCompanionInterface.cs