From 43efa4e03787c59da8b9635c37926fc4936c09d1 Mon Sep 17 00:00:00 2001 From: akihiro Date: Mon, 26 Oct 2020 15:26:55 +0900 Subject: [PATCH] remove ignoreRectMaskCulling --- .../TextMeshPro/TextMeshProBroadcasterBase.cs | 8 ++++---- .../TextMeshPro/TextMeshProObserverBase.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProBroadcasterBase.cs b/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProBroadcasterBase.cs index 07a1fbe39..1a0886506 100644 --- a/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProBroadcasterBase.cs +++ b/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProBroadcasterBase.cs @@ -136,9 +136,9 @@ public TextMeshProperties(TMP_Text textMesh) fontSizeMax = textMesh.fontSizeMax; fontSizeMin = textMesh.fontSizeMin; fontStyle = textMesh.fontStyle; - fontWeight = (int) textMesh.fontWeight; + fontWeight = (int)textMesh.fontWeight; horizontalMapping = textMesh.horizontalMapping; - ignoreRectMaskCulling = textMesh.ignoreRectMaskCulling; + ignoreRectMaskCulling = false;//textMesh.ignoreRectMaskCulling; ignoreVisibility = textMesh.ignoreVisibility; isOrthographic = textMesh.isOrthographic; isOverlay = textMesh.isOverlay; @@ -233,7 +233,7 @@ public bool IsCached(TMP_Text other) enableKerning == other.enableKerning && enableWordWrapping == other.enableWordWrapping && extraPadding == other.extraPadding && - ignoreRectMaskCulling == other.ignoreRectMaskCulling && + //ignoreRectMaskCulling == other.ignoreRectMaskCulling && ignoreVisibility == other.ignoreVisibility && isOrthographic == other.isOrthographic && isOverlay == other.isOverlay && @@ -256,7 +256,7 @@ public bool IsCached(TMP_Text other) fontSizeMax == other.fontSizeMax && fontSizeMin == other.fontSizeMin && fontStyle == other.fontStyle && - fontWeight == (int) other.fontWeight && + fontWeight == (int)other.fontWeight && horizontalMapping == other.horizontalMapping && lineSpacing == other.lineSpacing && lineSpacingAdjustment == other.lineSpacingAdjustment && diff --git a/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProObserverBase.cs b/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProObserverBase.cs index 1f0420d9e..076a82290 100644 --- a/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProObserverBase.cs +++ b/src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/NetworkedComponents/TextMeshPro/TextMeshProObserverBase.cs @@ -60,7 +60,7 @@ public override void Read(INetworkConnection connection, BinaryReader message) TextMeshObserver.enableKerning = values[4]; TextMeshObserver.enableWordWrapping = values[5]; TextMeshObserver.extraPadding = values[6]; - TextMeshObserver.ignoreRectMaskCulling = values[7]; + //TextMeshObserver.ignoreRectMaskCulling = values[7]; values = Unpack(message.ReadByte()); TextMeshObserver.ignoreVisibility = values[0];