Merge branch 'master' into bugfix/1322032-create-shadowmesh-problem

Author: lopezt-unity

CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Bug Fixes
 
 - [case: 1322032] Fixing wrong ProBuilderMesh colors on domain reload when null.
+- [case: 1322150] Fixing torus and sphere UV generation when creating New Shape.
+- [case: 1320936] Fixing 'ProBuilderize' action creating empty submeshes.
 
 ### Changes
 

Runtime/Core/ProBuilderMeshFunction.cs

@@ -324,7 +324,7 @@ public void ToMesh(MeshTopology preferredTopology = MeshTopology.Triangles)
 
             Submesh[] submeshes = Submesh.GetSubmeshes(facesInternal, materialCount, preferredTopology);
 
-            mesh.subMeshCount = materialCount;
+            mesh.subMeshCount = submeshes.Length;
 
             for (int i = 0; i < mesh.subMeshCount; i++)
             {

Runtime/Core/Submesh.cs

@@ -113,6 +113,7 @@ public static Submesh[] GetSubmeshes(IEnumerable<Face> faces, int submeshCount,
             List<int>[] quads = wantsQuads ? new List<int>[submeshCount] : null;
             List<int>[] tris = new List<int>[submeshCount];
             int maxSubmeshIndex = submeshCount - 1;
+            int maxSubmeshIndexUsed = -1;
 
             for (int i = 0; i < submeshCount; i++)
             {
@@ -128,13 +129,14 @@ public static Submesh[] GetSubmeshes(IEnumerable<Face> faces, int submeshCount,
                     continue;
 
                 int submeshIndex = Math.Clamp(face.submeshIndex, 0, maxSubmeshIndex);
-
+                maxSubmeshIndexUsed = UnityEngine.Mathf.Max(submeshIndex,maxSubmeshIndexUsed);
                 if (wantsQuads && face.IsQuad())
                     quads[submeshIndex].AddRange(face.ToQuad());
                 else
                     tris[submeshIndex].AddRange(face.indexesInternal);
             }
 
+            submeshCount = maxSubmeshIndexUsed + 1;
             var submeshes = new Submesh[submeshCount];
 
             switch (preferredTopology)

Runtime/Shapes/Sphere.cs

@@ -73,18 +73,12 @@ public override void CopyShape(Shape shape)
         public override Bounds UpdateBounds(ProBuilderMesh mesh, Vector3 size, Quaternion rotation, Bounds bounds)
         {
             bounds = mesh.mesh.bounds;
-            Vector3 boxSize = bounds.size;
-            boxSize.x = boxSize.y = boxSize.z = Mathf.Max(boxSize.x, Mathf.Max(boxSize.y, boxSize.z));
-            bounds.size = boxSize;
             return bounds;
         }
 
         public override Bounds RebuildMesh(ProBuilderMesh mesh, Vector3 size, Quaternion rotation)
         {
-            var radius = System.Math.Min(System.Math.Min(Mathf.Abs(size.x), Mathf.Abs(size.y)), Mathf.Abs(size.z));
-            //avoid to create a degenerated sphere with a radius set to 0
-            radius = radius < 0.001f ? 0.001f : radius;
-
+            var radius = .5f;
             // http://blog.andreaskahler.com/2009/06/creating-icosphere-mesh-in-code.html
 
             Vector3[] v = new Vector3[k_IcosphereTriangles.Length];
@@ -110,7 +104,7 @@ public override Bounds RebuildMesh(ProBuilderMesh mesh, Vector3 size, Quaternion
             {
                 f[i / 3] = new Face(new int[3] { i, i + 1, i + 2 });
                 f[i / 3].smoothingGroup = m_Smooth ? 1 : 0;
-                f[i / 3].manualUV = true;
+                f[i / 3].manualUV = false;
 
                 // Get the bottom most vertex of the whole shape. We'll use it as a pivot point.
                 for (int j = 0; j < f[i / 3].indexes.Count; ++j)
@@ -124,6 +118,26 @@ public override Bounds RebuildMesh(ProBuilderMesh mesh, Vector3 size, Quaternion
                     }
                 }
             }
+
+            for (int i = 0; i < f.Length; i++)
+            {
+                var nrm = Math.Normal(v[f[i].indexesInternal[0]], v[f[i].indexesInternal[1]], v[f[i].indexesInternal[2]]);
+                var axis = Projection.VectorToProjectionAxis(nrm);
+
+                if (axis == ProjectionAxis.X)
+                    f[i].textureGroup = 2;
+                else if (axis == ProjectionAxis.Y)
+                    f[i].textureGroup = 3;
+                else if (axis == ProjectionAxis.Z)
+                    f[i].textureGroup = 4;
+                else if (axis == ProjectionAxis.XNegative)
+                    f[i].textureGroup = 5;
+                else if (axis == ProjectionAxis.YNegative)
+                    f[i].textureGroup = 6;
+                else if (axis == ProjectionAxis.ZNegative)
+                    f[i].textureGroup = 7;
+            }
+
             mesh.unwrapParameters = new UnwrapParameters()
             {
                 packMargin = 30f

Runtime/Shapes/Torus.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using UnityEditor;
+using UnityEngine.ProBuilder.MeshOperations;
 
 namespace UnityEngine.ProBuilder.Shapes
 {
@@ -119,6 +120,8 @@ public override Bounds RebuildMesh(ProBuilderMesh mesh, Vector3 size, Quaternion
             mesh.TranslateVerticesInWorldSpace(mesh.mesh.triangles, mesh.transform.TransformDirection(-mesh.mesh.bounds.center));
             mesh.Refresh();
 
+            UVEditing.ProjectFacesBox(mesh, mesh.facesInternal);
+
             return UpdateBounds(mesh, size, rotation, new Bounds());
         }