Improvement: Normals and tangents (if not present) are only calculate…

…d if the assigned material actually requires them.
atteneder · Feb 25, 2020 · 08eb93e · 08eb93e
1 parent 8459872
commit 08eb93e
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Changed
+- Normals and tangents (if not present) are only calculated if the assigned material actually requires them.
+
 ## [0.10.1] - 2020-02-24
 ### Added
 - Experimental KTX / Basis Universal support was merged (off by default)

diff --git a/Runtime/Scripts/GltFast.cs b/Runtime/Scripts/GltFast.cs
@@ -1127,6 +1127,9 @@ void CreatePrimitiveContexts( Root gltf ) {
                         }
                         context.primtiveIndex = i;
                         context.materials[primIndex] = primitive.material;
+
+                        context.needsNormals |= primitive.material<0 || gltf.materials[primitive.material].requiresNormals;
+                        context.needsTangents |= primitive.material>=0 && gltf.materials[primitive.material].requiresTangents;
                     }
 
                     primitiveContexts[i] = context;

diff --git a/Runtime/Scripts/PrimitiveCreateContext.cs b/Runtime/Scripts/PrimitiveCreateContext.cs
@@ -72,8 +72,10 @@ public override bool IsCompleted {
             if(normals!=null) {
                 msh.normals = normals;
             } else
-            if(topology==MeshTopology.Triangles || topology==MeshTopology.Quads) {
+            if( needsNormals && ( topology==MeshTopology.Triangles || topology==MeshTopology.Quads ) ) {
+                Profiler.BeginSample("RecalculateNormals");
                 msh.RecalculateNormals();
+                Profiler.EndSample();
             }
             Profiler.EndSample();
             Profiler.BeginSample("SetColor");
@@ -87,15 +89,12 @@ public override bool IsCompleted {
             if(tangents!=null) {
                 msh.tangents = tangents;
             } else
-            if(topology==MeshTopology.Triangles || topology==MeshTopology.Quads) {
-                // TODO: Improvement idea: by only calculating tangents, if they are actually needed
+            if( needsTangents && uvs0!=null && (topology==MeshTopology.Triangles || topology==MeshTopology.Quads) ) {
                 Profiler.BeginSample("RecalculateTangents");
                 msh.RecalculateTangents();
                 Profiler.EndSample();
             }
             Profiler.EndSample();
-            // primitives[c.primtiveIndex] = new Primitive(msh,c.primitive.material);
-            // resources.Add(msh);
 
             Profiler.BeginSample("Dispose");
             Dispose();

diff --git a/Runtime/Scripts/PrimitiveCreateContextBase.cs b/Runtime/Scripts/PrimitiveCreateContextBase.cs
@@ -7,6 +7,8 @@ namespace GLTFast {
     abstract class PrimitiveCreateContextBase {
         public int primtiveIndex;
         public int[] materials;
+        public bool needsNormals;
+        public bool needsTangents;
         public abstract bool IsCompleted {get;}
         public abstract Primitive? CreatePrimitive();
     }

diff --git a/Runtime/Scripts/PrimitiveDracoCreateContext.cs b/Runtime/Scripts/PrimitiveDracoCreateContext.cs
@@ -38,13 +38,13 @@ public override bool IsCompleted {
             var mesh = DracoMeshLoader.CreateMesh(dracoMesh, out hasNormals, out hasTexcoords);
             Profiler.EndSample();
 
-            if(!hasNormals) {
+            if(needsNormals && !hasNormals) {
                 Profiler.BeginSample("Draco.RecalculateNormals");
                 // TODO: Make optional. Only calculate if actually needed
                 mesh.RecalculateNormals();
                 Profiler.EndSample();
             }
-            if(hasTexcoords) {
+            if(needsTangents && hasTexcoords) {
                 Profiler.BeginSample("Draco.RecalculateTangents");
                 // TODO: Make optional. Only calculate if actually needed
                 mesh.RecalculateTangents();

diff --git a/Runtime/Scripts/Schema/Material.cs b/Runtime/Scripts/Schema/Material.cs
@@ -115,5 +115,17 @@ public AlphaMode alphaModeEnum {
         /// lighting equation is evaluated.
         /// </summary>
         public bool doubleSided = false;
+
+        public bool requiresNormals {
+            get {
+                return extensions==null || extensions.KHR_materials_unlit==null;
+            }
+        }
+
+        public bool requiresTangents {
+            get {
+                return normalTexture!=null && normalTexture.index>=0;
+            }
+        }
     }
 }
diff --git a/Runtime/Scripts/Schema/MeshPrimitive.cs b/Runtime/Scripts/Schema/MeshPrimitive.cs
@@ -36,7 +36,7 @@ public class MeshPrimitive {
         /// <summary>
         /// The index of the material to apply to this primitive when rendering.
         /// </summary>
-        public int material;
+        public int material = -1;
 
         /// <summary>
         /// The type of primitives to render. All valid values correspond to WebGL enums.