Relax limits about normals

CHANGELOG-PRERELEASE.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - AnimatorOverrideController may not be proceed correctly `#567`
+- Unclear behaviour if we merged meshes with and without normals `#569`
 
 ### Security
 

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - AnimatorController with Synced can be broken `#564`
 - AnimatorOverrideController may not be proceed correctly `#567`
+- Unclear behaviour if we merged meshes with and without normals `#569`
 
 ### Security
 

Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs

@@ -44,6 +44,16 @@ public override void Process(OptimizerSession session, MeshInfo2 target)
                 .ToArray();
             var sourceMaterials = meshInfos.Select(x => x.SubMeshes.Select(y => y.SharedMaterial).ToArray()).ToArray();
 
+            // check normal information.
+            int hasNormal = 0;
+            foreach (var meshInfo2 in meshInfos)
+                hasNormal |= meshInfo2.HasNormals ? 1 : 2;
+
+            if (hasNormal == 3)
+            {
+                BuildReport.LogFatal("MergeSkinnedMesh:error:mix-normal-existence")?.WithContext(Component);
+            }
+
             var (subMeshIndexMap, materials) = CreateMergedMaterialsAndSubMeshIndexMapping(sourceMaterials);
 
             var sourceRootBone = target.RootBone;
@@ -127,6 +137,7 @@ TexCoordStatus TexCoordStatusMax(TexCoordStatus x, TexCoordStatus y) =>
                 target.Bones.AddRange(meshInfo.Bones);
 
                 target.HasColor |= meshInfo.HasColor;
+                target.HasNormals |= meshInfo.HasNormals;
                 target.HasTangent |= meshInfo.HasTangent;
 
                 target.AssertInvariantContract($"processing meshInfo {Target.gameObject.name}");

Editor/Processors/SkinnedMeshes/MeshInfo2.cs

@@ -30,6 +30,7 @@ internal class MeshInfo2
         public readonly List<Bone> Bones = new List<Bone>();
 
         public bool HasColor { get; set; }
+        public bool HasNormals { get; set; }
         public bool HasTangent { get; set; }
 
         public MeshInfo2(SkinnedMeshRenderer renderer)
@@ -192,7 +193,11 @@ public void ReadStaticMesh([NotNull] Mesh mesh)
             for (var i = 0; i < mesh.vertexCount; i++) Vertices.Add(new Vertex());
 
             CopyVertexAttr(mesh.vertices, (x, v) => x.Position = v);
-            CopyVertexAttr(mesh.normals, (x, v) => x.Normal = v);
+            if (mesh.GetVertexAttributeDimension(VertexAttribute.Normal) != 0)
+            {
+                HasNormals = true;
+                CopyVertexAttr(mesh.normals, (x, v) => x.Normal = v);
+            }
             if (mesh.GetVertexAttributeDimension(VertexAttribute.Tangent) != 0)
             {
                 HasTangent = true;
@@ -275,6 +280,7 @@ public void Clear()
             BlendShapes.Clear();
             Bones.Clear();
             HasColor = false;
+            HasNormals = false;
             HasTangent = false;
         }
 
@@ -301,14 +307,17 @@ public void WriteToMesh(Mesh destMesh)
             // Basic Vertex Attributes: vertices, normals
             {
                 var vertices = new Vector3[Vertices.Count];
-                var normals = new Vector3[Vertices.Count];
                 for (var i = 0; i < Vertices.Count; i++)
-                {
                     vertices[i] = Vertices[i].Position;
-                    normals[i] = Vertices[i].Normal;
-                }
-
                 destMesh.vertices = vertices;
+            }
+
+            // tangents
+            if (HasNormals)
+            {
+                var normals = new Vector3[Vertices.Count];
+                for (var i = 0; i < Vertices.Count; i++)
+                    normals[i] = Vertices[i].Normal;
                 destMesh.normals = normals;
             }
 

Localization/en.po

@@ -272,6 +272,11 @@ msgstr "Merge"
 msgid "MergeSkinnedMesh:label:Renderers"
 msgstr "Renderers:"
 
+msgid "MergeSkinnedMesh:error:mix-normal-existence"
+msgstr ""
+"Merging both meshes with and without normal is not supported."
+"Please change import setting of models to include normals!"
+
 # endregion
 
 # region MergeToonLitMaterial

Localization/ja.po

@@ -209,6 +209,11 @@ msgstr "統合する"
 msgid "MergeSkinnedMesh:label:Renderers"
 msgstr "レンダラー:"
 
+msgid "MergeSkinnedMesh:error:mix-normal-existence"
+msgstr ""
+"法線があるメッシュとないメッシュの両方を1つに統合する操作には対応していません。"
+"法線が含まれるようにモデルのインポート設定を変更してください!"
+
 # endregion
 
 # region MergeToonLitMaterial