From 91fb887dade57aaba028d9c7716eb2081e3cf80f Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 28 Aug 2022 18:30:08 -0700 Subject: [PATCH] Add a self-importing stub --- Packages/manifest.json | 2 +- .../Editor.meta | 0 .../Editor/AnimatorMerger.cs | 0 .../Editor/AnimatorMerger.cs.meta | 0 .../Editor/Av3EmuHook.cs | 0 .../Editor/Av3EmuHook.cs.meta | 0 .../Editor/BoneProxyHook.cs | 0 .../Editor/BoneProxyHook.cs.meta | 0 .../Editor/ComponentAllowlistPatch.cs | 0 .../Editor/ComponentAllowlistPatch.cs.meta | 0 .../Editor/HookSequence.cs | 0 .../Editor/HookSequence.cs.meta | 0 .../Editor/LastResortTagComponentCleaner.cs | 0 .../LastResortTagComponentCleaner.cs.meta | 0 .../Editor/MergeAnimatorHook.cs | 0 .../Editor/MergeAnimatorHook.cs.meta | 0 .../Editor/MergeArmatureHook.cs | 0 .../Editor/MergeArmatureHook.cs.meta | 0 .../Editor/MeshRetargeter.cs | 0 .../Editor/MeshRetargeter.cs.meta | 0 .../Editor/ModularAvatarBootstrap.cs | 104 +++++++++++++++ .../Editor/ModularAvatarBootstrap.cs.meta | 3 + .../Editor/PathMappings.cs | 0 .../Editor/PathMappings.cs.meta | 0 .../Editor/Util.cs | 0 .../Editor/Util.cs.meta | 0 .../Editor/Version.cs | 7 + .../Editor/Version.cs.meta | 3 + ...fushizen.modular-avatar.core.editor.asmdef | 0 ...zen.modular-avatar.core.editor.asmdef.meta | 0 .../Runtime.meta | 0 .../Runtime/AvatarTagComponent.cs | 0 .../Runtime/AvatarTagComponent.cs.meta | 0 .../Runtime/MergeAnimator.cs | 0 .../Runtime/MergeAnimator.cs.meta | 0 .../Runtime/ModularAvatarBoneProxy.cs | 0 .../Runtime/ModularAvatarBoneProxy.cs.meta | 0 .../Runtime/ModularAvatarMergeArmature.cs | 0 .../ModularAvatarMergeArmature.cs.meta | 0 .../Runtime/RuntimeUtil.cs | 2 + .../Runtime/RuntimeUtil.cs.meta | 0 .../net.fushizen.modular-avatar.core.asmdef | 0 ...t.fushizen.modular-avatar.core.asmdef.meta | 0 .../package.json | 4 +- .../package.json.meta | 0 Packages/packages-lock.json | 4 +- ProjectSettings/lilToonSetting.json | 124 ++++++++++++++++++ 47 files changed, 248 insertions(+), 5 deletions(-) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/AnimatorMerger.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/AnimatorMerger.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/Av3EmuHook.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/Av3EmuHook.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/BoneProxyHook.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/BoneProxyHook.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/ComponentAllowlistPatch.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/ComponentAllowlistPatch.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/HookSequence.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/HookSequence.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/LastResortTagComponentCleaner.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/LastResortTagComponentCleaner.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/MergeAnimatorHook.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/MergeAnimatorHook.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/MergeArmatureHook.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/MergeArmatureHook.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/MeshRetargeter.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/MeshRetargeter.cs.meta (100%) create mode 100644 Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs create mode 100644 Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs.meta rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/PathMappings.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/PathMappings.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/Util.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/Util.cs.meta (100%) create mode 100644 Packages/net.fushizen.modular-avatar/Editor/Version.cs create mode 100644 Packages/net.fushizen.modular-avatar/Editor/Version.cs.meta rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/net.fushizen.modular-avatar.core.editor.asmdef (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/AvatarTagComponent.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/AvatarTagComponent.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/MergeAnimator.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/MergeAnimator.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/ModularAvatarBoneProxy.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/ModularAvatarBoneProxy.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/ModularAvatarMergeArmature.cs (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/ModularAvatarMergeArmature.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/RuntimeUtil.cs (97%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/RuntimeUtil.cs.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/net.fushizen.modular-avatar.core.asmdef (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/Runtime/net.fushizen.modular-avatar.core.asmdef.meta (100%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/package.json (79%) rename Packages/{net.fushizen.modular-avatar.core => net.fushizen.modular-avatar}/package.json.meta (100%) create mode 100644 ProjectSettings/lilToonSetting.json diff --git a/Packages/manifest.json b/Packages/manifest.json index 7625a5bc..5d56e686 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.ugui": "1.0.0", "com.unity.xr.oculus.standalone": "2.38.4", "com.unity.xr.openvr.standalone": "2.0.5", - "net.fushizen.modular-avatar.core": "0.0.1", + "net.fushizen.modular-avatar": "0.0.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/net.fushizen.modular-avatar.core/Editor.meta b/Packages/net.fushizen.modular-avatar/Editor.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor.meta rename to Packages/net.fushizen.modular-avatar/Editor.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/AnimatorMerger.cs b/Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/AnimatorMerger.cs rename to Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/AnimatorMerger.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/AnimatorMerger.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/Av3EmuHook.cs b/Packages/net.fushizen.modular-avatar/Editor/Av3EmuHook.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/Av3EmuHook.cs rename to Packages/net.fushizen.modular-avatar/Editor/Av3EmuHook.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/Av3EmuHook.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/Av3EmuHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/Av3EmuHook.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/Av3EmuHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/BoneProxyHook.cs b/Packages/net.fushizen.modular-avatar/Editor/BoneProxyHook.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/BoneProxyHook.cs rename to Packages/net.fushizen.modular-avatar/Editor/BoneProxyHook.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/BoneProxyHook.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/BoneProxyHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/BoneProxyHook.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/BoneProxyHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/ComponentAllowlistPatch.cs b/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/ComponentAllowlistPatch.cs rename to Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/ComponentAllowlistPatch.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/ComponentAllowlistPatch.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/HookSequence.cs b/Packages/net.fushizen.modular-avatar/Editor/HookSequence.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/HookSequence.cs rename to Packages/net.fushizen.modular-avatar/Editor/HookSequence.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/HookSequence.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/HookSequence.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/HookSequence.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/HookSequence.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/LastResortTagComponentCleaner.cs b/Packages/net.fushizen.modular-avatar/Editor/LastResortTagComponentCleaner.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/LastResortTagComponentCleaner.cs rename to Packages/net.fushizen.modular-avatar/Editor/LastResortTagComponentCleaner.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/LastResortTagComponentCleaner.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/LastResortTagComponentCleaner.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/LastResortTagComponentCleaner.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/LastResortTagComponentCleaner.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/MergeAnimatorHook.cs b/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/MergeAnimatorHook.cs rename to Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/MergeAnimatorHook.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/MergeAnimatorHook.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/MergeArmatureHook.cs b/Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/MergeArmatureHook.cs rename to Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/MergeArmatureHook.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/MergeArmatureHook.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/MeshRetargeter.cs b/Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/MeshRetargeter.cs rename to Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/MeshRetargeter.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/MeshRetargeter.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs b/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs new file mode 100644 index 00000000..d46ae622 --- /dev/null +++ b/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs @@ -0,0 +1,104 @@ +using System; +using System.IO; +using System.Reflection; +using System.Text; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using UnityEditor; +using UnityEditor.PackageManager; +using UnityEditor.PackageManager.Requests; +using UnityEngine; + +namespace net.fushizen.modular_avatar.core.editor +{ + [InitializeOnLoad] + public static class ModularAvatarBootstrap + { + private const string VERSION = "0.0.1"; + private const string GIT_HASH = "d13c857e3ccffed4fa5f0ce53d9ad09a4fdd9b6b"; + + private const string GIT_URL = + "git+ssh://github-bdunderscore/bdunderscore/modular-avatar.git?path=Packages/net.fushizen.modular-avatar#" + + GIT_HASH; + + private const string PACKAGE_NAME = "net.fushizen.modular-avatar"; + + private const string JSON_PACKAGE = "jillejr.newtonsoft.json-for-unity"; + + private static AddRequest Request; + + static ModularAvatarBootstrap() + { + SemanticVersioning.Version installedVersion = null; + try + { + installedVersion = GetInstalledVersion(); + var targetVersion = SemanticVersioning.Version.Parse(VERSION); + + if (targetVersion <= installedVersion) + { + return; + } + } + catch (Exception e) + { + // Assume we aren't installed. + } + + // VRCSDK depends on Newtonsoft JSON, so we can (theoretically) rely on it here. + var manifestFile = Path.Combine(Application.dataPath, "../Packages/manifest.json"); + var manifestContents = File.ReadAllText(manifestFile, Encoding.UTF8); + + JObject manifest = JsonConvert.DeserializeObject(manifestContents); + var packages = manifest["dependencies"] as JObject; + if (packages == null || packages.ContainsKey(PACKAGE_NAME)) + { + return; // we assume the package manager is still doing its thing + } + + packages[PACKAGE_NAME] = GIT_URL; + File.WriteAllText(manifestFile, JsonConvert.SerializeObject(manifest, Formatting.Indented)); + + EditorApplication.delayCall += () => + { + MethodInfo refresh = typeof(Client).GetMethod("Resolve", + BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly); + if (refresh != null) refresh.Invoke(null, null); + }; + } + + private static void Poll() + { + if (Request.IsCompleted) + { + if (Request.Status == StatusCode.Success) + { + Debug.Log("Installed modular avatar framework"); + } + else + { + Debug.LogError(Request.Error.message); + } + + EditorApplication.update -= Poll; + } + } + + private static SemanticVersioning.Version GetInstalledVersion() + { + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) + { + var versionType = assembly.GetType("net.fushizen.modular_avatar.core.editor.Version", false); + if (versionType == null) continue; + + var versionString = versionType.GetField("VERSION", BindingFlags.Public | BindingFlags.Static); + if (versionString == null) continue; + + var version = versionString.GetValue(null) as string; + return SemanticVersioning.Version.Parse(version); + } + + return null; + } + } +} \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs.meta new file mode 100644 index 00000000..0b00cc97 --- /dev/null +++ b/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarBootstrap.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4ea7e474dfbc419ba053aefa9ab74a26 +timeCreated: 1661734297 \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/PathMappings.cs b/Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/PathMappings.cs rename to Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/PathMappings.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/PathMappings.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/Util.cs b/Packages/net.fushizen.modular-avatar/Editor/Util.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/Util.cs rename to Packages/net.fushizen.modular-avatar/Editor/Util.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/Util.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/Util.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/Util.cs.meta rename to Packages/net.fushizen.modular-avatar/Editor/Util.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Version.cs b/Packages/net.fushizen.modular-avatar/Editor/Version.cs new file mode 100644 index 00000000..64c9512d --- /dev/null +++ b/Packages/net.fushizen.modular-avatar/Editor/Version.cs @@ -0,0 +1,7 @@ +namespace net.fushizen.modular_avatar.core.editor +{ + public static class Version + { + public const string VERSION = "0.0.1"; + } +} \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar/Editor/Version.cs.meta b/Packages/net.fushizen.modular-avatar/Editor/Version.cs.meta new file mode 100644 index 00000000..8760538c --- /dev/null +++ b/Packages/net.fushizen.modular-avatar/Editor/Version.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5d9001ce79e34e7ea114fb7e218ae09d +timeCreated: 1661734309 \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/net.fushizen.modular-avatar.core.editor.asmdef b/Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/net.fushizen.modular-avatar.core.editor.asmdef rename to Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef diff --git a/Packages/net.fushizen.modular-avatar.core/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta b/Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta rename to Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime.meta b/Packages/net.fushizen.modular-avatar/Runtime.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime.meta rename to Packages/net.fushizen.modular-avatar/Runtime.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/AvatarTagComponent.cs b/Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/AvatarTagComponent.cs rename to Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/AvatarTagComponent.cs.meta b/Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/AvatarTagComponent.cs.meta rename to Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/MergeAnimator.cs b/Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/MergeAnimator.cs rename to Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/MergeAnimator.cs.meta b/Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/MergeAnimator.cs.meta rename to Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarBoneProxy.cs b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarBoneProxy.cs rename to Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarBoneProxy.cs.meta b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarBoneProxy.cs.meta rename to Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarMergeArmature.cs b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarMergeArmature.cs rename to Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarMergeArmature.cs.meta b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/ModularAvatarMergeArmature.cs.meta rename to Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/RuntimeUtil.cs b/Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar.core/Runtime/RuntimeUtil.cs rename to Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs index 3dc78479..c4bde401 100644 --- a/Packages/net.fushizen.modular-avatar.core/Runtime/RuntimeUtil.cs +++ b/Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs @@ -49,11 +49,13 @@ namespace net.fushizen.modular_avatar.core public static void MarkDirty(UnityEngine.Object obj) { + #if UNITY_EDITOR if (PrefabUtility.IsPartOfPrefabInstance(obj)) { PrefabUtility.RecordPrefabInstancePropertyModifications(obj); } EditorUtility.SetDirty(obj); + #endif } } } \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/RuntimeUtil.cs.meta b/Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/RuntimeUtil.cs.meta rename to Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs.meta diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/net.fushizen.modular-avatar.core.asmdef b/Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/net.fushizen.modular-avatar.core.asmdef rename to Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef diff --git a/Packages/net.fushizen.modular-avatar.core/Runtime/net.fushizen.modular-avatar.core.asmdef.meta b/Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/Runtime/net.fushizen.modular-avatar.core.asmdef.meta rename to Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef.meta diff --git a/Packages/net.fushizen.modular-avatar.core/package.json b/Packages/net.fushizen.modular-avatar/package.json similarity index 79% rename from Packages/net.fushizen.modular-avatar.core/package.json rename to Packages/net.fushizen.modular-avatar/package.json index 91d61617..00dd38c4 100644 --- a/Packages/net.fushizen.modular-avatar.core/package.json +++ b/Packages/net.fushizen.modular-avatar/package.json @@ -1,6 +1,6 @@ { - "name" : "net.fushizen.modular-avatar.core", - "displayName" : "Modular Avatar - Core", + "name" : "net.fushizen.modular-avatar", + "displayName" : "Modular Avatar", "version" : "0.0.1", "unity" : "2019.4", "description" : "", diff --git a/Packages/net.fushizen.modular-avatar.core/package.json.meta b/Packages/net.fushizen.modular-avatar/package.json.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar.core/package.json.meta rename to Packages/net.fushizen.modular-avatar/package.json.meta diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 70106a21..3050d2a2 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -141,8 +141,8 @@ "com.unity.nuget.newtonsoft-json": "2.0.2" } }, - "net.fushizen.modular-avatar.core": { - "version": "file:net.fushizen.modular-avatar.core", + "net.fushizen.modular-avatar": { + "version": "file:net.fushizen.modular-avatar", "depth": 0, "source": "embedded", "dependencies": {} diff --git a/ProjectSettings/lilToonSetting.json b/ProjectSettings/lilToonSetting.json new file mode 100644 index 00000000..ddc41af5 --- /dev/null +++ b/ProjectSettings/lilToonSetting.json @@ -0,0 +1,124 @@ +{ + "LIL_FEATURE_ANIMATE_MAIN_UV": true, + "LIL_FEATURE_MAIN_TONE_CORRECTION": true, + "LIL_FEATURE_MAIN_GRADATION_MAP": true, + "LIL_FEATURE_MAIN2ND": true, + "LIL_FEATURE_MAIN3RD": true, + "LIL_FEATURE_DECAL": true, + "LIL_FEATURE_ANIMATE_DECAL": true, + "LIL_FEATURE_LAYER_DISSOLVE": true, + "LIL_FEATURE_ALPHAMASK": true, + "LIL_FEATURE_SHADOW": true, + "LIL_FEATURE_RECEIVE_SHADOW": true, + "LIL_FEATURE_SHADOW_3RD": true, + "LIL_FEATURE_EMISSION_1ST": true, + "LIL_FEATURE_EMISSION_2ND": true, + "LIL_FEATURE_ANIMATE_EMISSION_UV": true, + "LIL_FEATURE_ANIMATE_EMISSION_MASK_UV": true, + "LIL_FEATURE_EMISSION_GRADATION": true, + "LIL_FEATURE_NORMAL_1ST": true, + "LIL_FEATURE_NORMAL_2ND": true, + "LIL_FEATURE_ANISOTROPY": true, + "LIL_FEATURE_REFLECTION": true, + "LIL_FEATURE_MATCAP": true, + "LIL_FEATURE_MATCAP_2ND": true, + "LIL_FEATURE_RIMLIGHT": true, + "LIL_FEATURE_RIMLIGHT_DIRECTION": true, + "LIL_FEATURE_GLITTER": true, + "LIL_FEATURE_BACKLIGHT": true, + "LIL_FEATURE_PARALLAX": true, + "LIL_FEATURE_POM": true, + "LIL_FEATURE_CLIPPING_CANCELLER": false, + "LIL_FEATURE_DISTANCE_FADE": true, + "LIL_FEATURE_AUDIOLINK": true, + "LIL_FEATURE_AUDIOLINK_VERTEX": true, + "LIL_FEATURE_AUDIOLINK_LOCAL": true, + "LIL_FEATURE_DISSOLVE": true, + "LIL_FEATURE_ENCRYPTION": false, + "LIL_FEATURE_ANIMATE_OUTLINE_UV": true, + "LIL_FEATURE_OUTLINE_TONE_CORRECTION": true, + "LIL_FEATURE_OUTLINE_RECEIVE_SHADOW": true, + "LIL_FEATURE_FUR_COLLISION": true, + "LIL_FEATURE_MainGradationTex": true, + "LIL_FEATURE_MainColorAdjustMask": true, + "LIL_FEATURE_Main2ndTex": true, + "LIL_FEATURE_Main2ndBlendMask": true, + "LIL_FEATURE_Main2ndDissolveMask": true, + "LIL_FEATURE_Main2ndDissolveNoiseMask": true, + "LIL_FEATURE_Main3rdTex": true, + "LIL_FEATURE_Main3rdBlendMask": true, + "LIL_FEATURE_Main3rdDissolveMask": true, + "LIL_FEATURE_Main3rdDissolveNoiseMask": true, + "LIL_FEATURE_AlphaMask": true, + "LIL_FEATURE_BumpMap": true, + "LIL_FEATURE_Bump2ndMap": true, + "LIL_FEATURE_Bump2ndScaleMask": true, + "LIL_FEATURE_AnisotropyTangentMap": true, + "LIL_FEATURE_AnisotropyScaleMask": true, + "LIL_FEATURE_AnisotropyShiftNoiseMask": true, + "LIL_FEATURE_ShadowBorderMask": true, + "LIL_FEATURE_ShadowBlurMask": true, + "LIL_FEATURE_ShadowStrengthMask": true, + "LIL_FEATURE_ShadowColorTex": true, + "LIL_FEATURE_Shadow2ndColorTex": true, + "LIL_FEATURE_Shadow3rdColorTex": true, + "LIL_FEATURE_BacklightColorTex": true, + "LIL_FEATURE_SmoothnessTex": true, + "LIL_FEATURE_MetallicGlossMap": true, + "LIL_FEATURE_ReflectionColorTex": true, + "LIL_FEATURE_ReflectionCubeTex": true, + "LIL_FEATURE_MatCapTex": true, + "LIL_FEATURE_MatCapBlendMask": true, + "LIL_FEATURE_MatCapBumpMap": true, + "LIL_FEATURE_MatCap2ndTex": true, + "LIL_FEATURE_MatCap2ndBlendMask": true, + "LIL_FEATURE_MatCap2ndBumpMap": true, + "LIL_FEATURE_RimColorTex": true, + "LIL_FEATURE_GlitterColorTex": true, + "LIL_FEATURE_GlitterShapeTex": true, + "LIL_FEATURE_EmissionMap": true, + "LIL_FEATURE_EmissionBlendMask": true, + "LIL_FEATURE_EmissionGradTex": true, + "LIL_FEATURE_Emission2ndMap": true, + "LIL_FEATURE_Emission2ndBlendMask": true, + "LIL_FEATURE_Emission2ndGradTex": true, + "LIL_FEATURE_ParallaxMap": true, + "LIL_FEATURE_AudioLinkMask": true, + "LIL_FEATURE_AudioLinkLocalMap": true, + "LIL_FEATURE_DissolveMask": true, + "LIL_FEATURE_DissolveNoiseMask": true, + "LIL_FEATURE_OutlineTex": true, + "LIL_FEATURE_OutlineWidthMask": true, + "LIL_FEATURE_OutlineVectorTex": true, + "LIL_FEATURE_FurNoiseMask": true, + "LIL_FEATURE_FurMask": true, + "LIL_FEATURE_FurLengthMask": true, + "LIL_FEATURE_FurVectorTex": true, + "LIL_OPTIMIZE_APPLY_SHADOW_FA": true, + "LIL_OPTIMIZE_USE_FORWARDADD": true, + "LIL_OPTIMIZE_USE_FORWARDADD_SHADOW": false, + "LIL_OPTIMIZE_USE_VERTEXLIGHT": true, + "LIL_OPTIMIZE_USE_LIGHTMAP": false, + "isLocked": false, + "isDebugOptimize": false, + "isOptimizeInTestBuild": false, + "defaultAsUnlit": 0.0, + "defaultVertexLightStrength": 0.0, + "defaultLightMinLimit": 0.05000000074505806, + "defaultLightMaxLimit": 1.0, + "defaultBeforeExposureLimit": 10000.0, + "defaultMonochromeLighting": 0.0, + "defaultlilDirectionalLightStrength": 1.0, + "presetSkin": { + "instanceID": 0 + }, + "presetFace": { + "instanceID": 0 + }, + "presetHair": { + "instanceID": 0 + }, + "presetCloth": { + "instanceID": 0 + } +} \ No newline at end of file