Merge pull request #2 from setchi/feature/unity2019

Unity2019 対応

Author: setchi

Assets/Hypertext/Examples/RegexExample.unity

@@ -325,7 +325,9 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "URL: https://example.com/\r\nHashtag: #hoge"
+  m_Text: 'URL: https://example.com/
+
+    Hashtag: #hoge'
 --- !u!1 &1167677275
 GameObject:
   m_ObjectHideFlags: 0

Assets/Hypertext/Examples/RegexHypertext.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
@@ -63,28 +62,11 @@ public override void RemoveListeners()
         /// </summary>
         protected override void AddListeners()
         {
-            var lineCount = text.Count(x => x == '\n') + 1;
-            bool hasFolded = lineCount != cachedTextGenerator.lineCount;
-
             foreach (var entry in entries)
             {
                 foreach (Match match in Regex.Matches(text, entry.RegexPattern))
                 {
-#if UNITY_2019_1_OR_NEWER
-                    if (hasFolded)
-                    {
-                        OnClick(match.Index, match.Value.Length, entry.Color, entry.Callback);
-                    }
-                    else
-                    {
-                        // 折り返していない場合のみ「空白」と「改行」が描画されないため、調整する
-                        var head = text.Substring(0, match.Index);
-                        var count = head.Count(x => x == ' ') + head.Count(x => x == '\n');
-                        OnClick(match.Index - count, match.Value.Length, entry.Color, entry.Callback);
-                    }
-#else
                     OnClick(match.Index, match.Value.Length, entry.Color, entry.Callback);
-#endif
                 }
             }
         }

