diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs b/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs
index 98cd17242..a8b7d1d45 100644
--- a/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs
@@ -52,7 +52,7 @@ public void SendLocationEvent()
}
- void OnValidate()
+ protected virtual void OnValidate()
{
if (_sendEvent)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs
index bcf7c0fc2..ab7e7c442 100644
--- a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs
@@ -69,7 +69,7 @@ public class DeviceLocationProvider : AbstractLocationProvider
#endif
- void Awake()
+ protected virtual void Awake()
{
_currentLocation.Provider = "unity";
_wait1sec = new WaitForSeconds(1f);
diff --git a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs
index bd8cb040e..9a0e22d2d 100644
--- a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs
@@ -92,17 +92,12 @@ private void shutdown()
}
- private void OnDestroy() { shutdown(); }
+ protected virtual void OnDestroy() { shutdown(); }
- private void OnDisable() { shutdown(); }
+ protected virtual void OnDisable() { shutdown(); }
-
-
-
-
-
- void Awake()
+ protected virtual void Awake()
{
_wait1sec = new WaitForSeconds(1);
@@ -387,7 +382,7 @@ private void populateWithBetterLocation(AndroidJavaObject locGps, AndroidJavaObj
- private void Update()
+ protected virtual void Update()
{
/*
diff --git a/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProvider.cs b/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProvider.cs
index d587f32ad..d02ddb7c4 100644
--- a/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProvider.cs
@@ -34,7 +34,7 @@ public class EditorLocationProvider : AbstractEditorLocationProvider
bool _mapInitialized;
#if UNITY_EDITOR
- protected void Start()
+ protected virtual void Start()
{
LocationProviderFactory.Instance.mapManager.OnInitialized += Map_OnInitialized;
//_map.OnInitialized += Map_OnInitialized;
diff --git a/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs b/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs
index 36652ed30..2d2351dc3 100644
--- a/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs
@@ -119,7 +119,7 @@ public ILocationProvider DeviceLocationProvider
///
/// Create singleton instance and inject the DefaultLocationProvider upon initialization of this component.
///
- private void Awake()
+ protected virtual void Awake()
{
if (Instance != null)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs b/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
index 0e452a979..c922f69b5 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
@@ -304,14 +304,14 @@ public void SetWorldRelativeScale(float scale)
///
public event Action OnUpdated = delegate { };
- void Awake()
+ protected virtual void Awake()
{
// Setup a visualizer to get a "Starter" map.
_mapVisualizer = ScriptableObject.CreateInstance();
}
// Use this for initialization
- void Start()
+ protected virtual void Start()
{
StartCoroutine("SetupAccess");
if (_initializeOnStart)
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/CameraBoundsTileProvider.cs b/sdkproject/Assets/Mapbox/Unity/Map/CameraBoundsTileProvider.cs
index 7e581d7e0..cbd2756ae 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/CameraBoundsTileProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/CameraBoundsTileProvider.cs
@@ -46,7 +46,7 @@ public override void OnInitialized()
toRemove = new List();
}
- void Update()
+ protected virtual void Update()
{
if (!_shouldUpdate)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/GlobeTileProvider.cs b/sdkproject/Assets/Mapbox/Unity/Map/GlobeTileProvider.cs
index a13c39605..6d93414a6 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/GlobeTileProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/GlobeTileProvider.cs
@@ -12,13 +12,6 @@ public override void OnInitialized()
{
throw new System.Exception("Too many tiles! Use a lower zoom level!");
}
- }
- private void Update()
- {
- if (_map.AbsoluteZoom > 5)
- {
- throw new System.Exception("Too many tiles! Use a lower zoom level!");
- }
var tileCover = TileCover.Get(Vector2dBounds.World(), _map.AbsoluteZoom);
foreach (var tile in tileCover)
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs b/sdkproject/Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
index 6020cf056..f92c19910 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
@@ -10,14 +10,14 @@ public class InitializeMapWithLocationProvider : MonoBehaviour
AbstractMap _map;
ILocationProvider _locationProvider;
-
+
private void Awake()
{
// Prevent double initialization of the map.
_map.InitializeOnStart = false;
}
- IEnumerator Start()
+ protected virtual IEnumerator Start()
{
yield return null;
_locationProvider = LocationProviderFactory.Instance.DefaultLocationProvider;
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/QuadTreeTileProvider.cs b/sdkproject/Assets/Mapbox/Unity/Map/QuadTreeTileProvider.cs
index e99fa11de..6edff84a1 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/QuadTreeTileProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/QuadTreeTileProvider.cs
@@ -27,7 +27,7 @@ public override void OnInitialized()
_shouldUpdate = true;
}
- void Update()
+ protected virtual void Update()
{
//Camera Debugging
//Vector3[] frustumCorners = new Vector3[4];
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/RangeAroundTransformTileProvider.cs b/sdkproject/Assets/Mapbox/Unity/Map/RangeAroundTransformTileProvider.cs
index bf0d9157d..9ee211f3c 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/RangeAroundTransformTileProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/RangeAroundTransformTileProvider.cs
@@ -32,7 +32,7 @@ public override void OnInitialized()
_cachedTile = new UnwrappedTileId();
}
- private void Update()
+ protected virtual void Update()
{
if (!_initialized) return;
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs b/sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs
index e3a3ef4d6..88372ab22 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs
@@ -24,7 +24,7 @@ public override void OnInitialized()
_initialized = true;
}
- private void Update()
+ protected virtual void Update()
{
if (!_initialized)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Map/TileErrorHandler.cs b/sdkproject/Assets/Mapbox/Unity/Map/TileErrorHandler.cs
index d77104ede..19f8bdadf 100644
--- a/sdkproject/Assets/Mapbox/Unity/Map/TileErrorHandler.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Map/TileErrorHandler.cs
@@ -21,7 +21,7 @@ public class TileErrorHandler : MonoBehaviour
public TileErrorEvent OnTileError;
- void OnEnable()
+ protected virtual void OnEnable()
{
if (_mapInstance == null)
{
@@ -83,7 +83,7 @@ private string printMessage(List exceptions, TileErrorEventArgs e)
}
- void OnDisable()
+ protected virtual void OnDisable()
{
_mapInstance.MapVisualizer.OnTileError -= _OnTileErrorHandler;
}
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebugger.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebugger.cs
index 1f9e4aebb..1e9f4811d 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebugger.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebugger.cs
@@ -7,7 +7,7 @@ public class VertexDebugger : MonoBehaviour
[Multiline(10)]
public string Triangles;
- void Start()
+ protected virtual void Start()
{
var mf = GetComponent();
if (mf)
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebuggerGizmo.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebuggerGizmo.cs
index f888f2659..e8a97c1aa 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebuggerGizmo.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Components/VertexDebuggerGizmo.cs
@@ -16,7 +16,7 @@ public class VertexDebuggerGizmo : MonoBehaviour
Mesh _mesh;
- void Start()
+ protected virtual void Start()
{
var mf = GetComponent();
if (mf)
@@ -31,7 +31,7 @@ void Start()
}
}
- void OnDrawGizmosSelected()
+ protected virtual void OnDrawGizmosSelected()
{
if (_mesh)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs
index 59c07d19a..9c58a9371 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs
@@ -35,7 +35,7 @@ public void AddOnValidateEvent(UnityAction action)
m_OnValidate.AddListener(action);
}
- private void OnValidate()
+ protected virtual void OnValidate()
{
if(m_OnValidate != null)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs
index 51f3a3c54..16bb4e306 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs
@@ -253,7 +253,7 @@ public void Cancel()
}
}
- void OnDestroy()
+ protected virtual void OnDestroy()
{
Cancel();
if (_heightTexture != null)
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/DirectionsFactory.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/DirectionsFactory.cs
index 53c36a92f..e967d0706 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/DirectionsFactory.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/DirectionsFactory.cs
@@ -32,7 +32,7 @@ public class DirectionsFactory : MonoBehaviour
GameObject _directionsGO;
- void Awake()
+ protected virtual void Awake()
{
if (_map == null)
{
@@ -43,7 +43,7 @@ void Awake()
_map.OnUpdated += Query;
}
- void OnDestroy()
+ protected virtual void OnDestroy()
{
_map.OnInitialized -= Query;
_map.OnUpdated -= Query;
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs
index f8441c9fa..862f9c3a6 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs
@@ -38,7 +38,7 @@ public string MapId
}
#region UnityMethods
- private void OnDestroy()
+ protected virtual void OnDestroy()
{
if (DataFetcher != null)
{
@@ -60,7 +60,7 @@ private void OnImageRecieved(UnityTile tile, RasterTile rasterTile)
}
//merge this with OnErrorOccurred?
- private void OnDataError(UnityTile tile, TileErrorEventArgs e)
+ protected virtual void OnDataError(UnityTile tile, TileErrorEventArgs e)
{
if (tile != null)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MergedModifierStack.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MergedModifierStack.cs
index 21aa9c2c4..a904a88d2 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MergedModifierStack.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MergedModifierStack.cs
@@ -36,7 +36,7 @@ public class MergedModifierStack : ModifierStackBase
private int _counter, _counter2;
- private void OnEnable()
+ protected virtual void OnEnable()
{
//we'll use this to concat building data until it reaches 65000 verts
_pool = new ObjectPool(() =>
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/LineMeshModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/LineMeshModifier.cs
index ae2c2d73c..a407a742f 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/LineMeshModifier.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/LineMeshModifier.cs
@@ -17,7 +17,7 @@ public class LineMeshModifier : MeshModifier
private float _scaledWidth;
public override ModifierType Type { get { return ModifierType.Preprocess; } }
- private void OnEnable()
+ protected virtual void OnEnable()
{
_scaledWidth = Width;
}
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs
index fb85f07ef..fae600b4f 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs
@@ -51,7 +51,7 @@ public class ModifierStack : ModifierStackBase
[NonSerialized] private int _counter;
[NonSerialized] private int _secondCounter;
- private void OnEnable()
+ protected virtual void OnEnable()
{
_pool = new ObjectPool(() =>
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/Console.cs b/sdkproject/Assets/Mapbox/Unity/Utilities/Console.cs
index 1da712242..02d171a8a 100644
--- a/sdkproject/Assets/Mapbox/Unity/Utilities/Console.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Utilities/Console.cs
@@ -23,7 +23,7 @@ public class Console : MonoBehaviour
string _log;
- void Awake()
+ protected virtual void Awake()
{
if (_instance != null)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/DontDestroyOnLoad.cs b/sdkproject/Assets/Mapbox/Unity/Utilities/DontDestroyOnLoad.cs
index 317ac21d3..09c0293e0 100644
--- a/sdkproject/Assets/Mapbox/Unity/Utilities/DontDestroyOnLoad.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Utilities/DontDestroyOnLoad.cs
@@ -9,7 +9,7 @@ public class DontDestroyOnLoad : MonoBehaviour
[SerializeField]
bool _useSingleInstance;
- void Awake()
+ protected virtual void Awake()
{
if (_instance != null && _useSingleInstance)
{
diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/MapVisualizerPerformance.cs b/sdkproject/Assets/Mapbox/Unity/Utilities/MapVisualizerPerformance.cs
index ecae799c1..ec048b99d 100644
--- a/sdkproject/Assets/Mapbox/Unity/Utilities/MapVisualizerPerformance.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Utilities/MapVisualizerPerformance.cs
@@ -18,7 +18,7 @@ public class MapVisualizerPerformance : MonoBehaviour
public float TotalTime = 0;
private float _firstRun;
- private void Awake()
+ protected virtual void Awake()
{
TotalTime = 0;
_currentTest = 1;
diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/OpenUrlOnButtonClick.cs b/sdkproject/Assets/Mapbox/Unity/Utilities/OpenUrlOnButtonClick.cs
index 0c688f1fc..f71b80357 100644
--- a/sdkproject/Assets/Mapbox/Unity/Utilities/OpenUrlOnButtonClick.cs
+++ b/sdkproject/Assets/Mapbox/Unity/Utilities/OpenUrlOnButtonClick.cs
@@ -9,7 +9,7 @@ public class OpenUrlOnButtonClick : MonoBehaviour
[SerializeField]
string _url;
- void Awake()
+ protected virtual void Awake()
{
GetComponent