move elevation settings under terrain module stuff again

fix side walls

Author: brnkhy

Runtime/Mapbox/BaseModule/Data/TerrainStrategies/ElevatedTerrainStrategy.cs

@@ -87,15 +87,15 @@ public override void RegisterTile(UnityMapTile tile, bool createElevatedMesh)
 				sharedMesh.uv = newMesh.Uvs;
 			}
 
-			if (_elevationOptions.sideWallOptions.isActive)
-			{
-				var firstMat = tile.MeshRenderer.materials[0];
-				tile.MeshRenderer.materials = new Material[2]
-				{
-					firstMat,
-					_elevationOptions.sideWallOptions.wallMaterial
-				};
-			}
+			// if (_elevationOptions.sideWallOptions.isActive)
+			// {
+			// 	var firstMat = tile.MeshRenderer.materials[0];
+			// 	tile.MeshRenderer.materials = new Material[2]
+			// 	{
+			// 		firstMat,
+			// 		_elevationOptions.sideWallOptions.wallMaterial
+			// 	};
+			// }
 
 			if (createElevatedMesh)
 			{
@@ -128,7 +128,6 @@ private void CreateElevatedMesh(UnityMapTile tile)
 
 				vertices[i].Set(vertices[i].x, elevation, vertices[i].z);
 			}
-
 			mesh.vertices = vertices;
 		}
 
@@ -285,8 +284,9 @@ private MeshDataArray CreateBaseMeshSkirts(float size, int sideVertexCount)
 			mesh.Vertices = _newVertexList.ToArray();
 			mesh.Normals = _newNormalList.ToArray();
 			mesh.Uvs = _newUvList.ToArray();
+			topQuadTris.AddRange(_newTriangleList.ToArray());
 			mesh.Triangles.Add(topQuadTris.ToArray());
-			mesh.Triangles.Add(_newTriangleList.ToArray());
+			//mesh.Triangles.Add(_newTriangleList.ToArray());
 			return mesh;
 		}
 		#endregion

Runtime/Mapbox/BaseModule/Data/TerrainStrategies/FlatTerrainStrategy.cs

@@ -31,15 +31,15 @@ public override void RegisterTile(UnityMapTile tile, bool createElevatedMesh)
 
 			if (meshFilter.sharedMesh.vertexCount != RequiredVertexCount)
 			{
-				if (_elevationOptions.sideWallOptions.isActive)
-				{
-					var firstMat = tile.MeshRenderer.materials[0];
-					tile.MeshRenderer.materials = new Material[2]
-					{
-						firstMat,
-						_elevationOptions.sideWallOptions.wallMaterial
-					};
-				}
+				// if (_elevationOptions.sideWallOptions.isActive)
+				// {
+				// 	var firstMat = tile.MeshRenderer.materials[0];
+				// 	tile.MeshRenderer.materials = new Material[2]
+				// 	{
+				// 		firstMat,
+				// 		_elevationOptions.sideWallOptions.wallMaterial
+				// 	};
+				// }
 			// }
 			//
 			// if ((int)tile.ElevationType != (int)ElevationLayerType.FlatTerrain)

Runtime/Mapbox/BaseModule/Data/TerrainStrategies/Settings/TerrainSideWallOptions.cs

@@ -10,7 +10,5 @@ public class TerrainSideWallOptions
 		public bool isActive = false;
 		[Tooltip("Height of side walls.")]
 		public float wallHeight = 10;
-		[Tooltip("Unity material to use for side walls.")]
-		public Material wallMaterial;
 	}
 }

Runtime/Mapbox/ImageModule/Terrain/TerrainLayerModule.cs

@@ -26,7 +26,7 @@ public TerrainLayerModule(Source<TerrainData> source, TerrainLayerModuleSettings
             _settings = settings;
             _retainedTerrainTiles = new HashSet<CanonicalTileId>();
             _rasterSource = source;
-            _terrainStrategy = new FlatTerrainStrategy(); //new ElevatedTerrainStrategy();
+            _terrainStrategy = new ElevatedTerrainStrategy();
         }
 
         public virtual IEnumerator Initialize()

Runtime/Mapbox/ImageModule/Terrain/TerrainLayerModuleSettings.cs

@@ -17,5 +17,7 @@ public class TerrainLayerModuleSettings
 
         [Tooltip("Tile outside this range will be rejected.")]
         public Vector2 RejectTilesOutsideZoom = new Vector2(12, 16);
+
+        public ElevationLayerProperties ElevationLayerProperties;
     }
 }