Assets/Hypertext/Scripts/HypertextBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -8,14 +9,7 @@ namespace Hypertext
 {
     public abstract class HypertextBase : Text, IPointerClickHandler
     {
-        Canvas rootCanvas;
-        Canvas RootCanvas => rootCanvas ?? (rootCanvas = GetComponentInParent<Canvas>());
-
-        const int CharVerts = 6;
-        readonly List<Span> spans = new List<Span>();
-        static readonly ObjectPool<List<UIVertex>> verticesPool = new ObjectPool<List<UIVertex>>(null, l => l.Clear());
-
-        struct Span
+        class Span
         {
             public readonly int StartIndex;
             public readonly int Length;
@@ -33,6 +27,30 @@ public Span(int startIndex, int endIndex, Color color, Action<string> callback)
             }
         };
 
+        readonly List<Span> spans = new List<Span>();
+
+        // TODO: 頂点が生成されない空白文字をすべて洗い出す
+        readonly char[] invisibleChars =
+        {
+            Space,
+            Tab,
+            LineFeed
+        };
+        static readonly ObjectPool<List<UIVertex>> verticesPool = new ObjectPool<List<UIVertex>>(null, l => l.Clear());
+
+        const int CharVerts = 6;
+        const char 
+            Tab = '\t',
+            LineFeed = '\n',
+            Space = ' ',
+            LesserThan = '<',
+            GreaterThan = '>';
+
+        int[] visibleCharIndexMap;
+
+        Canvas rootCanvas;
+        Canvas RootCanvas => rootCanvas ?? (rootCanvas = GetComponentInParent<Canvas>());
+
         /// <summary>
         /// 指定した部分文字列にクリックイベントを登録します
         /// </summary>
@@ -75,33 +93,98 @@ public virtual void RemoveListeners()
         /// </summary>
         protected abstract void AddListeners();
 
-        protected override void OnPopulateMesh(VertexHelper vertexHelper)
+        readonly UIVertex[] tempVerts = new UIVertex[4];
+        protected override void OnPopulateMesh(VertexHelper toFill)
         {
-            base.OnPopulateMesh(vertexHelper);
+            if (font == null)
+            {
+                return;
+            }
 
-            spans.Clear();
-            AddListeners();
+            m_DisableFontTextureRebuiltCallback = true;
+
+            var extents = rectTransform.rect.size;
+
+            var settings = GetGenerationSettings(extents);
+            settings.generateOutOfBounds = true;
+            cachedTextGenerator.PopulateWithErrors(text, settings, gameObject);
+
+            var verts = cachedTextGenerator.verts;
+            var unitsPerPixel = 1 / pixelsPerUnit;
+            int vertCount = verts.Count;
+
+            if (vertCount <= 0)
+            {
+                toFill.Clear();
+                return;
+            }
+
+            var roundingOffset = new Vector2(verts[0].position.x, verts[0].position.y) * unitsPerPixel;
+            roundingOffset = PixelAdjustPoint(roundingOffset) - roundingOffset;
+            toFill.Clear();
+
+            if (roundingOffset != Vector2.zero)
+            {
+                for (int i = 0; i < vertCount; ++i)
+                {
+                    int tempVertsIndex = i & 3;
+                    tempVerts[tempVertsIndex] = verts[i];
+                    tempVerts[tempVertsIndex].position *= unitsPerPixel;
+                    tempVerts[tempVertsIndex].position.x += roundingOffset.x;
+                    tempVerts[tempVertsIndex].position.y += roundingOffset.y;
+
+                    if (tempVertsIndex == 3)
+                    {
+                        toFill.AddUIVertexQuad(tempVerts);
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < vertCount; ++i)
+                {
+                    int tempVertsIndex = i & 3;
+                    tempVerts[tempVertsIndex] = verts[i];
+                    tempVerts[tempVertsIndex].position *= unitsPerPixel;
+
+                    if (tempVertsIndex == 3)
+                    {
+                        toFill.AddUIVertexQuad(tempVerts);
+                    }
+                }
+            }
+
+            m_DisableFontTextureRebuiltCallback = false;
 
             var vertices = verticesPool.Get();
-            vertexHelper.GetUIVertexStream(vertices);
+            toFill.GetUIVertexStream(vertices);
 
-            Modify(ref vertices);
+            GenerateVisibleCharIndexMap(vertices.Count < text.Length * CharVerts);
 
-            vertexHelper.Clear();
-            vertexHelper.AddUIVertexTriangleStream(vertices);
+            spans.Clear();
+            AddListeners();
+            GenerateHrefBoundingBoxes(ref vertices);
+
+            toFill.Clear();
+            toFill.AddUIVertexTriangleStream(vertices);
             verticesPool.Release(vertices);
         }
 
-        void Modify(ref List<UIVertex> vertices)
+        void GenerateHrefBoundingBoxes(ref List<UIVertex> vertices)
         {
             var verticesCount = vertices.Count;
 
             for (var i = 0; i < spans.Count; i++)
             {
                 var span = spans[i];
-                var endIndex = span.StartIndex + span.Length;
 
-                for (var textIndex = span.StartIndex; textIndex < endIndex; textIndex++)
+                var startIndex = visibleCharIndexMap[span.StartIndex];
+                var endIndex = visibleCharIndexMap[span.StartIndex + span.Length - 1];
+
+                startIndex = Mathf.Clamp(startIndex, 0, text.Length - 1);
+                endIndex = Mathf.Clamp(endIndex, 0, text.Length - 1);
+
+                for (var textIndex = startIndex; textIndex <= endIndex; textIndex++)
                 {
                     var vertexStartIndex = textIndex * CharVerts;
                     if (vertexStartIndex + CharVerts > verticesCount)
@@ -146,7 +229,6 @@ void Modify(ref List<UIVertex> vertices)
 
                 // 文字ごとのバウンディングボックスを行ごとのバウンディングボックスにまとめる
                 span.BoundingBoxes = CalculateLineBoundingBoxes(span.BoundingBoxes);
-                spans[i] = span;
             }
         }
 
@@ -205,6 +287,52 @@ static Rect CalculateAABB(IReadOnlyList<Rect> rects)
             return new Rect {min = min, max = max};
         }
 
+        void GenerateVisibleCharIndexMap(bool verticesReduced)
+        {
+            if (visibleCharIndexMap == null || visibleCharIndexMap.Length < text.Length)
+            {
+                Array.Resize(ref visibleCharIndexMap, text.Length);
+            }
+
+            if (!verticesReduced)
+            {
+                for (var i = 0; i < visibleCharIndexMap.Length; i++)
+                {
+                    visibleCharIndexMap[i] = i;
+                }
+                return;
+            }
+
+            var offset = 0;
+            var inTag = false;
+
+            for (var i = 0; i < text.Length; i++)
+            {
+                var character = text[i];
+
+                if (inTag)
+                {
+                    offset++;
+
+                    if (character == GreaterThan)
+                    {
+                        inTag = false;
+                    }
+                }
+                else if (supportRichText && character == LesserThan)
+                {
+                    offset++;
+                    inTag = true;
+                }
+                else if (invisibleChars.Contains(character))
+                {
+                    offset++;
+                }
+
+                visibleCharIndexMap[i] = i - offset;
+            }
+        }
+
         Vector3 CalculateLocalPosition(Vector3 position, Camera pressEventCamera)
         {
             if (!RootCanvas)

ProjectSettings/ProjectVersion.txt

@@ -1 +1,2 @@
-m_EditorVersion: 2018.3.6f1
+m_EditorVersion: 2019.2.10f1
+m_EditorVersionWithRevision: 2019.2.10f1 (923acd2d43aa)

README.md

@@ -28,7 +28,7 @@ protected void OnClick(int startIndex, int length, Color color, Action<string> o
 ```
 
 ## 開発環境
-Unity 2018.3.6f1
+Unity 2019.2.10f1
 
 ## Author
 [setchi](https://github.com/setchi)