Merge branch 'main' into av-name-filter

CHANGELOG.md

@@ -13,7 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-* Fixed build failures when avatar names contained non-path-safe characters (#18)
+- Fixed build failures when avatar names contained non-path-safe characters (#18)
+- Suppress apply-on-play when Lyuma's Av3Emulator is active (improves compatibility) (#16)
 
 ### Changed
 

Runtime/ApplyOnPlayGlobalActivator.cs

@@ -1,5 +1,6 @@
 #if UNITY_EDITOR
 
+using System;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
@@ -51,6 +52,28 @@ private void Awake()
             if (!RuntimeUtil.IsPlaying || this == null) return;
 
             var scene = gameObject.scene;
+
+            // Check if Lyuma's Av3Emulator is present and enabled; if so, we leave preprocessing up to it.
+            // First, find the type...
+
+            Type ty_av3emu = null;
+            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                ty_av3emu = assembly.GetType("Lyuma.Av3Emulator.Runtime.LyumaAv3Emulator", false);
+                if (ty_av3emu != null) break;
+            }
+
+            if (ty_av3emu != null)
+            {
+                foreach (var root in scene.GetRootGameObjects())
+                {
+                    if (root.GetComponentInChildren(ty_av3emu) != null)
+                    {
+                        return;
+                    }
+                }
+            }
+
             foreach (var root in scene.GetRootGameObjects())
             {
                 foreach (var avatar in root.GetComponentsInChildren<VRCAvatarDescriptor>())