diff --git a/Assets/VRM/Editor/Format/VRMMaterialValidator.cs b/Assets/VRM/Editor/Format/VRMMaterialValidator.cs index 5d0cd30cf..f2734ed48 100644 --- a/Assets/VRM/Editor/Format/VRMMaterialValidator.cs +++ b/Assets/VRM/Editor/Format/VRMMaterialValidator.cs @@ -30,10 +30,10 @@ namespace VRM // // extensions.VRM.materialProperties に記録する // - var prop = UniGLTF.ShaderPropExporter.PreShaderPropExporter.GetPropsForMToon(); + var prop = PreShaderPropExporter.GetPropsForMToon(); foreach (var kv in prop.Properties) { - if (kv.ShaderPropertyType == UniGLTF.ShaderPropExporter.ShaderPropertyType.TexEnv) + if (kv.ShaderPropertyType == ShaderPropertyType.TexEnv) { yield return (kv.Key, m.GetTexture(kv.Key)); } diff --git a/Assets/VRM/Editor/VRM.Editor.asmdef b/Assets/VRM/Editor/VRM.Editor.asmdef index 1f917e647..0e11c34da 100644 --- a/Assets/VRM/Editor/VRM.Editor.asmdef +++ b/Assets/VRM/Editor/VRM.Editor.asmdef @@ -8,7 +8,6 @@ "GUID:7da8a75dcade2144aab699032d7d7987", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:5f875fdc81c40184c8333b9d63c6ddd5", - "GUID:301b251fd9834274c9228e0532f444f7", "GUID:1cd941934d098654fa21a13f28346412" ], "includePlatforms": [ diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs index 84fb47e2a..fd4ab2da5 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs @@ -1,6 +1,5 @@ using System; using UniGLTF; -using UniGLTF.ShaderPropExporter; using UnityEngine; using VRMShaders; using ColorSpace = VRMShaders.ColorSpace; diff --git a/Assets/VRMShaders/VRM/IO.meta b/Assets/VRM/Runtime/IO/MaterialIO/MToon.meta similarity index 77% rename from Assets/VRMShaders/VRM/IO.meta rename to Assets/VRM/Runtime/IO/MaterialIO/MToon.meta index 59eb885b7..8b6089fe0 100644 --- a/Assets/VRMShaders/VRM/IO.meta +++ b/Assets/VRM/Runtime/IO/MaterialIO/MToon.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85f7c43c499b9f74d9a8e16f42d44492 +guid: fbf9b693f6dfcb247abd30eec9c1092f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs similarity index 98% rename from Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs index 50c6e6cf4..65b3c0fbf 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs @@ -1,4 +1,4 @@ -namespace UniGLTF.ShaderPropExporter +namespace VRM { /// /// TODO: MToon にひきとってもらう diff --git a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs.meta diff --git a/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs b/Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs similarity index 98% rename from Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs index 36d9a8258..805b62573 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs @@ -5,8 +5,7 @@ using UnityEditor; using UnityEngine; #endif - -namespace UniGLTF.ShaderPropExporter +namespace VRM { public enum ShaderPropertyType { diff --git a/Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs.meta similarity index 100% rename from Assets/VRMShaders/VRM/IO/Runtime/ShaderProps.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/MToon/ShaderProps.cs.meta diff --git a/Assets/VRM/Runtime/VRM.asmdef b/Assets/VRM/Runtime/VRM.asmdef index e18ce1e85..ccd56a061 100644 --- a/Assets/VRM/Runtime/VRM.asmdef +++ b/Assets/VRM/Runtime/VRM.asmdef @@ -5,7 +5,6 @@ "GUID:b7aa47b240b57de44a4b2021c143c9bf", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:da3e51d19d51a544fa14d43fee843098", - "GUID:301b251fd9834274c9228e0532f444f7", "GUID:a9bc101fb0471f94a8f99fd242fdd934", "GUID:ac229b552c3025545b074203f857547c", "GUID:1cd941934d098654fa21a13f28346412", diff --git a/Assets/VRMShaders/VRM/IO/Runtime.meta b/Assets/VRMShaders/VRM/IO/Runtime.meta deleted file mode 100644 index 8fa342dbb..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd900b6f302c9404b99d77a1ae3d00be -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef deleted file mode 100644 index 1afe036ef..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "VRMShaders.VRM.IO.Runtime", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta deleted file mode 100644 index ec0da628b..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 301b251fd9834274c9228e0532f444f7 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: