vrm-c · ousttrue · May 27, 2021 · May 27, 2021 · May 27, 2021 · May 27, 2021
diff --git a/Assets/UniGLTF/Editor/MeshUtility/TextureSaver.cs b/Assets/UniGLTF/Editor/MeshUtility/TextureSaver.cs
@@ -2,7 +2,7 @@
 using UnityEditor;
 using UnityEngine;
 using VRMShaders;
-using ColorSpace = UniGLTF.ColorSpace;
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace MeshUtility
 {

diff --git a/Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs b/Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using UnityEngine;
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {
@@ -10,13 +11,13 @@ public static float[] ToFloat4(this Color src, ColorSpace srcColorSpace, ColorSp
             var dst = src.ConvertColorSpace(srcColorSpace, dstColorSpace);
             return new float[] {dst.r, dst.g, dst.b, dst.a};
         }
-        
+
         public static float[] ToFloat3(this Color src, ColorSpace srcColorSpace, ColorSpace dstColorSpace)
         {
             var dst = src.ConvertColorSpace(srcColorSpace, dstColorSpace);
             return new float[] {dst.r, dst.g, dst.b};
         }
-        
+
         public static Color ToColor4(this float[] src, ColorSpace srcColorSpace, ColorSpace dstColorSpace)
         {
             if (src == null || src.Length < 4)
@@ -27,7 +28,7 @@ public static Color ToColor4(this float[] src, ColorSpace srcColorSpace, ColorSp
 
             return new Color(src[0], src[1], src[2], src[3]).ConvertColorSpace(srcColorSpace, dstColorSpace);
         }
-        
+
         public static Color ToColor3(this float[] src, ColorSpace srcColorSpace, ColorSpace dstColorSpace)
         {
             if (src == null || src.Length < 3)
@@ -64,4 +65,4 @@ private static Color ConvertColorSpace(this Color srcColor, ColorSpace srcColorS
             }
         }
     }
-}
+}
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
@@ -37,14 +37,19 @@ public IAnimationImporter AnimationImporter
         public TextureFactory TextureFactory { get; }
         public MaterialFactory MaterialFactory { get; }
 
