kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't send AAS while switching avatar.

Browse source 
Don't send AAS while switching avatar. This should mean I am less likely to load into the wrong states while switching if others load me faster.

This does mean though that it is more likely that remote users will apply null buffers forcing all 0/false instead of garbage aas, but its at least kind of a mitigation.

There is a possibility syncing garbage data is better than syncing nothing at all, as that does give the chance to apply settings that don't immediatly load in naked. This just requires testing...
This commit is contained in:
NotAKidoS 2023-02-12 04:42:07 -06:00
parent 495a3b33fd
commit 9332b06d06
6 changed files with 69 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

80
AASBufferFix/AASBufferHelper.cs
View file

@ -1,10 +1,13 @@
using ABI_RC.Core.Player;
using ABI.CCK.Components;
using ABI_RC.Core.Player;
using UnityEngine;
namespace NAK.Melons.AASBufferFix
{
public class AASBufferHelper : MonoBehaviour
{
///public bool DebuggingFlag = false;
//public stuff
public bool GameHandlesAAS { get; private set; }
@ -24,33 +27,38 @@ namespace NAK.Melons.AASBufferFix
public void OnAvatarInstantiated(Animator animator)
{
///MelonLoader.MelonLogger.Msg("[OnInit] Remote avatar initialized. Generating avatar animator footprint.");
_avatarFootprint = Utils.GenerateAnimatorAASFootprint(animator);
// avatar does not contain proper AAS
// this is likely because the avatar was made before AAS, or is blocked/hidden
if (_avatarFootprint == 1)
//check if avatar uses Avatar Advanced Settings
///SendDebug("[OnInit] Remote avatar initialized. Checking for AAS...");
CVRAvatar avatar = animator.GetComponent<CVRAvatar>();
if (avatar != null && !avatar.avatarUsesAdvancedSettings)
{
///MelonLoader.MelonLogger.Msg("[OnInit] Avatar does not contain valid AAS.");
// we will let the game handle this by setting IsAcceptingAAS to true
GameHandlesAAS = true;
return;
}
///MelonLoader.MelonLogger.Msg($"[OnInit] Avatar footprint is : {_avatarFootprint}");
//check if AAS footprint is valid
///SendDebug("[OnInit] Avatar uses AAS. Generating AAS footprint...");
_avatarFootprint = Utils.GenerateAnimatorAASFootprint(animator);
if (_avatarFootprint == 1)
{
// we will let the game handle this by setting GameHandlesAAS to true
///SendDebug("[OnInit] Avatar does not contain valid AAS. It is likely hidden or blocked.");
GameHandlesAAS = true;
return;
}
///SendDebug($"[OnInit] Avatar footprint is : {_avatarFootprint}");
//check if we received expected AAS while we loaded the avatar, and if so, apply it now
if (SyncDataMatchesExpected())
{
///MelonLoader.MelonLogger.Msg("[OnInit] Valid buffered AAS found. Applying AAS immediatly.");
///SendDebug("[OnInit] Valid buffered AAS found. Applying buffer...");
ApplyExternalAASBuffer();
return;
}
//we loaded avatar faster than wearer
///MelonLoader.MelonLogger.Msg("[OnInit] Remote avatar initialized faster than wearer. Waiting on valid AAS before applying.");
///SendDebug("[OnInit] Remote avatar initialized faster than wearer. Waiting on valid AAS...");
}
public void OnAvatarDestroyed()
@ -60,38 +68,36 @@ namespace NAK.Melons.AASBufferFix
_avatarFootprint = 0;
}
public void OnApplyAAS(float[] settingsFloat, int[] settingsInt, byte[] settingsByte)
public void OnReceiveAAS(float[] settingsFloat, int[] settingsInt, byte[] settingsByte)
{
//avatar is still loading on our side, we must assume AAS data is correct and store it until we load
//there is also a chance it errored
if (_avatarFootprint == 0)
{
///MelonLoader.MelonLogger.Msg("[OnSync] Avatar is still loading on our end.");
// Calculate AAS footprint to compare against later.
_aasFootprint = (settingsFloat.Length + 1) * (settingsInt.Length + 1) * (settingsByte.Length + 1);
StoreExternalAASBuffer(settingsFloat, settingsInt, settingsByte);
return;
}
//avatar is loaded on our end, and is not blocked by filter
//this does run if it is manually hidden or distance hidden
///MelonLoader.MelonLogger.Msg("[OnSync] Avatar is loaded on our side and is not blocked. Comparing for expected values.");
///MelonLoader.MelonLogger.Msg($"[OnSync] Avatar Footprint is : {_avatarFootprint}");
// Calculate AAS footprint to compare against.
_aasFootprint = (settingsFloat.Length + 1) * (settingsInt.Length + 1) * (settingsByte.Length + 1);
//if it matches, apply the settings and let game take over
if (SyncDataMatchesExpected())
{
///MelonLoader.MelonLogger.Msg("[OnSync] Avatar values matched and have been applied.");
///SendDebug("[OnSync] Avatar values matched and have been applied.");
ApplyExternalAAS(settingsFloat, settingsInt, settingsByte);
return;
}
//avatar is still loading on our side, we must assume AAS data is correct and store it until we load
//there is also a chance it errored
//if (_avatarFootprint == 0)
//{
// ///SendDebug("[OnSync] Avatar is still loading on our end.");
// StoreExternalAASBuffer(settingsFloat, settingsInt, settingsByte);
// return;
//}
//avatar is loaded on our end, and is not blocked by filter
//this does run if it is manually hidden or distance hidden
///SendDebug("[OnSync] Avatar is loaded on our side and is not blocked. Comparing for expected values.");
///SendDebug($"[OnSync] Avatar Footprint is : {_avatarFootprint}");
//if it did not match, that means the avatar we see on our side is different than what the remote user is wearing and syncing
///MelonLoader.MelonLogger.Msg("[OnSync] Avatar loaded is different than wearer. The wearer is likely still loading the avatar!");
///SendDebug("[OnSync] Avatar loaded is different than wearer. The wearer is likely still loading the avatar!");
StoreExternalAASBuffer(settingsFloat, settingsInt, settingsByte);
}
@ -118,5 +124,11 @@ namespace NAK.Melons.AASBufferFix
}
private bool SyncDataMatchesExpected() => _aasFootprint == _avatarFootprint;
///private void SendDebug(string message)
///{
/// if (!DebuggingFlag) return;
/// AASBufferFix.Logger.Msg(message);
///}
}
}

