Refactoring

Author: setchi

Assets/Hypertext/Scripts/HypertextBase.cs

@@ -1,9 +1,9 @@
-using System;
+using HypertextHelper;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using HypertextHelper;
 
 public abstract class HypertextBase : Text, IPointerClickHandler
 {
@@ -13,16 +13,16 @@ public abstract class HypertextBase : Text, IPointerClickHandler
 
     struct ClickableEntry
     {
-        public int WordStartIndex;
         public string Word;
+        public int StartIndex;
         public Color Color;
         public Action<string> OnClick;
         public List<Rect> Rects;
 
         public ClickableEntry(string word, int startIndex, Color color, Action<string> onClick)
         {
             Word = word;
-            WordStartIndex = startIndex;
+            StartIndex = startIndex;
             Color = color;
             OnClick = onClick;
             Rects = new List<Rect>();
@@ -32,23 +32,23 @@ public ClickableEntry(string word, int startIndex, Color color, Action<string> o
     /// <summary>
     /// クリック可能領域に関する情報を登録します
     /// </summary>
-    /// <param name="wordStartIndex">対象ワードの開始インデックス</param>
+    /// <param name="startIndex">対象ワードの開始インデックス</param>
     /// <param name="wordLength">対象ワードの文字数</param>
     /// <param name="color">対象ワードにつける色</param>
     /// <param name="onClick">対象ワードがクリックされたときのコールバック</param>
-    protected void RegisterClickable(int wordStartIndex, int wordLength, Color color, Action<string> onClick)
+    protected void RegisterClickable(int startIndex, int wordLength, Color color, Action<string> onClick)
     {
         if (onClick == null)
         {
             return;
         }
 
-        if (wordStartIndex < 0 || wordLength < 0 || wordStartIndex + wordLength > text.Length)
+        if (startIndex < 0 || wordLength < 0 || startIndex + wordLength > text.Length)
         {
             return;
         }
 
-        _entries.Add(new ClickableEntry(text.Substring(wordStartIndex, wordLength), wordStartIndex, color, onClick));
+        _entries.Add(new ClickableEntry(text.Substring(startIndex, wordLength), startIndex, color, onClick));
     }
 
     /// <summary>
@@ -90,7 +90,7 @@ void Modify(ref List<UIVertex> vertices)
         {
             var entry = _entries[i];
 
-            for (int textIndex = entry.WordStartIndex, wordEndIndex = entry.WordStartIndex + entry.Word.Length; textIndex < wordEndIndex; textIndex++)
+            for (int textIndex = entry.StartIndex, wordEndIndex = entry.StartIndex + entry.Word.Length; textIndex < wordEndIndex; textIndex++)
             {
                 var vertexStartIndex = textIndex * CharVertsNum;
                 if (vertexStartIndex + CharVertsNum > verticesCount)
@@ -130,10 +130,7 @@ void Modify(ref List<UIVertex> vertices)
                     }
                 }
 
-                var charRect = new Rect();
-                charRect.min = min;
-                charRect.max = max;
-                entry.Rects.Add(charRect);
+                entry.Rects.Add(new Rect { min = min, max = max });
             }
 
             // 同じ行で隣り合った矩形をまとめる
@@ -198,10 +195,7 @@ Rect MergeRects(List<Rect> rects)
             }
         }
 
-        var rect = new Rect();
-        rect.min = min;
-        rect.max = max;
-        return rect;
+        return new Rect { min = min, max = max };
     }
 
     // TODO: Canvas の Render Mode によって localPosition の算出方法を変える

Assets/Hypertext/Scripts/ObjectPool.cs

@@ -1,20 +1,19 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Events;
+using System;
+using System.Collections.Generic;
 
 namespace HypertextHelper
 {
     public class ObjectPool<T> where T : new()
     {
         readonly Stack<T> _stack = new Stack<T>();
-        readonly UnityAction<T> _onGet;
-        readonly UnityAction<T> _onRelease;
+        readonly Action<T> _onGet;
+        readonly Action<T> _onRelease;
 
         public int CountAll { get; set; }
         public int CountActive { get { return CountAll - CountInactive; } }
         public int CountInactive { get { return _stack.Count; } }
 
-        public ObjectPool(UnityAction<T> onGet, UnityAction<T> onRelease)
+        public ObjectPool(Action<T> onGet, Action<T> onRelease)
         {
             _onGet = onGet;
             _onRelease = onRelease;
@@ -45,7 +44,7 @@ public void Release(T element)
         {
             if (_stack.Count > 0 && ReferenceEquals(_stack.Peek(), element))
             {
-                Debug.LogError("Internal error. Trying to destroy object that is already released to pool.");
+                UnityEngine.Debug.LogError("Internal error. Trying to destroy object that is already released to pool.");
             }
 
             if (_onRelease != null)