Skip to content

Commit e750063

Browse files
abhishektripabhishektrip
committed
Merge commit '782c9fa9a22495d60456bd7cd7172485c3984a82' into restructureAbstractMapFile
* commit '782c9fa9a22495d60456bd7cd7172485c3984a82': Removed update debug messages (#1065) Fix tabletop ar snap to plane (#999) # Conflicts: # sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
2 parents 9e7c2d0 + 782c9fa commit e750063

File tree

15 files changed

+118
-68
lines changed

15 files changed

+118
-68
lines changed

‎sdkproject/Assets/Mapbox/Unity/Editor/EditorHelper.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ public static void CheckForModifiedProperty<T>(SerializedProperty property, T ta
2020
if (targetObjectAsDataProperty != null)
2121
{
2222
targetObjectAsDataProperty.HasChanged = forceHasChanged || property.serializedObject.ApplyModifiedProperties();
23-
//REMOVE ME....
24-
Debug.Log("<color=cyan>CheckForModifiedProperty is TRUE!! ---> </color>" + targetObject.GetType().ToString());
2523
}
2624
}
2725

‎sdkproject/Assets/Mapbox/Unity/Editor/GeocodeAttributeSearchWindow.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ public static void Open(SerializedProperty property, object objectToUpdate = nul
5252
if (objectToUpdate != null)
5353
{
5454
window._objectToUpdate = objectToUpdate;
55-
56-
//REMOVE ME!!!
57-
string propertyType = objectToUpdate.GetType().ToString();
58-
Debug.Log("<color=red>" + propertyType + "</color>");
5955
}
6056

6157
Event e = Event.current;

‎sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -542,45 +542,33 @@ protected virtual void InitializeMap(MapOptions options)
542542
_vectorData.SubLayerAdded += OnVectorDataSubLayerAdded;
543543
_vectorData.UpdateLayer += OnVectorDataUpdateLayer;
544544

545-
_options.PropertyHasChanged += (object sender, System.EventArgs eventArgs) =>
546-
{
547-
Debug.Log("<color=yellow>General </color>" + gameObject.name);
548-
//take care of redraw map business...
549-
550-
};
551-
552545
_options.locationOptions.PropertyHasChanged += (object sender, System.EventArgs eventArgs) =>
553546
{
554-
Debug.Log("<color=yellow>General - Location Options </color>" + gameObject.name);
555547
//take care of redraw map business...
556548
UpdateMap();
557549
};
558550

559551
_options.extentOptions.PropertyHasChanged += (object sender, System.EventArgs eventArgs) =>
560552
{
561-
Debug.Log("<color=yellow>General - Extent Type Options </color>" + gameObject.name);
562553
//take care of redraw map business...
563554
OnTileProviderChanged();
564555
};
565556

566557
_options.extentOptions.defaultExtents.PropertyHasChanged += (object sender, System.EventArgs eventArgs) =>
567558
{
568-
Debug.Log("<color=yellow>General - Extent Options </color>" + gameObject.name);
569559
//take care of redraw map business...
570560
_tileProvider.UpdateTileExtent();
571561
};
572562

573563
_options.placementOptions.PropertyHasChanged += (object sender, System.EventArgs eventArgs) =>
574564
{
575-
Debug.Log("<color=yellow>General - Placement Options </color>" + gameObject.name);
576565
//take care of redraw map business...
577566
SetPlacementStrategy();
578567
UpdateMap();
579568
};
580569

581570
_options.scalingOptions.PropertyHasChanged += (object sender, System.EventArgs eventArgs) =>
582571
{
583-
Debug.Log("<color=yellow>General - Scaling Options </color>" + gameObject.name);
584572
//take care of redraw map business...
585573
SetScalingStrategy();
586574
UpdateMap();
@@ -732,15 +720,12 @@ private void OnVectorDataSubLayerRemoved(object sender, EventArgs eventArgs)
732720
{
733721
_mapVisualizer.RemoveTilesFromLayer((VectorTileFactory)layerUpdateArgs.factory, layerUpdateArgs.visualizer);
734722
}
735-
Debug.Log("<color=blue>Vector</color>");
736723
OnMapRedrawn();
737724
}
738725

739726
private void OnVectorDataSubLayerAdded(object sender, EventArgs eventArgs)
740727
{
741728
RedrawVectorDataLayer();
742-
743-
Debug.Log("<color=blue>Vector</color>");
744729
OnMapRedrawn();
745730
}
746731

@@ -751,7 +736,6 @@ private void OnVectorDataUpdateLayer(object sender, System.EventArgs eventArgs)
751736

752737
if (layerUpdateArgs.visualizer != null)
753738
{
754-
Debug.Log("UnregisterTiles");
755739
//we got a visualizer. Update only the visualizer.
756740
// No need to unload the entire factory to apply changes.
757741
_mapVisualizer.UnregisterAndRedrawTilesFromLayer((VectorTileFactory)layerUpdateArgs.factory, layerUpdateArgs.visualizer);
@@ -762,7 +746,6 @@ private void OnVectorDataUpdateLayer(object sender, System.EventArgs eventArgs)
762746
//All vector features need to get unloaded and re-created.
763747
RedrawVectorDataLayer();
764748
}
765-
Debug.Log("<color=blue>Vector</color>");
766749
OnMapRedrawn();
767750
}
768751

‎sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/AbstractTileFactory.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public virtual void UnbindEvents()
9494

9595
public virtual void UpdateTileProperty(UnityTile tile, LayerUpdateArgs updateArgs)
9696
{
97-
Debug.Log("Update Tile Property -> " + tile.UnwrappedTileId.ToString());
9897
updateArgs.property.UpdateProperty(tile);
9998

10099
if (updateArgs.property.NeedsForceUpdate())
@@ -124,7 +123,6 @@ protected virtual void OnErrorOccurred(TileErrorEventArgs e)
124123
public event EventHandler TileFactoryHasChanged;
125124
protected virtual void UpdateTileFactory(object sender, System.EventArgs args)
126125
{
127-
Debug.Log("TileFactoryHasChanged Delegate ");
128126
System.EventHandler handler = TileFactoryHasChanged;
129127
if (handler != null)
130128
{

‎sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorTileFactory.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ protected override void OnRegistered(UnityTile tile)
229229

230230
protected override void UpdateTileFactory(object sender, EventArgs args)
231231
{
232-
Debug.Log("TileFactoryHasChanged Override ");
233232
VectorLayerUpdateArgs layerUpdateArgs = args as VectorLayerUpdateArgs;
234233
layerUpdateArgs.factory = this;
235234
base.UpdateTileFactory(sender, layerUpdateArgs);

‎sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ public T AddOrCreateGameObjectModifier<T>() where T : GameObjectModifier
105105

106106
private void UpdateVector(object sender, System.EventArgs eventArgs)
107107
{
108-
Debug.Log("UpdateVector " + sender.ToString());
109-
110108
VectorLayerUpdateArgs layerUpdateArgs = eventArgs as VectorLayerUpdateArgs;
111109

112110
layerUpdateArgs.visualizer = this;
@@ -159,10 +157,6 @@ public override void SetProperties(VectorSubLayerProperties properties)
159157
}
160158
}
161159

162-
//watch this in the console when doing runtime changes...
163-
//this message is currenly displaying multiple times per layer on redraws...
164-
Debug.Log("SetProperties");
165-
166160
if (_layerProperties.coreOptions.combineMeshes)
167161
{
168162
if (_defaultStack == null || !(_defaultStack is MergedModifierStack))

‎sdkproject/Assets/Mapbox/Unity/SourceLayers/VectorLayer.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public void Initialize()
7575
_layerProperty.SubLayerPropertyRemoved += RemoveVectorLayer;
7676
_vectorTileFactory.TileFactoryHasChanged += (sender, args) =>
7777
{
78-
Debug.Log("VectorLayer Delegate");
7978
NotifyUpdateLayer(args as LayerUpdateArgs);
8079
};
8180

‎sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/ARTableTopCameraMovement.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ void ZoomMapUsingTouchOrMouse(float zoomFactor)
106106
{
107107
var zoom = Mathf.Max(0.0f, Mathf.Min(_mapManager.Zoom + zoomFactor * _zoomSpeed, 21.0f));
108108

109-
_mapManager.UpdateMap(_mapManager.CenterLatitudeLongitude, zoom);
109+
if (Math.Abs(zoom - _mapManager.Zoom) > 0.0f)
110+
{
111+
_mapManager.UpdateMap(_mapManager.CenterLatitudeLongitude, zoom);
112+
}
110113
}
111114

112115
void PanMapUsingKeyBoard(float xMove, float zMove)

‎sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/SnapMapToTargetTransform.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using Mapbox.Unity.Map;
5+
6+
public class SnapMapToTargetTransform : MonoBehaviour
7+
{
8+
[SerializeField]
9+
private AbstractMap _map;
10+
[SerializeField]
11+
private Transform _target;
12+
13+
private void Awake()
14+
{
15+
if (_map == null)
16+
{
17+
_map = FindObjectOfType<AbstractMap>();
18+
}
19+
}
20+
21+
// Use this for initialization
22+
void Start()
23+
{
24+
_map.OnUpdated += SnapMapToTarget;
25+
}
26+
27+
void SnapMapToTarget()
28+
{
29+
var h = _map.QueryElevationInUnityUnitsAt(_map.CenterLatitudeLongitude);
30+
_map.Root.transform.position = new Vector3(
31+
_map.Root.transform.position.x,
32+
_target.transform.position.y - h,
33+
_map.Root.transform.position.z);
34+
}
35+
}

‎sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/SnapMapToTargetTransform.cs.meta‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)