Fixed DXT5 normal decode

ousttrue · Aug 22, 2018 · bdfd1b4 · bdfd1b4
1 parent b6d3730
commit bdfd1b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Core/Scripts/IO/TextureIO.cs b/Core/Scripts/IO/TextureIO.cs
@@ -69,17 +69,17 @@ struct BytesWithPath
             //public string Path;
             public string Mime;
 
-            public BytesWithPath(Texture texture)
+            public BytesWithPath(Texture texture, bool isNormalMap)
             {
                 //Path = "";
-                Bytes = TextureItem.CopyTexture(texture).EncodeToPNG();
+                Bytes = TextureItem.CopyTexture(texture, isNormalMap).EncodeToPNG();
                 Mime = "image/png";
             }
         }
 
         public static int ExportTexture(glTF gltf, int bufferIndex, Texture texture, bool isNormalMap)
         {
-            var bytesWithPath = new BytesWithPath(texture); ;
+            var bytesWithPath = new BytesWithPath(texture, isNormalMap); ;
 
             // add view
             var view = gltf.buffers[bufferIndex].Append(bytesWithPath.Bytes, glBufferTarget.NONE);

diff --git a/Core/Scripts/IO/TextureItem.cs b/Core/Scripts/IO/TextureItem.cs
@@ -146,7 +146,7 @@ public Texture2D GetMetallicRoughnessOcclusionConverted()
         {
             if (m_metallicRoughnessOcclusion == null)
             {
-                var texture = CopyTexture(Texture);
+                var texture = CopyTexture(Texture, false);
                 texture.SetPixels32(texture.GetPixels32().Select(ConvertMetallicRoughnessOcclusion).ToArray());
                 texture.name = this.Texture.name + ".metallicRoughnessOcclusion";
                 m_metallicRoughnessOcclusion = texture;
@@ -241,15 +241,15 @@ static Material GetDecodeDxt5()
             return s_dxt5decode;
         }
 
-        public static Texture2D CopyTexture(Texture src)
+        public static Texture2D CopyTexture(Texture src, bool isNormal)
         {
             Texture2D dst = null;
 
             var renderTexture = new RenderTexture(src.width, src.height, 0, RenderTextureFormat.ARGB32, RenderTextureReadWrite.sRGB);
 
             using (var scope = new sRGBScope(true))
             {
-                if (IsDxt5(src))
+                if (isNormal && IsDxt5(src))
                 {
                     var mat = GetDecodeDxt5();
                     Graphics.Blit(src, renderTexture, mat);