Merge pull request #2373 from Santarh/disassemblyVrmShaders6

Move unity resource IO definitions from VRMShaders to UniGLTF

Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Editor/UniGLTF/IO.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8e700c0746b947c28cb2436d9111fcaa
+timeCreated: 1721484195

Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs

@@ -3,7 +3,7 @@ using System.Reflection;
 using UnityEditor;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     internal static class EditorTextureUtility
     {

Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs

@@ -3,7 +3,7 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     public sealed class EditorTextureSerializer : ITextureSerializer
     {

Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 
-
-namespace VRMShaders
+namespace UniGLTF
 {
     public static class TextureImporterConfigurator
     {

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs

@@ -2,8 +2,7 @@ using UnityEditor;
 using UnityEngine;
 using System.IO;
 using System.Linq;
-using System.Collections.Generic;
-using VRMShaders;
+
 #if UNITY_2020_2_OR_NEWER
 using UnityEditor.AssetImporters;
 #else

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 using System.Linq;
-using VRMShaders;
+
 #if UNITY_2020_2_OR_NEWER
 using UnityEditor.AssetImporters;
 #else

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs

@@ -1,13 +1,12 @@
 using System.Collections.Generic;
-using System.Linq;
 using UnityEditor;
+using UnityEngine;
+
 #if UNITY_2020_1_OR_NEWER
 using UnityEditor.AssetImporters;
 #else
 using UnityEditor.Experimental.AssetImporters;
 #endif
-using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using UnityEditor;
+using UnityEngine;
+
 #if UNITY_2020_1_OR_NEWER
 using UnityEditor.AssetImporters;
 #else
 using UnityEditor.Experimental.AssetImporters;
 #endif
-using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using VRMShaders;
+
 #if UNITY_2020_2_OR_NEWER
 using UnityEditor.AssetImporters;
 #else

Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapScriptedImporterEditorBase.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
+using UnityEngine;
+
 #if UNITY_2020_1_OR_NEWER
 using UnityEditor.AssetImporters;
 #else
 using UnityEditor.Experimental.AssetImporters;
 #endif
-using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

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

@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 using UnityEditor;
-using UniGLTF;
 using System.Linq;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs

@@ -1,6 +1,5 @@
 using System;
 using UnityEngine;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF.MeshUtility
 {

Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs

@@ -1,7 +1,5 @@
 using UnityEngine;
 using System.Linq;
-using VRMShaders;
-using System;
 using System.Collections.Generic;
 
 

Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs

@@ -2,8 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using UnityEngine.UIElements;
-using VRMShaders;
 
 namespace UniGLTF.MeshUtility
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Export.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 44c184c5fb704e08b064c515409d4d9e
+timeCreated: 1721483589

Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3d3b03f6cf8e4923a3f7e5f90db85b57
+timeCreated: 1721483585

Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     public class AnimationClipFactory : IResponsibilityForDestroyObjects
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {
@@ -346,11 +345,11 @@ namespace UniGLTF
                 });
         }
 
-        public static IEnumerable<VRMShaders.SubAssetKey> EnumerateSubAssetKeys(glTF gltf)
+        public static IEnumerable<SubAssetKey> EnumerateSubAssetKeys(glTF gltf)
         {
             foreach (var gltfAnimation in gltf.animations)
             {
-                yield return new VRMShaders.SubAssetKey(typeof(AnimationClip), gltfAnimation.name);
+                yield return new SubAssetKey(typeof(AnimationClip), gltfAnimation.name);
             }
         }
     }

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     /// ImporterContext の 非同期実行 LoadAsync を補助する。

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9cd79193a3dfa7148bb76882f4988071
+guid: b381854307ab2814fbed3675a370b2e2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     /// 同期実行

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 30f43d5b7d6b4184fb775a315b835365
+guid: 7ef2aac87a2c64f4da10574f463ce6e5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using Object = UnityEngine.Object;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     internal sealed class NextFrameTaskScheduler
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8782dbc36975e6848870c8a238b85c65
+timeCreated: 1634203513

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     /// Runtime (Build 後と、Editor Playing) での非同期ロードを実現する AwaitCaller.

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce49957c7e15bea4ba3025c536fcbff7
+timeCreated: 1634203216

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     /// Runtime (Build 後と、Editor Playing) での非同期ロードを実現する AwaitCaller.

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6d3630f9fecf62f4a8137907b0f7beb2
+guid: c03c79777091593448c34eb4dfd35300
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     internal sealed class TinyManagedTaskScheduler
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 200218a9545e455468caf9c92e92b114
+timeCreated: 1634203919

Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders
+namespace UniGLTF
 {
     public enum ColorSpace
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: 5e97eeb2080e43e18ba57f1a3820a7e6
+fileFormatVersion: 2
+guid: 5e97eeb2080e43e18ba57f1a3820a7e6
 timeCreated: 1620901197

Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs

@@ -2,7 +2,6 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     public delegate void TakeResponsibilityForDestroyObjectFunc(SubAssetKey key, UnityEngine.Object obj);
 

Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using System.Threading.Tasks;
 using UnityEngine.Profiling;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs

@@ -1,6 +1,5 @@
 using System;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/BuiltInGltfMaterialExporter.cs

@@ -1,5 +1,4 @@
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInFallbackMaterialExporter.cs

@@ -1,7 +1,5 @@
 using System;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInGenericUnlitMaterialExporter.cs

@@ -1,7 +1,5 @@
 using System;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInStandardMaterialExporter.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Linq;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInUniUnlitMaterialExporter.cs

@@ -1,8 +1,6 @@
 using System;
 using UniGLTF.UniUnlit;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using VRMShaders;
-
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfDefaultMaterialImporter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using UniGLTF.UniUnlit;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c361a1fc6032467aa77f6ecc470d4503
+timeCreated: 1721483918

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs

@@ -1,5 +1,4 @@
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: afbe933c51a9404199ba1efe6d2f8c62
+fileFormatVersion: 2
+guid: afbe933c51a9404199ba1efe6d2f8c62
 timeCreated: 1622015749

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d488314aa2e44b84b3ff5348cf2f3b08
+timeCreated: 1721483827

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs

@@ -1,5 +1,4 @@
 using UnityEngine;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {
@@ -50,7 +49,7 @@ namespace UniGLTF
 
             if (data.MigrationFlags.IsEmissiveFactorGamma)
             {
-                return emissiveFactor.ToColor3(VRMShaders.ColorSpace.sRGB, VRMShaders.ColorSpace.Linear);
+                return emissiveFactor.ToColor3(ColorSpace.sRGB, ColorSpace.Linear);
             }
             else
             {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs

@@ -1,6 +1,4 @@
-using VRMShaders;
-
-namespace UniGLTF
+namespace UniGLTF
 {
     /// <summary>
     /// 指定の index の glTFMaterial から Import できる Material の生成情報を生成する。

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: c309fb8ee8534a54b291d408511c9331
+fileFormatVersion: 2
+guid: c309fb8ee8534a54b291d408511c9331
 timeCreated: 1622015740

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     public sealed class MaterialDescriptor
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
 
-
-namespace VRMShaders
+namespace UniGLTF
 {
     public delegate Task<Texture> GetTextureAsyncFunc(TextureDescriptor texDesc, IAwaitCaller awaitCaller);
 

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using VRMShaders;
-using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs

@@ -2,8 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using UnityEngine;
-using VRMShaders;
-
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Profiling;
 using UnityEngine.Rendering;
-using VRMShaders;
 
 namespace UniGLTF
 {

Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 using UnityEditor;
 #endif
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     /// UniGLTF.UnityPath (Assets の ひとつ上がルート) をすべてのパスが扱えるように拡張するのが趣旨。

Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     /// UnityEditor.Experimental.AssetImporter.SourceAssetIdentifier に対応する

Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs

@@ -1,4 +1,4 @@
-namespace VRMShaders
+namespace UniGLTF
 {
     public static class Symbols
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     public static class NormalConverter
     {

Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs

@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     /// <summary>
     ///

Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs

@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using UnityEngine;
 
-namespace VRMShaders
+namespace UniGLTF
 {
     public static class TextureConverter
     {