Refactoring VRMShaders directory & asmdef

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "MToon"]
-	path = Assets/VRMShaders/MToon
-	url = https://github.com/Santarh/MToon.git
 [submodule "vrm-specification"]
 	path = vrm-specification
 	url = https://github.com/vrm-c/vrm-specification.git
 [submodule "glTF"]
 	path = glTF
 	url = https://github.com/KhronosGroup/glTF.git
+[submodule "Assets/VRMShaders/VRM/MToon"]
+	path = Assets/VRMShaders/VRM/MToon
+	url = https://github.com/Santarh/MToon.git

Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef

@@ -4,10 +4,9 @@
         "UniGLTF",
         "MeshUtility",
         "MeshUtility.Editor",
-        "VRMShaders",
-        "VRMShaders.Editor"
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -16,5 +15,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs

@@ -1,65 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using MeshUtility.M17N;
-using UnityEngine;
-
-
-namespace MeshUtility.Validators
-{
-    public static class MaterialValidator
-    {
-        public enum ValidationMessages
-        {
-            [LangMsg(Languages.ja, "Standard, Unlit, MToon 以外のマテリアルは、Standard になります")]
-            [LangMsg(Languages.en, "It will export as `Standard` fallback")]
-            UNKNOWN_SHADER,
-        }
-
-        public static IEnumerable<Validation> Validate(GameObject ExportRoot)
-        {
-            if (ExportRoot == null)
-            {
-                yield break;
-            }
-
-            var renderers = ExportRoot.GetComponentsInChildren<Renderer>();
-            foreach (var r in renderers)
-            {
-                for (int i = 0; i < r.sharedMaterials.Length; ++i)
-                    if (r.sharedMaterials[i] == null)
-                    {
-                        yield return Validation.Error($"Renderer: {r.name}.Materials[{i}] is null. please fix it");
-                    }
-            }
-
-            var materials = renderers.SelectMany(x => x.sharedMaterials).Where(x => x != null).Distinct();
-            foreach (var material in materials)
-            {
-                if (material == null)
-                {
-                    continue;
-                }
-
-                if (material.shader.name == "Standard")
-                {
-                    // standard
-                    continue;
-                }
-
-                if (UniGLTF.ShaderPropExporter.PreShaderPropExporter.UseUnlit(material.shader.name))
-                {
-                    // unlit
-                    continue;
-                }
-
-                if (UniGLTF.ShaderPropExporter.PreShaderPropExporter.VRMExtensionShaders.Contains(material.shader.name))
-                {
-                    // VRM supported
-                    continue;
-                }
-
-                yield return Validation.Warning($"Material: {material.name}. Unknown Shader: \"{material.shader.name}\" is used. {ValidationMessages.UNKNOWN_SHADER.Msg()}");
-            }
-        }
-    }
-}

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/MaterialValidator.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: aa8f593f0ade99a4d9cc23947cdded6e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/UniGLTF/Runtime/UniGLTF.asmdef