13
AASBufferFix/HarmonyPatches.cs
View file

@ -39,7 +39,7 @@ internal class HarmonyPatches
AASBufferHelper externalBuffer = __instance.GetComponent<AASBufferHelper>();
if (externalBuffer != null && !externalBuffer.GameHandlesAAS)
{
externalBuffer.OnApplyAAS(settingsFloat, settingsInt, settingsByte);
externalBuffer.OnReceiveAAS(settingsFloat, settingsInt, settingsByte);
return false;
}
return true;
@ -47,7 +47,7 @@ internal class HarmonyPatches
[HarmonyPrefix]
[HarmonyPatch(typeof(CVRAnimatorManager), "ApplyAdvancedAvatarSettingsFromBuffer")]
private static bool Prefix_PuppetMaster_ApplyAdvancedAvatarSettingsFromBuffer(ref Animator ____animator)
private static bool Prefix_CVRAnimatorManager_ApplyAdvancedAvatarSettingsFromBuffer(ref Animator ____animator)
{
AASBufferHelper externalBuffer = ____animator.GetComponentInParent<AASBufferHelper>();
if (externalBuffer != null && !externalBuffer.GameHandlesAAS)
@ -57,4 +57,13 @@ internal class HarmonyPatches
}
return true;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(PlayerSetup), "SendAdvancedAvatarSettings")]
private static bool Prefix_PlayerSetup_SendAdvancedAvatarSettings(ref PlayerSetup __instance)
{
//dont sync wrong settings to remote users
if (__instance.avatarIsLoading) return false;
return true;
}
}