-        public ImporterContext(GltfParser parser, IReadOnlyDictionary<SubAssetKey, UnityEngine.Object> externalObjectMap = null)
+        public ImporterContext(
+            GltfParser parser,
+            IReadOnlyDictionary<SubAssetKey, UnityEngine.Object> externalObjectMap = null,
+            ITextureDeserializer textureDeserializer = null)
         {
             Parser = parser;
             TextureDescriptorGenerator = new GltfTextureDescriptorGenerator(Parser);
             MaterialDescriptorGenerator = new GltfMaterialDescriptorGenerator();
 
             externalObjectMap = externalObjectMap ?? new Dictionary<SubAssetKey, UnityEngine.Object>();
-            TextureFactory = new TextureFactory(externalObjectMap
+            textureDeserializer = textureDeserializer ?? new UnityTextureDeserializer();
+
+            TextureFactory = new TextureFactory(textureDeserializer, externalObjectMap
                 .Where(x => x.Value is Texture)
                 .ToDictionary(x => x.Key, x => (Texture) x.Value));
             MaterialFactory = new MaterialFactory(externalObjectMap

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs
@@ -1,5 +1,6 @@
 using UnityEngine;
 using VRMShaders;
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 using VRMShaders;
-
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/MaterialExporter.cs
@@ -2,7 +2,7 @@
 using UniGLTF.UniUnlit;
 using UnityEngine;
 using VRMShaders;
-
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs
@@ -1,6 +1,7 @@
 using System;
 using UnityEngine;
 using VRMShaders;
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace UniGLTF
 {

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/Resources/Shaders/NormalMapEncoder.shader b/Assets/UniGLTF/Runtime/UniGLTF/Resources/Shaders/NormalMapEncoder.shader
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/Resources/Shaders/NormalMapEncoder.shader.meta b/Assets/UniGLTF/Runtime/UniGLTF/Resources/Shaders/NormalMapEncoder.shader.meta
diff --git a/Assets/VRM/Runtime/IO/VRMExporter.cs b/Assets/VRM/Runtime/IO/VRMExporter.cs
@@ -3,8 +3,8 @@
 using UniGLTF;
 using UniJSON;
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
-
+using VRMShaders;
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace VRM
 {

diff --git a/Assets/VRM/Runtime/IO/VRMMaterialExporter.cs b/Assets/VRM/Runtime/IO/VRMMaterialExporter.cs
@@ -5,7 +5,7 @@
 using UniGLTF.ShaderPropExporter;
 using UnityEngine;
 using VRMShaders;
-using ColorSpace = UniGLTF.ColorSpace;
+using ColorSpace = VRMShaders.ColorSpace;
 
 namespace VRM
 {

diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialExporter.cs
@@ -4,7 +4,7 @@
 using UniGLTF.Extensions.VRMC_materials_mtoon;
 using UnityEngine;
 using VRMShaders;
-using ColorSpace = UniGLTF.ColorSpace;
+using ColorSpace = VRMShaders.ColorSpace;
 using OutlineWidthMode = MToon.OutlineWidthMode;
 using RenderMode = MToon.RenderMode;
 

diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs
@@ -4,7 +4,7 @@
 using UniGLTF.Extensions.VRMC_materials_mtoon;
 using UnityEngine;
 using VRMShaders;
-using ColorSpace = UniGLTF.ColorSpace;
+using ColorSpace = VRMShaders.ColorSpace;
 using OutlineWidthMode = UniGLTF.Extensions.VRMC_materials_mtoon.OutlineWidthMode;
 
 namespace UniVRM10

diff --git a/Assets/VRM10/Runtime/Migration/MigrationMToon.cs b/Assets/VRM10/Runtime/Migration/MigrationMToon.cs
@@ -5,7 +5,7 @@
 using UniGLTF.Extensions.VRMC_materials_mtoon;
 using UniJSON;
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
+using ColorSpace = VRMShaders.ColorSpace;
 using RenderMode = MToon.RenderMode;
 
 namespace UniVRM10

diff --git a/Assets/VRMShaders/GLTF/IO/Editor/EditorTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Editor/EditorTextureSerializer.cs
@@ -1,10 +1,8 @@
 using System;
 using System.IO;
 using System.Reflection;
-using UniGLTF;
 using UnityEditor;
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
 
 namespace VRMShaders
 {

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs b/Assets/VRMShaders/GLTF/IO/Runtime/ColorSpace.cs
@@ -1,8 +1,8 @@
-namespace UniGLTF
+namespace VRMShaders
 {
     public enum ColorSpace
     {
         sRGB,
         Linear,
     }
-}
+}
diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ITextureDeserializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/ITextureDeserializer.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace VRMShaders
+{
+    /// <summary>
+    /// 単純に Texture2D アセットを生成する機能
+    /// </summary>
+    public interface ITextureDeserializer
+    {
+        /// <summary>
+        /// imageData をもとに Texture2D を生成する
+        /// </summary>
+        /// <param name="imageData">データ</param>
+        /// <param name="useMipmap">Texture2D の mipmap が生成されるべきか否か</param>
+        /// <param name="colorSpace">Texture2D の色空間</param>
+        /// <returns></returns>
+        Task<Texture2D> LoadTextureAsync(byte[] imageData, bool useMipmap, ColorSpace colorSpace);
+    }
+}
diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ITextureDeserializer.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/ITextureDeserializer.cs.meta
diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ITextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/ITextureExporter.cs
@@ -13,7 +13,7 @@ public interface ITextureExporter
         /// <summary>
         /// Export する Texture2D のリスト。これが gltf.textures になる
         /// </summary>
-        IReadOnlyList<(Texture2D, UniGLTF.ColorSpace)> Exported { get; }
+        IReadOnlyList<(Texture2D, ColorSpace)> Exported { get; }
 
         /// <summary>
         /// 指定の Texture を、 sRGB 色空間の値を持つ Texture に出力するように指示する。

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/ITextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/ITextureSerializer.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UniGLTF
+namespace VRMShaders
 {
     /// <summary>
     /// Texture2D を入力として byte[] を得る機能

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/NormalConverter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/NormalConverter.cs
@@ -1,6 +1,4 @@
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
-
 
 namespace VRMShaders
 {
@@ -19,28 +17,13 @@ private static Material Decoder
             }
         }
 
-        private static Material m_encoder;
-        private static Material Encoder
-        {
-            get
-            {
-                if (m_encoder == null)
-                {
-                    m_encoder = new Material(Shader.Find("UniGLTF/NormalMapEncoder"));
-                }
-                return m_encoder;
-            }
-        }
-
         // GLTF data to Unity texture
-        // ConvertToNormalValueFromRawColorWhenCompressionIsRequired
         public static Texture2D Import(Texture2D texture)
         {
-            return TextureConverter.CopyTexture(texture, ColorSpace.Linear, false, Encoder);
+            return texture;
         }
 
         // Unity texture to GLTF data
-        // ConvertToRawColorWhenNormalValueIsCompressed
         public static Texture2D Export(Texture texture)
         {
             return TextureConverter.CopyTexture(texture, ColorSpace.Linear, false, Decoder);

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/OcclusionMetallicRoughnessConverter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/OcclusionMetallicRoughnessConverter.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Linq;
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
-
 
 namespace VRMShaders
 {

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/RuntimeTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/RuntimeTextureSerializer.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using VRMShaders;
 
-namespace UniGLTF
+namespace VRMShaders
 {
     public sealed class RuntimeTextureSerializer : ITextureSerializer
     {

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureConverter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureConverter.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Linq;
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
-
 
 namespace VRMShaders
 {
@@ -11,6 +9,7 @@ public static class TextureConverter
         public static Texture2D CreateEmptyTextureWithSettings(Texture src, ColorSpace dstColorSpace, bool dstNeedsAlpha)
         {
             var texFormat = dstNeedsAlpha ? TextureFormat.ARGB32 : TextureFormat.RGB24;
+            texFormat = TextureFormat.ARGB32;
             var dst = new Texture2D(src.width, src.height, texFormat, src.HasMipMap(), dstColorSpace == ColorSpace.Linear);
             dst.name = src.name;
             dst.anisoLevel = src.anisoLevel;

diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureExporter.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using UniGLTF;
 using UnityEngine;
-using ColorSpace = UniGLTF.ColorSpace;
-
 
 namespace VRMShaders
 {