fix: Improve performance for map tile loading

Assets/Cryville.Common/Unity/Tweener.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Utils {
+namespace Cryville.Common.Unity {
 	public class PropertyTweener<T> {
 		readonly Func<T> _getter;
 		readonly Action<T> _setter;

Assets/Cryville.EEW.Unity/Map/LineRenderer.cs

@@ -13,11 +13,16 @@ namespace Cryville.EEW.Unity.Map {
 	[RequireComponent(typeof(MeshFilter))]
 	[RequireComponent(typeof(MeshRenderer))]
 	class LineRenderer : MonoBehaviour {
+		Material _sharedMaterial;
 		public Material Material {
-			get => _meshRenderer.material;
+			get => _meshRenderer.sharedMaterial;
 			set {
-				_meshRenderer.material = value;
-				_meshRenderer.material.color = m_color;
+				if (value == _sharedMaterial) return;
+				if (_sharedMaterial != null) Destroy(_meshRenderer.sharedMaterial);
+				_sharedMaterial = value;
+				if (_sharedMaterial == null) return;
+				_meshRenderer.sharedMaterial = Instantiate(_sharedMaterial);
+				_meshRenderer.sharedMaterial.color = m_color;
 			}
 		}
 
@@ -28,7 +33,7 @@ namespace Cryville.EEW.Unity.Map {
 			set {
 				if (m_color == value) return;
 				m_color = value;
-				_meshRenderer.material.color = value;
+				_meshRenderer.sharedMaterial.color = value;
 			}
 		}
 
@@ -126,12 +131,17 @@ namespace Cryville.EEW.Unity.Map {
 				_meshFilter.mesh = new();
 			}
 			_mesh = _meshFilter.mesh;
-			_meshRenderer.material.color = m_color;
+			if (_sharedMaterial == null && _meshRenderer.sharedMaterial != null) {
+				_sharedMaterial = _meshRenderer.sharedMaterial;
+				_meshRenderer.sharedMaterial = Instantiate(_sharedMaterial);
+				_meshRenderer.sharedMaterial.color = m_color;
+			}
 		}
 		void OnDestroy() {
 			if (_positions is not null)
 				ArrayPool<Vector2>.Shared.Return(_positions);
 			Destroy(_mesh);
+			Destroy(Material);
 		}
 		void LateUpdate() {
 			if (_valid) return;

Assets/Cryville.EEW.Unity/Map/MapElementManager.cs

@@ -22,6 +22,8 @@ namespace Cryville.EEW.Unity.Map {
 		readonly List<ReportViewModel> _displayingReports = new();
 		readonly List<int> _displayingOrder = new();
 
+		public int Count => _displayingReports.Count;
+
 		[SerializeField] MapElementManager m_subManager;
 
 		public RectangleF? AABB {
@@ -37,8 +39,6 @@ namespace Cryville.EEW.Unity.Map {
 			return _displayingElements[index].AABB;
 		}
 
-		public void AddOngoing(ReportViewModel e) => Add(e);
-		public void RemoveOngoing(ReportViewModel e) => Remove(e);
 		public void SetSelected(ReportViewModel e) {
 			if (_selected is not null)
 				Remove(_selected);
@@ -46,16 +46,17 @@ namespace Cryville.EEW.Unity.Map {
 				_selected = null;
 				return;
 			}
-			Add(e);
+			if (!Add(e))
+				return;
 			_selected = e;
 		}
 		public void SetCurrent(ReportViewModel e) {
 			_current = e;
 		}
 
-		void Add(ReportViewModel e) {
+		public bool Add(ReportViewModel e) {
 			var element = Build(e.Model, out _, out int order);
-			if (element == null) return;
+			if (element == null) return false;
 			var pos = element.transform.localPosition;
 			pos.z = OrderToZ(_displayingOrder.Sum());
 			element.transform.localPosition = pos;
@@ -64,8 +65,9 @@ namespace Cryville.EEW.Unity.Map {
 			_displayingOrder.Add(order);
 			element.transform.SetParent(transform, false);
 			if (m_subManager != null) m_subManager.Add(e);
+			return true;
 		}
-		void Remove(ReportViewModel e) {
+		public void Remove(ReportViewModel e) {
 			int index = _displayingReports.IndexOf(e);
 			if (index == -1) return;
 			_displayingElements.RemoveAt(index);

Assets/Cryville.EEW.Unity/Map/MapTile.cs

@@ -87,7 +87,7 @@ namespace Cryville.EEW.Unity.Map {
 			if (_texHandler.isDone) {
 				_tex = _texHandler.texture;
 				_tex.wrapMode = TextureWrapMode.Clamp;
-				_sprite = Sprite.Create(_tex, new Rect(0, 0, _tex.width, _tex.height), Vector2.zero, _tex.height);
+				_sprite = Sprite.Create(_tex, new Rect(0, 0, _tex.width, _tex.height), Vector2.zero, _tex.height, 0, SpriteMeshType.FullRect, Vector4.zero, false);
 				_renderer.sprite = _sprite;
 			}
 			else {
@@ -105,6 +105,7 @@ namespace Cryville.EEW.Unity.Map {
 			if (_req != null) {
 				_req.Abort();
 				_req.Dispose();
+				_texHandler.Dispose();
 			}
 			if (_sprite) Destroy(_sprite);
 			if (_tex) Destroy(_tex);

Assets/Cryville.EEW.Unity/Map/MultiLineRenderer.cs

@@ -48,11 +48,13 @@ namespace Cryville.EEW.Unity.Map {
 				_segments.Add(segment = Instantiate(m_lineRendererPrefab, transform, false).GetComponent<LineRenderer>());
 			}
 			else {
-				segment = _segments[_segmentIndex++];
+				segment = _segments[_segmentIndex];
 				segment.gameObject.SetActive(true);
 			}
+			_segmentIndex++;
 			segment.SetPositions(positions, index, length);
 			segment.Width = m_width;
+			segment.TilingScale = m_tilingScale;
 		}
 		public void Clear() {
 			for (int i = 0; i < _segmentIndex; i++) {

Assets/Cryville.EEW.Unity/Map/PolygonRenderer.cs

@@ -11,11 +11,16 @@ namespace Cryville.EEW.Unity.Map {
 	[RequireComponent(typeof(MeshFilter))]
 	[RequireComponent(typeof(MeshRenderer))]
 	class PolygonRenderer : MonoBehaviour {
+		Material _sharedMaterial;
 		public Material Material {
-			get => _meshRenderer.material;
+			get => _meshRenderer.sharedMaterial;
 			set {
-				_meshRenderer.material = value;
-				_meshRenderer.material.color = m_color;
+				if (value == _sharedMaterial) return;
+				if (_sharedMaterial != null) Destroy(_meshRenderer.sharedMaterial);
+				_sharedMaterial = value;
+				if (_sharedMaterial == null) return;
+				_meshRenderer.sharedMaterial = Instantiate(_sharedMaterial);
+				_meshRenderer.sharedMaterial.color = m_color;
 			}
 		}
 
@@ -40,10 +45,15 @@ namespace Cryville.EEW.Unity.Map {
 				_meshFilter.mesh = new();
 			}
 			_mesh = _meshFilter.mesh;
-			_meshRenderer.material.color = m_color;
+			if (_sharedMaterial == null && _meshRenderer.sharedMaterial != null) {
+				_sharedMaterial = _meshRenderer.sharedMaterial;
+				_meshRenderer.sharedMaterial = Instantiate(_sharedMaterial);
+				_meshRenderer.sharedMaterial.color = m_color;
+			}
 		}
 		void OnDestroy() {
 			Destroy(_mesh);
+			Destroy(Material);
 		}
 		public void SetPolygon(IEnumerable<IEnumerable<PointF>> polygon) {
 			_mesh.Clear();

Assets/Cryville.EEW.Unity/UI/EventOngoingListView.cs

@@ -16,8 +16,6 @@ namespace Cryville.EEW.Unity.UI {
 		readonly List<ReportViewModel> _displayingReports = new();
 		readonly List<EventOngoingView> _displayingViews = new();
 
-		public int Count => _displayingReports.Count;
-
 		public void Add(ReportViewModel e) {
 			_displayingReports.Add(e);
 
@@ -89,6 +87,7 @@ namespace Cryville.EEW.Unity.UI {
 			int index = _displayingReports.IndexOf(viewModel);
 			if (index == -1) return;
 			SwitchTo(index);
+			Worker.Instance.SetSelected(viewModel);
 		}
 	}
 }

Assets/Cryville.EEW.Unity/UI/EventOngoingView.cs

@@ -1,10 +1,10 @@
+using Cryville.Common.Unity;
 using Cryville.Common.Unity.UI;
 using Cryville.EEW.Report;
 using System.Globalization;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
-using Utils;
 
 namespace Cryville.EEW.Unity.UI {
 	class EventOngoingView : MonoBehaviour {

Assets/Cryville.EEW.Unity/UI/StatusView.cs

@@ -0,0 +1,27 @@
+using System.Globalization;
+using TMPro;
+using UnityEngine;
+
+namespace Cryville.EEW.Unity.UI {
+	[RequireComponent(typeof(TMP_Text))]
+	class StatusView : MonoBehaviour {
+		TMP_Text _textView;
+
+		void Awake() {
+			_textView = GetComponent<TMP_Text>();
+		}
+
+		void Update() {
+			_textView.text = string.Format(
+				CultureInfo.InvariantCulture,
+				"FPS: i{0:0} / s{1:0}\nSMem: {2:N0} / {3:N0}\nIMem: {4:N0} / {5:N0}",
+				1 / Time.deltaTime,
+				1 / Time.smoothDeltaTime,
+				UnityEngine.Profiling.Profiler.GetMonoUsedSizeLong(),
+				UnityEngine.Profiling.Profiler.GetMonoHeapSizeLong(),
+				UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong(),
+				UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong()
+			);
+		}
+	}
+}

Assets/Cryville.EEW.Unity/UI/StatusView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4e142baf0f0bd70439133e17e7185611
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville.EEW.Unity/Worker.cs

@@ -12,9 +12,11 @@ using Cryville.EEW.Unity.Map;
 using Cryville.EEW.Unity.UI;
 using Cryville.EEW.UpdateChecker;
 using Cryville.EEW.Wolfx;
+using Cryville.EEW.Wolfx.Model;
 using Cryville.EEW.Wolfx.TTS;
 using System;
 using System.Collections.Concurrent;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -138,7 +140,6 @@ namespace Cryville.EEW.Unity {
 			}
 #endif
 		}
-#if !UNITY_EDITOR
 		JMAAtomWorker BuildJMAAtomWorkerFilter(JMAAtomWorker worker, JMAAtomEventSourceConfig config) {
 			if (config.Filter != null) worker.SetFilter(config.Filter);
 			worker.IsFilterWhitelist = config.IsFilterWhitelist;
@@ -157,7 +158,6 @@ namespace Cryville.EEW.Unity {
 			worker.IsFilterWhitelist = config.IsFilterWhitelist;
 			return worker;
 		}
-#endif
 
 		readonly OngoingReportManager _ongoingReportManager = new();
 		readonly ConcurrentQueue<Action> _uiActionQueue = new();
@@ -176,16 +176,18 @@ namespace Cryville.EEW.Unity {
 		void OnOngoingReported(ReportViewModel item, CollectionChangeAction action) {
 			if (action == CollectionChangeAction.Add) {
 				_uiActionQueue.Enqueue(() => {
-					m_mapElementManager.AddOngoing(item);
 					m_ongoingEventList.Add(item);
+					if (m_mapElementManager.Add(item)) {
+						m_mapElementManager.SetSelected(null);
+					}
 					m_cameraController.OnMapElementUpdated();
 				});
 			}
 			else if (action == CollectionChangeAction.Remove) {
 				_uiActionQueue.Enqueue(() => {
-					m_mapElementManager.RemoveOngoing(item);
 					m_ongoingEventList.Remove(item);
-					if (m_ongoingEventList.Count == 0 && SharedSettings.Instance.DoSwitchBackToHistory && _latestHistoryReport is not null) {
+					m_mapElementManager.Remove(item);
+					if (m_mapElementManager.Count == 0 && SharedSettings.Instance.DoSwitchBackToHistory && _latestHistoryReport is not null) {
 						m_mapElementManager.SetSelected(_latestHistoryReport);
 					}
 					m_cameraController.OnMapElementUpdated();

Assets/Main.unity

@@ -706,6 +706,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 123805241}
+  - {fileID: 2039723256}
   - {fileID: 1925427751}
   m_Father: {fileID: 1431650511}
   m_RootOrder: 2
@@ -1362,7 +1363,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 408286581}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1466,6 +1467,158 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1925427750}
   m_CullTransparentMesh: 1
+--- !u!1 &2039723255
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2039723256}
+  - component: {fileID: 2039723259}
+  - component: {fileID: 2039723258}
+  - component: {fileID: 2039723257}
+  m_Layer: 5
+  m_Name: Status
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2039723256
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039723255}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 408286581}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2039723257
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039723255}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e142baf0f0bd70439133e17e7185611, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2039723258
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039723255}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 'FPS: i60 / s60
+
+    SMem: 0 / 0
+
+    IMem: 0 / 0'
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4279769379
+  m_fontColor: {r: 0.13725491, g: 0.09803922, b: 0.09411765, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 12
+  m_fontSizeBase: 12
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 0
+  m_fontSizeMax: 0
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 1024
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 0
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 8, y: 4, z: 8, w: 4}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &2039723259
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039723255}
+  m_CullTransparentMesh: 1
 --- !u!114 &79416137231161493
 MonoBehaviour:
   m_ObjectHideFlags: 0