diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ccae5833..7cb9587f 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -10,7 +10,7 @@ on: - '**' env: - packageName: "net.fushizen.modular-avatar" + packageName: "nadena.dev.modular-avatar" jobs: build: diff --git a/Packages/.gitignore b/Packages/.gitignore index 7e80cf73..da630112 100644 --- a/Packages/.gitignore +++ b/Packages/.gitignore @@ -1,4 +1,4 @@ /*/ !com.vrchat.core.*/ com.vrchat.*/ -!net.fushizen.*/ +!nadena.dev.*/ diff --git a/Packages/manifest.json b/Packages/manifest.json index f7fdaf5f..28b90807 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": "0.0.1", + "nadena.dev.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/COPYING.md b/Packages/nadena.dev.modular-avatar/COPYING.md similarity index 100% rename from Packages/net.fushizen.modular-avatar/COPYING.md rename to Packages/nadena.dev.modular-avatar/COPYING.md diff --git a/Packages/net.fushizen.modular-avatar/COPYING.md.meta b/Packages/nadena.dev.modular-avatar/COPYING.md.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/COPYING.md.meta rename to Packages/nadena.dev.modular-avatar/COPYING.md.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor.meta b/Packages/nadena.dev.modular-avatar/Editor.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor.meta rename to Packages/nadena.dev.modular-avatar/Editor.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs rename to Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs index c1289bb5..86ad1481 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs @@ -31,7 +31,7 @@ using UnityEngine; using VRC.SDK3.Avatars.Components; using Object = UnityEngine.Object; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class AnimatorCombiner { diff --git a/Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/ApplyOnPlay.cs b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/ApplyOnPlay.cs rename to Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs index 43e0bebf..cddbd0bc 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/ApplyOnPlay.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs @@ -28,13 +28,13 @@ using UnityEngine.SceneManagement; using VRC.SDK3.Avatars.Components; using VRC.SDKBase.Editor.BuildPipeline; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [InitializeOnLoad] public static class ApplyOnPlay { private const string MENU_NAME = "Tools/Modular Avatar/Apply on Play"; - + /** * We need to process avatars before lyuma's av3 emulator wakes up and processes avatars; it does this in Awake, * so we have to do our processing in Awake as well. This seems to work fine when first entering play mode, but @@ -44,7 +44,7 @@ namespace net.fushizen.modular_avatar.core.editor * all initially-enabled components have Awake called), we switch to processing from Start instead. */ private static RuntimeUtil.OnDemandSource armedSource = RuntimeUtil.OnDemandSource.Awake; - + static ApplyOnPlay() { EditorApplication.playModeStateChanged += OnPlayModeStateChanged; diff --git a/Packages/net.fushizen.modular-avatar/Editor/ApplyOnPlay.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/ApplyOnPlay.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/AvatarProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/AvatarProcessor.cs rename to Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs index 9b4e7147..0a1ae3dc 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/AvatarProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs @@ -32,7 +32,7 @@ using VRC.SDKBase.Editor.BuildPipeline; using VRC.SDKBase.Validation.Performance.Stats; using Object = UnityEngine.Object; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [InitializeOnLoad] public class AvatarProcessor : IVRCSDKPreprocessAvatarCallback, IVRCSDKPostprocessAvatarCallback diff --git a/Packages/net.fushizen.modular-avatar/Editor/AvatarProcessor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/AvatarProcessor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs rename to Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs index 35c6a7d3..ad5a66e8 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs @@ -7,7 +7,7 @@ using UnityEngine; using VRC.SDK3.Avatars.Components; using Object = UnityEngine.Object; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { /** * Ensures that any blendshapes marked for syncing by BlendshapeSync propagate values in all animation clips. diff --git a/Packages/net.fushizen.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/BoneProxyProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/BoneProxyProcessor.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar/Editor/BoneProxyProcessor.cs rename to Packages/nadena.dev.modular-avatar/Editor/BoneProxyProcessor.cs index 0c7cf875..8fde4477 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/BoneProxyProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/BoneProxyProcessor.cs @@ -24,7 +24,7 @@ using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal class BoneProxyProcessor { diff --git a/Packages/net.fushizen.modular-avatar/Editor/BoneProxyProcessor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/BoneProxyProcessor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/BoneProxyProcessor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/BoneProxyProcessor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs b/Packages/nadena.dev.modular-avatar/Editor/ComponentAllowlistPatch.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs rename to Packages/nadena.dev.modular-avatar/Editor/ComponentAllowlistPatch.cs index 2c92a9d4..05c5efa8 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ComponentAllowlistPatch.cs @@ -30,7 +30,7 @@ using UnityEditor.PackageManager.Requests; using UnityEngine; using VRC.SDK3.Avatars.Components; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [InitializeOnLoad] internal static class ComponentAllowlistPatch diff --git a/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/ComponentAllowlistPatch.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/ComponentAllowlistPatch.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/EasySetupOutfit.cs b/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/EasySetupOutfit.cs rename to Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs index f9ee759d..79ac82be 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/EasySetupOutfit.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class EasySetupOutfit { diff --git a/Packages/net.fushizen.modular-avatar/Editor/EasySetupOutfit.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/EasySetupOutfit.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Images.meta b/Packages/nadena.dev.modular-avatar/Editor/Images.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Images.meta rename to Packages/nadena.dev.modular-avatar/Editor/Images.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Images/.gitignore b/Packages/nadena.dev.modular-avatar/Editor/Images/.gitignore similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Images/.gitignore rename to Packages/nadena.dev.modular-avatar/Editor/Images/.gitignore diff --git a/Packages/net.fushizen.modular-avatar/Editor/Images/logo.png b/Packages/nadena.dev.modular-avatar/Editor/Images/logo.png similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Images/logo.png rename to Packages/nadena.dev.modular-avatar/Editor/Images/logo.png diff --git a/Packages/net.fushizen.modular-avatar/Editor/Images/logo.png.meta b/Packages/nadena.dev.modular-avatar/Editor/Images/logo.png.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Images/logo.png.meta rename to Packages/nadena.dev.modular-avatar/Editor/Images/logo.png.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector.meta diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/.editorconfig b/Packages/nadena.dev.modular-avatar/Editor/Inspector/.editorconfig new file mode 100644 index 00000000..e69de29b diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvMenuTreeView.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/AvMenuTreeView.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs index e12f8c46..db870453 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvMenuTreeView.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs @@ -8,7 +8,7 @@ using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; using VRC.SDKBase; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { class AvMenuTreeViewWindow : EditorWindow { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvMenuTreeView.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/AvMenuTreeView.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs index ca6497d1..3c44ab8d 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs @@ -2,7 +2,7 @@ using UnityEngine; using VRC.SDK3.Avatars.Components; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomPropertyDrawer(typeof(AvatarObjectReference))] public class AvatarObjectReferenceDrawer : PropertyDrawer @@ -10,7 +10,7 @@ namespace net.fushizen.modular_avatar.core.editor public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { if (CustomGUI(position, property, label)) return; - + var xButtonSize = EditorStyles.miniButtonRight.CalcSize(new GUIContent("x")); var xButtonRect = new Rect(position.xMax - xButtonSize.x, position.y, xButtonSize.x, position.height); position = new Rect(position.x, position.y, position.width - xButtonSize.x, position.height); diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs index f8babb6b..a2990562 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs @@ -6,10 +6,10 @@ using UnityEditor; using UnityEditorInternal; using UnityEngine; using UnityEngine.Serialization; -using static net.fushizen.modular_avatar.core.editor.Localization; +using static nadena.dev.modular_avatar.core.editor.Localization; using Debug = System.Diagnostics.Debug; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomEditor(typeof(ModularAvatarParameters))] internal class AvatarParametersEditor : MAEditorBase diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs index b1a26900..c0ff0c19 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs @@ -7,7 +7,7 @@ using UnityEditor.IMGUI.Controls; using UnityEditor.PackageManager.UI; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class BlendshapeSelectWindow : EditorWindow { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs index 531edccc..cc062725 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs @@ -8,9 +8,9 @@ using UnityEditorInternal; using UnityEngine; using UnityEngine.PlayerLoop; using VRC.Core; -using static net.fushizen.modular_avatar.core.editor.Localization; +using static nadena.dev.modular_avatar.core.editor.Localization; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomEditor(typeof(ModularAvatarBlendshapeSync))] [CanEditMultipleObjects] diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BoneProxyEditor.cs similarity index 95% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/BoneProxyEditor.cs index b411c233..016647a4 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BoneProxyEditor.cs @@ -1,8 +1,8 @@ using UnityEditor; using UnityEngine; -using static net.fushizen.modular_avatar.core.editor.Localization; +using static nadena.dev.modular_avatar.core.editor.Localization; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal class TempObjRef : ScriptableObject { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BoneProxyEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/BoneProxyEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs similarity index 96% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs index 6a0dd4cb..bfa98c5e 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomEditor(typeof(ModularAvatarVisibleHeadAccessory))] internal class FirstPersonVisibleEditor : MAEditorBase diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/InspectorCommon.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs similarity index 92% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/InspectorCommon.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs index cec24dcf..732ea9cd 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/InspectorCommon.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs @@ -2,7 +2,7 @@ using UnityEditor.Experimental.SceneManagement; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal static class InspectorCommon { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/InspectorCommon.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/InspectorCommon.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/LogoDisplay.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/LogoDisplay.cs similarity index 96% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/LogoDisplay.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/LogoDisplay.cs index d636ac7e..67bcdfa2 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/LogoDisplay.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/LogoDisplay.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal static class LogoDisplay { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/LogoDisplay.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/LogoDisplay.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/LogoDisplay.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/LogoDisplay.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MAEditorBase.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAEditorBase.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MAEditorBase.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MAEditorBase.cs index 5c8496e4..275f2f71 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MAEditorBase.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAEditorBase.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEditor.UIElements; using UnityEngine.UIElements; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { // This class performs common setup for Modular Avatar editors, including ensuring that only one instance of the\ // logo is rendered per container. diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MAEditorBase.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAEditorBase.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MAEditorBase.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MAEditorBase.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs index af3c021d..6133e264 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs @@ -4,9 +4,9 @@ using UnityEditor; using UnityEngine; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; -using static net.fushizen.modular_avatar.core.editor.Localization; +using static nadena.dev.modular_avatar.core.editor.Localization; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomEditor(typeof(ModularAvatarMenuInstaller))] [CanEditMultipleObjects] diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs similarity index 95% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs index 1ec7b959..4d7cfd24 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs @@ -1,9 +1,9 @@ using UnityEditor; using UnityEngine; using UnityEngine.UIElements; -using static net.fushizen.modular_avatar.core.editor.Localization; +using static nadena.dev.modular_avatar.core.editor.Localization; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomPropertyDrawer(typeof(MergeAnimatorPathMode))] class PathModeDrawer : PropertyDrawer diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs similarity index 94% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs index 0f9f3add..c512762c 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs @@ -1,9 +1,9 @@ using System; using UnityEditor; using UnityEngine; -using static net.fushizen.modular_avatar.core.editor.Localization; +using static nadena.dev.modular_avatar.core.editor.Localization; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [CustomEditor(typeof(ModularAvatarMergeArmature))] internal class MergeArmatureEditor : MAEditorBase diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/ZeroIndentScope.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/ZeroIndentScope.cs similarity index 88% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/ZeroIndentScope.cs rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/ZeroIndentScope.cs index b10dfc20..d5c8f4af 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/ZeroIndentScope.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/ZeroIndentScope.cs @@ -1,7 +1,7 @@ using System; using UnityEditor; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class ZeroIndentScope : IDisposable { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/ZeroIndentScope.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Inspector/ZeroIndentScope.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Inspector/ZeroIndentScope.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Inspector/ZeroIndentScope.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization.meta b/Packages/nadena.dev.modular-avatar/Editor/Localization.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Localization.meta rename to Packages/nadena.dev.modular-avatar/Editor/Localization.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization/Localization.cs b/Packages/nadena.dev.modular-avatar/Editor/Localization/Localization.cs similarity index 93% rename from Packages/net.fushizen.modular-avatar/Editor/Localization/Localization.cs rename to Packages/nadena.dev.modular-avatar/Editor/Localization/Localization.cs index 4bc983a9..fa61e809 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Localization/Localization.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Localization/Localization.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json; using UnityEditor; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public static class Localization { @@ -86,7 +86,7 @@ namespace net.fushizen.modular_avatar.core.editor private static string GetSelectedLocalization() { - return EditorPrefs.GetString("net.fushizen.modularavatar.lang", "en"); + return EditorPrefs.GetString("nadena.dev.modularavatar.lang", "en"); } public static void ShowLanguageUI() @@ -99,7 +99,7 @@ namespace net.fushizen.modular_avatar.core.editor var newIndex = EditorGUILayout.Popup("Editor Language", curIndex, DisplayNames); if (newIndex != curIndex) { - EditorPrefs.SetString("net.fushizen.modularavatar.lang", SupportedLanguages[newIndex]); + EditorPrefs.SetString("nadena.dev.modularavatar.lang", SupportedLanguages[newIndex]); Reload(); } } diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization/Localization.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Localization/Localization.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Localization/Localization.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Localization/Localization.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization/en.json b/Packages/nadena.dev.modular-avatar/Editor/Localization/en.json similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Localization/en.json rename to Packages/nadena.dev.modular-avatar/Editor/Localization/en.json diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization/en.json.meta b/Packages/nadena.dev.modular-avatar/Editor/Localization/en.json.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Localization/en.json.meta rename to Packages/nadena.dev.modular-avatar/Editor/Localization/en.json.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization/ja.json b/Packages/nadena.dev.modular-avatar/Editor/Localization/ja.json similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Localization/ja.json rename to Packages/nadena.dev.modular-avatar/Editor/Localization/ja.json diff --git a/Packages/net.fushizen.modular-avatar/Editor/Localization/ja.json.meta b/Packages/nadena.dev.modular-avatar/Editor/Localization/ja.json.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Localization/ja.json.meta rename to Packages/nadena.dev.modular-avatar/Editor/Localization/ja.json.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/MenuInstallHook.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/MenuInstallHook.cs rename to Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs index dc410df3..e5dc19f6 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/MenuInstallHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs @@ -5,7 +5,7 @@ using UnityEngine; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class MenuInstallHook { diff --git a/Packages/net.fushizen.modular-avatar/Editor/MenuInstallHook.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/MenuInstallHook.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorProcessor.cs rename to Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs index 776ef557..98b5306e 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs @@ -30,7 +30,7 @@ using UnityEngine; using VRC.SDK3.Avatars.Components; using Object = UnityEngine.Object; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal class MergeAnimatorProcessor { diff --git a/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorProcessor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorProcessor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs b/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs rename to Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs index ae9d44d4..6135a0eb 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs @@ -31,7 +31,7 @@ using VRC.Dynamics; using VRC.SDK3.Dynamics.PhysBone.Components; using Object = UnityEngine.Object; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class MergeArmatureHook { diff --git a/Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/MergeArmatureHook.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs b/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs similarity index 95% rename from Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs rename to Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs index abf83aee..d115a698 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs @@ -28,7 +28,7 @@ using UnityEditor; using UnityEngine; using VRC.SDKBase.Editor.BuildPipeline; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal static class BoneDatabase { @@ -73,7 +73,7 @@ namespace net.fushizen.modular_avatar.core.editor return retargeted ? retargeted : (fallbackToOriginal ? bone : null); } } - + internal class RetargetMeshes { internal void OnPreprocessAvatar(GameObject avatarGameObject) @@ -95,7 +95,7 @@ namespace net.fushizen.modular_avatar.core.editor new MeshRetargeter(renderer).Retarget(); } } - + // Now remove retargeted bones if (true) { @@ -111,18 +111,18 @@ namespace net.fushizen.modular_avatar.core.editor { children.Add(child); } - - foreach (Transform child in children) { + + foreach (Transform child in children) + { child.SetParent(destBone, true); } UnityEngine.Object.DestroyImmediate(sourceBone.gameObject); } - } } } - + /** * This class processes a given mesh, adjusting the bind poses for any bones that are to be merged to instead match * the bind pose of the original avatar's bone. @@ -138,7 +138,7 @@ namespace net.fushizen.modular_avatar.core.editor public Matrix4x4 localToBone; public Matrix4x4 priorToNew; } - + public MeshRetargeter(SkinnedMeshRenderer renderer) { this.renderer = renderer; @@ -146,7 +146,6 @@ namespace net.fushizen.modular_avatar.core.editor public void Retarget() { - var avatar = RuntimeUtil.FindAvatarInParents(renderer.transform); if (avatar == null) throw new System.Exception("Could not find avatar in parents of " + renderer.name); var avatarTransform = avatar.transform; @@ -158,18 +157,18 @@ namespace net.fushizen.modular_avatar.core.editor avatarTransform.position = Vector3.zero; avatarTransform.rotation = Quaternion.identity; avatarTransform.localScale = Vector3.one; - + src = renderer.sharedMesh; dst = Mesh.Instantiate(src); dst.name = "RETARGETED: " + src.name; RetargetBones(); AdjustShapeKeys(); - + avatarTransform.position = avPos; avatarTransform.rotation = avRot; - avatarTransform.localScale = avScale; - + avatarTransform.localScale = avScale; + AssetDatabase.CreateAsset(dst, Util.GenerateAssetPath()); } @@ -191,8 +190,9 @@ namespace net.fushizen.modular_avatar.core.editor Transform newBindTarget = BoneDatabase.GetRetargetedBone(originalBones[i]); if (newBindTarget == null) continue; - Matrix4x4 Bp = newBindTarget.worldToLocalMatrix * originalBones[i].localToWorldMatrix * originalBindPoses[i]; - + Matrix4x4 Bp = newBindTarget.worldToLocalMatrix * originalBones[i].localToWorldMatrix * + originalBindPoses[i]; + newBones[i] = newBindTarget; newBindPoses[i] = Bp; } diff --git a/Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/MeshRetargeter.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarSettings.cs b/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs similarity index 89% rename from Packages/net.fushizen.modular-avatar/Editor/ModularAvatarSettings.cs rename to Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs index 507a85c9..caee7d50 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarSettings.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs @@ -25,19 +25,19 @@ using UnityEditor; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public static class ModularAvatarSettings { - private const string PREFKEY_APPLY_ON_PLAY = "net.fushizen.modular-avatar.applyOnPlay"; + private const string PREFKEY_APPLY_ON_PLAY = "nadena.dev.modular-avatar.applyOnPlay"; #if UNITY_EDITOR public static bool applyOnPlay { get => EditorPrefs.GetBool(PREFKEY_APPLY_ON_PLAY, true); set => EditorPrefs.SetBool(PREFKEY_APPLY_ON_PLAY, value); } - #else +#else public static bool applyOnPlay = false; - #endif +#endif } } \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar/Editor/ModularAvatarSettings.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/ModularAvatarSettings.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/ParameterPolicy.cs b/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/ParameterPolicy.cs rename to Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs index 652e0e5f..b4253fee 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/ParameterPolicy.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs @@ -9,7 +9,7 @@ using VRC.SDK3.Avatars.ScriptableObjects; using VRC.SDK3.Dynamics.Contact.Components; using VRC.SDK3.Dynamics.PhysBone.Components; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public struct DetectedParameter { diff --git a/Packages/net.fushizen.modular-avatar/Editor/ParameterPolicy.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/ParameterPolicy.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs b/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs rename to Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs index e3ba6b17..a946ca6c 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs @@ -26,7 +26,7 @@ using System.Collections.Generic; using UnityEngine; using VRC.SDKBase.Editor.BuildPipeline; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public static class PathMappings { diff --git a/Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/PathMappings.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/RenameParametersHook.cs b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/RenameParametersHook.cs rename to Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs index d91d4d04..59d22eb8 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/RenameParametersHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs @@ -11,7 +11,7 @@ using VRC.SDK3.Dynamics.Contact.Components; using VRC.SDK3.Dynamics.PhysBone.Components; using Object = UnityEngine.Object; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { public class RenameParametersHook { diff --git a/Packages/net.fushizen.modular-avatar/Editor/RenameParametersHook.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/RenameParametersHook.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Util.cs b/Packages/nadena.dev.modular-avatar/Editor/Util.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Editor/Util.cs rename to Packages/nadena.dev.modular-avatar/Editor/Util.cs index 9712454f..32166fb4 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Util.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Util.cs @@ -28,7 +28,7 @@ using UnityEditor.Animations; using UnityEngine; using VRC.SDKBase.Editor.BuildPipeline; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal class CleanupTempAssets : IVRCSDKPostprocessAvatarCallback { diff --git a/Packages/net.fushizen.modular-avatar/Editor/Util.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Util.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Util.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Util.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/Version.cs b/Packages/nadena.dev.modular-avatar/Editor/Version.cs similarity index 96% rename from Packages/net.fushizen.modular-avatar/Editor/Version.cs rename to Packages/nadena.dev.modular-avatar/Editor/Version.cs index f9bb9d2d..e0ac49a4 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/Version.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Version.cs @@ -24,7 +24,7 @@ using JetBrains.Annotations; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { [UsedImplicitly] public static class Version diff --git a/Packages/net.fushizen.modular-avatar/Editor/Version.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Version.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/Version.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/Version.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs rename to Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs index 323d7192..fca43a7f 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs @@ -4,7 +4,7 @@ using Unity.Collections; using UnityEditor; using UnityEngine; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { /// /// Many avatars have hair meshes which are partially painted to the Head bone, and partially to a bone we might diff --git a/Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs rename to Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs index 62cfa739..f7e99b9d 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs @@ -4,7 +4,7 @@ using UnityEngine.Animations; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Dynamics.PhysBone.Components; -namespace net.fushizen.modular_avatar.core.editor +namespace nadena.dev.modular_avatar.core.editor { internal class VisibleHeadAccessoryProcessor { diff --git a/Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs.meta rename to Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef b/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef similarity index 56% rename from Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef rename to Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef index cd8c1af4..ef7d4a97 100644 --- a/Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef +++ b/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef @@ -1,10 +1,10 @@ { - "name": "net.fushizen.modular-avatar.core.editor", + "name": "nadena.dev.modular-avatar.core.editor", "references": [ - "GUID:fc900867c0f47cd49b6e2ae4ef907300", - "GUID:5718fb738711cd34ea54e9553040911d", - "GUID:6e9c6119ac4eb334284fb7b4bc6d1f05", - "GUID:b906909fcc54f634db50f2cad0f988d9" + "GUID:fc900867c0f47cd49b6e2ae4ef907300", + "GUID:5718fb738711cd34ea54e9553040911d", + "GUID:6e9c6119ac4eb334284fb7b4bc6d1f05", + "GUID:b906909fcc54f634db50f2cad0f988d9" ], "includePlatforms": [ "Editor" diff --git a/Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta b/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Editor/net.fushizen.modular-avatar.core.editor.asmdef.meta rename to Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime.meta b/Packages/nadena.dev.modular-avatar/Runtime.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime.meta rename to Packages/nadena.dev.modular-avatar/Runtime.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/AvatarObjectReference.cs b/Packages/nadena.dev.modular-avatar/Runtime/AvatarObjectReference.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar/Runtime/AvatarObjectReference.cs rename to Packages/nadena.dev.modular-avatar/Runtime/AvatarObjectReference.cs index 837fc6ec..b9897ebe 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/AvatarObjectReference.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/AvatarObjectReference.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [Serializable] public class AvatarObjectReference diff --git a/Packages/net.fushizen.modular-avatar/Runtime/AvatarObjectReference.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/AvatarObjectReference.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/AvatarObjectReference.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/AvatarObjectReference.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs b/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs rename to Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs index 1255c5f2..1f7cc400 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs @@ -25,7 +25,7 @@ using System; using UnityEngine; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { /** * This abstract base class is injected into the VRCSDK avatar component allowlist to avoid diff --git a/Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/AvatarTagComponent.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs similarity index 98% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs index 4a35318b..1cfdbb7d 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [Serializable] public struct BlendshapeBinding diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs index f5917c18..d9ef1e50 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [ExecuteInEditMode] [DisallowMultipleComponent] diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarBoneProxy.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs similarity index 92% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs index f1a6cd41..4c38dc65 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs @@ -2,7 +2,7 @@ using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [AddComponentMenu("Modular Avatar/MA Menu Installer")] public class ModularAvatarMenuInstaller : AvatarTagComponent diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstaller.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs similarity index 97% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs index 916e68d9..96663030 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs @@ -25,7 +25,7 @@ using UnityEngine; using VRC.SDK3.Avatars.Components; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { public enum MergeAnimatorPathMode { diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs index a0d75c51..589b8517 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs @@ -29,7 +29,7 @@ using UnityEngine; using UnityEditor; #endif -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [ExecuteInEditMode] [DisallowMultipleComponent] diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarParameters.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs similarity index 94% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarParameters.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs index 45669072..0b8ee7ba 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarParameters.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using VRC.SDK3.Avatars.ScriptableObjects; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [Serializable] public struct ParameterConfig diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarParameters.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarParameters.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs similarity index 85% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs index c510284e..284094fa 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { [AddComponentMenu("Modular Avatar/MA Visible Head Accessory")] [DisallowMultipleComponent] diff --git a/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs b/Packages/nadena.dev.modular-avatar/Runtime/RuntimeUtil.cs similarity index 99% rename from Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs rename to Packages/nadena.dev.modular-avatar/Runtime/RuntimeUtil.cs index 49bdf41d..2c8d6454 100644 --- a/Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/RuntimeUtil.cs @@ -31,7 +31,7 @@ using VRC.SDK3.Avatars.Components; using System.Reflection; #endif -namespace net.fushizen.modular_avatar.core +namespace nadena.dev.modular_avatar.core { public static class RuntimeUtil { diff --git a/Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/RuntimeUtil.cs.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/RuntimeUtil.cs.meta rename to Packages/nadena.dev.modular-avatar/Runtime/RuntimeUtil.cs.meta diff --git a/Packages/nadena.dev.modular-avatar/Runtime/TestComponent.cs b/Packages/nadena.dev.modular-avatar/Runtime/TestComponent.cs new file mode 100644 index 00000000..c521930b --- /dev/null +++ b/Packages/nadena.dev.modular-avatar/Runtime/TestComponent.cs @@ -0,0 +1,27 @@ +using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace nadena.dev.modular_avatar.core +{ + public class TestComponent : MonoBehaviour + { + public AvatarObjectReference objRef = new AvatarObjectReference(); + } + +#if UNITY_EDITOR + [CustomEditor(typeof(TestComponent))] + class TestComponentEditor : Editor + { + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + TestComponent target = (TestComponent) this.target; + + EditorGUILayout.ObjectField("Current target", target.objRef.Get(target), typeof(GameObject), true); + } + } +#endif +} \ No newline at end of file diff --git a/Packages/nadena.dev.modular-avatar/Runtime/TestComponent.cs.meta b/Packages/nadena.dev.modular-avatar/Runtime/TestComponent.cs.meta new file mode 100644 index 00000000..9eddaaad --- /dev/null +++ b/Packages/nadena.dev.modular-avatar/Runtime/TestComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3023876a11c0479c8e673d330b619394 +timeCreated: 1664755225 \ No newline at end of file diff --git a/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef b/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef new file mode 100644 index 00000000..9de4b1f9 --- /dev/null +++ b/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef @@ -0,0 +1,13 @@ +{ + "name": "nadena.dev.modular-avatar.core", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef.meta b/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef.meta rename to Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples.meta b/Packages/nadena.dev.modular-avatar/Samples.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples.meta rename to Packages/nadena.dev.modular-avatar/Samples.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/ClapMenu.asset b/Packages/nadena.dev.modular-avatar/Samples/Clap/ClapMenu.asset similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/ClapMenu.asset rename to Packages/nadena.dev.modular-avatar/Samples/Clap/ClapMenu.asset diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/ClapMenu.asset.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/ClapMenu.asset.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/ClapMenu.asset.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/ClapMenu.asset.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_controller.controller b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_controller.controller similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_controller.controller rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_controller.controller diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_controller.controller.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_controller.controller.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_controller.controller.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_controller.controller.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_off.anim b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_off.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_off.anim rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_off.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_off.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_off.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_off.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_off.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_l.anim b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_l.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_l.anim rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_l.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_l.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_l.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_l.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_l.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_r.anim b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_r.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_r.anim rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_r.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_r.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_r.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/clap_on_r.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/clap_on_r.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav b/Packages/nadena.dev.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav rename to Packages/nadena.dev.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/freesound_244568__clap-clean-reverb.wav.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/star.mat b/Packages/nadena.dev.modular-avatar/Samples/Clap/star.mat similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/star.mat rename to Packages/nadena.dev.modular-avatar/Samples/Clap/star.mat diff --git a/Packages/net.fushizen.modular-avatar/Samples/Clap/star.mat.meta b/Packages/nadena.dev.modular-avatar/Samples/Clap/star.mat.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Clap/star.mat.meta rename to Packages/nadena.dev.modular-avatar/Samples/Clap/star.mat.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/ClapSample.prefab b/Packages/nadena.dev.modular-avatar/Samples/ClapSample.prefab similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/ClapSample.prefab rename to Packages/nadena.dev.modular-avatar/Samples/ClapSample.prefab diff --git a/Packages/net.fushizen.modular-avatar/Samples/ClapSample.prefab.meta b/Packages/nadena.dev.modular-avatar/Samples/ClapSample.prefab.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/ClapSample.prefab.meta rename to Packages/nadena.dev.modular-avatar/Samples/ClapSample.prefab.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen.prefab b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen.prefab similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen.prefab rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen.prefab diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen.prefab.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen.prefab.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen.prefab.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen.prefab.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawActive.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_DrawInactive.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Disable.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FP_Global_Enable.anim.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/Fingerpen.asset b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/Fingerpen.asset similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/Fingerpen.asset rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/Fingerpen.asset diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/Fingerpen.asset.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/Fingerpen.asset.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/Fingerpen.asset.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/Fingerpen.asset.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenController.controller b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenController.controller similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenController.controller rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenController.controller diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenController.controller.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenController.controller.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenController.controller.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenController.controller.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenMaterial.mat.meta diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenSub.asset b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenSub.asset similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenSub.asset rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenSub.asset diff --git a/Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenSub.asset.meta b/Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenSub.asset.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/Samples/Fingerpen/FingerpenSub.asset.meta rename to Packages/nadena.dev.modular-avatar/Samples/Fingerpen/FingerpenSub.asset.meta diff --git a/Packages/net.fushizen.modular-avatar/package.json b/Packages/nadena.dev.modular-avatar/package.json similarity index 75% rename from Packages/net.fushizen.modular-avatar/package.json rename to Packages/nadena.dev.modular-avatar/package.json index dc430afc..6a78b3b0 100644 --- a/Packages/net.fushizen.modular-avatar/package.json +++ b/Packages/nadena.dev.modular-avatar/package.json @@ -1,5 +1,5 @@ { - "name": "net.fushizen.modular-avatar", + "name": "nadena.dev.modular-avatar", "displayName": "Modular Avatar", "version": "0.7.1", "unity": "2019.4", @@ -10,10 +10,10 @@ "url": "https://github.com/bdunderscore/modular-avatar" }, "url": "", - "repo": "https://vpm.fushizen.net/vpm.json", + "repo": "https://vpm.nadena.dev/vpm.json", "dependencies": { }, - "vpmDependencies" : { + "vpmDependencies": { "com.vrchat.base": "3.1.9", "com.vrchat.avatars": "3.1.9" } diff --git a/Packages/net.fushizen.modular-avatar/package.json.meta b/Packages/nadena.dev.modular-avatar/package.json.meta similarity index 100% rename from Packages/net.fushizen.modular-avatar/package.json.meta rename to Packages/nadena.dev.modular-avatar/package.json.meta diff --git a/Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef b/Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef deleted file mode 100644 index fba0479a..00000000 --- a/Packages/net.fushizen.modular-avatar/Runtime/net.fushizen.modular-avatar.core.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "net.fushizen.modular-avatar.core" -} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index dc02f5bc..ccd529bd 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": { - "version": "file:net.fushizen.modular-avatar", + "nadena.dev.modular-avatar": { + "version": "file:nadena.dev.modular-avatar", "depth": 0, "source": "embedded", "dependencies": {}