AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-02-02 03:32:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adding some hooks for xdress benefit

Browse Source
This commit is contained in:
bd_ 2022-09-11 15:30:57 -07:00 committed by bd_
parent d96ee7a718
commit 441865cd22
3 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs
View File

@ -49,7 +49,7 @@ namespace net.fushizen.modular_avatar.core.editor
public AnimatorCombiner() public AnimatorCombiner()
{ {
_combined = Util.CreateContainer(); _combined = Util.CreateAnimator();
} }
public AnimatorController Finish() public AnimatorController Finish()
@ -67,7 +67,8 @@ namespace net.fushizen.modular_avatar.core.editor
{ {
if (acp.type != param.type) if (acp.type != param.type)
{ {
throw new Exception($"Parameter {param.name} has different types in {basePath} and {controller.name}"); throw new Exception(
$"Parameter {param.name} has different types in {basePath} and {controller.name}");
} }
continue; continue;
@ -161,7 +162,8 @@ namespace net.fushizen.modular_avatar.core.editor
AnimationUtility.SetAnimationClipSettings(newClip, AnimationUtility.GetAnimationClipSettings(clip)); AnimationUtility.SetAnimationClipSettings(newClip, AnimationUtility.GetAnimationClipSettings(clip));
return newClip; return newClip;
} else if (o is Texture) }
else if (o is Texture)
{ {
return o; return o;
} }
@ -202,6 +204,7 @@ namespace net.fushizen.modular_avatar.core.editor
obj = (T) ctor.Invoke(Array.Empty<object>()); obj = (T) ctor.Invoke(Array.Empty<object>());
EditorUtility.CopySerialized(original, obj); EditorUtility.CopySerialized(original, obj);
} }
cloneMap[original] = obj; cloneMap[original] = obj;
AssetDatabase.AddObjectToAsset(obj, _combined); AssetDatabase.AddObjectToAsset(obj, _combined);

10
Packages/net.fushizen.modular-avatar/Editor/AvatarProcessor.cs
View File

@ -23,17 +23,19 @@
*/ */
using System; using System;
using System.Reflection;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using VRC.SDK3.Avatars.Components;
using VRC.SDKBase.Editor.BuildPipeline; using VRC.SDKBase.Editor.BuildPipeline;
namespace net.fushizen.modular_avatar.core.editor namespace net.fushizen.modular_avatar.core.editor
{ {
[InitializeOnLoad] [InitializeOnLoad]
internal class AvatarProcessor : IVRCSDKPreprocessAvatarCallback, IVRCSDKPostprocessAvatarCallback public class AvatarProcessor : IVRCSDKPreprocessAvatarCallback, IVRCSDKPostprocessAvatarCallback
{ {
public delegate void AvatarProcessorCallback(GameObject obj);
public static event AvatarProcessorCallback AfterProcessing;
static AvatarProcessor() static AvatarProcessor()
{ {
EditorApplication.playModeStateChanged += OnPlayModeStateChanged; EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
@ -82,6 +84,8 @@ namespace net.fushizen.modular_avatar.core.editor
{ {
UnityEngine.Object.DestroyImmediate(component); UnityEngine.Object.DestroyImmediate(component);
} }
AfterProcessing?.Invoke(avatarGameObject);
} }
} }
} }

28
Packages/net.fushizen.modular-avatar/Editor/Util.cs
View File

@ -24,6 +24,7 @@
using UnityEditor; using UnityEditor;
using UnityEditor.Animations; using UnityEditor.Animations;
using UnityEngine;
using VRC.SDKBase.Editor.BuildPipeline; using VRC.SDKBase.Editor.BuildPipeline;
namespace net.fushizen.modular_avatar.core.editor namespace net.fushizen.modular_avatar.core.editor
@ -31,6 +32,7 @@ namespace net.fushizen.modular_avatar.core.editor
internal class CleanupTempAssets : IVRCSDKPostprocessAvatarCallback internal class CleanupTempAssets : IVRCSDKPostprocessAvatarCallback
{ {
public int callbackOrder => 99999; public int callbackOrder => 99999;
public void OnPostprocessAvatar() public void OnPostprocessAvatar()
{ {
Util.DeleteTemporaryAssets(); Util.DeleteTemporaryAssets();
@ -40,28 +42,36 @@ namespace net.fushizen.modular_avatar.core.editor
[InitializeOnLoad] [InitializeOnLoad]
public static class Util public static class Util
{ {
internal const string generatedAssetsSubdirectory = "999_Modular_Avatar_Generated"; private const string generatedAssetsSubdirectory = "999_Modular_Avatar_Generated";
internal const string generatedAssetsPath = "Assets/" + generatedAssetsSubdirectory; private const string generatedAssetsPath = "Assets/" + generatedAssetsSubdirectory;
static Util() static Util()
{ {
RuntimeUtil.delayCall = (cb) => EditorApplication.delayCall += cb.Invoke; RuntimeUtil.delayCall = (cb) => EditorApplication.delayCall += cb.Invoke;
} }
static internal AnimatorController CreateContainer() public static AnimatorController CreateAnimator(AnimatorController toClone = null)
{ {
var container = new AnimatorController(); AnimatorController controller;
AssetDatabase.CreateAsset(container, GenerateAssetPath()); if (toClone != null)
{
controller = Object.Instantiate(toClone);
}
else
{
controller = new AnimatorController();
}
AssetDatabase.CreateAsset(controller, GenerateAssetPath());
return container; return controller;
} }
internal static string GenerateAssetPath() public static string GenerateAssetPath()
{ {
return GetGeneratedAssetsFolder() + "/" + GUID.Generate() + ".asset"; return GetGeneratedAssetsFolder() + "/" + GUID.Generate() + ".asset";
} }
internal static string GetGeneratedAssetsFolder() private static string GetGeneratedAssetsFolder()
{ {
if (!AssetDatabase.IsValidFolder(generatedAssetsPath)) if (!AssetDatabase.IsValidFolder(generatedAssetsPath))
{ {
@ -71,7 +81,7 @@ namespace net.fushizen.modular_avatar.core.editor
return generatedAssetsPath; return generatedAssetsPath;
} }
static internal void DeleteTemporaryAssets() internal static void DeleteTemporaryAssets()
{ {
EditorApplication.delayCall += () => EditorApplication.delayCall += () =>
{ {