Merge pull request #61 from tangrams/constant-uvs

wip: Generate UVs for polylines and polygons

Author: karimnaaji

Assets/Editor/MapzenMapEditor.cs

@@ -141,6 +141,12 @@ private void LogWarnings()
     {
         foreach (var style in mapzenMap.FeatureStyling)
         {
+            if (style == null)
+            {
+                Debug.LogWarning("'Null' style provided in feature styling collection");
+                continue;
+            }
+
             if (style.FilterStyles.Count == 0)
             {
                 Debug.LogWarning("The style " + style.name + " has no filter");

Assets/Editor/PolygonBuilderEditor.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEditor;
 using Mapzen;
+using System.Linq;
 using Mapzen.Unity;
 using System;
 
@@ -10,6 +11,9 @@ public class PolygonBuilderEditor : EditorBase
     [SerializeField]
     private bool show;
 
+    [SerializeField]
+    private int selectedExtrusionType = -1;
+
     public PolygonBuilderEditor()
         : base()
     {
@@ -20,7 +24,7 @@ public static PolygonBuilder.Options DefaultOptions()
     {
         var defaultOptions = new PolygonBuilder.Options();
 
-        defaultOptions.Extrude = true;
+        defaultOptions.Extrusion = PolygonBuilder.ExtrusionType.TopAndSides;
         defaultOptions.Enabled = true;
         defaultOptions.MaxHeight = 0.0f;
 
@@ -49,8 +53,16 @@ public PolygonBuilder.Options OnInspectorGUI(PolygonBuilder.Options options)
             return options;
         }
 
+        if (selectedExtrusionType == -1)
+        {
+            selectedExtrusionType = (int) options.Extrusion;
+        }
+
         options.MaxHeight = EditorGUILayout.FloatField("Max Height: ", options.MaxHeight);
-        options.Extrude = EditorGUILayout.Toggle("Extrude: ", options.Extrude);
+        var extrusionTypeList = Enum.GetValues(typeof(PolygonBuilder.ExtrusionType)).Cast<PolygonBuilder.ExtrusionType>();
+        var extrusionTypeStringList = extrusionTypeList.Select(type => type.ToString());
+        selectedExtrusionType = EditorGUILayout.Popup("Extrusion type: ", selectedExtrusionType, extrusionTypeStringList.ToArray());
+        options.Extrusion = (PolygonBuilder.ExtrusionType) selectedExtrusionType;
         options.Enabled = EditorGUILayout.Toggle("Enabled: ", options.Enabled);
 
         SavePreferences();

Assets/Editor/PolylineBuilderEditor.cs

@@ -2,6 +2,7 @@
 using UnityEditor;
 using Mapzen;
 using Mapzen.Unity;
+using System.Linq;
 using System;
 
 [Serializable]
@@ -10,6 +11,9 @@ public class PolylineBuilderEditor : EditorBase
     [SerializeField]
     private bool show;
 
+    [SerializeField]
+    private int selectedExtrusionType = -1;
+
     public PolylineBuilderEditor()
         : base()
     {
@@ -20,7 +24,7 @@ public static PolylineBuilder.Options DefaultOptions()
     {
         var defaultOptions = new PolylineBuilder.Options();
 
-        defaultOptions.Extrude = true;
+        defaultOptions.Extrusion = PolygonBuilder.ExtrusionType.TopAndSides;
         defaultOptions.Enabled = true;
         defaultOptions.MaxHeight = 3.0f;
         defaultOptions.MiterLimit = 3.0f;
@@ -51,9 +55,17 @@ public PolylineBuilder.Options OnInspectorGUI(PolylineBuilder.Options options)
             return options;
         }
 
+        if (selectedExtrusionType == -1)
+        {
+            selectedExtrusionType = (int) options.Extrusion;
+        }
+
         options.Width = EditorGUILayout.FloatField("Width: ", options.Width);
         options.MaxHeight = EditorGUILayout.FloatField("Max Height: ", options.MaxHeight);
-        options.Extrude = EditorGUILayout.Toggle("Extrude: ", options.Extrude);
+        var extrusionTypeList = Enum.GetValues(typeof(PolygonBuilder.ExtrusionType)).Cast<PolygonBuilder.ExtrusionType>();
+        var extrusionTypeStringList = extrusionTypeList.Select(type => type.ToString());
+        selectedExtrusionType = EditorGUILayout.Popup("Extrusion type:", selectedExtrusionType, extrusionTypeStringList.ToArray());
+        options.Extrusion = (PolygonBuilder.ExtrusionType) selectedExtrusionType;
         options.Enabled = EditorGUILayout.Toggle("Enabled: ", options.Enabled);
 
         SavePreferences();

Assets/Mapzen/Unity/Earcut.cs

@@ -20,20 +20,15 @@ public class Earcut
         private static extern uint ReleaseTesselationContext(uint context);
 
         [DllImport(LibraryName, EntryPoint = "TesselatePolygon")]
-        private static extern void TesselatePolygon(uint context, IntPtr points, IntPtr rings, int nRings, out int nIndices, out int nVertices);
+        private static extern void TesselatePolygon(uint context, IntPtr points, IntPtr rings, int nRings, out int nIndices);
 
         [DllImport(LibraryName, EntryPoint = "GetIndices")]
         private static extern void GetIndices(uint context, IntPtr indices);
 
-        [DllImport(LibraryName, EntryPoint = "GetVertices")]
-        private static extern void GetVertices(uint context, IntPtr vertices);
-
         private uint contextId;
 
         public int[] Indices { get; internal set; }
 
-        public float[] Vertices { get; internal set; }
-
         public Earcut()
         {
             contextId = CreateTesselationContext();
@@ -42,28 +37,23 @@ public Earcut()
 
         public void Tesselate(float[] points, int[] rings)
         {
-            int nVertices = 0;
             int nIndices = 0;
 
             GCHandle pointsBufferHandle = GCHandle.Alloc(points, GCHandleType.Pinned);
             GCHandle ringsBufferHandle = GCHandle.Alloc(rings, GCHandleType.Pinned);
 
-            TesselatePolygon(contextId, pointsBufferHandle.AddrOfPinnedObject(), ringsBufferHandle.AddrOfPinnedObject(), rings.Length, out nIndices, out nVertices);
+            TesselatePolygon(contextId, pointsBufferHandle.AddrOfPinnedObject(), ringsBufferHandle.AddrOfPinnedObject(), rings.Length, out nIndices);
 
             pointsBufferHandle.Free();
             ringsBufferHandle.Free();
 
             Indices = new int[nIndices];
-            Vertices = new float[nVertices * 2];
 
             GCHandle indicesBufferHandle = GCHandle.Alloc(Indices, GCHandleType.Pinned);
-            GCHandle verticesBufferHandle = GCHandle.Alloc(Vertices, GCHandleType.Pinned);
 
             GetIndices(contextId, indicesBufferHandle.AddrOfPinnedObject());
-            GetVertices(contextId, verticesBufferHandle.AddrOfPinnedObject());
 
             indicesBufferHandle.Free();
-            verticesBufferHandle.Free();
         }
 
         public void Release()

Assets/Mapzen/Unity/FeatureStyle.cs

@@ -106,7 +106,7 @@ public List<Matcher> Matchers
 
             public IFeatureMatcher GetFeatureMatcher()
             {
-                IFeatureMatcher matcher = null;
+                IFeatureMatcher matcher = new FeatureMatcher();
 
                 if (IsCompound() && matchers.Count > 0)
                 {

Assets/Mapzen/Unity/MeshData.cs

@@ -16,10 +16,12 @@ public class MeshBucket
         {
             public List<Submesh> Submeshes;
             public List<Vector3> Vertices;
+            public List<Vector2> UVs;
 
             public MeshBucket()
             {
                 Vertices = new List<Vector3>();
+                UVs = new List<Vector2>();
                 Submeshes = new List<Submesh>();
             }
         }
@@ -33,7 +35,7 @@ public MeshData()
             Meshes = new List<MeshBucket>();
         }
 
-        public void AddElements(IEnumerable<Vector3> vertices, IEnumerable<int> indices, Material material)
+        public void AddElements(IEnumerable<Vector3> vertices, IEnumerable<Vector2> uvs, IEnumerable<int> indices, Material material)
         {
             var vertexList = new List<Vector3>(vertices);
             int vertexCount = vertexList.Count;
@@ -59,6 +61,7 @@ public void AddElements(IEnumerable<Vector3> vertices, IEnumerable<int> indices,
 
             int offset = bucket.Vertices.Count;
             bucket.Vertices.AddRange(vertexList);
+            bucket.UVs.AddRange(uvs);
 
             // Find a submesh with this material, or create a new one.
             Submesh submesh = null;

Assets/Mapzen/Unity/PolygonBuilder.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Mapzen.VectorData;
 using UnityEngine;
 using System;
@@ -7,11 +8,19 @@ namespace Mapzen.Unity
 {
     public class PolygonBuilder : IGeometryHandler
     {
+        [Serializable]
+        public enum ExtrusionType
+        {
+            TopOnly,
+            TopAndSides,
+            SidesOnly,
+        }
+
         [Serializable]
         public struct Options
         {
             public Material Material;
-            public bool Extrude;
+            public ExtrusionType Extrusion;
             public float MinHeight;
             public float MaxHeight;
             public bool Enabled;
@@ -27,7 +36,9 @@ public PolygonBuilder(MeshData outputMeshData, Options options, Matrix4x4 transf
             this.lastPoint = new Point();
             this.pointsInRing = 0;
             this.extrusionVertices = new List<Vector3>();
+            this.extrusionUVs = new List<Vector2>();
             this.extrusionIndices = new List<int>();
+            this.polygonUVs = new List<Vector2>();
         }
 
         private Matrix4x4 transform;
@@ -42,13 +53,19 @@ public PolygonBuilder(MeshData outputMeshData, Options options, Matrix4x4 transf
         // Values for extrusions.
         private Point lastPoint;
         private List<Vector3> extrusionVertices;
+        private List<Vector2> extrusionUVs;
+        private List<Vector2> polygonUVs;
         private List<int> extrusionIndices;
 
         public void OnPoint(Point point)
         {
+            bool buildWalls =
+                options.Extrusion == ExtrusionType.TopAndSides ||
+                options.Extrusion == ExtrusionType.SidesOnly;
+
             // For all but the first point in each ring, create a quad extending from the
             // previous point to the current point and from MinHeight to MaxHeight.
-            if (options.Extrude && pointsInRing > 0)
+            if (buildWalls && pointsInRing > 0)
             {
                 var p0 = lastPoint;
                 var p1 = point;
@@ -70,21 +87,36 @@ public void OnPoint(Point point)
                 extrusionVertices.Add(v2);
                 extrusionVertices.Add(v3);
 
+                extrusionUVs.Add(new Vector2(1.0f, 1.0f));
+                extrusionUVs.Add(new Vector2(0.0f, 1.0f));
+                extrusionUVs.Add(new Vector2(1.0f, 0.0f));
+                extrusionUVs.Add(new Vector2(0.0f, 0.0f));
+
                 extrusionIndices.Add(indexOffset + 1);
                 extrusionIndices.Add(indexOffset + 3);
                 extrusionIndices.Add(indexOffset + 2);
                 extrusionIndices.Add(indexOffset + 1);
                 extrusionIndices.Add(indexOffset + 2);
                 extrusionIndices.Add(indexOffset + 0);
             }
+
             lastPoint = point;
 
             // Add the current point to the buffer of coordinates for the tesselator.
-            coordinates.Add(point.X);
-            coordinates.Add(point.Y);
+            if (options.Extrusion != ExtrusionType.SidesOnly)
+            {
+                coordinates.Add(point.X);
+                coordinates.Add(point.Y);
+            }
+
             pointsInRing++;
         }
 
+        public void AddUV(Vector2 uv)
+        {
+            polygonUVs.Add(uv);
+        }
+
         public void OnBeginLineString()
         {
         }
@@ -108,33 +140,49 @@ public void OnBeginPolygon()
             coordinates.Clear();
             rings.Clear();
             extrusionVertices.Clear();
+            extrusionUVs.Clear();
             extrusionIndices.Clear();
+            polygonUVs.Clear();
         }
 
         public void OnEndPolygon()
         {
             // First add vertices and indices for extrusions.
-            outputMeshData.AddElements(extrusionVertices, extrusionIndices, options.Material);
-
-            // Then tesselate polygon interior and add vertices and indices.
-            var earcut = new Earcut();
-
-            earcut.Tesselate(coordinates.ToArray(), rings.ToArray());
+            outputMeshData.AddElements(extrusionVertices, extrusionUVs, extrusionIndices, options.Material);
 
-            var vertices = new List<Vector3>(earcut.Vertices.Length / 2);
-
-            for (int i = 0; i < earcut.Vertices.Length; i += 2)
+            if (coordinates.Count > 0)
             {
-                var v = new Vector3(earcut.Vertices[i], options.MaxHeight, earcut.Vertices[i + 1]);
-
-                v = this.transform.MultiplyPoint(v);
-
-                vertices.Add(v);
+                // Then tesselate polygon interior and add vertices and indices.
+                var earcut = new Earcut();
+
+                earcut.Tesselate(coordinates.ToArray(), rings.ToArray());
+                var vertices = new List<Vector3>(coordinates.Count / 2);
+                List<Vector2> uvs;
+
+                if (polygonUVs.Count > 0)
+                {
+                    uvs = polygonUVs;
+                }
+                else
+                {
+                    uvs = new List<Vector2>(coordinates.Count / 2);
+                    for (int i = 0; i < coordinates.Count; i += 2)
+                    {
+                        uvs.Add(new Vector2(coordinates[i], coordinates[i + 1]));
+                    }
+                }
+
+                for (int i = 0; i < coordinates.Count; i += 2)
+                {
+                    var v = new Vector3(coordinates[i], options.MaxHeight, coordinates[i + 1]);
+                    v = this.transform.MultiplyPoint(v);
+                    vertices.Add(v);
+                }
+
+                outputMeshData.AddElements(vertices, uvs, earcut.Indices, options.Material);
+
+                earcut.Release();
             }
-
-            outputMeshData.AddElements(vertices, earcut.Indices, options.Material);
-
-            earcut.Release();
         }
     }
 }