From 1f068f7c47855b053d3ef9d72e802860b26cb71a Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Thu, 30 Mar 2017 14:20:58 -0600 Subject: [PATCH] =?UTF-8?q?Removing=20monobehaviour=20injection=20(no=20lo?= =?UTF-8?q?nger=20needed).=20Use=20`Runnable.Run()`=20for=20any=20?= =?UTF-8?q?=E2=80=9Casynchronous=E2=80=9D=20operations,=20rather=20than=20?= =?UTF-8?q?coroutines!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/Unity/MeshGeneration/Factories/DirectionsFactory.cs | 4 ++-- .../Mapbox/Core/Unity/MeshGeneration/Factories/Factory.cs | 2 +- .../Core/Unity/MeshGeneration/Factories/MapImageFactory.cs | 4 ++-- .../Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs | 4 ++-- .../Core/Unity/MeshGeneration/Factories/TerrainFactory.cs | 4 ++-- .../Assets/Mapbox/Core/Unity/MeshGeneration/MapController.cs | 4 +--- .../Mapbox/Core/Unity/MeshGeneration/MapVisualization.cs | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/DirectionsFactory.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/DirectionsFactory.cs index 7135140e0..cb80b7035 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/DirectionsFactory.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/DirectionsFactory.cs @@ -18,9 +18,9 @@ public class DirectionsFactory : Factory private Directions _directions; public List MeshModifiers; - public override void Initialize(MonoBehaviour mb, IFileSource fileSource) + public override void Initialize(IFileSource fileSource) { - base.Initialize(mb, fileSource); + base.Initialize(fileSource); _directions = MapboxAccess.Instance.Directions; } diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/Factory.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/Factory.cs index b9bc43e57..f2334709a 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/Factory.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/Factory.cs @@ -8,7 +8,7 @@ public class Factory : ScriptableObject { protected IFileSource FileSource; - public virtual void Initialize(MonoBehaviour mb, IFileSource fileSource) + public virtual void Initialize(IFileSource fileSource) { FileSource = fileSource; } diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MapImageFactory.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MapImageFactory.cs index fa608eeb0..c17596a32 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MapImageFactory.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MapImageFactory.cs @@ -20,9 +20,9 @@ public class MapImageFactory : Factory private Dictionary _tiles; - public override void Initialize(MonoBehaviour mb, IFileSource fs) + public override void Initialize(IFileSource fs) { - base.Initialize(mb, fs); + base.Initialize(fs); _tiles = new Dictionary(); } diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs index c539695dd..f50a83a62 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs @@ -17,9 +17,9 @@ public class MeshFactory : Factory private Dictionary _tiles; private Dictionary> _layerBuilder; - public override void Initialize(MonoBehaviour mb, IFileSource fs) + public override void Initialize(IFileSource fs) { - base.Initialize(mb, fs); + base.Initialize(fs); _tiles = new Dictionary(); _layerBuilder = new Dictionary>(); foreach (LayerVisualizerBase factory in Visualizers) diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/TerrainFactory.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/TerrainFactory.cs index fcb26c321..8d49919f4 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/TerrainFactory.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/TerrainFactory.cs @@ -25,9 +25,9 @@ public class TerrainFactory : Factory [SerializeField] private int sampleCount = 40; - public override void Initialize(MonoBehaviour mb, IFileSource fs) + public override void Initialize(IFileSource fs) { - base.Initialize(mb, fs); + base.Initialize(fs); _tiles = new Dictionary(); } diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapController.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapController.cs index 9a53ec215..224ce95d7 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapController.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapController.cs @@ -10,7 +10,6 @@ namespace Mapbox.Unity.MeshGeneration public class MapController : MonoBehaviour { - private IFileSource _fileSource; public static RectD ReferenceTileRect { get; set; } public static float WorldScaleFactor { get; set; } @@ -30,8 +29,7 @@ public class MapController : MonoBehaviour public void Awake() { - _fileSource = MapboxAccess.Instance; - MapVisualization.Initialize(this, _fileSource); + MapVisualization.Initialize(MapboxAccess.Instance); _tiles = new Dictionary(); } diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapVisualization.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapVisualization.cs index 24a5794d8..525289c93 100644 --- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapVisualization.cs +++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/MapVisualization.cs @@ -12,11 +12,11 @@ public class MapVisualization : ScriptableObject { public List Factories; - public void Initialize(MonoBehaviour runner, IFileSource fs) + public void Initialize(IFileSource fs) { foreach (Factory fac in Factories.Where(x => x != null)) { - fac.Initialize(runner, fs); + fac.Initialize(fs); } }