diff --git a/ml_asl/Main.cs b/ml_asl/Main.cs
index 599c8f0..87534df 100644
--- a/ml_asl/Main.cs
+++ b/ml_asl/Main.cs
@@ -1,4 +1,5 @@
using ABI_RC.Core.Player;
+using ABI_RC.Core.Savior;
using ABI_RC.Systems.FaceTracking;
using System;
using System.Reflection;
@@ -8,8 +9,6 @@ namespace ml_asl
{
public class AvatarSyncedLook : MelonLoader.MelonMod
{
- readonly static Matrix4x4 ms_back = Matrix4x4.Translate(Vector3.back);
-
public override void OnInitializeMelon()
{
HarmonyInstance.Patch(
@@ -28,14 +27,24 @@ namespace ml_asl
{
try
{
- if(Settings.Enabled && (__instance.EyeMovementController != null) && !FaceTrackingManager.Instance.IsEyeDataAvailable())
+ if(Settings.Enabled && (__instance.EyeMovementController != null))
{
- ____playerAvatarMovementData.EyeTrackingOverride = true;
+ if(!FaceTrackingManager.Instance.IsEyeDataAvailable())
+ {
+ ____playerAvatarMovementData.EyeTrackingOverride = true;
- if(__instance.EyeMovementController.CurrentTarget != null)
- ____playerAvatarMovementData.EyeTrackingPosition = __instance.EyeMovementController.CurrentTarget.GetPosition();
- else
- ____playerAvatarMovementData.EyeTrackingPosition = (__instance.transform.GetMatrix() * ms_back).GetPosition();
+ if(__instance.EyeMovementController.CurrentTarget != null)
+ ____playerAvatarMovementData.EyeTrackingPosition = __instance.EyeMovementController.CurrentTarget.GetPosition();
+ else
+ {
+ Transform l_camera = (!MetaPort.Instance.isUsingVr ? __instance.desktopCamera : __instance.vrCamera).transform;
+ ____playerAvatarMovementData.EyeTrackingPosition = l_camera.position - l_camera.forward;
+ }
+
+ ____playerAvatarMovementData.EyeBlinkingOverride = true;
+ ____playerAvatarMovementData.EyeTrackingBlinkProgressLeft = __instance.EyeMovementController.blinkProgressLeft;
+ ____playerAvatarMovementData.EyeTrackingBlinkProgressRight = __instance.EyeMovementController.blinkProgressRight;
+ }
}
}
catch(Exception e)
diff --git a/ml_asl/Properties/AssemblyInfo.cs b/ml_asl/Properties/AssemblyInfo.cs
index c62cdb2..c1b4d8b 100644
--- a/ml_asl/Properties/AssemblyInfo.cs
+++ b/ml_asl/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.5", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
diff --git a/ml_asl/Utils.cs b/ml_asl/Utils.cs
index 526c89c..4abb238 100644
--- a/ml_asl/Utils.cs
+++ b/ml_asl/Utils.cs
@@ -9,11 +9,5 @@ namespace ml_asl
static readonly FieldInfo ms_view = typeof(CohtmlControlledViewWrapper).GetField("_view", BindingFlags.Instance | BindingFlags.NonPublic);
public static void ExecuteScript(this CohtmlControlledViewWrapper p_instance, string p_script) => (ms_view?.GetValue(p_instance) as cohtml.Net.View)?.ExecuteScript(p_script);
-
- // Extensions
- public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
- {
- return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.localScale : Vector3.one);
- }
}
}
diff --git a/ml_asl/ml_asl.csproj b/ml_asl/ml_asl.csproj
index 6352e14..e846e67 100644
--- a/ml_asl/ml_asl.csproj
+++ b/ml_asl/ml_asl.csproj
@@ -7,7 +7,7 @@
SDraw
SDraw
AvatarSyncedLook
- 1.1.4
+ 1.1.5
AvatarSyncedLook