5
AASBufferFix/Main.cs
View file

@ -2,10 +2,11 @@
namespace NAK.Melons.AASBufferFix;
public class AASBufferFixMod : MelonMod
public class AASBufferFix : MelonMod
{
///public static MelonLogger.Instance Logger;
public override void OnInitializeMelon()
{
//boobs
///Logger = LoggerInstance;
}
}

8
AASBufferFix/Properties/AssemblyInfo.cs
View file

@ -1,5 +1,5 @@
using NAK.Melons.AASBufferFix.Properties;
using MelonLoader;
using MelonLoader;
using NAK.Melons.AASBufferFix.Properties;
using System.Reflection;
@ -11,7 +11,7 @@ using System.Reflection;
[assembly: AssemblyProduct(nameof(NAK.Melons.AASBufferFix))]
[assembly: MelonInfo(
typeof(NAK.Melons.AASBufferFix.AASBufferFixMod),
typeof(NAK.Melons.AASBufferFix.AASBufferFix),
nameof(NAK.Melons.AASBufferFix),
AssemblyInfoParams.Version,
AssemblyInfoParams.Author,
@ -25,6 +25,6 @@ using System.Reflection;
namespace NAK.Melons.AASBufferFix.Properties;
internal static class AssemblyInfoParams
{
public const string Version = "1.0.4";
public const string Version = "1.0.5";
public const string Author = "NotAKidoS";
}

7
AASBufferFix/Utils.cs
View file

@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine;
namespace NAK.Melons.AASBufferFix;

8
AASBufferFix/format.json
View file

@ -1,12 +1,12 @@
{
"_id": 126,
"name": "AASBufferFix",
"modversion": "1.0.4",
"modversion": "1.0.5",
"gameversion": "2022r170",
"loaderversion": "0.5.7",
"modtype": "Mod",
"author": "NotAKidoS",
"description": "Fixes two issues with the Avatar Advanced Settings buffers when loading remote avatars. In simple terms, it means 'fewer wardrobe malfunctions'.\n\nEmpty buffer (all 0/false) will no longer be applied on load.\nReceived AAS data is ignored until the wearer has loaded into the expected avatar.\n(The avatar will sit in its default state until the wearer has loaded and started syncing correct AAS)\n\nPlease view the GitHub README for links to relevant feedback posts.",
"description": "Fixes two issues with the Avatar Advanced Settings buffers when loading remote avatars. In simple terms, it means 'fewer wardrobe malfunctions'.\n\nEmpty buffer (all 0/false) will no longer be applied on load.\nReceived AAS data is ignored until the wearer has loaded into the expected avatar.\n(The avatar will sit in its default state until the wearer has loaded and started syncing correct AAS)\nAAS will no longer be sent while switching avatar.\n\nPlease view the GitHub README for links to relevant feedback posts.",
"searchtags": [
"aas",
"sync",
@ -16,8 +16,8 @@
"requirements": [
"None"
],
"downloadlink": "https://github.com/NotAKidOnSteam/AASBufferFix/releases/download/v1.0.4/AASBufferFix.dll",
"downloadlink": "https://github.com/NotAKidOnSteam/AASBufferFix/releases/download/v1.0.5/AASBufferFix.dll",
"sourcelink": "https://github.com/NotAKidOnSteam/AASBufferFix/",
"changelog": "- Initial Release",
"changelog": "- Don't send AAS while switching avatar. This *should* mean using this mod makes you less likely to show naked for others.\nThis isn't perfect though, as remote users without this mod still have a null buffer applied on avatar load.'",
"embedcolor": "9b59b6"
}