standardize on unity 2021.3.26f1

Author: pinglis

Assets/TestScripts/TestMap.cs

@@ -116,21 +116,17 @@ bool Toolbar(MapBehaviour map)
             layerMessage = "\nZoom out!";
         else if (map.CurrentZoom < layers[currentLayerIndex].MinZoom)
             layerMessage = "\nZoom in!";
+
         if (GUILayout.Button(((layers != null && currentLayerIndex < layers.Count) ? layers[currentLayerIndex].name + layerMessage : "Layer"), GUILayout.ExpandHeight(true)))
         {
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-            layers[currentLayerIndex].gameObject.SetActiveRecursively(false);
-#else
 			layers[currentLayerIndex].gameObject.SetActive(false);
-#endif
             ++currentLayerIndex;
-            if (currentLayerIndex >= layers.Count)
-                currentLayerIndex = 0;
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-            layers[currentLayerIndex].gameObject.SetActiveRecursively(true);
-#else
+			if (currentLayerIndex >= layers.Count)
+			{
+				currentLayerIndex = 0;
+			}
+
 			layers[currentLayerIndex].gameObject.SetActive(true);
-#endif
             map.IsDirty = true;
         }
 
@@ -191,24 +187,15 @@ private IEnumerator Start()
         WMSTileLayerBehaviour wmsLayer = map.CreateLayer<WMSTileLayerBehaviour>("WMS");
         wmsLayer.BaseURL = "http://ows.mundialis.de/services/service?"; 
         wmsLayer.Layers = "TOPO-OSM-WMS";
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-        wmsLayer.gameObject.SetActiveRecursively(false);
-#else
 		wmsLayer.gameObject.SetActive(false);
-#endif
 
         layers.Add(wmsLayer);
 
 		// create a VirtualEarth tile layer
         VirtualEarthTileLayerBehaviour virtualEarthLayer = map.CreateLayer<VirtualEarthTileLayerBehaviour>("VirtualEarth");
         // Note: this is the key UnitySlippyMap, DO NOT use it for any other purpose than testing
         virtualEarthLayer.Key = "ArgkafZs0o_PGBuyg468RaapkeIQce996gkyCe8JN30MjY92zC_2hcgBU_rHVUwT";
-
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-        virtualEarthLayer.gameObject.SetActiveRecursively(false);
-#else
 		virtualEarthLayer.gameObject.SetActive(false);
-#endif
 
         layers.Add(virtualEarthLayer);
 
@@ -262,11 +249,7 @@ private IEnumerator Start()
             Debug.Log("DEBUG: using MBTiles file: " + filepath);
 			MBTilesLayerBehaviour mbTilesLayer = map.CreateLayer<MBTilesLayerBehaviour>("MBTiles");
 			mbTilesLayer.Filepath = filepath;
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-            mbTilesLayer.gameObject.SetActiveRecursively(false);
-#else
 			mbTilesLayer.gameObject.SetActive(false);
-#endif
 
             layers.Add(mbTilesLayer);
 		}

Assets/UnitySlippyMap/Map/MapBehaviour.cs

@@ -1000,13 +1000,9 @@ private void Update ()
 				}
 
 				if (locationMarker != null) {
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-				if (locationMarker.gameObject.active == false)
-					locationMarker.gameObject.SetActiveRecursively(true);
-#else
 					if (locationMarker.gameObject.activeSelf == false)
 						locationMarker.gameObject.SetActive (true);
-#endif
+
 					if (UnityEngine.Input.location.lastData.longitude <= 180.0f
 						&& UnityEngine.Input.location.lastData.longitude >= -180.0f
 						&& UnityEngine.Input.location.lastData.latitude <= 90.0f
@@ -1083,31 +1079,20 @@ private void Update ()
 				IsDirty = false;
 
 				if (locationMarker != null
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-				&& locationMarker.gameObject.active == true)
-#else
 					&& locationMarker.gameObject.activeSelf == true)
-#endif
 					locationMarker.UpdateMarker ();
 
 				foreach (LayerBehaviour layer in layers) {	
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-				if (layer.gameObject.active == true
-#else
+
 					if (layer.gameObject.activeSelf == true
-#endif
 						&& layer.enabled == true
 						&& CurrentZoom >= layer.MinZoom
 						&& CurrentZoom <= layer.MaxZoom)
 						layer.UpdateContent ();
 				}
 
 				foreach (MarkerBehaviour marker in markers) {
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-				if (marker.gameObject.active == true
-#else
 					if (marker.gameObject.activeSelf == true
-#endif
 						&& marker.enabled == true)
 						marker.UpdateMarker ();
 				}
@@ -1138,11 +1123,7 @@ private void Update ()
 		public void CenterOnLocation ()
 		{
 			if (locationMarker != null
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-			&& locationMarker.gameObject.active == true)
-#else
 				&& locationMarker.gameObject.activeSelf == true)
-#endif
 				CenterWGS84 = locationMarker.CoordinatesWGS84;
 			updatesCenterWithLocation = true;
 		}
@@ -1189,11 +1170,7 @@ public T SetLocationMarker<T> (GameObject locationGo, GameObject orientationGo)
 										UnityEngine.Input.location.lastData.latitude
 								};
 			else
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-				markerObject.SetActiveRecursively(false);
-#else
 				markerObject.SetActive (false);
-#endif
 
 			// set the location marker
 			locationMarker = marker;

Assets/UnitySlippyMap/Markers/LocationMarkerBehaviour.cs

@@ -54,11 +54,7 @@ public Transform OrientationMarker {
 				if (orientationMarker != null) {
 					orientationMarker.parent = this.transform;
 					orientationMarker.localPosition = Vector3.zero; 
-#if UNITY_3_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_3_6 || UNITY_3_7 || UNITY_3_8 || UNITY_3_9
-                orientationMarker.gameObject.SetActiveRecursively(this.gameObject.active);
-#else
 					orientationMarker.gameObject.SetActive (this.gameObject.activeSelf);
-#endif
 				}
 			}
 		}

README.md

@@ -21,15 +21,18 @@ UnitySlippyMap is in alpha stage and currently supports:
   * [VirtualEarth/Bing maps tiles](http://www.microsoft.com/maps/)
   * [MBTiles databases](http://mapbox.com/developers/mbtiles/)
 
-It is tested in Unity3D Editor 3.5.6f4 & 4.0.0, and on iOS (beware the [Unity 4 GPS bug](http://forum.unity3d.com/threads/159257-Unity-4.0-iOS-GPS-Fix)) and Android devices.
-
 See the [TODO list](/jderrough/UnitySlippyMap#todo) if you want to contribute and don't know where to start.
 
 License
 -------
 
 UnitySplippyMap is released under the [MIT License](https://opensource.org/licenses/MIT).
 
+Unity Version
+-------------
+
+UnitySplippyMap requires at least Unity 2021.3.26f1
+
 TODO
 ----