diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs index 54bf0874f..003c8063e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs @@ -47,7 +47,7 @@ namespace UniGLTF Data.MigrationFlags.IsRoughnessTextureValueSquared); MaterialFactory = new MaterialFactory(ExternalObjectMap .Where(x => x.Value is Material) - .ToDictionary(x => x.Key, x => (Material)x.Value)); + .ToDictionary(x => x.Key, x => (Material)x.Value), MaterialFallback.FallbackShaders); AnimationClipFactory = new AnimationClipFactory(ExternalObjectMap .Where(x => x.Value is AnimationClip) .ToDictionary(x => x.Key, x => (AnimationClip)x.Value)); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialFallback.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialFallback.cs new file mode 100644 index 000000000..3b4978bce --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialFallback.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; + +namespace UniGLTF +{ + /// + /// 過去バージョンに含まれていたが、廃止・統合された Shader のフォールバック情報 + /// + public static class MaterialFallback + { + static Dictionary s_fallbackShaders = new Dictionary + { + {"VRM/UnlitTexture", "Unlit/Texture"}, + {"VRM/UnlitTransparent", "Unlit/Transparent"}, + {"VRM/UnlitCutout", "Unlit/Transparent Cutout"}, + {"UniGLTF/StandardVColor", UniGLTF.UniUnlit.UniUnlitUtil.ShaderName}, + }; + + public static IReadOnlyDictionary FallbackShaders => s_fallbackShaders; + } +} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialFallback.cs.meta similarity index 83% rename from Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialFallback.cs.meta index fa17b5099..ab0c0d9d4 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialFallback.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90dcef1978c51e74386b76d77689dc82 +guid: feb59fa02250d3d4db41cfa1c2e2b032 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM/Editor/Format/VRMMaterialValidator.cs b/Assets/VRM/Editor/Format/VRMMaterialValidator.cs index 941e59038..d6c792e65 100644 --- a/Assets/VRM/Editor/Format/VRMMaterialValidator.cs +++ b/Assets/VRM/Editor/Format/VRMMaterialValidator.cs @@ -30,7 +30,7 @@ namespace VRM // // extensions.VRM.materialProperties に記録する // - var prop = UniGLTF.ShaderPropExporter.PreShaderPropExporter.GetPropsForSupportedShader(m.shader.name); + var prop = UniGLTF.ShaderPropExporter.PreShaderPropExporter.GetPropsForMToon(); foreach (var kv in prop.Properties) { if (kv.ShaderPropertyType == UniGLTF.ShaderPropExporter.ShaderPropertyType.TexEnv) diff --git a/Assets/VRM/Editor/VrmTopMenu.cs b/Assets/VRM/Editor/VrmTopMenu.cs index 3ed060112..cabea8ec6 100644 --- a/Assets/VRM/Editor/VrmTopMenu.cs +++ b/Assets/VRM/Editor/VrmTopMenu.cs @@ -55,9 +55,6 @@ namespace VRM [MenuItem(DevelopmentMenuPrefix + "/Create UnityPackage", priority = 34)] private static void CreateUnityPackage() => VRMExportUnityPackage.CreateUnityPackageWithoutBuild(); - - [MenuItem(DevelopmentMenuPrefix + "/Export ShaderProps Code", priority = 35)] - private static void ExportShaderPropertyCode() => ShaderPropMenu.PreExport(); #endif } } \ No newline at end of file diff --git a/Assets/VRM/Runtime/IO/VRMMaterialExporter.cs b/Assets/VRM/Runtime/IO/VRMMaterialExporter.cs index bf021f20b..5b7c9035b 100644 --- a/Assets/VRM/Runtime/IO/VRMMaterialExporter.cs +++ b/Assets/VRM/Runtime/IO/VRMMaterialExporter.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using UniGLTF; using UniGLTF.ShaderPropExporter; @@ -135,16 +134,16 @@ namespace VRM renderQueue = m.renderQueue, }; - if (!PreShaderPropExporter.VRMExtensionShaders.Contains(m.shader.name)) + if (m.shader.name != MToon.Utils.ShaderName) { material.shader = glTF_VRM_Material.VRM_USE_GLTFSHADER; return material; } - var prop = PreShaderPropExporter.GetPropsForSupportedShader(m.shader.name); + var prop = PreShaderPropExporter.GetPropsForMToon(); if (prop == null) { - Debug.LogWarningFormat("Fail to export shader: {0}", m.shader.name); + throw new Exception("arienai"); } else { diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs index f8f0011ac..a349269a1 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs @@ -11,21 +11,14 @@ namespace VRMShaders public class MaterialFactory : IResponsibilityForDestroyObjects { private readonly IReadOnlyDictionary m_externalMap; + private readonly IReadOnlyDictionary m_fallbackShaders; - public MaterialFactory(IReadOnlyDictionary externalMaterialMap) + public MaterialFactory(IReadOnlyDictionary externalMaterialMap, IReadOnlyDictionary fallbackShaders) { m_externalMap = externalMaterialMap; + m_fallbackShaders = fallbackShaders; } - // TODO: UniVRM 0.x の方に処理を移したい - static Dictionary s_fallbackShaders = new Dictionary - { - {"VRM/UnlitTexture", "Unlit/Texture"}, - {"VRM/UnlitTransparent", "Unlit/Transparent"}, - {"VRM/UnlitCutout", "Unlit/Transparent Cutout"}, - {"UniGLTF/StandardVColor", UniGLTF.UniUnlit.UniUnlitUtil.ShaderName}, - }; - public struct MaterialLoadInfo { public SubAssetKey Key; @@ -117,7 +110,7 @@ namespace VRMShaders { throw new Exception("no shader name"); } - if (s_fallbackShaders.TryGetValue(shaderName, out string fallback)) + if (m_fallbackShaders.TryGetValue(shaderName, out string fallback)) { Debug.LogWarning($"fallback: {shaderName} => {fallback}"); shaderName = fallback; diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef index 3b9bbeeb0..54472abde 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef +++ b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef @@ -1,8 +1,6 @@ { "name": "VRMShaders.GLTF.IO.Runtime", - "references": [ - "GUID:60c8346e00a8ddd4cafc5a02eceeec57" - ], + "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, diff --git a/Assets/VRMShaders/VRM/IO/Editor.meta b/Assets/VRMShaders/VRM/IO/Editor.meta deleted file mode 100644 index 8ccaa983d..000000000 --- a/Assets/VRMShaders/VRM/IO/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 36a5a07493511bd49b1ad9dbad2683d2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs b/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs deleted file mode 100644 index 059c7fb87..000000000 --- a/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System.Reflection; -using System.Linq; -using UnityEditor; -using UnityEngine; -using System.IO; -using UniGLTF.ShaderPropExporter; -using System.Collections.Generic; - -namespace UniGLTF -{ - public static class ShaderPropMenu - { - public static void PreExport() - { - foreach (var fi in typeof(PreExportShaders).GetFields( - BindingFlags.Static - | BindingFlags.Public - | BindingFlags.NonPublic)) - { - var attr = fi.GetCustomAttributes(true).FirstOrDefault(y => y is PreExportShadersAttribute); - if (attr != null) - { - var supportedShaders = fi.GetValue(null) as SupportedShader[]; - foreach (var supported in supportedShaders) - { - PreExport(supported); - } - } - } - } - - static string EscapeShaderName(string name) - { - return name.Replace("/", "_").Replace(" ", "_"); - } - - static string ExportDir - { - get - { - return Application.dataPath + "/VRM/ShaderProperty/Runtime"; - } - } - - static void PreExport(SupportedShader supportedShader) - { - var shader = Shader.Find(supportedShader.ShaderName); - var props = ShaderProps.FromShader(shader); - - var path = Path.Combine(ExportDir, supportedShader.TargetFolder); - path = Path.Combine(path, EscapeShaderName(supportedShader.ShaderName) + ".cs").Replace("\\", "/"); - Debug.LogFormat("PreExport: {0}", path); - File.WriteAllText(path, ToString(props, shader.name)); - } - - static string ToString(ShaderProps props, string shaderName) - { - var list = new List(); - foreach (var prop in props.Properties) - { - list.Add(string.Format("new ShaderProperty(\"{0}\", ShaderPropertyType.{1})\r\n", prop.Key, prop.ShaderPropertyType)); - } - - return string.Format(@"using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{{ - public static partial class PreShaderPropExporter - {{ - [PreExportShader] - static KeyValuePair {0} - {{ - get - {{ - return new KeyValuePair( - ""{1}"", - new ShaderProps - {{ - Properties = new ShaderProperty[]{{ -{2} - }} - }} - ); - }} - }} - }} -}} -" -, EscapeShaderName(shaderName) -, shaderName -, string.Join(",", list.ToArray())); - } - - } -} diff --git a/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs.meta b/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs.meta deleted file mode 100644 index 0626004d1..000000000 --- a/Assets/VRMShaders/VRM/IO/Editor/ShaderPropMenu.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5eb12c186c6337e4db278b5f01d47cae -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef deleted file mode 100644 index 683e958e1..000000000 --- a/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "VRMShaders.VRM.IO.Editor", - "references": [ - "GUID:301b251fd9834274c9228e0532f444f7" - ], - "includePlatforms": [ - "Editor" - ], - "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/Editor/VRMShaders.VRM.IO.Editor.asmdef.meta b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef.meta deleted file mode 100644 index f5affb986..000000000 --- a/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bc66ece0f33b52446a0830c05781d4db -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF.meta deleted file mode 100644 index 38d4fd8e7..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9c97ad7f5bbcac489a47a2f34dfff00 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs deleted file mode 100644 index f6fcb7675..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/PreExportShaders_GLTF.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreExportShaders - { - const string GLTF_FOLDER = "GLTF"; - -#pragma warning disable 414 - [PreExportShaders] - static SupportedShader[] SupportedShaders = new SupportedShader[] - { - new SupportedShader(GLTF_FOLDER, "Standard"), - new SupportedShader(GLTF_FOLDER, "Unlit/Color"), - new SupportedShader(GLTF_FOLDER, "Unlit/Texture"), - new SupportedShader(GLTF_FOLDER, "Unlit/Transparent"), - new SupportedShader(GLTF_FOLDER, "Unlit/Transparent Cutout"), - new SupportedShader(GLTF_FOLDER, "UniGLTF/UniUnlit"), - }; -#pragma warning restore 414 - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs deleted file mode 100644 index aa5b342d2..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair Standard - { - get - { - return new KeyValuePair( - "Standard", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_Color", ShaderPropertyType.Color) -,new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) -,new ShaderProperty("_Cutoff", ShaderPropertyType.Range) -,new ShaderProperty("_Glossiness", ShaderPropertyType.Range) -,new ShaderProperty("_GlossMapScale", ShaderPropertyType.Range) -,new ShaderProperty("_SmoothnessTextureChannel", ShaderPropertyType.Float) -,new ShaderProperty("_Metallic", ShaderPropertyType.Range) -,new ShaderProperty("_MetallicGlossMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_SpecularHighlights", ShaderPropertyType.Float) -,new ShaderProperty("_GlossyReflections", ShaderPropertyType.Float) -,new ShaderProperty("_BumpScale", ShaderPropertyType.Float) -,new ShaderProperty("_BumpMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_Parallax", ShaderPropertyType.Range) -,new ShaderProperty("_ParallaxMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_OcclusionStrength", ShaderPropertyType.Range) -,new ShaderProperty("_OcclusionMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_EmissionColor", ShaderPropertyType.Color) -,new ShaderProperty("_EmissionMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_DetailMask", ShaderPropertyType.TexEnv) -,new ShaderProperty("_DetailAlbedoMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_DetailNormalMapScale", ShaderPropertyType.Float) -,new ShaderProperty("_DetailNormalMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_UVSec", ShaderPropertyType.Float) -,new ShaderProperty("_Mode", ShaderPropertyType.Float) -,new ShaderProperty("_SrcBlend", ShaderPropertyType.Float) -,new ShaderProperty("_DstBlend", ShaderPropertyType.Float) -,new ShaderProperty("_ZWrite", ShaderPropertyType.Float) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs.meta deleted file mode 100644 index abf6b6c83..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Standard.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 54043e349b047bf4b8f127cd919a757d -timeCreated: 1533542890 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs deleted file mode 100644 index ce4503a7b..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair UniGLTF_UniUnlit - { - get - { - return new KeyValuePair( - "UniGLTF/UniUnlit", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) -,new ShaderProperty("_Color", ShaderPropertyType.Color) -,new ShaderProperty("_Cutoff", ShaderPropertyType.Range) -,new ShaderProperty("_BlendMode", ShaderPropertyType.Float) -,new ShaderProperty("_CullMode", ShaderPropertyType.Float) -,new ShaderProperty("_VColBlendMode", ShaderPropertyType.Float) -,new ShaderProperty("_SrcBlend", ShaderPropertyType.Float) -,new ShaderProperty("_DstBlend", ShaderPropertyType.Float) -,new ShaderProperty("_ZWrite", ShaderPropertyType.Float) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta deleted file mode 100644 index c1315f41d..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: ad4b6b115b83ecd48a513f697afc95f0 -timeCreated: 1537860074 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs deleted file mode 100644 index 1ef6c3a02..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair Unlit_Color - { - get - { - return new KeyValuePair( - "Unlit/Color", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_Color", ShaderPropertyType.Color) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs.meta deleted file mode 100644 index 4f97a3c69..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Color.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 4f91421c5846d5d48933d2ee4ffeeceb -timeCreated: 1535186213 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs deleted file mode 100644 index ed6f487a3..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair Unlit_Texture - { - get - { - return new KeyValuePair( - "Unlit/Texture", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs.meta deleted file mode 100644 index 83320688d..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Texture.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 8273e1e61ad8e914baae94d06836f2ad -timeCreated: 1535186213 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs deleted file mode 100644 index cad3b4b94..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair Unlit_Transparent - { - get - { - return new KeyValuePair( - "Unlit/Transparent", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs.meta deleted file mode 100644 index f64c65586..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b98a8ee8ca13abb43809305cc4e5571a -timeCreated: 1535186213 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs deleted file mode 100644 index ebe366b5b..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair Unlit_Transparent_Cutout - { - get - { - return new KeyValuePair( - "Unlit/Transparent Cutout", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) -,new ShaderProperty("_Cutoff", ShaderPropertyType.Range) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta deleted file mode 100644 index 5ffeb3f48..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 844490f13976543478d82efe28251941 -timeCreated: 1535186301 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs b/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs index 8bc5988cb..50c6e6cf4 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs +++ b/Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs @@ -1,69 +1,63 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using UnityEngine; -#if UNITY_EDITOR -using UnityEditor; -#endif - - -namespace UniGLTF.ShaderPropExporter +namespace UniGLTF.ShaderPropExporter { - public class PreExportShadersAttribute : Attribute { } - public class PreExportShaderAttribute : Attribute { } - - public struct SupportedShader + /// + /// TODO: MToon にひきとってもらう + /// + public static class PreShaderPropExporter { - public string TargetFolder; - public string ShaderName; - - public SupportedShader(string targetFolder, string shaderName) + const string ShaderName = "VRM/MToon"; + public static ShaderProps GetPropsForMToon() { - TargetFolder = targetFolder; - ShaderName = shaderName; + return VRM_MToon; } - } - public static partial class PreShaderPropExporter - { - public static readonly string[] VRMExtensionShaders = new string[] - { - "VRM/UnlitTransparentZWrite", - "VRM/MToon" - }; - - static Dictionary m_shaderPropMap; - - public static ShaderProps GetPropsForSupportedShader(string shaderName) - { - if (m_shaderPropMap == null) - { - m_shaderPropMap = new Dictionary(); - foreach (var prop in typeof(PreShaderPropExporter).GetProperties(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)) - { - if (prop.GetCustomAttributes(typeof(PreExportShaderAttribute), true).Any()) + static ShaderProps VRM_MToon = + new ShaderProps { - var kv = (KeyValuePair)prop.GetValue(null, null); - m_shaderPropMap.Add(kv.Key, kv.Value); - } - } - } - - ShaderProps props; - if (m_shaderPropMap.TryGetValue(shaderName, out props)) - { - return props; - } - -#if UNITY_EDITOR - // fallback - Debug.LogWarningFormat("{0} is not predefined shader. Use ShaderUtil", shaderName); - var shader = Shader.Find(shaderName); - return ShaderProps.FromShader(shader); -#else - return null; -#endif - } + Properties = new ShaderProperty[]{ +new ShaderProperty("_Cutoff", ShaderPropertyType.Range) +,new ShaderProperty("_Color", ShaderPropertyType.Color) +,new ShaderProperty("_ShadeColor", ShaderPropertyType.Color) +,new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) +,new ShaderProperty("_ShadeTexture", ShaderPropertyType.TexEnv) +,new ShaderProperty("_BumpScale", ShaderPropertyType.Float) +,new ShaderProperty("_BumpMap", ShaderPropertyType.TexEnv) +,new ShaderProperty("_ReceiveShadowRate", ShaderPropertyType.Range) +,new ShaderProperty("_ReceiveShadowTexture", ShaderPropertyType.TexEnv) +,new ShaderProperty("_ShadingGradeRate", ShaderPropertyType.Range) +,new ShaderProperty("_ShadingGradeTexture", ShaderPropertyType.TexEnv) +,new ShaderProperty("_ShadeShift", ShaderPropertyType.Range) +,new ShaderProperty("_ShadeToony", ShaderPropertyType.Range) +,new ShaderProperty("_LightColorAttenuation", ShaderPropertyType.Range) +,new ShaderProperty("_IndirectLightIntensity", ShaderPropertyType.Range) +,new ShaderProperty("_RimColor", ShaderPropertyType.Color) +,new ShaderProperty("_RimTexture", ShaderPropertyType.TexEnv) +,new ShaderProperty("_RimLightingMix", ShaderPropertyType.Range) +,new ShaderProperty("_RimFresnelPower", ShaderPropertyType.Range) +,new ShaderProperty("_RimLift", ShaderPropertyType.Range) +,new ShaderProperty("_SphereAdd", ShaderPropertyType.TexEnv) +,new ShaderProperty("_EmissionColor", ShaderPropertyType.Color) +,new ShaderProperty("_EmissionMap", ShaderPropertyType.TexEnv) +,new ShaderProperty("_OutlineWidthTexture", ShaderPropertyType.TexEnv) +,new ShaderProperty("_OutlineWidth", ShaderPropertyType.Range) +,new ShaderProperty("_OutlineScaledMaxDistance", ShaderPropertyType.Range) +,new ShaderProperty("_OutlineColor", ShaderPropertyType.Color) +,new ShaderProperty("_OutlineLightingMix", ShaderPropertyType.Range) +,new ShaderProperty("_UvAnimMaskTexture", ShaderPropertyType.TexEnv) +,new ShaderProperty("_UvAnimScrollX", ShaderPropertyType.Float) +,new ShaderProperty("_UvAnimScrollY", ShaderPropertyType.Float) +,new ShaderProperty("_UvAnimRotation", ShaderPropertyType.Float) +,new ShaderProperty("_MToonVersion", ShaderPropertyType.Float) +,new ShaderProperty("_DebugMode", ShaderPropertyType.Float) +,new ShaderProperty("_BlendMode", ShaderPropertyType.Float) +,new ShaderProperty("_OutlineWidthMode", ShaderPropertyType.Float) +,new ShaderProperty("_OutlineColorMode", ShaderPropertyType.Float) +,new ShaderProperty("_CullMode", ShaderPropertyType.Float) +,new ShaderProperty("_OutlineCullMode", ShaderPropertyType.Float) +,new ShaderProperty("_SrcBlend", ShaderPropertyType.Float) +,new ShaderProperty("_DstBlend", ShaderPropertyType.Float) +,new ShaderProperty("_ZWrite", ShaderPropertyType.Float) + } + }; } } diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs deleted file mode 100644 index f246304c9..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreExportShaders - { - const string VRM_TARGET_FOLDER = "VRM"; - [PreExportShaders] - public static SupportedShader[] VRMSupportedShaders = new SupportedShader[] - { - new SupportedShader(VRM_TARGET_FOLDER, "VRM/MToon"), - new SupportedShader(VRM_TARGET_FOLDER, "VRM/UnlitTexture"), - new SupportedShader(VRM_TARGET_FOLDER, "VRM/UnlitCutout"), - new SupportedShader(VRM_TARGET_FOLDER, "VRM/UnlitTransparent"), - new SupportedShader(VRM_TARGET_FOLDER, "VRM/UnlitTransparentZWrite"), - }; - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs.meta deleted file mode 100644 index d0fd45cad..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/PreExportShaders_VRM.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 625b5ee8b5811dc4a915a2fbb2cb319d -timeCreated: 1533035131 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs deleted file mode 100644 index f5fc6f15a..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair VRM_MToon - { - get - { - return new KeyValuePair( - "VRM/MToon", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_Cutoff", ShaderPropertyType.Range) -,new ShaderProperty("_Color", ShaderPropertyType.Color) -,new ShaderProperty("_ShadeColor", ShaderPropertyType.Color) -,new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) -,new ShaderProperty("_ShadeTexture", ShaderPropertyType.TexEnv) -,new ShaderProperty("_BumpScale", ShaderPropertyType.Float) -,new ShaderProperty("_BumpMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_ReceiveShadowRate", ShaderPropertyType.Range) -,new ShaderProperty("_ReceiveShadowTexture", ShaderPropertyType.TexEnv) -,new ShaderProperty("_ShadingGradeRate", ShaderPropertyType.Range) -,new ShaderProperty("_ShadingGradeTexture", ShaderPropertyType.TexEnv) -,new ShaderProperty("_ShadeShift", ShaderPropertyType.Range) -,new ShaderProperty("_ShadeToony", ShaderPropertyType.Range) -,new ShaderProperty("_LightColorAttenuation", ShaderPropertyType.Range) -,new ShaderProperty("_IndirectLightIntensity", ShaderPropertyType.Range) -,new ShaderProperty("_RimColor", ShaderPropertyType.Color) -,new ShaderProperty("_RimTexture", ShaderPropertyType.TexEnv) -,new ShaderProperty("_RimLightingMix", ShaderPropertyType.Range) -,new ShaderProperty("_RimFresnelPower", ShaderPropertyType.Range) -,new ShaderProperty("_RimLift", ShaderPropertyType.Range) -,new ShaderProperty("_SphereAdd", ShaderPropertyType.TexEnv) -,new ShaderProperty("_EmissionColor", ShaderPropertyType.Color) -,new ShaderProperty("_EmissionMap", ShaderPropertyType.TexEnv) -,new ShaderProperty("_OutlineWidthTexture", ShaderPropertyType.TexEnv) -,new ShaderProperty("_OutlineWidth", ShaderPropertyType.Range) -,new ShaderProperty("_OutlineScaledMaxDistance", ShaderPropertyType.Range) -,new ShaderProperty("_OutlineColor", ShaderPropertyType.Color) -,new ShaderProperty("_OutlineLightingMix", ShaderPropertyType.Range) -,new ShaderProperty("_UvAnimMaskTexture", ShaderPropertyType.TexEnv) -,new ShaderProperty("_UvAnimScrollX", ShaderPropertyType.Float) -,new ShaderProperty("_UvAnimScrollY", ShaderPropertyType.Float) -,new ShaderProperty("_UvAnimRotation", ShaderPropertyType.Float) -,new ShaderProperty("_MToonVersion", ShaderPropertyType.Float) -,new ShaderProperty("_DebugMode", ShaderPropertyType.Float) -,new ShaderProperty("_BlendMode", ShaderPropertyType.Float) -,new ShaderProperty("_OutlineWidthMode", ShaderPropertyType.Float) -,new ShaderProperty("_OutlineColorMode", ShaderPropertyType.Float) -,new ShaderProperty("_CullMode", ShaderPropertyType.Float) -,new ShaderProperty("_OutlineCullMode", ShaderPropertyType.Float) -,new ShaderProperty("_SrcBlend", ShaderPropertyType.Float) -,new ShaderProperty("_DstBlend", ShaderPropertyType.Float) -,new ShaderProperty("_ZWrite", ShaderPropertyType.Float) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs.meta deleted file mode 100644 index 26afcbf63..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_MToon.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 4629d794c8969c141a4724e182af082e -timeCreated: 1533542890 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs deleted file mode 100644 index 8695f72f3..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair VRM_UnlitCutout - { - get - { - return new KeyValuePair( - "VRM/UnlitCutout", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) -,new ShaderProperty("_Cutoff", ShaderPropertyType.Range) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs.meta deleted file mode 100644 index 3f6607d2a..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitCutout.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 611b546ea471ad34cb7d94740c63b558 -timeCreated: 1533542890 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs deleted file mode 100644 index 6a0ab5b39..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair VRM_UnlitTexture - { - get - { - return new KeyValuePair( - "VRM/UnlitTexture", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs.meta deleted file mode 100644 index 181adad30..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTexture.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 22a8083880389b3498f421e6a5c340d5 -timeCreated: 1533542890 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs deleted file mode 100644 index 2c750386e..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair VRM_UnlitTransparent - { - get - { - return new KeyValuePair( - "VRM/UnlitTransparent", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs.meta deleted file mode 100644 index eeaf3b8d6..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparent.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 140d6538826e0eb448929d3e4bb2f1cd -timeCreated: 1533542890 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs deleted file mode 100644 index 8d03c4ec7..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - - -namespace UniGLTF.ShaderPropExporter -{ - public static partial class PreShaderPropExporter - { - [PreExportShader] - static KeyValuePair VRM_UnlitTransparentZWrite - { - get - { - return new KeyValuePair( - "VRM/UnlitTransparentZWrite", - new ShaderProps - { - Properties = new ShaderProperty[]{ -new ShaderProperty("_MainTex", ShaderPropertyType.TexEnv) - - } - } - ); - } - } - } -} diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta b/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta deleted file mode 100644 index 6efeb43e5..000000000 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 165ec79b7aac1564a850fb3d3d19396e -timeCreated: 1533542890 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: