Merge pull request #64 from sr4dev/feature/fix_parallel_import_issue

Fix Parallel import issue.

Author: sr4dev

Assets/SpriteAssist/Editor/Inspector/SpriteProcessor.cs

@@ -466,27 +466,27 @@ public void OnInspectorGUI(bool disableBaseGUI)
             EditorGUILayout.Space();
 
             using (new EditorGUILayout.HorizontalScope())
-            using (new EditorGUI.DisabledScope(!_isDataChanged))
-            {
-                GUILayout.FlexibleSpace();
-
-                if (GUILayout.Button("Revert", GUILayout.Width(50)))
+                using (new EditorGUI.DisabledScope(!_isDataChanged))
                 {
-                    Revert();
-                }
+                    GUILayout.FlexibleSpace();
 
-                if (GUILayout.Button("Apply", GUILayout.Width(50)))
-                {
-                    if (_meshPrefab != _mainImportData.MeshPrefab)
+                    if (GUILayout.Button("Revert", GUILayout.Width(50)))
                     {
-                        Apply(true, _meshPrefab == null, false, (GameObject)_meshPrefab);
+                        Revert();
                     }
-                    else
+
+                    if (GUILayout.Button("Apply", GUILayout.Width(50)))
                     {
-                        Apply();
+                        if (_meshPrefab != _mainImportData.MeshPrefab)
+                        {
+                            Apply(true, _meshPrefab == null, false, (GameObject)_meshPrefab);
+                        }
+                        else
+                        {
+                            Apply();
+                        }
                     }
                 }
-            }
 
             if (!_mainImportData.IsTightMesh)
             {
@@ -513,7 +513,7 @@ public bool OnPreviewGUI(Rect rect, Sprite baseSprite, Sprite dummySprite, Textu
 
             //for multiple preview
             bool hasMultipleTargets = Selection.objects.Length > 1;
-            
+
             if (_isPreviewChanged || _preview.Rect != rect || hasMultipleTargets || isForce)
             {
                 _preview.Update(rect, baseSprite, dummySprite, textureInfo, _configData);
@@ -579,8 +579,12 @@ private void Apply(bool withMeshPrefabProcess = false, bool hasMeshPrefab = fals
 
             Undo.RegisterCompleteObjectUndo(_targets, "SpriteAssist Texture");
 
+            _isDataChanged = false;
+            _meshPrefab = _mainImportData.MeshPrefab;
             _originalUserData = JsonUtility.ToJson(_configData);
 
+            var oldSelection = Selection.objects;
+
             foreach (var selectedTarget in _targets)
             {
                 if (SpriteImportData.TryGetSpriteImportData(selectedTarget, out var importData))
@@ -620,10 +624,9 @@ private void Apply(bool withMeshPrefabProcess = false, bool hasMeshPrefab = fals
 
             AssetDatabase.SaveAssets();
 
-            _isDataChanged = false;
-            _meshPrefab = _mainImportData.MeshPrefab;
+            Selection.objects = oldSelection;
         }
-        
+
         private void SetMeshPrefabContainer(SpriteImportData importData, bool removeOldMeshPrefab, GameObject attachedMeshPrefab)
         {
             importData.RemoveExternalPrefab(removeOldMeshPrefab);

Assets/SpriteAssist/Editor/MeshCreator/OpaqueEdgeGridMeshCreator.cs

@@ -42,11 +42,11 @@ private Mesh GetCombinedMesh(Sprite baseSprite, Sprite dummySprite, TextureInfo
         {
             dummySprite.GetVertexAndTriangle2D(data, out var vertices, out var triangles, MeshRenderType.OpaqueWithoutTightGrid);
             if (applyPixelPerUnitScale) vertices = MeshUtil.GetScaledVertices(vertices, textureInfo, isClamped: true);
-            Mesh opaqueMesh = MeshUtil.Create(vertices.ToVector3(), triangles.ToInt(), textureInfo, false);
+            Mesh opaqueMesh = MeshUtil.Update(null, vertices.ToVector3(), triangles.ToInt(), textureInfo, false);
 
             dummySprite.GetVertexAndTriangle2D(data, out var verticesGrid, out var trianglesGrid, MeshRenderType.TightGrid);
             if (applyPixelPerUnitScale) verticesGrid = MeshUtil.GetScaledVertices(verticesGrid, textureInfo, isClamped: true);
-            Mesh gridMesh = MeshUtil.Create(verticesGrid.ToVector3(), trianglesGrid.ToInt(), textureInfo, false);
+            Mesh gridMesh = MeshUtil.Update(null, verticesGrid.ToVector3(), trianglesGrid.ToInt(), textureInfo, false);
 
             var combinedMesh = new Mesh();
 
@@ -59,4 +59,4 @@ private Mesh GetCombinedMesh(Sprite baseSprite, Sprite dummySprite, TextureInfo
             return combinedMesh;
         }
     }
-}
+}

Assets/SpriteAssist/Editor/Util/MeshUtil.cs

@@ -48,7 +48,7 @@ public static int[] ToInt(this ushort[] triangles2D)
         {
             return Array.ConvertAll(triangles2D, i => (int)i);
         }
-        
+
         public static ushort[] ToUShort(this int[] triangles3D)
         {
             return Array.ConvertAll(triangles3D, i => (ushort)i);
@@ -63,7 +63,7 @@ public static string GetAreaInfo(Vector2[] vertices2D, ushort[] triangles2D, Tex
                 Vector2 a = vertices2D[triangles2D[i]];
                 Vector2 b = vertices2D[triangles2D[i + 1]];
                 Vector2 c = vertices2D[triangles2D[i + 2]];
-                area += (a.x * (b.y - c.y) + b.x * (c.y - a.y) + c.x * (a.y - b.y));
+                area += a.x * (b.y - c.y) + b.x * (c.y - a.y) + c.x * (a.y - b.y);
             }
 
             area *= 0.5f * textureInfo.pixelPerUnit * textureInfo.pixelPerUnit;
@@ -73,14 +73,7 @@ public static string GetAreaInfo(Vector2[] vertices2D, ushort[] triangles2D, Tex
             return $"{vertices2D.Length} verts, {triangles2D.Length / 3} tris, {meshAreaRatio:F2}% overdraw";
         }
 
-        public static Mesh Create(Vector3[] v, int[] t, TextureInfo textureInfo, bool splitVertices)
-        {
-            Mesh mesh = new Mesh();
-            Update(mesh, v, t, textureInfo, splitVertices);
-            return mesh;
-        }
-
-        public static void Update(Mesh mesh, Vector3[] v, int[] t, TextureInfo textureInfo, bool splitVertices)
+        public static Mesh Update(Mesh mesh, Vector3[] v, int[] t, TextureInfo textureInfo, bool splitVertices)
         {
             Vector2[] uv = new Vector2[v.Length];
 
@@ -91,6 +84,11 @@ public static void Update(Mesh mesh, Vector3[] v, int[] t, TextureInfo textureIn
                 uv[i].y /= textureInfo.rect.size.y;
             }
 
+            if (mesh == null)
+            {
+                mesh = new Mesh();
+            }
+
             mesh.Clear();
             mesh.SetVertices(v);
             mesh.SetUVs(0, uv);
@@ -102,6 +100,8 @@ public static void Update(Mesh mesh, Vector3[] v, int[] t, TextureInfo textureIn
             {
                 mesh.SplitVertices();
             }
+
+            return mesh;
         }
 
         //reference 'https://github.com/sr4dev/Unity-SpriteAssist/issues/38 by MateuszRe'
@@ -129,7 +129,7 @@ public static void SplitVertices(this Mesh mesh)
             {
                 var triangles = mesh.GetTriangles(s);
                 int tCnt = triangles.Length;
-                
+
                 for (int t = 0; t < tCnt; t++)
                 {
                     int index = triangles[t];
@@ -138,8 +138,10 @@ public static void SplitVertices(this Mesh mesh)
                         vertices.Add(vertices[index]);
                         if (hasUvs)
                             uvs.Add(uvs[index]);
+
                         if (hasColors)
                             colors.Add(colors[index]);
+
                         if (hasTangents)
                             tangents.Add(tangents[index]);
 
@@ -158,8 +160,10 @@ public static void SplitVertices(this Mesh mesh)
 
             if (hasUvs)
                 mesh.SetUVs(0, uvs);
+
             if (hasColors)
                 mesh.SetColors(colors);
+
             if (hasTangents)
                 mesh.SetTangents(tangents);
 
@@ -228,9 +232,9 @@ public static void WeldVertices(Mesh mesh, float threshold = 0.005f, float bucke
                 {
                     tempIndex = tempList[j];
                     if (Vector3.SqrMagnitude(vertBuffer[tempIndex] - vertices[i]) < threshold
-                                            && (!hasUVs || uvs[i] == uvsBuffer[tempIndex])
-                                            && (!hasColors || colors[i] == colorBuffer[tempIndex])
-                                            && (ignoreNormals || normals[i] == normalBuffer[tempIndex]))
+                        && (!hasUVs || uvs[i] == uvsBuffer[tempIndex])
+                        && (!hasColors || colors[i] == colorBuffer[tempIndex])
+                        && (ignoreNormals || normals[i] == normalBuffer[tempIndex]))
                     {
                         indexBuffer.Add(tempList[j]);
                         goto skip;
@@ -240,16 +244,18 @@ public static void WeldVertices(Mesh mesh, float threshold = 0.005f, float bucke
                 vertBuffer.Add(vertices[i]);
                 if (hasColors)
                     colorBuffer.Add(colors[i]);
+
                 if (hasUVs)
                     uvsBuffer.Add(uvs[i]);
+
                 if (!ignoreNormals)
                     normalBuffer.Add(normals[i]);
 
                 tempList.Add(newSize);
                 indexBuffer.Add(newSize);
                 newSize++;
 
-                skip:;
+                skip: ;
             }
 
             for (int i = 0; i < triangles.Length; i++)
@@ -263,6 +269,7 @@ public static void WeldVertices(Mesh mesh, float threshold = 0.005f, float bucke
 
             if (hasColors)
                 mesh.SetColors(colorBuffer);
+
             if (hasUVs)
                 mesh.SetUVs(0, uvsBuffer);
 
@@ -273,6 +280,5 @@ public static void WeldVertices(Mesh mesh, float threshold = 0.005f, float bucke
 
             if (printResults) Debug.Log("Reduced " + mesh.name + " from " + vertices.Length + " to " + vertBuffer.Count);
         }
-
     }
-}
+}

Assets/SpriteAssist/Editor/Util/PrefabUtil.cs

@@ -5,6 +5,7 @@
 using Object = UnityEngine.Object;
 #if UNITY_2021_2_OR_NEWER
 using UnityEditor.SceneManagement;
+
 #else
 using UnityEditor.Experimental.SceneManagement;
 #endif
@@ -48,8 +49,7 @@ public static GameObject CreateMeshPrefab(TextureInfo textureInfo, bool hasSubOb
 
                 string countText = count > 1 ? $"_{count}" : string.Empty;
                 path = Path.Combine(currentDirectory, $"{textureFileName}{countText}.prefab");
-            }
-            while (File.Exists(path));
+            } while (File.Exists(path));
 
             if (!string.IsNullOrEmpty(relativePath))
             {
@@ -146,12 +146,8 @@ public static void AddComponentsAssets(Sprite sprite, GameObject prefab, Vector3
             }
 
             //create new mesh
-            Mesh mesh = new Mesh()
-            {
-                name = renderType,
-            };
-
-            MeshUtil.Update(mesh, v, t, textureInfo, spriteConfigData.isCorrectNormal);
+            Mesh mesh = MeshUtil.Update(null, v, t, textureInfo, spriteConfigData.isCorrectNormal);
+            mesh.name = renderType;
             meshFilter.mesh = mesh;
 
             //create new material
@@ -170,9 +166,7 @@ public static void AddComponentsAssets(Sprite sprite, GameObject prefab, Vector3
         public static void UpdateMeshFiltersMesh(GameObject prefab, Vector3[] v, int[] t, TextureInfo textureInfo, bool splitVertices)
         {
             MeshFilter meshFilter = prefab.GetComponent<MeshFilter>();
-            Mesh mesh = meshFilter.sharedMesh;
-            MeshUtil.Update(mesh, v, t, textureInfo, splitVertices);
-            meshFilter.sharedMesh = mesh;
+            meshFilter.sharedMesh = MeshUtil.Update(meshFilter.sharedMesh, v, t, textureInfo, splitVertices);
         }
 
         public static void CleanUpSubAssets(GameObject prefab)
@@ -211,7 +205,7 @@ public static bool TryGetMutableInstanceInHierarchy(Object target, out GameObjec
         public static bool TryGetSpriteRendererWithSprite(GameObject gameObject, out SpriteRenderer spriteRenderer)
         {
             spriteRenderer = gameObject.GetComponent<SpriteRenderer>();
-            
+
             if (spriteRenderer != null && spriteRenderer.sprite != null)
             {
                 return true;
@@ -249,4 +243,4 @@ public static bool TryRename(string spriteAssetPath, GameObject meshPrefab)
             return false;
         }
     }
-}
+}