From 16e4bcab44e950b057ea18849662ca29fbbd0264 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 28 Jan 2021 18:33:49 +0900 Subject: [PATCH] fix build error in vrm10 #701 --- .../EditorUnityBuilder.cs | 0 .../EditorUnityBuilder.cs.meta | 0 .../Editor.meta => Editor/Preview.meta} | 2 +- .../Preview}/PreviewMeshItem.cs | 0 .../Preview}/PreviewMeshItem.cs.meta | 0 .../Preview}/PreviewSceneManager.cs | 0 .../Preview}/PreviewSceneManager.cs.meta | 0 .../Editor/ScriptedImporter.meta | 0 .../ScriptedImporter/GltfScriptedImporter.cs | 0 .../GltfScriptedImporter.cs.meta | 0 .../GltfScriptedImporterEditorGUI.cs | 0 .../GltfScriptedImporterEditorGUI.cs.meta | 0 .../ScriptedImporter/IExternalUnityObject.cs | 0 .../IExternalUnityObject.cs.meta | 0 .../ScriptedImporterExtension.cs | 0 .../ScriptedImporterExtension.cs.meta | 0 .../ScriptedImporter/VrmScriptedImporter.cs | 0 .../VrmScriptedImporter.cs.meta | 0 .../VrmScriptedImporterEditorGUI.cs | 0 .../VrmScriptedImporterEditorGUI.cs.meta | 0 .../Expression/PreviewMaterialItem.cs | 31 ++++++++++++++++--- .../Expression/PreviewMaterialItem.cs.meta | 2 +- Assets/VRM10/Tests/SerializationTests.cs | 11 +++---- 23 files changed, 34 insertions(+), 12 deletions(-) rename Assets/VRM10/{Runtime/UnityBuilder => Editor}/EditorUnityBuilder.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => Editor}/EditorUnityBuilder.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder/Editor.meta => Editor/Preview.meta} (77%) rename Assets/VRM10/{Runtime/Components/Expression => Editor/Preview}/PreviewMeshItem.cs (100%) rename Assets/VRM10/{Runtime/Components/Expression => Editor/Preview}/PreviewMeshItem.cs.meta (100%) rename Assets/VRM10/{Runtime/Components/Expression => Editor/Preview}/PreviewSceneManager.cs (100%) rename Assets/VRM10/{Runtime/Components/Expression => Editor/Preview}/PreviewSceneManager.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/GltfScriptedImporter.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/GltfScriptedImporter.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/IExternalUnityObject.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/IExternalUnityObject.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/ScriptedImporterExtension.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/VrmScriptedImporter.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/VrmScriptedImporter.cs.meta (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs (100%) rename Assets/VRM10/{Runtime/UnityBuilder => }/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs.meta (100%) diff --git a/Assets/VRM10/Runtime/UnityBuilder/EditorUnityBuilder.cs b/Assets/VRM10/Editor/EditorUnityBuilder.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/EditorUnityBuilder.cs rename to Assets/VRM10/Editor/EditorUnityBuilder.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/EditorUnityBuilder.cs.meta b/Assets/VRM10/Editor/EditorUnityBuilder.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/EditorUnityBuilder.cs.meta rename to Assets/VRM10/Editor/EditorUnityBuilder.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor.meta b/Assets/VRM10/Editor/Preview.meta similarity index 77% rename from Assets/VRM10/Runtime/UnityBuilder/Editor.meta rename to Assets/VRM10/Editor/Preview.meta index bc3af4797..d5bcc3675 100644 --- a/Assets/VRM10/Runtime/UnityBuilder/Editor.meta +++ b/Assets/VRM10/Editor/Preview.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 117159fa2bfe3824689e2566a48ea457 +guid: 5f7b7c8fb7bd5f244a45e72845748d31 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewMeshItem.cs b/Assets/VRM10/Editor/Preview/PreviewMeshItem.cs similarity index 100% rename from Assets/VRM10/Runtime/Components/Expression/PreviewMeshItem.cs rename to Assets/VRM10/Editor/Preview/PreviewMeshItem.cs diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewMeshItem.cs.meta b/Assets/VRM10/Editor/Preview/PreviewMeshItem.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/Components/Expression/PreviewMeshItem.cs.meta rename to Assets/VRM10/Editor/Preview/PreviewMeshItem.cs.meta diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewSceneManager.cs b/Assets/VRM10/Editor/Preview/PreviewSceneManager.cs similarity index 100% rename from Assets/VRM10/Runtime/Components/Expression/PreviewSceneManager.cs rename to Assets/VRM10/Editor/Preview/PreviewSceneManager.cs diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewSceneManager.cs.meta b/Assets/VRM10/Editor/Preview/PreviewSceneManager.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/Components/Expression/PreviewSceneManager.cs.meta rename to Assets/VRM10/Editor/Preview/PreviewSceneManager.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter.meta b/Assets/VRM10/Editor/ScriptedImporter.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter.meta rename to Assets/VRM10/Editor/ScriptedImporter.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporter.cs b/Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporter.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporter.cs rename to Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporter.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporter.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporter.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporter.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporter.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs b/Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs rename to Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/IExternalUnityObject.cs b/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/IExternalUnityObject.cs rename to Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/IExternalUnityObject.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/IExternalUnityObject.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/ScriptedImporterExtension.cs b/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/ScriptedImporterExtension.cs rename to Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporter.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporter.cs rename to Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporter.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporter.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs.meta diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs rename to Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs diff --git a/Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/UnityBuilder/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs.meta diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs index 8f9aed7dc..923284020 100644 --- a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs +++ b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs @@ -5,15 +5,38 @@ using UnityEngine; namespace UniVRM10 { -#if UNITY_EDITOR + + public enum ShaderPropertyType + { + // + // 概要: + // Color Property. + Color = 0, + // + // 概要: + // Vector Property. + Vector = 1, + // + // 概要: + // Float Property. + Float = 2, + // + // 概要: + // Range Property. + Range = 3, + // + // 概要: + // Texture Property. + TexEnv = 4 + } + [Serializable] public struct PropItem { public string Name; - public ShaderUtil.ShaderPropertyType PropertyType; + public ShaderPropertyType PropertyType; public Vector4 DefaultValues; } -#endif /// /// Material 一つ分のプロパティを蓄えている @@ -68,7 +91,7 @@ namespace UniVRM10 item.PropMap.Add(bindType, new PropItem { Name = name, - PropertyType = propType, + PropertyType = (UniVRM10.ShaderPropertyType)Enum.Parse(typeof(UniVRM10.ShaderPropertyType), propType.ToString(), true), DefaultValues = material.GetColor(name), }); propNames.Add(name); diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs.meta b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs.meta index 8bd7966ba..58b4efbde 100644 --- a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs.meta +++ b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90ee9936998e23342978b06befb3d9dd +guid: 713446847d9e57341828430ee0f79ad2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Tests/SerializationTests.cs b/Assets/VRM10/Tests/SerializationTests.cs index 15dc56374..ed635f801 100644 --- a/Assets/VRM10/Tests/SerializationTests.cs +++ b/Assets/VRM10/Tests/SerializationTests.cs @@ -8,7 +8,6 @@ using UniJSON; using UnityEditor; using UnityEngine; using VrmLib.Diff; -using static UnityEditor.ShaderUtil; namespace UniVRM10 { @@ -112,8 +111,8 @@ namespace UniVRM10 switch (ShaderUtil.GetPropertyType(lhs.shader, i)) { - case ShaderPropertyType.Color: - case ShaderPropertyType.Vector: + case UnityEditor.ShaderUtil.ShaderPropertyType.Color: + case UnityEditor.ShaderUtil.ShaderPropertyType.Vector: { var l = lhs.GetVector(prop); var r = rhs.GetVector(prop); @@ -124,8 +123,8 @@ namespace UniVRM10 } break; - case ShaderPropertyType.Float: - case ShaderPropertyType.Range: + case UnityEditor.ShaderUtil.ShaderPropertyType.Float: + case UnityEditor.ShaderUtil.ShaderPropertyType.Range: { var l = lhs.GetFloat(prop); var r = rhs.GetFloat(prop); @@ -136,7 +135,7 @@ namespace UniVRM10 } break; - case ShaderPropertyType.TexEnv: + case UnityEditor.ShaderUtil.ShaderPropertyType.TexEnv: { var l = lhs.GetTextureOffset(prop); var r = rhs.GetTextureOffset(prop);