Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class DirectionsFactory : Factory
private Directions _directions;
public List<MeshModifier> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public class MapImageFactory : Factory

private Dictionary<Vector2, UnityTile> _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<Vector2, UnityTile>();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ public class MeshFactory : Factory
private Dictionary<Vector2, UnityTile> _tiles;
private Dictionary<string, List<LayerVisualizerBase>> _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<Vector2, UnityTile>();
_layerBuilder = new Dictionary<string, List<LayerVisualizerBase>>();
foreach (LayerVisualizerBase factory in Visualizers)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Vector2, UnityTile>();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -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<Vector2, UnityTile>();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public class MapVisualization : ScriptableObject
{
public List<Factory> 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);
}
}

Expand Down