@@ -1,16 +1,16 @@
 {
     "name": "UniGLTF",
     "references": [
-        "UniUnlit",
-        "ShaderProperty.Runtime",
-        "VRMShaders"
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.UniUnlit.Runtime"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef

@@ -3,19 +3,24 @@
     "references": [
         "UniGLTF",
         "UniGLTF.Editor",
-        "VRMShaders",
-        "VRMShaders.Editor"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor"
     ],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": []
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef

@@ -7,19 +7,24 @@
         "UniGLTF",
         "UniVRM.Editor",
         "VRM.Tests",
-        "VRMShaders",
-        "VRMShaders.Editor"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor"
     ],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": []
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM.Samples/VRM.Samples.asmdef

@@ -4,14 +4,15 @@
         "VRM",
         "UniHumanoid",
         "UniGLTF",
-        "VRMShaders"
+        "VRMShaders.GLTF.IO.Runtime"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM/Editor/VRM.Editor.asmdef

@@ -6,12 +6,11 @@
         "MeshUtility",
         "MeshUtility.Editor",
         "UniUnlit",
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor",
         "UniGLTF",
-        "UniGLTF.Editor",
-        "VRMShaders",
-        "VRMShaders.Editor"
+        "UniGLTF.Editor"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -20,5 +19,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM/Resources/Shaders/VRMShaders.shadervariants

@@ -1,33 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!200 &20000000
-ShaderVariantCollection:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: VRMShaders
-  m_Shaders:
-    data:
-      first: {fileID: 4800000, guid: 1a70c9898704e1a4691843883f5101af, type: 3}
-      second:
-        variants: []
-    data:
-      first: {fileID: 4800000, guid: 429a3203ab2959741aab76fa2856b450, type: 3}
-      second:
-        variants: []
-    data:
-      first: {fileID: 4800000, guid: 4c9ce97af40038f45811fc4b0975a483, type: 3}
-      second:
-        variants: []
-    data:
-      first: {fileID: 4800000, guid: 8c17b56f4bf084c47872edcb95237e4a, type: 3}
-      second:
-        variants: []
-    data:
-      first: {fileID: 4800000, guid: df359ad0838642d4fa0339514fcbbb2d, type: 3}
-      second:
-        variants: []
-    data:
-      first: {fileID: 4800000, guid: 1a97144e4ad27a04aafd70f7b915cedb, type: 3}
-      second:
-        variants: []

Assets/VRM/Runtime/VRM.asmdef

@@ -2,19 +2,20 @@
     "name": "VRM",
     "references": [
         "MToon",
-        "UniUnlit",
         "UniHumanoid",
-        "ShaderProperty.Runtime",
         "MeshUtility",
         "UniGLTF",
-        "VRMShaders"
+        "VRMShaders.GLTF.IO.Runtime",
+        "UniUnlit",
+        "VRMShaders.VRM.IO.Runtime"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM/Tests/VRM.Tests.asmdef

@@ -5,19 +5,24 @@
         "UniGLTF",
         "MeshUtility",
         "MeshUtility.Editor",
-        "VRMShaders",
-        "VRMShaders.Editor"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor"
     ],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": []
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM10/Editor/VRM10.Editor.asmdef

@@ -7,9 +7,9 @@
         "MeshUtility.Editor",
         "UniGLTF.Editor",
         "UniGLTF",
-        "VRMShaders"
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -18,5 +18,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM10/Runtime/VRM10.asmdef

@@ -7,14 +7,15 @@
         "MeshUtility",
         "MeshUtility.Editor",
         "UniGLTF",
-        "VRMShaders"
+        "VRMShaders.GLTF.IO.Runtime"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef

@@ -4,16 +4,21 @@
         "VrmLib",
         "VRM10",
         "UniGLTF",
-        "VRMShaders"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "VRMShaders.GLTF.IO.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
     "autoReferenced": false,
-    "defineConstraints": []
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRMShaders/GLTF.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f877649750df3814aa5272250b22678c
+guid: 3b19641943478e4459a38dcd6eeb86f3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/VRMShaders/GLTF/IO.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 817051ccab3a4cc4986dc955681fac6f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef

@@ -1,7 +1,6 @@
 {
-    "name": "VRMShaders.Editor",
+    "name": "VRMShaders.GLTF.IO.Editor",
     "references": [],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -9,6 +8,8 @@
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": []
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef

@@ -0,0 +1,13 @@
+{
+    "name": "VRMShaders.GLTF.IO.Runtime",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef

@@ -0,0 +1,24 @@
+{
+    "name": "VRMShaders.GLTF.IO.Tests",
+    "references": [
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.GLTF.IO.Editor",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef

@@ -0,0 +1,17 @@
+{
+    "name": "VRMShaders.GLTF.UniUnlit.Editor",
+    "references": [
+        "VRMShaders.GLTF.UniUnlit.Runtime"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef

@@ -0,0 +1,13 @@
+{
+    "name": "VRMShaders.GLTF.UniUnlit.Runtime",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/VRMShaders/Runtime/VRMShaders.asmdef

@@ -1,3 +0,0 @@
-{
-	"name": "VRMShaders"
-}

Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef

@@ -1,12 +0,0 @@
-{
-    "name": "ShaderProperty.Editor",
-    "references": [
-        "ShaderProperty.Runtime"
-    ],
-    "optionalUnityReferences": [],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false
-}

Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef

@@ -1,8 +0,0 @@
-{
-    "name": "ShaderProperty.Runtime",
-    "references": [],
-    "optionalUnityReferences": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false
-}

Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef

@@ -1,12 +0,0 @@
-{
-    "name": "UniUnlit.Editor",
-    "references": [
-        "UniUnlit"
-    ],
-    "optionalUnityReferences": [],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false
-}

Assets/VRMShaders/UniUnlit/UniUnlit.asmdef

@@ -1,3 +0,0 @@
-{
-	"name": "UniUnlit"
-}

Assets/VRMShaders/VRM.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 67bc2cd71cccda64bba542dc0d8c2c9f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/VRMShaders/VRM/IO.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85f7c43c499b9f74d9a8e16f42d44492
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef

@@ -1,11 +1,7 @@
 {
-    "name": "VRMShaders.Tests",
+    "name": "VRMShaders.VRM.IO.Editor",
     "references": [
-        "VRMShaders",
-        "VRMShaders.Editor"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "VRMShaders.VRM.IO.Runtime"
     ],
     "includePlatforms": [
         "Editor"
@@ -15,5 +11,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": false,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs

@@ -27,23 +27,6 @@ namespace UniGLTF.ShaderPropExporter
 
     public static partial class PreShaderPropExporter
     {
-        public static bool UseUnlit(string shaderName)
-        {
-            switch (shaderName)
-            {
-                case "Unlit/Color":
-                case "Unlit/Texture":
-                case "Unlit/Transparent":
-                case "Unlit/Transparent Cutout":
-                case "UniGLTF/UniUnlit":
-                case "VRM/UnlitTexture":
-                case "VRM/UnlitTransparent":
-                case "VRM/UnlitCutout":
-                    return true;
-            }
-            return false;
-        }
-
         public static readonly string[] VRMExtensionShaders = new string[]
         {
             "VRM/UnlitTransparentZWrite",