From 6ebd7de12b63ccfc416c91a7be3e4c276ae75a1c Mon Sep 17 00:00:00 2001
From: herbst <herbst@prefrontalcortex.de>
Date: Thu, 10 Dec 2015 19:01:54 +0100
Subject: [PATCH] fixed letter spacing for 5.2.1+ (6 verts per character
 instead of 4); added cylindrical text bending

--HG--
branch : letterspacing_fix
---
 Scripts/Effects/CylinderText.cs  | 59 ++++++++++++++++++++++++++++++++
 Scripts/Effects/LetterSpacing.cs | 32 ++++++++++-------
 2 files changed, 79 insertions(+), 12 deletions(-)
 create mode 100644 Scripts/Effects/CylinderText.cs

diff --git a/Scripts/Effects/CylinderText.cs b/Scripts/Effects/CylinderText.cs
new file mode 100644
index 0000000..02fa588
--- /dev/null
+++ b/Scripts/Effects/CylinderText.cs
@@ -0,0 +1,59 @@
+/// Credit Breyer
+/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/#post-1777407
+
+namespace UnityEngine.UI.Extensions
+{
+    [RequireComponent(typeof(Text), typeof(RectTransform))]
+    [AddComponentMenu("UI/Effects/Extensions/Cylinder Text")]
+    public class CylinderText : BaseMeshEffect
+    {
+        public float radius;
+        private RectTransform rectTrans;
+
+
+#if UNITY_EDITOR
+        protected override void OnValidate()
+        {
+            base.OnValidate();
+            if (rectTrans == null)
+                rectTrans = GetComponent<RectTransform>();
+        }
+#endif
+        protected override void Awake()
+        {
+            base.Awake();
+            rectTrans = GetComponent<RectTransform>();
+            OnRectTransformDimensionsChange();
+        }
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+            rectTrans = GetComponent<RectTransform>();
+            OnRectTransformDimensionsChange();
+        }
+        public override void ModifyMesh(VertexHelper vh)
+        {
+            Vector3 center = transform.position;
+
+            int count = vh.currentVertCount;
+            if (!IsActive() || count == 0)
+            {
+                return;
+            }
+            for (int index = 0; index < vh.currentVertCount; index++)
+            {
+                UIVertex uiVertex = new UIVertex();
+                vh.PopulateUIVertex(ref uiVertex, index);
+
+                // get x position
+                var x = uiVertex.position.x;                
+
+                // calculate bend based on pivot and radius
+                uiVertex.position.z = -radius * Mathf.Cos(x / radius);
+                uiVertex.position.x = radius * Mathf.Sin(x / radius);
+                
+                vh.SetUIVertex(uiVertex, index);
+            }
+        }
+    }
+}
diff --git a/Scripts/Effects/LetterSpacing.cs b/Scripts/Effects/LetterSpacing.cs
index d4778d3..112116f 100644
--- a/Scripts/Effects/LetterSpacing.cs
+++ b/Scripts/Effects/LetterSpacing.cs
@@ -47,12 +47,12 @@ namespace UnityEngine.UI.Extensions
 {
 	[AddComponentMenu("UI/Effects/Extensions/Letter Spacing")]
     ///Summary
-    /// Note, LetterSpacing is now non-functional in 5.2.1p+ / 5.3, seems the vertex order has changed?
+    /// Note, Vertex Count has changed in 5.2.1+, is now 6 (two tris) instead of 4 (tri strip).
     public class LetterSpacing : BaseMeshEffect
 	{
 		[SerializeField]
 		private float m_spacing = 0f;
-		
+
 		protected LetterSpacing() { }
 		
 		#if UNITY_EDITOR
@@ -119,21 +119,25 @@ namespace UnityEngine.UI.Extensions
 			{
 				string line = lines[lineIdx];
 				float lineOffset = (line.Length -1) * letterOffset * alignmentFactor;
-				
+
 				for (int charIdx = 0; charIdx < line.Length; charIdx++)
 				{
-					int idx1 = glyphIdx * 4 + 0;
-					int idx2 = glyphIdx * 4 + 1;
-					int idx3 = glyphIdx * 4 + 2;
-					int idx4 = glyphIdx * 4 + 3;
-					
-					// Check for truncated text (doesn't generate verts for all characters)
-					if (idx4 > verts.Count - 1) return;
+					int idx1 = glyphIdx * 6 + 0;
+					int idx2 = glyphIdx * 6 + 1;
+					int idx3 = glyphIdx * 6 + 2;
+					int idx4 = glyphIdx * 6 + 3;
+                    int idx5 = glyphIdx * 6 + 4;
+                    int idx6 = glyphIdx * 6 + 5;
+
+                    // Check for truncated text (doesn't generate verts for all characters)
+                    if (idx6 > verts.Count - 1) return;
 
                     UIVertex vert1 = verts[idx1];
                     UIVertex vert2 = verts[idx2];
                     UIVertex vert3 = verts[idx3];
                     UIVertex vert4 = verts[idx4];
+                    UIVertex vert5 = verts[idx5];
+                    UIVertex vert6 = verts[idx6];
 
                     pos = Vector3.right * (letterOffset * charIdx - lineOffset);
 
@@ -141,13 +145,17 @@ namespace UnityEngine.UI.Extensions
                     vert2.position += pos;
                     vert3.position += pos;
                     vert4.position += pos;
+                    vert5.position += pos;
+                    vert6.position += pos;
 
                     verts[idx1] = vert1;
 					verts[idx2] = vert2;
 					verts[idx3] = vert3;
 					verts[idx4] = vert4;
-					
-					glyphIdx++;
+                    verts[idx5] = vert5;
+                    verts[idx6] = vert6;
+
+                    glyphIdx++;
 				}
 				
 				// Offset for carriage return character that still generates verts