Update to new eye open-ness from VDFT.

Zeitheron · Sep 29, 2023 · ae86642 · ae86642
1 parent 882af37
commit ae86642
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 6 deletions.
diff --git a/.vs/VDFaceTracking/FileContentIndex/1ab72c96-3474-4c6a-ab6e-68599eeb4e2f.vsidx b/.vs/VDFaceTracking/FileContentIndex/1ab72c96-3474-4c6a-ab6e-68599eeb4e2f.vsidx
diff --git a/.vs/VDFaceTracking/FileContentIndex/4a5d214f-ebc6-462e-b6c1-bcf9973b5ff4.vsidx b/.vs/VDFaceTracking/FileContentIndex/4a5d214f-ebc6-462e-b6c1-bcf9973b5ff4.vsidx
diff --git a/.vs/VDFaceTracking/FileContentIndex/5a1b52c8-3473-4be9-bf20-ffcd8004e3b6.vsidx b/.vs/VDFaceTracking/FileContentIndex/5a1b52c8-3473-4be9-bf20-ffcd8004e3b6.vsidx
diff --git a/...6282f74-266e-407c-b708-640182b6e3a6.vsidx → ...65d5e6e-1913-42cc-bb07-df4686fe0a9c.vsidx b/...6282f74-266e-407c-b708-640182b6e3a6.vsidx → ...65d5e6e-1913-42cc-bb07-df4686fe0a9c.vsidx
diff --git a/.vs/VDFaceTracking/FileContentIndex/b96e449a-4d55-4774-9eda-a32250822c0b.vsidx b/.vs/VDFaceTracking/FileContentIndex/b96e449a-4d55-4774-9eda-a32250822c0b.vsidx
diff --git a/...e849b46-b270-4d9d-9341-4aeb8b262cc4.vsidx → ...1d3b9bd-0ae0-4976-be4d-2ae83c958675.vsidx b/...e849b46-b270-4d9d-9341-4aeb8b262cc4.vsidx → ...1d3b9bd-0ae0-4976-be4d-2ae83c958675.vsidx
diff --git a/.vs/VDFaceTracking/v17/.suo b/.vs/VDFaceTracking/v17/.suo
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -9,5 +9,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("39d944a3-538c-4a2d-8e53-8db606c64233")]
-[assembly: AssemblyFileVersion("1.12.6")]
-[assembly: AssemblyVersion("1.12.6.0")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyVersion("1.0.1.0")]
diff --git a/VDFaceTracking.cs b/VDFaceTracking.cs
@@ -37,7 +37,7 @@ public class VDFaceTracking : ResoniteMod
 
         public override string Author => "Zeith & dfgHiatus & Geenz & Earthmark";
 
-        public override string Version => "1.0.0";
+        public override string Version => "1.0.1";
 
         public static VDProxy proxy;
 

diff --git a/VDFaceTracking.csproj b/VDFaceTracking.csproj
@@ -58,6 +58,11 @@
     <Reference Include="ResoniteModLoader">
       <HintPath>F:\SteamLibrary\steamapps\common\Resonite\Libraries\ResoniteModLoader.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/VDProxy.cs b/VDProxy.cs
@@ -504,8 +504,8 @@ void UpdateEyes(float deltaTime)
             _eyes.CombinedEye.UpdateWithRotation(MathX.Slerp(_eyes.LeftEye.RawRotation, _eyes.RightEye.RawRotation, 0.5f));
             _eyes.CombinedEye.PupilDiameter = 0.004f;
 
-            _eyes.LeftEye.Openness = MathX.Pow(1 - _eyes.LeftEye.Openness, VDFaceTracking.EyeOpenExponent);
-            _eyes.RightEye.Openness = MathX.Pow(1 - _eyes.RightEye.Openness, VDFaceTracking.EyeOpenExponent);
+            _eyes.LeftEye.Openness = MathX.Pow(1.0f - Math.Max(0, Math.Min(1, expressions[(int)Expressions.EyesClosedL] + expressions[(int)Expressions.EyesClosedL] * expressions[(int)Expressions.LidTightenerL])), VDFaceTracking.EyeOpenExponent);
+            _eyes.RightEye.Openness = MathX.Pow(1.0f - (float)Math.Max(0, Math.Min(1, expressions[(int)Expressions.EyesClosedR] + expressions[(int)Expressions.EyesClosedR] * expressions[(int)Expressions.LidTightenerR])), VDFaceTracking.EyeOpenExponent);
 
             _eyes.ComputeCombinedEyeParameters();
             _eyes.ConvergenceDistance = 0f;

diff --git a/app.config b/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
diff --git a/bin/Release/VDFaceTracking.dll b/bin/Release/VDFaceTracking.dll
diff --git a/bin/Release/VDFaceTracking.dll.config b/bin/Release/VDFaceTracking.dll.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
diff --git a/bin/Release/VDFaceTracking.pdb b/bin/Release/VDFaceTracking.pdb
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/obj/Release/VDFaceTracking.csproj.AssemblyReference.cache b/obj/Release/VDFaceTracking.csproj.AssemblyReference.cache
diff --git a/obj/Release/VDFaceTracking.csproj.CoreCompileInputs.cache b/obj/Release/VDFaceTracking.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-47418b2f09a58f328195d16d8c8db199da9b7dd1
+f3779cc178268726a82128f10848769a3a33d059
diff --git a/obj/Release/VDFaceTracking.csproj.FileListAbsolute.txt b/obj/Release/VDFaceTracking.csproj.FileListAbsolute.txt
@@ -110,3 +110,4 @@ P:\$Code\C#\Resonite\VDFaceTracking\bin\Release\Microsoft.Extensions.Primitives.
 P:\$Code\C#\Resonite\VDFaceTracking\obj\Release\VDFaceTracking.csproj.CopyComplete
 P:\$Code\C#\Resonite\VDFaceTracking\obj\Release\VDFaceTracking.dll
 P:\$Code\C#\Resonite\VDFaceTracking\obj\Release\VDFaceTracking.pdb
+P:\$Code\C#\Resonite\VDFaceTracking\bin\Release\VDFaceTracking.dll.config
diff --git a/obj/Release/VDFaceTracking.dll b/obj/Release/VDFaceTracking.dll
diff --git a/obj/Release/VDFaceTracking.pdb b/obj/Release/VDFaceTracking.pdb
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		47418b2f09a58f328195d16d8c8db199da9b7dd1
		f3779cc178268726a82128f10848769a3a33d059