mirror of
https://github.com/SDraw/ml_mods_cvr.git
synced 2026-06-21 22:08:22 +00:00
Forgotten eye blinking
This commit is contained in:
parent
2c4fbb1731
commit
aa8def3192
4 changed files with 19 additions and 16 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)]
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<Authors>SDraw</Authors>
|
||||
<Company>SDraw</Company>
|
||||
<Product>AvatarSyncedLook</Product>
|
||||
<Version>1.1.4</Version>
|
||||
<Version>1.1.5</Version>
|
||||
<AssemblyName>AvatarSyncedLook</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue