Merge branch 'master' into disassemblyVrmShaders4

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs

@@ -59,7 +59,8 @@ namespace UniGLTF
             }
             else
             {
-                throw new Exception($"{key} is not converted.");
+                // throw new Exception($"{key} is not converted.");
+                Debug.LogWarning($"{key} is not converted.");
             }
         }
 

Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs

@@ -5,7 +5,7 @@ namespace UniGLTF
     {
         public const int MAJOR = 0;
         public const int MINOR = 124;
-        public const int PATCH = 1;
-        public const string VERSION = "0.124.1";
+        public const int PATCH = 2;
+        public const string VERSION = "0.124.2";
     }
 }

Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs

@@ -5,7 +5,7 @@ namespace UniGLTF
     {
         public const int MAJOR = 2;
         public const int MINOR = 60;
-        public const int PATCH = 1;
-        public const string VERSION = "2.60.1";
+        public const int PATCH = 2;
+        public const string VERSION = "2.60.2";
     }
 }

Assets/UniGLTF/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.gltf",
-  "version": "0.124.1",
+  "version": "0.124.2",
   "displayName": "UniGLTF",
   "description": "GLTF importer and exporter",
   "unity": "2021.3",
@@ -11,7 +11,7 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.124.1",
+    "com.vrmc.vrmshaders": "0.124.2",
     "com.unity.modules.animation": "1.0.0"
   },
   "samples": [

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));
                     }

Assets/VRM/Editor/VRM.Editor.asmdef

@@ -8,7 +8,6 @@
         "GUID:7da8a75dcade2144aab699032d7d7987",
         "GUID:8d76e605759c3f64a957d63ef96ada7c",
         "GUID:5f875fdc81c40184c8333b9d63c6ddd5",
-        "GUID:301b251fd9834274c9228e0532f444f7",
         "GUID:1cd941934d098654fa21a13f28346412"
     ],
     "includePlatforms": [

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;

Assets/VRM/Runtime/IO/MaterialIO/MToon.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 85f7c43c499b9f74d9a8e16f42d44492
+guid: fbf9b693f6dfcb247abd30eec9c1092f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/VRM/Runtime/IO/MaterialIO/MToon/PreShaderPropExporter.cs

@@ -1,4 +1,4 @@
-namespace UniGLTF.ShaderPropExporter
+namespace VRM
 {
     /// <summary>
     /// TODO: MToon にひきとってもらう

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
     {

Assets/VRM/Runtime/VRM.asmdef

@@ -5,7 +5,6 @@
         "GUID:b7aa47b240b57de44a4b2021c143c9bf",
         "GUID:8d76e605759c3f64a957d63ef96ada7c",
         "GUID:da3e51d19d51a544fa14d43fee843098",
-        "GUID:301b251fd9834274c9228e0532f444f7",
         "GUID:a9bc101fb0471f94a8f99fd242fdd934",
         "GUID:ac229b552c3025545b074203f857547c",
         "GUID:1cd941934d098654fa21a13f28346412",

Assets/VRM/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.univrm",
-  "version": "0.124.1",
+  "version": "0.124.2",
   "displayName": "VRM",
   "description": "VRM importer",
   "unity": "2021.3",
@@ -14,8 +14,8 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.124.1",
-    "com.vrmc.gltf": "0.124.1",
+    "com.vrmc.vrmshaders": "0.124.2",
+    "com.vrmc.gltf": "0.124.2",
     "com.unity.ugui": "1.0.0"
   },
   "samples": [

Assets/VRM10/Editor/Vrm10SerializerGenerator.cs

@@ -15,7 +15,7 @@ namespace UniVRM10
     /// </summary>
     public static class Vrm10SerializerGenerator
     {
-        struct GenerateInfo
+        private struct GenerateInfo
         {
             public string JsonSchema;
             public string FormatDir;
@@ -33,7 +33,8 @@ namespace UniVRM10
             }
         }
 
-        const string SPEC_DIR = "vrm-specification/specification";
+        private const string Vrm10SpecDir = "vrm-specification/specification";
+        private const string Vrm10FormatGeneratedDir = "Assets/VRM10/Runtime/Format";
 
         public static void Run(bool debug)
         {
@@ -45,45 +46,44 @@ namespace UniVRM10
             {
                 // VRMC_hdr_emissiveMultiplier
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_materials_hdr_emissiveMultiplier-1.0/schema/VRMC_materials_hdr_emissiveMultiplier.json",
+                    $"{Vrm10SpecDir}/VRMC_materials_hdr_emissiveMultiplier-1.0/schema/VRMC_materials_hdr_emissiveMultiplier.json",
                     "Assets/UniGLTF/Runtime/UniGLTF/Format/ExtensionsAndExtras/EmissiveMultiplier"
                 ),
 
                 // VRMC_vrm
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_vrm-1.0/schema/VRMC_vrm.schema.json",
-                    "Assets/VRM10/Runtime/Format/Vrm"
+                    $"{Vrm10SpecDir}/VRMC_vrm-1.0/schema/VRMC_vrm.schema.json",
+                    $"{Vrm10FormatGeneratedDir}/Vrm"
                 ),
 
                 // VRMC_materials_mtoon
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_materials_mtoon-1.0/schema/VRMC_materials_mtoon.schema.json",
-                    "Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon",
-                    "Assets/VRM10/Runtime/Format/MaterialsMToon"
+                    $"{Vrm10SpecDir}/VRMC_materials_mtoon-1.0/schema/VRMC_materials_mtoon.schema.json",
+                    $"{Vrm10FormatGeneratedDir}/MaterialsMToon"
                 ),
 
                 // VRMC_springBone
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_springBone-1.0/schema/VRMC_springBone.schema.json",
-                    "Assets/VRM10/Runtime/Format/SpringBone"
+                    $"{Vrm10SpecDir}/VRMC_springBone-1.0/schema/VRMC_springBone.schema.json",
+                    $"{Vrm10FormatGeneratedDir}/SpringBone"
                 ),
 
                 // VRMC_node_constraint
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_node_constraint-1.0/schema/VRMC_node_constraint.schema.json",
-                    "Assets/VRM10/Runtime/Format/Constraints"
+                    $"{Vrm10SpecDir}/VRMC_node_constraint-1.0/schema/VRMC_node_constraint.schema.json",
+                    $"{Vrm10FormatGeneratedDir}/Constraints"
                 ),
 
                 // VRMC_animation
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_vrm_animation-1.0/schema/VRMC_vrm_animation.schema.json",
-                    "Assets/VRM10/Runtime/Format/Animation"
+                    $"{Vrm10SpecDir}/VRMC_vrm_animation-1.0/schema/VRMC_vrm_animation.schema.json",
+                    $"{Vrm10FormatGeneratedDir}/Animation"
                 ),
 
                 // VRMC_animation
                 new GenerateInfo(
-                    $"{SPEC_DIR}/VRMC_springBone_extended_collider-1.0/schema/VRMC_springBone_extended_collider.schema.json",
-                    "Assets/VRM10/Runtime/Format/SpringBoneExtendedCollider"
+                    $"{Vrm10SpecDir}/VRMC_springBone_extended_collider-1.0/schema/VRMC_springBone_extended_collider.schema.json",
+                    $"{Vrm10FormatGeneratedDir}/SpringBoneExtendedCollider"
                 ),
             };
 

Assets/VRM10/MToon10/Editor/EditorMenu.cs

@@ -2,7 +2,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Editor
+namespace VRM10.MToon10.Editor
 {
     internal static class EditorMenu
     {

Assets/VRM10/MToon10/Editor/LabelScope.cs

@@ -2,7 +2,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Editor
+namespace VRM10.MToon10.Editor
 {
     public readonly struct LabelScope : IDisposable
     {

Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Editor
+namespace VRM10.MToon10.Editor
 {
     public enum MToon10EditorEditMode
     {

Assets/VRM10/MToon10/Editor/MToonInspector.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
-using VRMShaders.VRM10.MToon10.Runtime;
 
-namespace VRMShaders.VRM10.MToon10.Editor
+namespace VRM10.MToon10.Editor
 {
     public sealed class MToonInspector : ShaderGUI
     {

Assets/VRM10/MToon10/Editor/VRM10.MToon10.Editor.asmdef

@@ -1,5 +1,6 @@
 {
-    "name": "VRMShaders.VRM10.MToon10.Editor",
+    "name": "VRM10.MToon10.Editor",
+    "rootNamespace": "",
     "references": [
         "GUID:0aaf403bd13871a44b7127aef2695ff8"
     ],

Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader

@@ -209,5 +209,5 @@ Shader "VRM10/MToon10"
         }
     }
     Fallback "Unlit/Texture"
-    CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector"
+    CustomEditor "VRM10.MToon10.Editor.MToonInspector"
 }

Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader

@@ -253,5 +253,5 @@ Shader "VRM10/Universal Render Pipeline/MToon10"
     }
 
     FallBack "Hidden/Universal Render Pipeline/FallbackError"
-    CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector"
+    CustomEditor "VRM10.MToon10.Editor.MToonInspector"
 }

Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public static class MaterialExtensions
     {

Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
+namespace VRM10.MToon10.MToon0X
 {
     public class MToon0XDefinition
     {

Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
+namespace VRM10.MToon10.MToon0X
 {
     public enum MToon0XDebugMode
     {

Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs

@@ -1,8 +1,7 @@
 using System;
-using UnityEngine;
 using UnityEngine.Rendering;
 
-namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
+namespace VRM10.MToon10.MToon0X
 {
     public static partial class MToon0XUtils
     {

Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs

@@ -1,7 +1,6 @@
-using System;
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
+namespace VRM10.MToon10.MToon0X
 {
     public static partial class MToon0XUtils
     {
@@ -11,7 +10,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
             {
                 Meta = new MToon0XMetaDefinition
                 {
-                    Implementation = Implementation,
+                    Implementation = MToon0XUtils.Implementation,
                     VersionNumber = material.GetInt(PropVersion),
                 },
                 Rendering = new MToon0XRenderingDefinition

Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
+namespace VRM10.MToon10.MToon0X
 {
     public static partial class MToon0XUtils
     {

Assets/VRM10/MToon10/Runtime/MToon10Context.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public sealed class MToon10Context
     {

Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     /// <summary>
     /// Migrate from VRM 0.x MToon to VRM 1.0 vrmc_materials_mtoon

Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs

@@ -1,10 +1,10 @@
 using System;
 using UnityEngine;
-using VRMShaders.VRM10.MToon10.Runtime;
-using VRMShaders.VRM10.MToon10.Runtime.MToon0X;
+using VRM10.MToon10.MToon0X;
+using MToon0XUtils = VRM10.MToon10.MToon0X.MToon0XUtils;
 using Object = UnityEngine.Object;
 
-namespace VRMShaders.VRM10.MToon10.Editor
+namespace VRM10.MToon10
 {
     public sealed class MToonMaterialMigrator
     {

Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs

@@ -2,7 +2,7 @@
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public sealed class MToonOutlineRenderFeature : ScriptableRendererFeature
     {

Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs

@@ -1,9 +1,8 @@
 #if MTOON_URP
-using System;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public sealed class MToonOutlineRenderPass : ScriptableRenderPass
     {

Assets/VRM10/MToon10/Runtime/MToonValidator.cs

@@ -1,9 +1,8 @@
 using System;
 using UnityEngine;
 using UnityEngine.Rendering;
-using VRMShaders.VRM10.MToon10.Runtime;
 
-namespace VRMShaders.VRM10.MToon10.Runtime
+namespace VRM10.MToon10
 {
     public sealed class MToonValidator
     {