Fixed texture mapping error with Draco meshes.

There was a discrepancy between regular and Draco compressed meshes, since regular meshes' UVs were corrected into Unity Standard shader's space (different vertical origin; top vs. bottom). Now, instead of fixing/changing UV coordinates the material's texture transform is set properly to counter-balance this.
atteneder · Sep 14, 2019 · 8f748ac · 8f748ac
1 parent 037ff16
commit 8f748ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Runtime/Scripts/DefaultMaterialGenerator.cs b/Runtime/Scripts/DefaultMaterialGenerator.cs
@@ -10,6 +10,9 @@ namespace GLTFast {
 
     public class DefaultMaterialGenerator : IMaterialGenerator {
 
+        static readonly Vector2 TEXTURE_SCALE = new Vector2(1,-1);
+        static readonly Vector2 TEXTURE_OFFSET = new Vector2(0,1);
+
         Material defaultMaterial;
 
         public UnityEngine.Material GetDefaultMaterial() {
@@ -23,13 +26,17 @@ public UnityEngine.Material GenerateMaterial( Schema.Material gltfMaterial, Sche
             var material = Material.Instantiate<Material>( GetDefaultMaterial() );
             material.name = gltfMaterial.name;
 
+            material.mainTextureScale = TEXTURE_SCALE;
+            material.mainTextureOffset = TEXTURE_OFFSET;
+
             if(gltfMaterial.pbrMetallicRoughness!=null) {
                 material.color = gltfMaterial.pbrMetallicRoughness.baseColor;
                 material.SetFloat(StandardShaderHelper.metallicPropId, gltfMaterial.pbrMetallicRoughness.metallicFactor );
                 material.SetFloat(StandardShaderHelper.glossinessPropId, 1-gltfMaterial.pbrMetallicRoughness.roughnessFactor );
 
                 var mainTxt = GetTexture(gltfMaterial.pbrMetallicRoughness.baseColorTexture,textures,images);
                 if(mainTxt!=null) {
+                    mainTxt.wrapMode = TextureWrapMode.Clamp;
                     material.mainTexture = mainTxt;
                 }
 

diff --git a/Runtime/Scripts/Jobs.cs b/Runtime/Scripts/Jobs.cs
@@ -95,7 +95,7 @@ public void Execute()
             for (var i = 0; i < count; i++)
             {
                 result[i].x = input[i*2] / 255f;
-                result[i].y = 1 - input[i*2+1] / 255f;
+                result[i].y = input[i*2+1] / 255f;
             }
         }
     }
@@ -118,7 +118,7 @@ public void Execute()
             for (var i = 0; i < count; i++)
             {
                 result[i].x = input[i*2] / Constants.UINT16_MAX;
-                result[i].y = 1 - input[i*2+1] / Constants.UINT16_MAX;
+                result[i].y = input[i*2+1] / Constants.UINT16_MAX;
             }
         }
     }
@@ -143,10 +143,6 @@ public void Execute() {
                 count*8,
                 count*8
             );
-            for (var i = 0; i < count; i++)
-            {
-                result[i].y = 1 - result[i].y;
-            }
         }
     }
 
@@ -173,7 +169,7 @@ public void Execute()
             for (var i = 0; i < count; i++)
             {
                 result[i].x = *off / 255f;
-                result[i].y = 1 - *(off+1) / 255f;
+                result[i].y = *(off+1) / 255f;
                 off += byteStride;
             }
         }
@@ -203,7 +199,7 @@ public void Execute()
             {
                 System.UInt16* uv = (System.UInt16*) off;
                 result[i].x = *uv / Constants.UINT16_MAX;
-                result[i].y = 1 - *(uv+1) / Constants.UINT16_MAX;
+                result[i].y = *(uv+1) / Constants.UINT16_MAX;
                 off += byteStride;
             }
         }