use vertex array length to check for valid normals

check for null and vertex array length, not triangle array length. Same
for tangents and vertex colors. Binormals based on valid normals and
tangents.

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -192,7 +192,7 @@ private bool ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] un
                 // Set the normals on Layer 0.
                 FbxLayer fbxLayer = GetOrCreateLayer(fbxMesh);
 
-                if (mesh.HasValidNormals(unmergedTriangles.Length)) {
+                if (mesh.HasValidNormals()) {
                     using (var fbxLayerElement = FbxLayerElementNormal.Create (fbxMesh, "Normals")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eDirect);
@@ -211,7 +211,7 @@ private bool ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] un
                 }
 
                 /// Set the binormals on Layer 0.
-                if (mesh.HasValidBinormals(unmergedTriangles.Length)) {
+                if (mesh.HasValidBinormals()) {
                     using (var fbxLayerElement = FbxLayerElementBinormal.Create (fbxMesh, "Binormals")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eDirect);
@@ -229,7 +229,7 @@ private bool ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] un
                 }
 
                 /// Set the tangents on Layer 0.
-                if (mesh.HasValidTangents(unmergedTriangles.Length)) {
+                if (mesh.HasValidTangents()) {
                     using (var fbxLayerElement = FbxLayerElementTangent.Create (fbxMesh, "Tangents")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eDirect);
@@ -253,7 +253,7 @@ mesh.Tangents [unityTriangle] [2]
 
                 exportedAttribute |= ExportUVs (fbxMesh, mesh, unmergedTriangles);
 
-                if (mesh.HasValidVertexColors(unmergedTriangles.Length)) {
+                if (mesh.HasValidVertexColors()) {
                     using (var fbxLayerElement = FbxLayerElementVertexColor.Create (fbxMesh, "VertexColors")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eIndexToDirect);
@@ -1430,9 +1430,7 @@ public Vector3 [] Binormals {
                             var normals = Normals;
                             var tangents = Tangents;
 
-                            if (IsValidArray<Vector3>(normals) &&
-                                IsValidArray<Vector4>(tangents, normals.Length)
-                            ) {
+                            if (HasValidNormals() && HasValidTangents()) {
                                 m_Binormals = new Vector3 [normals.Length];
 
                                 for (int i = 0; i < normals.Length; i++)
@@ -1513,34 +1511,20 @@ public MeshInfo (Mesh mesh, Material[] materials)
                     }
                 }
 
-                /// <summary>
-                /// Determines whether this instance is a valid array with the specified length.
-                /// </summary>
-                /// <returns><c>true</c> if this instance is valid array; otherwise, <c>false</c>.</returns>
-                /// <param name="array">Array.</param>
-                /// <param name="expectedLength">Expected length.</param>
-                /// <typeparam name="T">The 1st type parameter.</typeparam>
-                public static bool IsValidArray<T>(T[] array, int expectedLength = -1)
-                {
-                    return array != null &&
-                        array.Length > 0 &&
-                        (expectedLength >= 0 ? array.Length == expectedLength : true);
-                }
-
-                public bool HasValidNormals(int expectedLength){
-                    return IsValidArray<Vector3> (Normals, expectedLength);
+                public bool HasValidNormals(){
+                    return Normals != null && Normals.Length == Vertices.Length;
                 }
 
-                public bool HasValidBinormals(int expectedLength){
-                    return IsValidArray<Vector3> (Binormals, expectedLength);
+                public bool HasValidBinormals(){
+                    return HasValidNormals () && HasValidTangents () && Binormals != null;
                 }
 
-                public bool HasValidTangents(int expectedLength){
-                    return IsValidArray<Vector4> (Tangents, expectedLength);
+                public bool HasValidTangents(){
+                    return Tangents != null && Tangents.Length == Vertices.Length;
                 }
 
-                public bool HasValidVertexColors(int expectedLength){
-                    return IsValidArray<Color32> (VertexColors, expectedLength);
+                public bool HasValidVertexColors(){
+                    return VertexColors != null && VertexColors.Length == Vertices.Length;
                 }
             }