byebye pimax

benaclejames · Jul 8, 2022 · 49e96ed · 49e96ed
1 parent a87fbbc
commit 49e96ed
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 190 deletions.
diff --git a/VRCFaceTracking/DependencyManager.cs b/VRCFaceTracking/DependencyManager.cs
@@ -15,8 +15,7 @@ public static class DependencyManager
             "SRanipal.nanomsg.dll",
             "SRanipal.SRWorks_Log.dll",
             "SRanipal.ViveSR_Client.dll",
-            "SRanipal.SRanipal.dll",
-            "Pimax.PimaxEyeTracker.dll"
+            "SRanipal.SRanipal.dll"
         };
 
         public static void Load()

diff --git a/VRCFaceTracking/TrackingLibs/Pimax/PimaxEyeTracker.dll b/VRCFaceTracking/TrackingLibs/Pimax/PimaxEyeTracker.dll
diff --git a/VRCFaceTracking/TrackingLibs/Pimax/PimaxTracker.cs b/VRCFaceTracking/TrackingLibs/Pimax/PimaxTracker.cs
diff --git a/VRCFaceTracking/TrackingLibs/Pimax/PimaxTrackingInterface.cs b/VRCFaceTracking/TrackingLibs/Pimax/PimaxTrackingInterface.cs
diff --git a/VRCFaceTracking/UnifiedTrackingData.cs b/VRCFaceTracking/UnifiedTrackingData.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 using ViveSR.anipal.Eye;
 using ViveSR.anipal.Lip;
 using VRCFaceTracking.Params;
 using VRCFaceTracking.Params.Eye;
 using VRCFaceTracking.Params.LipMerging;
-using VRCFaceTracking.Pimax;
 using Vector2 = VRCFaceTracking.Params.Vector2;
 
 namespace VRCFaceTracking
@@ -32,14 +30,6 @@ public void Update(SingleEyeData eyeData, SingleEyeExpression? expression = null
             Widen = expression.Value.eye_wide;
             Squeeze = expression.Value.eye_squeeze;
         }
-
-        public void Update(EyeExpressionState eyeState)
-        {
-            Look = new Vector2(eyeState.PupilCenter.X, eyeState.PupilCenter.Y);
-            Openness = eyeState.Openness;
-            Widen = 0;
-            Squeeze = 0;
-        }
     }
 
     public class EyeTrackingData
@@ -85,13 +75,6 @@ public void UpdateData(EyeData_v2 eyeData)
                 EyesDilation = dilation / _minDilation / (_maxDilation - _minDilation);
         }
 
-        public void UpdateData(Ai1EyeData eyeData)
-        {
-            Left.Update(eyeData.Left);
-            Right.Update(eyeData.Right);
-            Combined.Update(eyeData.Recommended);
-        }
-
         private void UpdateMinMaxDilation(float readDilation)
         {
             if (readDilation > _maxDilation)

diff --git a/VRCFaceTracking/VRCFaceTracking.csproj b/VRCFaceTracking/VRCFaceTracking.csproj
@@ -66,8 +66,6 @@
     <Compile Include="Params\XYParam.cs" />
     <Compile Include="SDK\ExtTrackingModule.cs" />
     <Compile Include="VRChat.cs" />
-    <Compile Include="TrackingLibs\Pimax\PimaxTracker.cs" />
-    <Compile Include="TrackingLibs\Pimax\PimaxTrackingInterface.cs" />
     <Compile Include="TrackingLibs\SRanipal\Eye\SRanipal_EyeData.cs" />
     <Compile Include="TrackingLibs\SRanipal\Eye\SRanipal_EyeDataType_v2.cs" />
     <Compile Include="TrackingLibs\SRanipal\Eye\SRanipal_Eye_API.cs" />
@@ -87,7 +85,6 @@
   <ItemGroup>
     <None Include="packages.config" />
     <EmbeddedResource Include="Assets\Images\VRCFT.ico" />
-    <EmbeddedResource Include="TrackingLibs\Pimax\PimaxEyeTracker.dll" />
     <EmbeddedResource Include="TrackingLibs\SRanipal\libHTC_License.dll" />
     <EmbeddedResource Include="TrackingLibs\SRanipal\nanomsg.dll" />
     <EmbeddedResource Include="TrackingLibs\SRanipal\SRanipal.dll" />