+ case MarkupTag.ROTATE:
// TODO: Add ability to use Random Rotation
value = ConvertToFloat(m_htmlTag, m_xmlAttribute[0].valueStartIndex, m_xmlAttribute[0].valueLength);
@@ -8412,12 +8504,10 @@ internal bool ValidateHtmlTag(UnicodeChar[] chars, int startIndex, out int endIn
m_isFXMatrixSet = true;
return true;
- case 7757466: //
- case 7130010: //
+ case MarkupTag.SLASH_ROTATE:
m_isFXMatrixSet = false;
return true;
- case 317446: //
- case 227814: //
+ case MarkupTag.TABLE:
//switch (m_xmlAttribute[1].nameHashCode)
//{
// case 327550: // width
@@ -8441,24 +8531,18 @@ internal bool ValidateHtmlTag(UnicodeChar[] chars, int startIndex, out int endIn
// break;
//}
return false;
- case 1107375: //
- case 1017743: //
+ case MarkupTag.SLASH_TABLE:
return true;
- case 926: //
- case 670: //
+ case MarkupTag.TR:
return true;
- case 3229: //
- case 2973: //
+ case MarkupTag.SLASH_TR:
return true;
- case 916: //
- case 660: // |
+ case MarkupTag.TH:
// Set style to bold and center alignment
return true;
- case 3219: // |
- case 2963: //
+ case MarkupTag.SLASH_TH:
return true;
- case 912: //
- case 656: // |
+ case MarkupTag.TD:
// Style options
//for (int i = 1; i < m_xmlAttribute.Length && m_xmlAttribute[i].nameHashCode != 0; i++)
//{
@@ -8501,8 +8585,7 @@ internal bool ValidateHtmlTag(UnicodeChar[] chars, int startIndex, out int endIn
//}
return false;
- case 3215: // |
- case 2959: //
+ case MarkupTag.SLASH_TD:
return false;
}
}
diff --git a/Scripts/Runtime/TMP_TextInfo.cs b/Scripts/Runtime/TMP_TextInfo.cs
index 168234b..6428dad 100644
--- a/Scripts/Runtime/TMP_TextInfo.cs
+++ b/Scripts/Runtime/TMP_TextInfo.cs
@@ -80,7 +80,7 @@ public TMP_TextInfo(TMP_Text textComponent)
///
/// Function to clear the counters of the text object.
///
- public void Clear()
+ internal void Clear()
{
characterCount = 0;
spaceCount = 0;
@@ -169,10 +169,10 @@ public void ClearUnusedVertices(MaterialReference[] materials)
///
/// Function to clear and initialize the lineInfo array.
///
- public void ClearLineInfo()
+ internal void ClearLineInfo()
{
if (this.lineInfo == null)
- this.lineInfo = new TMP_LineInfo[2];
+ this.lineInfo = new TMP_LineInfo[1];
int length = this.lineInfo.Length;
@@ -182,19 +182,21 @@ public void ClearLineInfo()
this.lineInfo[i].spaceCount = 0;
this.lineInfo[i].wordCount = 0;
this.lineInfo[i].controlCharacterCount = 0;
- this.lineInfo[i].width = 0;
+
+ this.lineInfo[i].visibleCharacterCount = 0;
+ this.lineInfo[i].visibleSpaceCount = 0;
this.lineInfo[i].ascender = k_InfinityVectorNegative.x;
+ this.lineInfo[i].baseline = 0;
this.lineInfo[i].descender = k_InfinityVectorPositive.x;
+ this.lineInfo[i].maxAdvance = 0;
this.lineInfo[i].marginLeft = 0;
this.lineInfo[i].marginRight = 0;
this.lineInfo[i].lineExtents.min = k_InfinityVectorPositive;
this.lineInfo[i].lineExtents.max = k_InfinityVectorNegative;
-
- this.lineInfo[i].maxAdvance = 0;
- //this.lineInfo[i].maxScale = 0;
+ this.lineInfo[i].width = 0;
}
}
@@ -232,7 +234,7 @@ public TMP_MeshInfo[] CopyMeshInfoVertexData()
int length = meshInfo[i].vertices.Length;
m_CachedMeshInfo[i].vertices = new Vector3[length];
- m_CachedMeshInfo[i].uvs0 = new Vector2[length];
+ m_CachedMeshInfo[i].uvs0 = new Vector4[length];
m_CachedMeshInfo[i].uvs2 = new Vector2[length];
m_CachedMeshInfo[i].colors32 = new Color32[length];
@@ -249,7 +251,7 @@ public TMP_MeshInfo[] CopyMeshInfoVertexData()
if (m_CachedMeshInfo[i].vertices.Length != length)
{
m_CachedMeshInfo[i].vertices = new Vector3[length];
- m_CachedMeshInfo[i].uvs0 = new Vector2[length];
+ m_CachedMeshInfo[i].uvs0 = new Vector4[length];
m_CachedMeshInfo[i].uvs2 = new Vector2[length];
m_CachedMeshInfo[i].colors32 = new Color32[length];
diff --git a/Scripts/Runtime/TMP_TextParsingUtilities.cs b/Scripts/Runtime/TMP_TextParsingUtilities.cs
index 8f7cc19..65da8ee 100644
--- a/Scripts/Runtime/TMP_TextParsingUtilities.cs
+++ b/Scripts/Runtime/TMP_TextParsingUtilities.cs
@@ -142,5 +142,26 @@ internal static uint ConvertToUTF32(uint highSurrogate, uint lowSurrogate)
{
return ((highSurrogate - CodePoint.HIGH_SURROGATE_START) * 0x400) + ((lowSurrogate - CodePoint.LOW_SURROGATE_START) + CodePoint.UNICODE_PLANE01_START);
}
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ internal static bool IsDiacriticalMark(uint c)
+ {
+ return c >= 0x300 && c <= 0x36F || c >= 0x1AB0 && c <= 0x1AFF || c >= 0x1DC0 && c <= 0x1DFF || c >= 0x20D0 && c <= 0x20FF || c >= 0xFE20 && c <= 0xFE2F;
+ }
+
+ internal static bool IsBaseGlyph(uint c)
+ {
+ return !(c >= 0x300 && c <= 0x36F || c >= 0x1AB0 && c <= 0x1AFF || c >= 0x1DC0 && c <= 0x1DFF || c >= 0x20D0 && c <= 0x20FF || c >= 0xFE20 && c <= 0xFE2F ||
+ // Thai
+ c == 0xE31 || c >= 0xE34 && c <= 0xE3A || c >= 0xE47 && c <= 0xE4E ||
+ // Hebrew
+ c >= 0x591 && c <= 0x5BD || c == 0x5BF || c >= 0x5C1 && c <= 0x5C2 || c >= 0x5C4 && c <= 0x5C5 || c == 0x5C7
+ );
+ }
+
}
}
diff --git a/Scripts/Runtime/TMP_TextProcessingStack.cs b/Scripts/Runtime/TMP_TextProcessingStack.cs
index d4a12b7..4fce85d 100644
--- a/Scripts/Runtime/TMP_TextProcessingStack.cs
+++ b/Scripts/Runtime/TMP_TextProcessingStack.cs
@@ -277,6 +277,7 @@ public void SetDefault(T item)
itemStack[0] = item;
index = 1;
+ m_Count = 1;
}
@@ -301,9 +302,11 @@ public void Add(T item)
public T Remove()
{
index -= 1;
+ m_Count -= 1;
if (index <= 0)
{
+ m_Count = 0;
index = 1;
return itemStack[0];
diff --git a/Scripts/Runtime/TMP_TextUtilities.cs b/Scripts/Runtime/TMP_TextUtilities.cs
index 2aa82bb..7445f17 100644
--- a/Scripts/Runtime/TMP_TextUtilities.cs
+++ b/Scripts/Runtime/TMP_TextUtilities.cs
@@ -2212,6 +2212,9 @@ internal static uint ToUpperASCIIFast(uint c)
///
public static int GetHashCode(string s)
{
+ if (string.IsNullOrEmpty(s))
+ return 0;
+
int hashCode = 0;
for (int i = 0; i < s.Length; i++)
@@ -2248,6 +2251,21 @@ public static uint GetSimpleHashCodeLowercase(string s)
return hashCode;
}
+ ///
+ /// Function which returns a simple hash code from a string converted to uppercase.
+ ///
+ /// The string from which to compute the hash code.
+ /// The computed hash code.
+ public static uint GetHashCodeCaseInSensitive(string s)
+ {
+ uint hashCode = 0;
+
+ for (int i = 0; i < s.Length; i++)
+ hashCode = (hashCode << 5) + hashCode ^ ToUpperFast(s[i]);
+
+ return hashCode;
+ }
+
///
/// Function to convert Hex to Int
@@ -2302,5 +2320,100 @@ public static int StringHexToInt(string s)
return value;
}
+ static readonly uint[] crc32Table = {
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+ 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+ 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+ 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+ 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+ 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+ 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+ 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+ 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+ 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+ 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+ 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+ 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+ 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+ 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+ 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+ 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+ 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
+
+ ///
+ ///
+ ///
+ ///
+ internal static uint CRCBegin()
+ {
+ return 0xffffffff;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ internal static uint CRCDone(uint crc)
+ {
+ return crc ^ 0xffffffff;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ internal static uint CRCFeed(uint crc, int value)
+ {
+ return (crc >> 8) ^ crc32Table[(crc & 0xFF) ^ value];
+ }
+
+ private static byte[] m_bytes = new byte[4];
+
+ internal static uint CRCFeed(uint crc, float value)
+ {
+ unsafe
+ {
+ int val = *(int*)&value;
+
+ fixed (byte* b = m_bytes)
+ {
+ *((int*)b) = val;
+ }
+
+ for (int i = 0; i < 4; i++)
+ {
+ crc = (crc >> 8) ^ crc32Table[(crc & 0xFF) ^ m_bytes[i]];
+ }
+
+ return crc;
+ }
+ }
+
+ internal static uint CRCFeed(uint crc, Color value)
+ {
+ crc = CRCFeed(crc, value.r);
+ crc = CRCFeed(crc, value.g);
+ crc = CRCFeed(crc, value.b);
+ crc = CRCFeed(crc, value.a);
+
+ return crc;
+ }
}
}
diff --git a/Scripts/Runtime/TMPro_ExtensionMethods.cs b/Scripts/Runtime/TMPro_ExtensionMethods.cs
index a6eee86..7478453 100644
--- a/Scripts/Runtime/TMPro_ExtensionMethods.cs
+++ b/Scripts/Runtime/TMPro_ExtensionMethods.cs
@@ -142,6 +142,27 @@ public static Color32 Tint(this Color32 c1, float tint)
return new Color32(r, g, b, a);
}
+ internal static Color32 GammaToLinear(this Color32 c)
+ {
+ return new Color32(GammaToLinear(c.r), GammaToLinear(c.g), GammaToLinear(c.b), c.a);
+ }
+
+ static byte GammaToLinear(byte value)
+ {
+ float v = value / 255f;
+
+ if (v <= 0.04045f)
+ return (byte)(v / 12.92f * 255f);
+
+ if (v < 1.0f)
+ return (byte)(Mathf.Pow((v + 0.055f) / 1.055f, 2.4f) * 255);
+
+ if (v == 1.0f)
+ return 255;
+
+ return (byte)(Mathf.Pow(v, 2.2f) * 255);
+ }
+
public static Color MinAlpha(this Color c1, Color c2)
{
float a = c1.a < c2.a ? c1.a : c2.a;
diff --git a/Scripts/Runtime/TMPro_MeshUtilities.cs b/Scripts/Runtime/TMPro_MeshUtilities.cs
index 86a6590..ba3b0fe 100644
--- a/Scripts/Runtime/TMPro_MeshUtilities.cs
+++ b/Scripts/Runtime/TMPro_MeshUtilities.cs
@@ -343,11 +343,12 @@ public override string ToString()
// Structure used for Word Wrapping which tracks the state of execution when the last space or carriage return character was encountered.
- public struct WordWrapState
+ internal struct WordWrapState
{
public int previous_WordBreak;
public int total_CharacterCount;
public int visible_CharacterCount;
+ public int visibleSpaceCount;
public int visible_SpriteCount;
public int visible_LinkCount;
public int firstCharacterIndex;
@@ -371,7 +372,9 @@ public struct WordWrapState
public float xAdvance;
public float preferredWidth;
public float preferredHeight;
- //public float maxFontScale;
+ public float renderedWidth;
+ public float renderedHeight;
+
public float previousLineScale;
public int wordCount;
@@ -383,7 +386,7 @@ public struct WordWrapState
public float baselineOffset;
public float lineOffset;
public bool isDrivenLineSpacing;
- public float glyphHorizontalAdvanceAdjustment;
+ public int lastBaseGlyphIndex;
public float cSpace;
public float mSpace;
@@ -394,7 +397,7 @@ public struct WordWrapState
public Color32 vertexColor;
public Color32 underlineColor;
public Color32 strikethroughColor;
- public Color32 highlightColor;
+ public HighlightState highlightState;
public TMP_FontStyleStack basicStyleStack;
public TMP_TextProcessingStack italicAngleStack;
public TMP_TextProcessingStack colorStack;
@@ -428,15 +431,14 @@ public struct WordWrapState
///
/// Structure used to store retrieve the name and hashcode of the font and material
///
- public struct TagAttribute
+ internal struct TagAttribute
{
public int startIndex;
public int length;
public int hashCode;
}
-
- public struct RichTextTagAttribute
+ internal struct RichTextTagAttribute
{
public int nameHashCode;
public int valueHashCode;
diff --git a/Scripts/Runtime/TMPro_Private.cs b/Scripts/Runtime/TMPro_Private.cs
index e47fed0..0b344ce 100644
--- a/Scripts/Runtime/TMPro_Private.cs
+++ b/Scripts/Runtime/TMPro_Private.cs
@@ -136,19 +136,6 @@ protected override void Awake()
m_cached_TextElement = new TMP_Character();
m_isFirstAllocation = true;
- // Check to make sure Sub Text Objects are tracked correctly in the event a Prefab is used.
- TMP_SubMesh[] subTextObjects = GetComponentsInChildren();
- if (subTextObjects.Length > 0)
- {
- int subTextObjectCount = subTextObjects.Length;
-
- if (subTextObjectCount + 1 > m_subTextObjects.Length)
- Array.Resize(ref m_subTextObjects, subTextObjectCount + 1);
-
- for (int i = 0; i < subTextObjectCount; i++)
- m_subTextObjects[i + 1] = subTextObjects[i];
- }
-
// Set flags to ensure our text is parsed and redrawn.
m_havePropertiesChanged = true;
@@ -351,7 +338,10 @@ void ON_MATERIAL_PROPERTY_CHANGED(bool isChanged, Material mat)
Debug.LogWarning("No Material was assigned to " + name + ". " + m_fontAsset.material.name + " was assigned.", this);
}
else
+ {
Debug.LogWarning("No Font Asset assigned to " + name + ". Please assign a Font Asset.", this);
+ return;
+ }
}
// if (m_fontAsset.atlasTexture != null && m_fontAsset.atlasTexture.GetInstanceID() != m_renderer.sharedMaterial.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID())
@@ -361,7 +351,7 @@ void ON_MATERIAL_PROPERTY_CHANGED(bool isChanged, Material mat)
// Debug.LogWarning("Font Asset Atlas doesn't match the Atlas in the newly assigned material. Select a matching material or a different font asset.", this);
// }
- if (m_renderer.sharedMaterial != m_sharedMaterial) // || m_renderer.sharedMaterials.Contains(mat))
+ if (m_renderer.sharedMaterial != m_sharedMaterial)
{
//Debug.Log("ON_MATERIAL_PROPERTY_CHANGED Called on Target ID: " + GetInstanceID() + ". Previous Material:" + m_sharedMaterial + " New Material:" + m_renderer.sharedMaterial); // on Object ID:" + GetInstanceID() + ". m_sharedMaterial: " + m_sharedMaterial.name + " m_renderer.sharedMaterial: " + m_renderer.sharedMaterial.name);
m_sharedMaterial = m_renderer.sharedMaterial;
@@ -383,15 +373,14 @@ void ON_FONT_PROPERTY_CHANGED(bool isChanged, Object fontAsset)
{
//Debug.Log("ON_FONT_PROPERTY_CHANGED event received. Target is [" + font.name + "]");
- if (MaterialReference.Contains(m_materialReferences, (TMP_FontAsset)fontAsset))
+ // TODO: Optimize so we don't update all text objects when font asset properties are changed.
+ //if (MaterialReference.Contains(m_materialReferences, (TMP_FontAsset)fontAsset))
{
- //Debug.Log("ON_FONT_PROPERTY_CHANGED event received.");
m_havePropertiesChanged = true;
UpdateMeshPadding();
- SetMaterialDirty();
- SetVerticesDirty();
+ SetAllDirty();
}
}
@@ -521,11 +510,11 @@ protected override void LoadFontAsset()
m_sharedMaterial.SetFloat(ShaderUtilities.ShaderTag_ZTestMode, 4);
// Check if we are using the SDF Surface Shader
- if (m_sharedMaterial.passCount == 1)
+ /*if (m_sharedMaterial.FindPass("ShadowCaster") == -1)
{
m_renderer.receiveShadows = false;
m_renderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
- }
+ }*/
}
@@ -1154,6 +1143,8 @@ internal override int SetArraySizes(UnicodeChar[] unicodeChars)
// Replace missing glyph by the Square (9633) glyph or possibly the Space (32) glyph.
if (character == null)
{
+ DoMissingGlyphCallback(unicode, unicodeChars[i].stringIndex, m_currentFontAsset);
+
// Save the original unicode character
int srcGlyph = unicode;
@@ -1428,7 +1419,6 @@ public override void ComputeMarginSize()
///
protected override void OnDidApplyAnimationProperties()
{
- //Debug.Log("*** OnDidApplyAnimationProperties() ***");
m_havePropertiesChanged = true;
isMaskUpdateRequired = true;
@@ -1475,22 +1465,22 @@ internal override void InternalUpdate()
{
float lossyScaleY = m_rectTransform.lossyScale.y;
- // Ignore very small lossy scale changes as their effect on SDF Scale would not be visually noticeable.
- // Do not update SDF Scale if the text is null or empty
- if (Mathf.Abs(lossyScaleY - m_previousLossyScaleY) > 0.0001f && m_TextProcessingArray[0].unicode != 0)
+ if (m_previousLossyScaleY != 0 && m_TextProcessingArray[0].unicode != 0)
{
float scaleDelta = lossyScaleY / m_previousLossyScaleY;
- UpdateSDFScale(scaleDelta);
-
- m_previousLossyScaleY = lossyScaleY;
+ // Only update SDF Scale when lossy scale has changed by more than 20%
+ if (scaleDelta < 0.8f || scaleDelta > 1.25f)
+ {
+ UpdateSDFScale(scaleDelta);
+ m_previousLossyScaleY = lossyScaleY;
+ }
}
}
// Added to handle legacy animation mode.
if (m_isUsingLegacyAnimationComponent)
{
- //if (m_havePropertiesChanged)
m_havePropertiesChanged = true;
OnPreRenderObject();
}
@@ -1712,6 +1702,7 @@ protected virtual void GenerateTextMesh()
m_startOfLineAscender = 0;
m_startOfLineDescender = 0;
m_lineVisibleCharacterCount = 0;
+ m_lineVisibleSpaceCount = 0;
bool isStartOfNewLine = true;
m_IsDrivenLineSpacing = false;
m_firstOverflowCharacterIndex = -1;
@@ -2017,7 +2008,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.characterInfo[m_characterCount].color = m_htmlColor;
m_textInfo.characterInfo[m_characterCount].underlineColor = m_underlineColor;
m_textInfo.characterInfo[m_characterCount].strikethroughColor = m_strikethroughColor;
- m_textInfo.characterInfo[m_characterCount].highlightState = m_HighlightStateStack.current;
+ m_textInfo.characterInfo[m_characterCount].highlightState = m_HighlightState;
m_textInfo.characterInfo[m_characterCount].style = m_FontStyleInternal;
// Cache glyph metrics
@@ -2030,7 +2021,6 @@ protected virtual void GenerateTextMesh()
#region Handle Kerning
TMP_GlyphValueRecord glyphAdjustments = new TMP_GlyphValueRecord();
float characterSpacingAdjustment = m_characterSpacing;
- m_GlyphHorizontalAdvanceAdjustment = 0;
if (m_enableKerning)
{
k_HandleGPOSFeaturesMarker.Begin();
@@ -2043,7 +2033,7 @@ protected virtual void GenerateTextMesh()
uint nextGlyphIndex = m_textInfo.characterInfo[m_characterCount + 1].textElement.m_GlyphIndex;
uint key = nextGlyphIndex << 16 | baseGlyphIndex;
- if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookupDictionary.TryGetValue(key, out adjustmentPair))
+ if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
{
glyphAdjustments = adjustmentPair.m_FirstAdjustmentRecord.m_GlyphValueRecord;
characterSpacingAdjustment = (adjustmentPair.m_FeatureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
@@ -2055,16 +2045,73 @@ protected virtual void GenerateTextMesh()
uint previousGlyphIndex = m_textInfo.characterInfo[m_characterCount - 1].textElement.m_GlyphIndex;
uint key = baseGlyphIndex << 16 | previousGlyphIndex;
- if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookupDictionary.TryGetValue(key, out adjustmentPair))
+ if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
{
glyphAdjustments += adjustmentPair.m_SecondAdjustmentRecord.m_GlyphValueRecord;
characterSpacingAdjustment = (adjustmentPair.m_FeatureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
}
}
- m_GlyphHorizontalAdvanceAdjustment = glyphAdjustments.xAdvance;
k_HandleGPOSFeaturesMarker.End();
}
+
+ m_textInfo.characterInfo[m_characterCount].adjustedHorizontalAdvance = glyphAdjustments.xAdvance;
+ #endregion
+
+
+ // Handle Diacritical Marks
+ #region Handle Diacritical Marks
+ bool isBaseGlyph = TMP_TextParsingUtilities.IsBaseGlyph((uint)charCode);
+
+ if (isBaseGlyph)
+ m_LastBaseGlyphIndex = m_characterCount;
+
+ if (!isBaseGlyph && /* m_MarkToBaseEnabled && */ m_characterCount > 0)
+ {
+ Glyph baseGlyph = m_textInfo.characterInfo[m_LastBaseGlyphIndex].textElement.glyph;
+ uint baseGlyphIndex = baseGlyph.index;
+ uint markGlyphIndex = m_cached_TextElement.glyphIndex;
+ uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+ // TODO: Add Type to glyph make it easier to identify the glyph type.
+ MarkToBaseAdjustmentRecord glyphAdjustmentRecord;
+
+ if (m_currentFontAsset.fontFeatureTable.m_MarkToBaseAdjustmentRecordLookup.TryGetValue(key, out glyphAdjustmentRecord))
+ {
+ float advanceOffset = (m_textInfo.characterInfo[m_LastBaseGlyphIndex].origin - m_xAdvance) / currentElementScale;
+
+ glyphAdjustments.xPlacement = advanceOffset + glyphAdjustmentRecord.baseGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.markPositionAdjustment.xPositionAdjustment;
+ glyphAdjustments.yPlacement = glyphAdjustmentRecord.baseGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.markPositionAdjustment.yPositionAdjustment;
+
+ characterSpacingAdjustment = 0;
+ }
+ }
+
+ if (!isBaseGlyph && /* m_MarkToMarkEnabled && */ m_characterCount > 0)
+ {
+ MarkToMarkAdjustmentRecord glyphAdjustmentRecord;
+
+ Glyph baseGlyph = m_textInfo.characterInfo[m_characterCount - 1].textElement.glyph;
+ uint baseGlyphIndex = baseGlyph.index;
+ uint markGlyphIndex = m_cached_TextElement.glyphIndex;
+ uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+ if (m_currentFontAsset.fontFeatureTable.m_MarkToMarkAdjustmentRecordLookup.TryGetValue(key, out glyphAdjustmentRecord))
+ {
+ float baseMarkOrigin = (m_textInfo.characterInfo[m_characterCount - 1].origin - m_xAdvance) / currentElementScale;
+ float currentBaseline = baselineOffset - m_lineOffset + m_baselineOffset;
+ float baseMarkBaseline = (m_textInfo.characterInfo[m_characterCount - 1].baseLine - currentBaseline) / currentElementScale;
+
+ glyphAdjustments.xPlacement = baseMarkOrigin + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.xPositionAdjustment;
+ glyphAdjustments.yPlacement = baseMarkBaseline + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.yPositionAdjustment;
+
+ characterSpacingAdjustment = 0;
+ }
+ }
+
+ // Adjust relevant text metrics
+ elementAscentLine += glyphAdjustments.yPlacement;
+ elementDescentLine += glyphAdjustments.yPlacement;
#endregion
@@ -2203,8 +2250,8 @@ protected virtual void GenerateTextMesh()
m_textInfo.characterInfo[m_characterCount].topRight = top_right;
m_textInfo.characterInfo[m_characterCount].bottomRight = bottom_right;
- m_textInfo.characterInfo[m_characterCount].origin = m_xAdvance;
- m_textInfo.characterInfo[m_characterCount].baseLine = baselineOffset - m_lineOffset + m_baselineOffset;
+ m_textInfo.characterInfo[m_characterCount].origin = m_xAdvance + glyphAdjustments.xPlacement * currentElementScale;
+ m_textInfo.characterInfo[m_characterCount].baseLine = (baselineOffset - m_lineOffset + m_baselineOffset) + glyphAdjustments.yPlacement * currentElementScale;
m_textInfo.characterInfo[m_characterCount].aspectRatio = (top_right.x - bottom_left.x) / (top_left.y - bottom_left.y);
@@ -2224,8 +2271,8 @@ protected virtual void GenerateTextMesh()
float adjustedAscender = elementAscender;
float adjustedDescender = elementDescender;
- bool isFirstCharacterOfLine = m_characterCount == m_firstCharacterOfLine;
// Max line ascender and descender in line space
+ bool isFirstCharacterOfLine = m_characterCount == m_firstCharacterOfLine;
if (isFirstCharacterOfLine || isWhiteSpace == false)
{
// Special handling for Superscript and Subscript where we use the unadjusted line ascender and descender
@@ -2284,7 +2331,7 @@ protected virtual void GenerateTextMesh()
// Setup Mesh for visible text elements. ie. not a SPACE / LINEFEED / CARRIAGE RETURN.
#region Handle Visible Characters
- if (charCode == 9 || (isWhiteSpace == false && charCode != 0x200B && charCode != 0xAD && charCode != 0x03) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_textElementType == TMP_TextElementType.Sprite)
+ if (charCode == 9 || ((m_TextWrappingMode == TextWrappingModes.PreserveWhitespace || m_TextWrappingMode == TextWrappingModes.PreserveWhitespaceNoWrap) && isWhiteSpace) || (isWhiteSpace == false && charCode != 0x200B && charCode != 0xAD && charCode != 0x03) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_textElementType == TMP_TextElementType.Sprite)
{
k_HandleVisibleCharacterMarker.Begin();
@@ -2512,12 +2559,12 @@ protected virtual void GenerateTextMesh()
// Handling of Horizontal Bounds
#region Current Line Horizontal Bounds Check
- if (textWidth > widthOfTextArea * (isJustifiedOrFlush ? 1.05f : 1.0f))
+ if (isBaseGlyph && textWidth > widthOfTextArea * (isJustifiedOrFlush ? 1.05f : 1.0f))
{
k_HandleHorizontalLineBreakingMarker.Begin();
// Handle Line Breaking (if still possible)
- if (m_enableWordWrapping && m_characterCount != m_firstCharacterOfLine)
+ if (m_TextWrappingMode != TextWrappingModes.NoWrap && m_TextWrappingMode != TextWrappingModes.PreserveWhitespaceNoWrap && m_characterCount != m_firstCharacterOfLine)
{
// Restore state to previous safe line breaking
i = RestoreWordWrappingState(ref m_SavedWordWrapState);
@@ -2720,7 +2767,7 @@ protected virtual void GenerateTextMesh()
case TextOverflowModes.Overflow:
case TextOverflowModes.ScrollRect:
case TextOverflowModes.Masking:
- InsertNewLine(i, baseScale, currentElementScale, currentEmScale, m_GlyphHorizontalAdvanceAdjustment, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
+ InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
isStartOfNewLine = true;
isFirstWordOfLine = true;
k_HandleVerticalLineBreakingMarker.End();
@@ -2789,7 +2836,7 @@ protected virtual void GenerateTextMesh()
// Add new page
m_isNewPage = true;
- InsertNewLine(i, baseScale, currentElementScale, currentEmScale, m_GlyphHorizontalAdvanceAdjustment, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
+ InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
m_startOfLineAscender = 0;
m_lineOffset = 0;
@@ -2833,7 +2880,7 @@ protected virtual void GenerateTextMesh()
//}
// New line of text does not exceed vertical bounds of text container
- InsertNewLine(i, baseScale, currentElementScale, currentEmScale, m_GlyphHorizontalAdvanceAdjustment, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
+ InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
isStartOfNewLine = true;
isFirstWordOfLine = true;
k_HandleHorizontalLineBreakingMarker.End();
@@ -2966,11 +3013,13 @@ protected virtual void GenerateTextMesh()
// Special handling of characters that are not ignored at the end of a line.
- if (charCode == 9)
+ if (isWhiteSpace)
{
m_textInfo.characterInfo[m_characterCount].isVisible = false;
m_lastVisibleCharacterOfLine = m_characterCount;
- m_textInfo.lineInfo[m_lineNumber].spaceCount += 1;
+ m_lineVisibleSpaceCount = m_textInfo.lineInfo[m_lineNumber].spaceCount += 1;
+ m_textInfo.lineInfo[m_lineNumber].marginLeft = marginLeft;
+ m_textInfo.lineInfo[m_lineNumber].marginRight = marginRight;
m_textInfo.spaceCount += 1;
}
else if (charCode == 0xAD)
@@ -3058,6 +3107,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.spaceCount += 1;
}
+ // Special handling for control characters like
if (charCode == 0xA0)
m_textInfo.lineInfo[m_lineNumber].controlCharacterCount += 1;
@@ -3204,6 +3254,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.lineInfo[m_lineNumber].characterCount = m_textInfo.lineInfo[m_lineNumber].lastCharacterIndex - m_textInfo.lineInfo[m_lineNumber].firstCharacterIndex + 1;
m_textInfo.lineInfo[m_lineNumber].visibleCharacterCount = m_lineVisibleCharacterCount;
+ m_textInfo.lineInfo[m_lineNumber].visibleSpaceCount = m_lineVisibleSpaceCount;
m_textInfo.lineInfo[m_lineNumber].lineExtents.min = new Vector2(m_textInfo.characterInfo[m_firstVisibleCharacterOfLine].bottomLeft.x, lineDescender);
m_textInfo.lineInfo[m_lineNumber].lineExtents.max = new Vector2(m_textInfo.characterInfo[m_lastVisibleCharacterOfLine].topRight.x, lineAscender);
m_textInfo.lineInfo[m_lineNumber].length = m_textInfo.lineInfo[m_lineNumber].lineExtents.max.x - (padding * currentElementScale);
@@ -3212,7 +3263,7 @@ protected virtual void GenerateTextMesh()
if (m_textInfo.lineInfo[m_lineNumber].characterCount == 1)
m_textInfo.lineInfo[m_lineNumber].alignment = m_lineJustification;
- float maxAdvanceOffset = ((m_currentFontAsset.normalSpacingOffset + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale - m_cSpacing) * (1 - m_charWidthAdjDelta);
+ float maxAdvanceOffset = ((m_currentFontAsset.normalSpacingOffset + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_cSpacing) * (1 - m_charWidthAdjDelta);
if (m_textInfo.characterInfo[m_lastVisibleCharacterOfLine].isVisible)
m_textInfo.lineInfo[m_lineNumber].maxAdvance = m_textInfo.characterInfo[m_lastVisibleCharacterOfLine].xAdvance + (m_isRightToLeft ? maxAdvanceOffset : - maxAdvanceOffset);
else
@@ -3236,6 +3287,7 @@ protected virtual void GenerateTextMesh()
m_firstCharacterOfLine = m_characterCount + 1;
m_lineVisibleCharacterCount = 0;
+ m_lineVisibleSpaceCount = 0;
// Check to make sure Array is large enough to hold a new line.
if (m_lineNumber >= m_textInfo.lineInfo.Length)
@@ -3326,7 +3378,7 @@ protected virtual void GenerateTextMesh()
// Save State of Mesh Creation for handling of Word Wrapping
#region Save Word Wrapping State
- if (m_enableWordWrapping || m_overflowMode == TextOverflowModes.Truncate || m_overflowMode == TextOverflowModes.Ellipsis || m_overflowMode == TextOverflowModes.Linked)
+ if ((m_TextWrappingMode != TextWrappingModes.NoWrap && m_TextWrappingMode != TextWrappingModes.PreserveWhitespaceNoWrap) || m_overflowMode == TextOverflowModes.Truncate || m_overflowMode == TextOverflowModes.Ellipsis || m_overflowMode == TextOverflowModes.Linked)
{
k_SaveProcessingStatesMarker.Begin();
@@ -3390,7 +3442,7 @@ protected virtual void GenerateTextMesh()
else if (isFirstWordOfLine)
{
// Special handling for non-breaking space and soft line breaks
- if (isWhiteSpace || (charCode == 0xAD && isSoftHyphenIgnored == false))
+ if (isWhiteSpace && charCode != 0xA0 || (charCode == 0xAD && isSoftHyphenIgnored == false))
SaveWordWrappingState(ref m_SavedSoftLineBreakState, i, m_characterCount);
SaveWordWrappingState(ref m_SavedWordWrapState, i, m_characterCount);
@@ -3401,6 +3453,7 @@ protected virtual void GenerateTextMesh()
}
#endregion Save Word Wrapping State
+ // Consider only saving state on base glyphs
SaveWordWrappingState(ref m_SavedLastValidState, i, m_characterCount);
m_characterCount += 1;
@@ -3504,7 +3557,6 @@ protected virtual void GenerateTextMesh()
}
#endregion
-
// Initialization for Second Pass
Vector3 justificationOffset = Vector3.zero;
Vector3 offset = Vector3.zero;
@@ -3545,6 +3597,7 @@ protected virtual void GenerateTextMesh()
TMP_FontAsset currentFontAsset = characterInfos[i].fontAsset;
char unicode = characterInfos[i].character;
+ bool isWhiteSpace = char.IsWhiteSpace(unicode);
int currentLine = characterInfos[i].lineNumber;
TMP_LineInfo lineInfo = m_textInfo.lineInfo[currentLine];
@@ -3580,8 +3633,8 @@ protected virtual void GenerateTextMesh()
case HorizontalAlignmentOptions.Justified:
case HorizontalAlignmentOptions.Flush:
- // Skip Zero Width Characters
- if (unicode == 0x0A || unicode == 0xAD || unicode == 0x200B || unicode == 0x2060 || unicode == 0x03) break;
+ // Skip Zero Width Characters and spaces outside of the margins.
+ if (i > lineInfo.lastVisibleCharacterIndex || unicode == 0x0A || unicode == 0xAD || unicode == 0x200B || unicode == 0x2060 || unicode == 0x03) break;
char lastCharOfCurrentLine = characterInfos[lineInfo.lastCharacterIndex].character;
@@ -3607,11 +3660,8 @@ protected virtual void GenerateTextMesh()
else
{
float gap = !m_isRightToLeft ? lineInfo.width - lineInfo.maxAdvance : lineInfo.width + lineInfo.maxAdvance;
-
int visibleCount = lineInfo.visibleCharacterCount - 1 + lineInfo.controlCharacterCount;
-
- // Get the number of spaces for each line ignoring the last character if it is not visible (ie. a space or linefeed).
- int spaces = (characterInfos[lineInfo.lastCharacterIndex].isVisible ? lineInfo.spaceCount : lineInfo.spaceCount - 1) - lineInfo.controlCharacterCount;
+ int spaces = lineInfo.visibleSpaceCount - lineInfo.controlCharacterCount;
if (isFirstSeperator) { spaces -= 1; visibleCount += 1; }
@@ -3619,7 +3669,7 @@ protected virtual void GenerateTextMesh()
if (spaces < 1) spaces = 1;
- if (unicode != 0xA0 && (unicode == 9 || char.IsSeparator((char)unicode)))
+ if (unicode != 0xA0 && (unicode == 9 || char.IsSeparator(unicode)))
{
if (!m_isRightToLeft)
justificationOffset += new Vector3(gap * (1 - ratio) / spaces, 0, 0);
@@ -3777,31 +3827,11 @@ protected virtual void GenerateTextMesh()
xScale = characterInfos[i].scale * Mathf.Abs(lossyScale) * (1 - m_charWidthAdjDelta);
if (!characterInfos[i].isUsingAlternateTypeface && (characterInfos[i].style & FontStyles.Bold) == FontStyles.Bold) xScale *= -1;
- //int isBold = (m_textInfo.characterInfo[i].style & FontStyles.Bold) == FontStyles.Bold ? 1 : 0;
- //Vector2 vertexData = new Vector2(isBold, xScale);
- //characterInfos[i].vertex_BL.uv4 = vertexData;
- //characterInfos[i].vertex_TL.uv4 = vertexData;
- //characterInfos[i].vertex_TR.uv4 = vertexData;
- //characterInfos[i].vertex_BR.uv4 = vertexData;
-
- float x0 = characterInfos[i].vertex_BL.uv2.x;
- float y0 = characterInfos[i].vertex_BL.uv2.y;
- float x1 = characterInfos[i].vertex_TR.uv2.x;
- float y1 = characterInfos[i].vertex_TR.uv2.y;
-
- float dx = (int)x0;
- float dy = (int)y0;
-
- x0 = x0 - dx;
- x1 = x1 - dx;
- y0 = y0 - dy;
- y1 = y1 - dy;
-
- // Optimization to avoid having a vector2 returned from the Pack UV function.
- characterInfos[i].vertex_BL.uv2.x = PackUV(x0, y0); characterInfos[i].vertex_BL.uv2.y = xScale;
- characterInfos[i].vertex_TL.uv2.x = PackUV(x0, y1); characterInfos[i].vertex_TL.uv2.y = xScale;
- characterInfos[i].vertex_TR.uv2.x = PackUV(x1, y1); characterInfos[i].vertex_TR.uv2.y = xScale;
- characterInfos[i].vertex_BR.uv2.x = PackUV(x1, y0); characterInfos[i].vertex_BR.uv2.y = xScale;
+ // Set SDF Scale
+ characterInfos[i].vertex_BL.uv.w = xScale;
+ characterInfos[i].vertex_TL.uv.w = xScale;
+ characterInfos[i].vertex_TR.uv.w = xScale;
+ characterInfos[i].vertex_BR.uv.w = xScale;
#endregion
break;
@@ -3837,6 +3867,10 @@ protected virtual void GenerateTextMesh()
}
#endregion
+ if (QualitySettings.activeColorSpace == ColorSpace.Linear)
+ m_ConvertToLinearSpace = true;
+ else
+ m_ConvertToLinearSpace = false;
// Fill Vertex Buffers for the various types of element
if (elementType == TMP_TextElementType.Character)
@@ -3934,7 +3968,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.lineInfo[currentLine].wordCount += 1;
}
}
- else if (isStartOfWord || i == 0 && (!char.IsPunctuation(unicode) || char.IsWhiteSpace(unicode) || unicode == 0x200B || i == m_characterCount - 1))
+ else if (isStartOfWord || i == 0 && (!char.IsPunctuation(unicode) || isWhiteSpace || unicode == 0x200B || i == m_characterCount - 1))
{
if (i > 0 && i < characterInfos.Length - 1 && i < m_characterCount && (unicode == 39 || unicode == 8217) && char.IsLetterOrDigit(characterInfos[i - 1].character) && char.IsLetterOrDigit(characterInfos[i + 1].character))
{
@@ -3978,7 +4012,7 @@ protected virtual void GenerateTextMesh()
isUnderlineVisible = false;
// We only use the scale of visible characters.
- if (!char.IsWhiteSpace(unicode) && unicode != 0x200B)
+ if (!isWhiteSpace && unicode != 0x200B)
{
underlineMaxScale = Mathf.Max(underlineMaxScale, m_textInfo.characterInfo[i].scale);
xScaleMax = Mathf.Max(xScaleMax, Mathf.Abs(xScale));
@@ -4019,7 +4053,7 @@ protected virtual void GenerateTextMesh()
else if (beginUnderline && (i == lineInfo.lastCharacterIndex || i >= lineInfo.lastVisibleCharacterIndex))
{
// Terminate underline at previous visible character if space or carriage return.
- if (char.IsWhiteSpace(unicode) || unicode == 0x200B)
+ if (isWhiteSpace || unicode == 0x200B)
{
int lastVisibleCharacterIndex = lineInfo.lastVisibleCharacterIndex;
underline_end = new Vector3(m_textInfo.characterInfo[lastVisibleCharacterIndex].topRight.x, underlineBaseLine, 0);
@@ -4120,7 +4154,7 @@ protected virtual void GenerateTextMesh()
else if (beginStrikethrough && i == lineInfo.lastCharacterIndex)
{
// Terminate Strikethrough at previous visible character if space or carriage return.
- if (char.IsWhiteSpace(unicode) || unicode == 0x200B)
+ if (isWhiteSpace || unicode == 0x200B)
{
int lastVisibleCharacterIndex = lineInfo.lastVisibleCharacterIndex;
strikethrough_end = new Vector3(m_textInfo.characterInfo[lastVisibleCharacterIndex].topRight.x, m_textInfo.characterInfo[lastVisibleCharacterIndex].baseLine + strikethroughOffset * strikethroughScale, 0);
@@ -4211,10 +4245,13 @@ protected virtual void GenerateTextMesh()
bool isColorTransition = false;
// Handle Highlight color changes
- if (highlightState != currentCharacter.highlightState)
+ if (highlightState != currentState)
{
// Adjust previous highlight section to prevent a gaps between sections.
- highlight_end.x = (highlight_end.x - highlightState.padding.right + currentCharacter.bottomLeft.x) / 2;
+ if (isWhiteSpace)
+ highlight_end.x = (highlight_end.x - highlightState.padding.right + currentCharacter.origin) / 2;
+ else
+ highlight_end.x = (highlight_end.x - highlightState.padding.right + currentCharacter.bottomLeft.x) / 2;
highlight_start.y = Mathf.Min(highlight_start.y, currentCharacter.descender);
highlight_end.y = Mathf.Max(highlight_end.y, currentCharacter.ascender);
@@ -4223,20 +4260,33 @@ protected virtual void GenerateTextMesh()
beginHighlight = true;
highlight_start = new Vector2(highlight_end.x, currentCharacter.descender - currentState.padding.bottom);
- highlight_end = new Vector2(currentCharacter.topRight.x + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
- highlightState = currentCharacter.highlightState;
+ if (isWhiteSpace)
+ highlight_end = new Vector2(currentCharacter.xAdvance + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
+ else
+ highlight_end = new Vector2(currentCharacter.topRight.x + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
+
+ highlightState = currentState;
isColorTransition = true;
}
if (!isColorTransition)
{
- // Use the Min / Max Extents of the Highlight area to handle different character sizes and fonts.
- highlight_start.x = Mathf.Min(highlight_start.x, currentCharacter.bottomLeft.x - highlightState.padding.left);
- highlight_start.y = Mathf.Min(highlight_start.y, currentCharacter.descender - highlightState.padding.bottom);
+ if (isWhiteSpace)
+ {
+ // Use the Min / Max of glyph metrics if white space.
+ highlight_start.x = Mathf.Min(highlight_start.x, currentCharacter.origin - highlightState.padding.left);
+ highlight_end.x = Mathf.Max(highlight_end.x, currentCharacter.xAdvance + highlightState.padding.right);
+ }
+ else
+ {
+ // Use the Min / Max of character bounds
+ highlight_start.x = Mathf.Min(highlight_start.x, currentCharacter.bottomLeft.x - highlightState.padding.left);
+ highlight_end.x = Mathf.Max(highlight_end.x, currentCharacter.topRight.x + highlightState.padding.right);
+ }
- highlight_end.x = Mathf.Max(highlight_end.x, currentCharacter.topRight.x + highlightState.padding.right);
+ highlight_start.y = Mathf.Min(highlight_start.y, currentCharacter.descender - highlightState.padding.bottom);
highlight_end.y = Mathf.Max(highlight_end.y, currentCharacter.ascender + highlightState.padding.top);
}
}
@@ -4302,7 +4352,7 @@ protected virtual void GenerateTextMesh()
// Upload Mesh Data
m_mesh.MarkDynamic();
m_mesh.vertices = m_textInfo.meshInfo[0].vertices;
- m_mesh.uv = m_textInfo.meshInfo[0].uvs0;
+ m_mesh.SetUVs(0, m_textInfo.meshInfo[0].uvs0);
m_mesh.uv2 = m_textInfo.meshInfo[0].uvs2;
//m_mesh.uv4 = m_textInfo.meshInfo[0].uvs4;
m_mesh.colors32 = m_textInfo.meshInfo[0].colors32;
@@ -4323,7 +4373,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.meshInfo[i].SortGeometry(VertexSortingOrder.Reverse);
m_subTextObjects[i].mesh.vertices = m_textInfo.meshInfo[i].vertices;
- m_subTextObjects[i].mesh.uv = m_textInfo.meshInfo[i].uvs0;
+ m_subTextObjects[i].mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
m_subTextObjects[i].mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
//m_subTextObjects[i].mesh.uv4 = m_textInfo.meshInfo[i].uvs4;
m_subTextObjects[i].mesh.colors32 = m_textInfo.meshInfo[i].colors32;
@@ -4541,19 +4591,19 @@ void UpdateSDFScale(float scaleDelta)
{
TMP_MeshInfo meshInfo = m_textInfo.meshInfo[materialIndex];
- for (int i = 0; i < meshInfo.uvs2.Length; i++)
+ for (int i = 0; i < meshInfo.uvs0.Length; i++)
{
- meshInfo.uvs2[i].y *= Mathf.Abs(scaleDelta);
+ meshInfo.uvs0[i].w *= Mathf.Abs(scaleDelta);
}
}
- // Push the updated uv2 scale information to the meshes.
+ // Push the updated uv0 scale information to the meshes.
for (int i = 0; i < m_textInfo.meshInfo.Length; i++)
{
if (i == 0)
- m_mesh.uv2 = m_textInfo.meshInfo[0].uvs2;
+ m_mesh.SetUVs(0, m_textInfo.meshInfo[0].uvs0);
else
- m_subTextObjects[i].mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
+ m_subTextObjects[i].mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
}
}
diff --git a/Scripts/Runtime/TMPro_UGUI_Private.cs b/Scripts/Runtime/TMPro_UGUI_Private.cs
index a9f6f03..3c43bfb 100644
--- a/Scripts/Runtime/TMPro_UGUI_Private.cs
+++ b/Scripts/Runtime/TMPro_UGUI_Private.cs
@@ -127,19 +127,6 @@ protected override void Awake()
m_cached_TextElement = new TMP_Character();
m_isFirstAllocation = true;
- // Check to make sure Sub Text Objects are tracked correctly in the event a Prefab is used.
- TMP_SubMeshUI[] subTextObjects = GetComponentsInChildren();
- if (subTextObjects.Length > 0)
- {
- int subTextObjectCount = subTextObjects.Length;
-
- if (subTextObjectCount + 1 > m_subTextObjects.Length)
- Array.Resize(ref m_subTextObjects, subTextObjectCount + 1);
-
- for (int i = 0; i < subTextObjectCount; i++)
- m_subTextObjects[i + 1] = subTextObjects[i];
- }
-
// Set flags to ensure our text is parsed and redrawn.
m_havePropertiesChanged = true;
@@ -433,7 +420,7 @@ void ON_MATERIAL_PROPERTY_CHANGED(bool isChanged, Material mat)
// Event received when font asset properties are changed in Font Inspector
void ON_FONT_PROPERTY_CHANGED(bool isChanged, Object font)
{
- if (MaterialReference.Contains(m_materialReferences, (TMP_FontAsset) font))
+ //if (MaterialReference.Contains(m_materialReferences, (TMP_FontAsset) font))
{
//Debug.Log("ON_FONT_PROPERTY_CHANGED event received.");
m_havePropertiesChanged = true;
@@ -1228,6 +1215,8 @@ internal override int SetArraySizes(UnicodeChar[] unicodeChars)
// Replace missing glyph by the Square (9633) glyph or possibly the Space (32) glyph.
if (character == null)
{
+ DoMissingGlyphCallback(unicode, unicodeChars[i].stringIndex, m_currentFontAsset);
+
// Save the original unicode character
int srcGlyph = unicode;
@@ -1530,6 +1519,8 @@ protected override void OnCanvasHierarchyChanged()
TMP_UpdateManager.UnRegisterTextObjectForUpdate(this);
else if (m_IsTextObjectScaleStatic == false)
TMP_UpdateManager.RegisterTextObjectForUpdate(this);
+
+ m_havePropertiesChanged = true;
}
@@ -1590,22 +1581,22 @@ internal override void InternalUpdate()
{
float lossyScaleY = m_rectTransform.lossyScale.y;
- // Ignore very small lossy scale changes as their effect on SDF Scale would not be visually noticeable.
- // Do not update SDF Scale if the text is null or empty
- if (Mathf.Abs(lossyScaleY - m_previousLossyScaleY) > 0.0001f && m_TextProcessingArray[0].unicode != 0)
+ if (m_previousLossyScaleY != 0 && m_TextProcessingArray[0].unicode != 0)
{
float scaleDelta = lossyScaleY / m_previousLossyScaleY;
- UpdateSDFScale(scaleDelta);
-
- m_previousLossyScaleY = lossyScaleY;
+ // Only update SDF Scale when lossy scale has changed by more than 20%
+ if (scaleDelta < 0.8f || scaleDelta > 1.25f)
+ {
+ UpdateSDFScale(scaleDelta);
+ m_previousLossyScaleY = lossyScaleY;
+ }
}
}
// Added to handle legacy animation mode.
if (m_isUsingLegacyAnimationComponent)
{
- //if (m_havePropertiesChanged)
m_havePropertiesChanged = true;
OnPreRenderCanvas();
}
@@ -1625,17 +1616,18 @@ void OnPreRenderCanvas()
if (m_canvas == null) { m_canvas = this.canvas; if (m_canvas == null) return; }
- // Check if we have a font asset assigned. Return if we don't because no one likes to see purple squares on screen.
- if (m_fontAsset == null)
- {
- Debug.LogWarning("Please assign a Font Asset to this " + transform.name + " gameobject.", this);
- return;
- }
if (m_havePropertiesChanged || m_isLayoutDirty)
{
//Debug.Log("Properties have changed!"); // Assigned Material is:" + m_sharedMaterial); // New Text is: " + m_text + ".");
+ // Check if we have a font asset assigned. Return if we don't because no one likes to see purple squares on screen.
+ if (m_fontAsset == null)
+ {
+ Debug.LogWarning("Please assign a Font Asset to this " + transform.name + " gameobject.", this);
+ return;
+ }
+
// Update mesh padding if necessary.
if (checkPaddingRequired)
UpdateMeshPadding();
@@ -1820,6 +1812,7 @@ protected virtual void GenerateTextMesh()
m_startOfLineAscender = 0;
m_startOfLineDescender = 0;
m_lineVisibleCharacterCount = 0;
+ m_lineVisibleSpaceCount = 0;
bool isStartOfNewLine = true;
m_IsDrivenLineSpacing = false;
m_firstOverflowCharacterIndex = -1;
@@ -2125,7 +2118,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.characterInfo[m_characterCount].color = m_htmlColor;
m_textInfo.characterInfo[m_characterCount].underlineColor = m_underlineColor;
m_textInfo.characterInfo[m_characterCount].strikethroughColor = m_strikethroughColor;
- m_textInfo.characterInfo[m_characterCount].highlightState = m_HighlightStateStack.current;
+ m_textInfo.characterInfo[m_characterCount].highlightState = m_HighlightState;
m_textInfo.characterInfo[m_characterCount].style = m_FontStyleInternal;
// Cache glyph metrics
@@ -2138,7 +2131,6 @@ protected virtual void GenerateTextMesh()
#region Handle Kerning
TMP_GlyphValueRecord glyphAdjustments = new TMP_GlyphValueRecord();
float characterSpacingAdjustment = m_characterSpacing;
- m_GlyphHorizontalAdvanceAdjustment = 0;
if (m_enableKerning)
{
k_HandleGPOSFeaturesMarker.Begin();
@@ -2151,7 +2143,7 @@ protected virtual void GenerateTextMesh()
uint nextGlyphIndex = m_textInfo.characterInfo[m_characterCount + 1].textElement.m_GlyphIndex;
uint key = nextGlyphIndex << 16 | baseGlyphIndex;
- if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookupDictionary.TryGetValue(key, out adjustmentPair))
+ if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
{
glyphAdjustments = adjustmentPair.m_FirstAdjustmentRecord.m_GlyphValueRecord;
characterSpacingAdjustment = (adjustmentPair.m_FeatureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
@@ -2163,16 +2155,73 @@ protected virtual void GenerateTextMesh()
uint previousGlyphIndex = m_textInfo.characterInfo[m_characterCount - 1].textElement.m_GlyphIndex;
uint key = baseGlyphIndex << 16 | previousGlyphIndex;
- if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookupDictionary.TryGetValue(key, out adjustmentPair))
+ if (m_currentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
{
glyphAdjustments += adjustmentPair.m_SecondAdjustmentRecord.m_GlyphValueRecord;
characterSpacingAdjustment = (adjustmentPair.m_FeatureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
}
}
- m_GlyphHorizontalAdvanceAdjustment = glyphAdjustments.xAdvance;
k_HandleGPOSFeaturesMarker.End();
}
+
+ m_textInfo.characterInfo[m_characterCount].adjustedHorizontalAdvance = glyphAdjustments.xAdvance;
+ #endregion
+
+
+ // Handle Diacritical Marks
+ #region Handle Diacritical Marks
+ bool isBaseGlyph = TMP_TextParsingUtilities.IsBaseGlyph((uint)charCode);
+
+ if (isBaseGlyph)
+ m_LastBaseGlyphIndex = m_characterCount;
+
+ if (!isBaseGlyph && /* m_MarkToBaseEnabled && */ m_characterCount > 0)
+ {
+ Glyph baseGlyph = m_textInfo.characterInfo[m_LastBaseGlyphIndex].textElement.glyph;
+ uint baseGlyphIndex = baseGlyph.index;
+ uint markGlyphIndex = m_cached_TextElement.glyphIndex;
+ uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+ // TODO: Add Type to glyph make it easier to identify the glyph type.
+ MarkToBaseAdjustmentRecord glyphAdjustmentRecord;
+
+ if (m_currentFontAsset.fontFeatureTable.m_MarkToBaseAdjustmentRecordLookup.TryGetValue(key, out glyphAdjustmentRecord))
+ {
+ float advanceOffset = (m_textInfo.characterInfo[m_LastBaseGlyphIndex].origin - m_xAdvance) / currentElementScale;
+
+ glyphAdjustments.xPlacement = advanceOffset + glyphAdjustmentRecord.baseGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.markPositionAdjustment.xPositionAdjustment;
+ glyphAdjustments.yPlacement = glyphAdjustmentRecord.baseGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.markPositionAdjustment.yPositionAdjustment;
+
+ characterSpacingAdjustment = 0;
+ }
+ }
+
+ if (!isBaseGlyph && /* m_MarkToMarkEnabled && */ m_characterCount > 0)
+ {
+ MarkToMarkAdjustmentRecord glyphAdjustmentRecord;
+
+ Glyph baseGlyph = m_textInfo.characterInfo[m_characterCount - 1].textElement.glyph;
+ uint baseGlyphIndex = baseGlyph.index;
+ uint markGlyphIndex = m_cached_TextElement.glyphIndex;
+ uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+ if (m_currentFontAsset.fontFeatureTable.m_MarkToMarkAdjustmentRecordLookup.TryGetValue(key, out glyphAdjustmentRecord))
+ {
+ float baseMarkOrigin = (m_textInfo.characterInfo[m_characterCount - 1].origin - m_xAdvance) / currentElementScale;
+ float currentBaseline = baselineOffset - m_lineOffset + m_baselineOffset;
+ float baseMarkBaseline = (m_textInfo.characterInfo[m_characterCount - 1].baseLine - currentBaseline) / currentElementScale;
+
+ glyphAdjustments.xPlacement = baseMarkOrigin + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.xPositionAdjustment;
+ glyphAdjustments.yPlacement = baseMarkBaseline + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.yPositionAdjustment;
+
+ characterSpacingAdjustment = 0;
+ }
+ }
+
+ // Adjust relevant text metrics
+ elementAscentLine += glyphAdjustments.yPlacement;
+ elementDescentLine += glyphAdjustments.yPlacement;
#endregion
@@ -2311,8 +2360,8 @@ protected virtual void GenerateTextMesh()
m_textInfo.characterInfo[m_characterCount].topRight = top_right;
m_textInfo.characterInfo[m_characterCount].bottomRight = bottom_right;
- m_textInfo.characterInfo[m_characterCount].origin = m_xAdvance;
- m_textInfo.characterInfo[m_characterCount].baseLine = baselineOffset - m_lineOffset + m_baselineOffset;
+ m_textInfo.characterInfo[m_characterCount].origin = m_xAdvance + glyphAdjustments.xPlacement * currentElementScale;
+ m_textInfo.characterInfo[m_characterCount].baseLine = (baselineOffset - m_lineOffset + m_baselineOffset) + glyphAdjustments.yPlacement * currentElementScale;
m_textInfo.characterInfo[m_characterCount].aspectRatio = (top_right.x - bottom_left.x) / (top_left.y - bottom_left.y);
@@ -2332,8 +2381,8 @@ protected virtual void GenerateTextMesh()
float adjustedAscender = elementAscender;
float adjustedDescender = elementDescender;
- bool isFirstCharacterOfLine = m_characterCount == m_firstCharacterOfLine;
// Max line ascender and descender in line space
+ bool isFirstCharacterOfLine = m_characterCount == m_firstCharacterOfLine;
if (isFirstCharacterOfLine || isWhiteSpace == false)
{
// Special handling for Superscript and Subscript where we use the unadjusted line ascender and descender
@@ -2392,7 +2441,7 @@ protected virtual void GenerateTextMesh()
// Setup Mesh for visible text elements. ie. not a SPACE / LINEFEED / CARRIAGE RETURN.
#region Handle Visible Characters
- if (charCode == 9 || (isWhiteSpace == false && charCode != 0x200B && charCode != 0xAD && charCode != 0x03) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_textElementType == TMP_TextElementType.Sprite)
+ if (charCode == 9 || ((m_TextWrappingMode == TextWrappingModes.PreserveWhitespace || m_TextWrappingMode == TextWrappingModes.PreserveWhitespaceNoWrap) && isWhiteSpace) || (isWhiteSpace == false && charCode != 0x200B && charCode != 0xAD && charCode != 0x03) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_textElementType == TMP_TextElementType.Sprite)
{
k_HandleVisibleCharacterMarker.Begin();
@@ -2620,12 +2669,12 @@ protected virtual void GenerateTextMesh()
// Handling of Horizontal Bounds
#region Current Line Horizontal Bounds Check
- if (textWidth > widthOfTextArea * (isJustifiedOrFlush ? 1.05f : 1.0f))
+ if (isBaseGlyph && textWidth > widthOfTextArea * (isJustifiedOrFlush ? 1.05f : 1.0f))
{
k_HandleHorizontalLineBreakingMarker.Begin();
// Handle Line Breaking (if still possible)
- if (m_enableWordWrapping && m_characterCount != m_firstCharacterOfLine)
+ if (m_TextWrappingMode != TextWrappingModes.NoWrap && m_TextWrappingMode != TextWrappingModes.PreserveWhitespaceNoWrap && m_characterCount != m_firstCharacterOfLine)
{
// Restore state to previous safe line breaking
i = RestoreWordWrappingState(ref m_SavedWordWrapState);
@@ -2828,7 +2877,7 @@ protected virtual void GenerateTextMesh()
case TextOverflowModes.Overflow:
case TextOverflowModes.ScrollRect:
case TextOverflowModes.Masking:
- InsertNewLine(i, baseScale, currentElementScale, currentEmScale, m_GlyphHorizontalAdvanceAdjustment, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
+ InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
isStartOfNewLine = true;
isFirstWordOfLine = true;
k_HandleVerticalLineBreakingMarker.End();
@@ -2897,7 +2946,7 @@ protected virtual void GenerateTextMesh()
// Add new page
m_isNewPage = true;
- InsertNewLine(i, baseScale, currentElementScale, currentEmScale, m_GlyphHorizontalAdvanceAdjustment, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
+ InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
m_startOfLineAscender = 0;
m_lineOffset = 0;
@@ -2941,7 +2990,7 @@ protected virtual void GenerateTextMesh()
//}
// New line of text does not exceed vertical bounds of text container
- InsertNewLine(i, baseScale, currentElementScale, currentEmScale, m_GlyphHorizontalAdvanceAdjustment, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
+ InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender);
isStartOfNewLine = true;
isFirstWordOfLine = true;
k_HandleHorizontalLineBreakingMarker.End();
@@ -3074,11 +3123,13 @@ protected virtual void GenerateTextMesh()
// Special handling of characters that are not ignored at the end of a line.
- if (charCode == 9)
+ if (isWhiteSpace)
{
m_textInfo.characterInfo[m_characterCount].isVisible = false;
m_lastVisibleCharacterOfLine = m_characterCount;
- m_textInfo.lineInfo[m_lineNumber].spaceCount += 1;
+ m_lineVisibleSpaceCount = m_textInfo.lineInfo[m_lineNumber].spaceCount += 1;
+ m_textInfo.lineInfo[m_lineNumber].marginLeft = marginLeft;
+ m_textInfo.lineInfo[m_lineNumber].marginRight = marginRight;
m_textInfo.spaceCount += 1;
}
else if (charCode == 0xAD)
@@ -3166,6 +3217,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.spaceCount += 1;
}
+ // Special handling for control characters like
if (charCode == 0xA0)
m_textInfo.lineInfo[m_lineNumber].controlCharacterCount += 1;
@@ -3312,6 +3364,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.lineInfo[m_lineNumber].characterCount = m_textInfo.lineInfo[m_lineNumber].lastCharacterIndex - m_textInfo.lineInfo[m_lineNumber].firstCharacterIndex + 1;
m_textInfo.lineInfo[m_lineNumber].visibleCharacterCount = m_lineVisibleCharacterCount;
+ m_textInfo.lineInfo[m_lineNumber].visibleSpaceCount = m_lineVisibleSpaceCount;
m_textInfo.lineInfo[m_lineNumber].lineExtents.min = new Vector2(m_textInfo.characterInfo[m_firstVisibleCharacterOfLine].bottomLeft.x, lineDescender);
m_textInfo.lineInfo[m_lineNumber].lineExtents.max = new Vector2(m_textInfo.characterInfo[m_lastVisibleCharacterOfLine].topRight.x, lineAscender);
m_textInfo.lineInfo[m_lineNumber].length = m_textInfo.lineInfo[m_lineNumber].lineExtents.max.x - (padding * currentElementScale);
@@ -3320,7 +3373,7 @@ protected virtual void GenerateTextMesh()
if (m_textInfo.lineInfo[m_lineNumber].characterCount == 1)
m_textInfo.lineInfo[m_lineNumber].alignment = m_lineJustification;
- float maxAdvanceOffset = ((m_currentFontAsset.normalSpacingOffset + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale - m_cSpacing) * (1 - m_charWidthAdjDelta);
+ float maxAdvanceOffset = ((m_currentFontAsset.normalSpacingOffset + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_cSpacing) * (1 - m_charWidthAdjDelta);
if (m_textInfo.characterInfo[m_lastVisibleCharacterOfLine].isVisible)
m_textInfo.lineInfo[m_lineNumber].maxAdvance = m_textInfo.characterInfo[m_lastVisibleCharacterOfLine].xAdvance + (m_isRightToLeft ? maxAdvanceOffset : - maxAdvanceOffset);
else
@@ -3344,6 +3397,7 @@ protected virtual void GenerateTextMesh()
m_firstCharacterOfLine = m_characterCount + 1;
m_lineVisibleCharacterCount = 0;
+ m_lineVisibleSpaceCount = 0;
// Check to make sure Array is large enough to hold a new line.
if (m_lineNumber >= m_textInfo.lineInfo.Length)
@@ -3434,7 +3488,7 @@ protected virtual void GenerateTextMesh()
// Save State of Mesh Creation for handling of Word Wrapping
#region Save Word Wrapping State
- if (m_enableWordWrapping || m_overflowMode == TextOverflowModes.Truncate || m_overflowMode == TextOverflowModes.Ellipsis || m_overflowMode == TextOverflowModes.Linked)
+ if ((m_TextWrappingMode != TextWrappingModes.NoWrap && m_TextWrappingMode != TextWrappingModes.PreserveWhitespaceNoWrap) || m_overflowMode == TextOverflowModes.Truncate || m_overflowMode == TextOverflowModes.Ellipsis || m_overflowMode == TextOverflowModes.Linked)
{
k_SaveProcessingStatesMarker.Begin();
@@ -3498,7 +3552,7 @@ protected virtual void GenerateTextMesh()
else if (isFirstWordOfLine)
{
// Special handling for non-breaking space and soft line breaks
- if (isWhiteSpace || (charCode == 0xAD && isSoftHyphenIgnored == false))
+ if (isWhiteSpace && charCode != 0xA0 || (charCode == 0xAD && isSoftHyphenIgnored == false))
SaveWordWrappingState(ref m_SavedSoftLineBreakState, i, m_characterCount);
SaveWordWrappingState(ref m_SavedWordWrapState, i, m_characterCount);
@@ -3509,6 +3563,7 @@ protected virtual void GenerateTextMesh()
}
#endregion Save Word Wrapping State
+ // Consider only saving state on base glyphs
SaveWordWrappingState(ref m_SavedLastValidState, i, m_characterCount);
m_characterCount += 1;
@@ -3612,7 +3667,6 @@ protected virtual void GenerateTextMesh()
}
#endregion
-
// Initialization for Second Pass
Vector3 justificationOffset = Vector3.zero;
Vector3 offset = Vector3.zero;
@@ -3657,6 +3711,7 @@ protected virtual void GenerateTextMesh()
TMP_FontAsset currentFontAsset = characterInfos[i].fontAsset;
char unicode = characterInfos[i].character;
+ bool isWhiteSpace = char.IsWhiteSpace(unicode);
int currentLine = characterInfos[i].lineNumber;
TMP_LineInfo lineInfo = m_textInfo.lineInfo[currentLine];
@@ -3692,8 +3747,8 @@ protected virtual void GenerateTextMesh()
case HorizontalAlignmentOptions.Justified:
case HorizontalAlignmentOptions.Flush:
- // Skip Zero Width Characters
- if (unicode == 0x0A || unicode == 0xAD || unicode == 0x200B || unicode == 0x2060 || unicode == 0x03) break;
+ // Skip Zero Width Characters and spaces outside of the margins.
+ if (i > lineInfo.lastVisibleCharacterIndex || unicode == 0x0A || unicode == 0xAD || unicode == 0x200B || unicode == 0x2060 || unicode == 0x03) break;
char lastCharOfCurrentLine = characterInfos[lineInfo.lastCharacterIndex].character;
@@ -3719,11 +3774,8 @@ protected virtual void GenerateTextMesh()
else
{
float gap = !m_isRightToLeft ? lineInfo.width - lineInfo.maxAdvance : lineInfo.width + lineInfo.maxAdvance;
-
int visibleCount = lineInfo.visibleCharacterCount - 1 + lineInfo.controlCharacterCount;
-
- // Get the number of spaces for each line ignoring the last character if it is not visible (ie. a space or linefeed).
- int spaces = (characterInfos[lineInfo.lastCharacterIndex].isVisible ? lineInfo.spaceCount : lineInfo.spaceCount - 1) - lineInfo.controlCharacterCount;
+ int spaces = lineInfo.visibleSpaceCount - lineInfo.controlCharacterCount;
if (isFirstSeperator) { spaces -= 1; visibleCount += 1; }
@@ -3731,7 +3783,7 @@ protected virtual void GenerateTextMesh()
if (spaces < 1) spaces = 1;
- if (unicode != 0xA0 && (unicode == 9 || char.IsSeparator((char)unicode)))
+ if (unicode != 0xA0 && (unicode == 9 || char.IsSeparator(unicode)))
{
if (!m_isRightToLeft)
justificationOffset += new Vector3(gap * (1 - ratio) / spaces, 0, 0);
@@ -3902,31 +3954,11 @@ protected virtual void GenerateTextMesh()
break;
}
- // isBold is encoded in the X value and SDF Scale in Y.
- //Vector2 vertexData = new Vector2((characterInfos[i].style & FontStyles.Bold) == FontStyles.Bold ? 1 : 0, xScale);
- //characterInfos[i].vertex_BL.uv2 = vertexData;
- //characterInfos[i].vertex_TL.uv2 = vertexData;
- //characterInfos[i].vertex_TR.uv2 = vertexData;
- //characterInfos[i].vertex_BR.uv2 = vertexData;
-
- float x0 = characterInfos[i].vertex_BL.uv2.x;
- float y0 = characterInfos[i].vertex_BL.uv2.y;
- float x1 = characterInfos[i].vertex_TR.uv2.x;
- float y1 = characterInfos[i].vertex_TR.uv2.y;
-
- float dx = (int)x0;
- float dy = (int)y0;
-
- x0 = x0 - dx;
- x1 = x1 - dx;
- y0 = y0 - dy;
- y1 = y1 - dy;
-
- // Optimization to avoid having a vector2 returned from the Pack UV function.
- characterInfos[i].vertex_BL.uv2.x = PackUV(x0, y0); characterInfos[i].vertex_BL.uv2.y = xScale;
- characterInfos[i].vertex_TL.uv2.x = PackUV(x0, y1); characterInfos[i].vertex_TL.uv2.y = xScale;
- characterInfos[i].vertex_TR.uv2.x = PackUV(x1, y1); characterInfos[i].vertex_TR.uv2.y = xScale;
- characterInfos[i].vertex_BR.uv2.x = PackUV(x1, y0); characterInfos[i].vertex_BR.uv2.y = xScale;
+ // Set SDF Scale
+ characterInfos[i].vertex_BL.uv.w = xScale;
+ characterInfos[i].vertex_TL.uv.w = xScale;
+ characterInfos[i].vertex_TR.uv.w = xScale;
+ characterInfos[i].vertex_BR.uv.w = xScale;
#endregion
break;
@@ -4059,7 +4091,7 @@ protected virtual void GenerateTextMesh()
m_textInfo.lineInfo[currentLine].wordCount += 1;
}
}
- else if (isStartOfWord || i == 0 && (!char.IsPunctuation(unicode) || char.IsWhiteSpace(unicode) || unicode == 0x200B || i == m_characterCount - 1))
+ else if (isStartOfWord || i == 0 && (!char.IsPunctuation(unicode) || isWhiteSpace || unicode == 0x200B || i == m_characterCount - 1))
{
if (i > 0 && i < characterInfos.Length - 1 && i < m_characterCount && (unicode == 39 || unicode == 8217) && char.IsLetterOrDigit(characterInfos[i - 1].character) && char.IsLetterOrDigit(characterInfos[i + 1].character))
{
@@ -4103,7 +4135,7 @@ protected virtual void GenerateTextMesh()
isUnderlineVisible = false;
// We only use the scale of visible characters.
- if (!char.IsWhiteSpace(unicode) && unicode != 0x200B)
+ if (!isWhiteSpace && unicode != 0x200B)
{
underlineMaxScale = Mathf.Max(underlineMaxScale, m_textInfo.characterInfo[i].scale);
xScaleMax = Mathf.Max(xScaleMax, Mathf.Abs(xScale));
@@ -4144,7 +4176,7 @@ protected virtual void GenerateTextMesh()
else if (beginUnderline && (i == lineInfo.lastCharacterIndex || i >= lineInfo.lastVisibleCharacterIndex))
{
// Terminate underline at previous visible character if space or carriage return.
- if (char.IsWhiteSpace(unicode) || unicode == 0x200B)
+ if (isWhiteSpace || unicode == 0x200B)
{
int lastVisibleCharacterIndex = lineInfo.lastVisibleCharacterIndex;
underline_end = new Vector3(m_textInfo.characterInfo[lastVisibleCharacterIndex].topRight.x, underlineBaseLine, 0);
@@ -4245,7 +4277,7 @@ protected virtual void GenerateTextMesh()
else if (beginStrikethrough && i == lineInfo.lastCharacterIndex)
{
// Terminate Strikethrough at previous visible character if space or carriage return.
- if (char.IsWhiteSpace(unicode) || unicode == 0x200B)
+ if (isWhiteSpace || unicode == 0x200B)
{
int lastVisibleCharacterIndex = lineInfo.lastVisibleCharacterIndex;
strikethrough_end = new Vector3(m_textInfo.characterInfo[lastVisibleCharacterIndex].topRight.x, m_textInfo.characterInfo[lastVisibleCharacterIndex].baseLine + strikethroughOffset * strikethroughScale, 0);
@@ -4336,10 +4368,13 @@ protected virtual void GenerateTextMesh()
bool isColorTransition = false;
// Handle Highlight color changes
- if (highlightState != currentCharacter.highlightState)
+ if (highlightState != currentState)
{
// Adjust previous highlight section to prevent a gaps between sections.
- highlight_end.x = (highlight_end.x - highlightState.padding.right + currentCharacter.bottomLeft.x) / 2;
+ if (isWhiteSpace)
+ highlight_end.x = (highlight_end.x - highlightState.padding.right + currentCharacter.origin) / 2;
+ else
+ highlight_end.x = (highlight_end.x - highlightState.padding.right + currentCharacter.bottomLeft.x) / 2;
highlight_start.y = Mathf.Min(highlight_start.y, currentCharacter.descender);
highlight_end.y = Mathf.Max(highlight_end.y, currentCharacter.ascender);
@@ -4348,20 +4383,33 @@ protected virtual void GenerateTextMesh()
beginHighlight = true;
highlight_start = new Vector2(highlight_end.x, currentCharacter.descender - currentState.padding.bottom);
- highlight_end = new Vector2(currentCharacter.topRight.x + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
- highlightState = currentCharacter.highlightState;
+ if (isWhiteSpace)
+ highlight_end = new Vector2(currentCharacter.xAdvance + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
+ else
+ highlight_end = new Vector2(currentCharacter.topRight.x + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
+
+ highlightState = currentState;
isColorTransition = true;
}
if (!isColorTransition)
{
- // Use the Min / Max Extents of the Highlight area to handle different character sizes and fonts.
- highlight_start.x = Mathf.Min(highlight_start.x, currentCharacter.bottomLeft.x - highlightState.padding.left);
- highlight_start.y = Mathf.Min(highlight_start.y, currentCharacter.descender - highlightState.padding.bottom);
+ if (isWhiteSpace)
+ {
+ // Use the Min / Max of glyph metrics if white space.
+ highlight_start.x = Mathf.Min(highlight_start.x, currentCharacter.origin - highlightState.padding.left);
+ highlight_end.x = Mathf.Max(highlight_end.x, currentCharacter.xAdvance + highlightState.padding.right);
+ }
+ else
+ {
+ // Use the Min / Max of character bounds
+ highlight_start.x = Mathf.Min(highlight_start.x, currentCharacter.bottomLeft.x - highlightState.padding.left);
+ highlight_end.x = Mathf.Max(highlight_end.x, currentCharacter.topRight.x + highlightState.padding.right);
+ }
- highlight_end.x = Mathf.Max(highlight_end.x, currentCharacter.topRight.x + highlightState.padding.right);
+ highlight_start.y = Mathf.Min(highlight_start.y, currentCharacter.descender - highlightState.padding.bottom);
highlight_end.y = Mathf.Max(highlight_end.y, currentCharacter.ascender + highlightState.padding.top);
}
}
@@ -4432,7 +4480,7 @@ protected virtual void GenerateTextMesh()
// Upload Mesh Data
m_mesh.MarkDynamic();
m_mesh.vertices = m_textInfo.meshInfo[0].vertices;
- m_mesh.uv = m_textInfo.meshInfo[0].uvs0;
+ m_mesh.SetUVs(0, m_textInfo.meshInfo[0].uvs0);
m_mesh.uv2 = m_textInfo.meshInfo[0].uvs2;
//m_mesh.uv4 = m_textInfo.meshInfo[0].uvs4;
m_mesh.colors32 = m_textInfo.meshInfo[0].colors32;
@@ -4461,7 +4509,7 @@ protected virtual void GenerateTextMesh()
//m_subTextObjects[i].mesh.MarkDynamic();
m_subTextObjects[i].mesh.vertices = m_textInfo.meshInfo[i].vertices;
- m_subTextObjects[i].mesh.uv = m_textInfo.meshInfo[i].uvs0;
+ m_subTextObjects[i].mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
m_subTextObjects[i].mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
//m_subTextObjects[i].mesh.uv4 = m_textInfo.meshInfo[i].uvs4;
m_subTextObjects[i].mesh.colors32 = m_textInfo.meshInfo[i].colors32;
@@ -4481,6 +4529,10 @@ protected virtual void GenerateTextMesh()
}
}
+ // Update culling if it has to be delayed due to text layout being dirty.
+ if (m_ShouldUpdateCulling)
+ UpdateCulling();
+
// Event indicating the text has been regenerated.
TMPro_EventManager.ON_TEXT_CHANGED(this);
@@ -4651,23 +4703,23 @@ void UpdateSDFScale(float scaleDelta)
{
TMP_MeshInfo meshInfo = m_textInfo.meshInfo[materialIndex];
- for (int i = 0; i < meshInfo.uvs2.Length; i++)
+ for (int i = 0; i < meshInfo.uvs0.Length; i++)
{
- meshInfo.uvs2[i].y *= Mathf.Abs(scaleDelta);
+ meshInfo.uvs0[i].w *= Mathf.Abs(scaleDelta);
}
}
- // Push the updated uv2 scale information to the meshes.
+ // Push the updated uv0 scale information to the meshes.
for (int i = 0; i < m_textInfo.materialCount; i++)
{
if (i == 0)
{
- m_mesh.uv2 = m_textInfo.meshInfo[0].uvs2;
+ m_mesh.SetUVs(0, m_textInfo.meshInfo[0].uvs0);
m_canvasRenderer.SetMesh(m_mesh);
}
else
{
- m_subTextObjects[i].mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
+ m_subTextObjects[i].mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
m_subTextObjects[i].canvasRenderer.SetMesh(m_subTextObjects[i].mesh);
}
}
diff --git a/Scripts/Runtime/TextMeshPro.cs b/Scripts/Runtime/TextMeshPro.cs
index 4ab5d8a..f173989 100644
--- a/Scripts/Runtime/TextMeshPro.cs
+++ b/Scripts/Runtime/TextMeshPro.cs
@@ -9,7 +9,7 @@ namespace TMPro
[RequireComponent(typeof(MeshRenderer))]
[AddComponentMenu("Mesh/TextMeshPro - Text")]
[ExecuteAlways]
- [HelpURL("https://docs.unity3d.com/Packages/com.unity.textmeshpro@3.0")]
+ [HelpURL("https://docs.unity3d.com/Packages/com.unity.textmeshpro@3.2")]
public partial class TextMeshPro : TMP_Text, ILayoutElement
{
// Public Properties and Serializable Properties
@@ -416,7 +416,7 @@ public override void UpdateVertexData(TMP_VertexDataUpdateFlags flags)
mesh.vertices = m_textInfo.meshInfo[i].vertices;
if ((flags & TMP_VertexDataUpdateFlags.Uv0) == TMP_VertexDataUpdateFlags.Uv0)
- mesh.uv = m_textInfo.meshInfo[i].uvs0;
+ mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
if ((flags & TMP_VertexDataUpdateFlags.Uv2) == TMP_VertexDataUpdateFlags.Uv2)
mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
@@ -456,7 +456,7 @@ public override void UpdateVertexData()
//mesh.MarkDynamic();
mesh.vertices = m_textInfo.meshInfo[i].vertices;
- mesh.uv = m_textInfo.meshInfo[i].uvs0;
+ mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
//mesh.uv4 = m_textInfo.meshInfo[i].uvs4;
mesh.colors32 = m_textInfo.meshInfo[i].colors32;
diff --git a/Scripts/Runtime/TextMeshProUGUI.cs b/Scripts/Runtime/TextMeshProUGUI.cs
index d284006..9c530ac 100644
--- a/Scripts/Runtime/TextMeshProUGUI.cs
+++ b/Scripts/Runtime/TextMeshProUGUI.cs
@@ -14,7 +14,7 @@ namespace TMPro
[RequireComponent(typeof(CanvasRenderer))]
[AddComponentMenu("UI/TextMeshPro - Text (UI)", 11)]
[ExecuteAlways]
- [HelpURL("https://docs.unity3d.com/Packages/com.unity.textmeshpro@3.0")]
+ [HelpURL("https://docs.unity3d.com/Packages/com.unity.textmeshpro@3.2")]
public partial class TextMeshProUGUI : TMP_Text, ILayoutElement
{
///
@@ -364,10 +364,12 @@ public override void RecalculateClipping()
///
public override void Cull(Rect clipRect, bool validRect)
{
+ m_ShouldUpdateCulling = false;
+
// Delay culling check in the event the text layout is dirty and geometry has to be updated.
if (m_isLayoutDirty)
{
- TMP_UpdateManager.RegisterTextElementForCullingUpdate(this);
+ m_ShouldUpdateCulling = true;
m_ClipRect = clipRect;
m_ValidRect = validRect;
return;
@@ -377,8 +379,8 @@ public override void Cull(Rect clipRect, bool validRect)
Rect rect = GetCanvasSpaceClippingRect();
// No point culling if geometry bounds have no width or height.
- if (rect.width == 0 || rect.height == 0)
- return;
+ //if (rect.width == 0 || rect.height == 0)
+ // return;
var cull = !validRect || !clipRect.Overlaps(rect, true);
if (m_canvasRenderer.cull != cull)
@@ -395,6 +397,7 @@ public override void Cull(Rect clipRect, bool validRect)
}
}
+ private bool m_ShouldUpdateCulling;
private Rect m_ClipRect;
private bool m_ValidRect;
@@ -407,8 +410,8 @@ internal override void UpdateCulling()
Rect rect = GetCanvasSpaceClippingRect();
// No point culling if geometry bounds have no width or height.
- if (rect.width == 0 || rect.height == 0)
- return;
+ //if (rect.width == 0 || rect.height == 0)
+ // return;
var cull = !m_ValidRect || !m_ClipRect.Overlaps(rect, true);
if (m_canvasRenderer.cull != cull)
@@ -423,6 +426,8 @@ internal override void UpdateCulling()
m_subTextObjects[i].canvasRenderer.cull = cull;
}
}
+
+ m_ShouldUpdateCulling = false;
}
@@ -637,7 +642,7 @@ public override void UpdateVertexData(TMP_VertexDataUpdateFlags flags)
mesh.vertices = m_textInfo.meshInfo[i].vertices;
if ((flags & TMP_VertexDataUpdateFlags.Uv0) == TMP_VertexDataUpdateFlags.Uv0)
- mesh.uv = m_textInfo.meshInfo[i].uvs0;
+ mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
if ((flags & TMP_VertexDataUpdateFlags.Uv2) == TMP_VertexDataUpdateFlags.Uv2)
mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
@@ -681,7 +686,7 @@ public override void UpdateVertexData()
//mesh.MarkDynamic();
mesh.vertices = m_textInfo.meshInfo[i].vertices;
- mesh.uv = m_textInfo.meshInfo[i].uvs0;
+ mesh.SetUVs(0, m_textInfo.meshInfo[i].uvs0);
mesh.uv2 = m_textInfo.meshInfo[i].uvs2;
//mesh.uv4 = m_textInfo.meshInfo[i].uvs4;
mesh.colors32 = m_textInfo.meshInfo[i].colors32;
diff --git a/Scripts/Runtime/Unity.TextMeshPro.asmdef b/Scripts/Runtime/Unity.TextMeshPro.asmdef
index 2abb4e4..7b3ba6c 100644
--- a/Scripts/Runtime/Unity.TextMeshPro.asmdef
+++ b/Scripts/Runtime/Unity.TextMeshPro.asmdef
@@ -1,12 +1,14 @@
{
"name": "Unity.TextMeshPro",
+ "rootNamespace": "",
"references": [],
- "optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
- "allowUnsafeCode": false,
+ "allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
- "defineConstraints": []
+ "defineConstraints": [],
+ "versionDefines": [],
+ "noEngineReferences": false
}
\ No newline at end of file
diff --git a/Tests/Editor/TMP_EditorTests.cs b/Tests/Editor/TMP_EditorTests.cs
index a31a640..d22b305 100644
--- a/Tests/Editor/TMP_EditorTests.cs
+++ b/Tests/Editor/TMP_EditorTests.cs
@@ -1,9 +1,7 @@
using UnityEngine;
using UnityEditor;
-using UnityEngine.TestTools;
using NUnit.Framework;
using System.IO;
-using System.Collections;
namespace TMPro
@@ -19,7 +17,7 @@ class TMP_EditorTests
// Characters: 104 Spaces: 14 Words: 15 Lines:
private const string m_TextBlock_01 = "Unity 2017 introduces new features that help teams of artists and developers build experiences together.";
- // Characters: 1500 Spaces: 228 Words: 241
+ // Characters: 1500 Spaces: 228 Words: 241
private const string m_TextBlock_02 = "The European languages are members of the same family. Their separate existence is a myth. For science, music, sport, etc, Europe uses the same vocabulary. The languages only differ in their grammar, their pronunciation and their most common words." +
"Everyone realizes why a new common language would be desirable: one could refuse to pay expensive translators.To achieve this, it would be necessary to have uniform grammar, pronunciation and more common words.If several languages coalesce, the grammar of the resulting language is more simple and regular than that of the individual languages." +
"The new common language will be more simple and regular than the existing European languages.It will be as simple as Occidental; in fact, it will be Occidental.To an English person, it will seem like simplified English, as a skeptical Cambridge friend of mine told me what Occidental is. The European languages are members of the same family." +
@@ -42,7 +40,7 @@ class TMP_EditorTests
"Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo.Maecenas malesuada. Praesent congue erat at massa.Sed cursus turpis vitae tortor.Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci.Phasellus consectetuer vestibulum elit.Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc.Vestibulum fringilla pede sit amet augue." +
"In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis.Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus.Ut varius tincidunt libero.Phasellus dolor.Maecenas vestibulum mollis";
- //
+ //
private const string m_TextBlock_05 = "This block of text contains bold and italicized characters.";
private const string m_TextBlock_06 = "<#ffffff>Multiple<#80f0ff> Alignment per text object\n" +
@@ -101,7 +99,7 @@ public void InternalResourceCheck(string filePath, string guid)
public void TextParsing_TextInfoTest_WordWrappingDisabled(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = false;
+ m_TextComponent.textWrappingMode = TextWrappingModes.NoWrap;
m_TextComponent.alignment = TextAlignmentOptions.TopLeft;
// Size the RectTransform
@@ -126,7 +124,7 @@ public void TextParsing_TextInfoTest_WordWrappingDisabled(int sourceTextIndex, i
public void TextParsing_TextInfoTest_WordWrappingEnabled(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = true;
+ m_TextComponent.textWrappingMode = TextWrappingModes.Normal;
m_TextComponent.alignment = TextAlignmentOptions.TopLeft;
// Size the RectTransform
@@ -149,7 +147,7 @@ public void TextParsing_TextInfoTest_WordWrappingEnabled(int sourceTextIndex, in
public void TextParsing_TextInfoTest_TopJustifiedAlignment(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = true;
+ m_TextComponent.textWrappingMode = TextWrappingModes.Normal;
m_TextComponent.alignment = TextAlignmentOptions.TopJustified;
// Size the RectTransform
@@ -171,7 +169,7 @@ public void TextParsing_TextInfoTest_TopJustifiedAlignment(int sourceTextIndex,
public void TextParsing_TextInfoTest_RichText(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = true;
+ m_TextComponent.textWrappingMode = TextWrappingModes.Normal;
m_TextComponent.alignment = TextAlignmentOptions.TopLeft;
// Size the RectTransform
diff --git a/Tests/Runtime/TMP_RuntimeTests.cs b/Tests/Runtime/TMP_RuntimeTests.cs
index 7b1834d..c4d2c1f 100644
--- a/Tests/Runtime/TMP_RuntimeTests.cs
+++ b/Tests/Runtime/TMP_RuntimeTests.cs
@@ -1,10 +1,9 @@
using UnityEngine;
-using UnityEngine.TestTools;
using NUnit.Framework;
using System.IO;
-using System.Collections;
using System.Collections.Generic;
+
namespace TMPro
{
[Category("Text Parsing & Layout")]
@@ -18,7 +17,7 @@ class TMP_RuntimeTests
// Characters: 104 Spaces: 14 Words: 15 Lines:
private const string m_TextBlock_01 = "Unity 2017 introduces new features that help teams of artists and developers build experiences together.";
- // Characters: 1500 Spaces: 228 Words: 241
+ // Characters: 1500 Spaces: 228 Words: 241
private const string m_TextBlock_02 = "The European languages are members of the same family. Their separate existence is a myth. For science, music, sport, etc, Europe uses the same vocabulary. The languages only differ in their grammar, their pronunciation and their most common words." +
"Everyone realizes why a new common language would be desirable: one could refuse to pay expensive translators.To achieve this, it would be necessary to have uniform grammar, pronunciation and more common words.If several languages coalesce, the grammar of the resulting language is more simple and regular than that of the individual languages." +
"The new common language will be more simple and regular than the existing European languages.It will be as simple as Occidental; in fact, it will be Occidental.To an English person, it will seem like simplified English, as a skeptical Cambridge friend of mine told me what Occidental is. The European languages are members of the same family." +
@@ -41,7 +40,7 @@ class TMP_RuntimeTests
"Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo.Maecenas malesuada. Praesent congue erat at massa.Sed cursus turpis vitae tortor.Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci.Phasellus consectetuer vestibulum elit.Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc.Vestibulum fringilla pede sit amet augue." +
"In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis.Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus.Ut varius tincidunt libero.Phasellus dolor.Maecenas vestibulum mollis";
- //
+ //
private const string m_TextBlock_05 = "This block of text contains bold and italicized characters.";
private const string m_TextBlock_06 = "<#ffffff>Multiple<#80f0ff> Alignment per text object\n" +
@@ -87,7 +86,7 @@ public static IEnumerable TestCases_Parsing_TextInfo_WordWrapDisabled(
public void Parsing_TextInfo_WordWrapDisabled(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = false;
+ m_TextComponent.textWrappingMode = TextWrappingModes.NoWrap;
m_TextComponent.alignment = TextAlignmentOptions.TopLeft;
// Size the RectTransform
@@ -116,7 +115,7 @@ public static IEnumerable TestCases_Parsing_TextInfo_WordWrapEnabled()
public void Parsing_TextInfo_WordWrapEnabled(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = true;
+ m_TextComponent.textWrappingMode = TextWrappingModes.Normal;
m_TextComponent.alignment = TextAlignmentOptions.TopLeft;
// Size the RectTransform
@@ -143,7 +142,7 @@ public static IEnumerable TestCases_Parsing_TextInfo_AlignmentTopJusti
public void Parsing_TextInfo_AlignmentTopJustified(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = true;
+ m_TextComponent.textWrappingMode = TextWrappingModes.Normal;
m_TextComponent.alignment = TextAlignmentOptions.TopJustified;
// Size the RectTransform
@@ -169,7 +168,7 @@ public static IEnumerable TestCases_Parsing_TextInfo_RichText()
public void Parsing_TextInfo_RichText(int sourceTextIndex, int characterCount, int spaceCount, int wordCount, int lineCount)
{
m_TextComponent.text = testStrings[sourceTextIndex];
- m_TextComponent.enableWordWrapping = true;
+ m_TextComponent.textWrappingMode = TextWrappingModes.Normal;
m_TextComponent.alignment = TextAlignmentOptions.TopLeft;
// Size the RectTransform
diff --git a/ValidationExceptions.json b/ValidationExceptions.json
deleted file mode 100644
index dca6edc..0000000
--- a/ValidationExceptions.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "ErrorExceptions":
- [
- {
- "ValidationTest": "API Validation",
- "PackageVersion": "3.0.6"
- }
- ]
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 1b5b44f..d2003cb 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
{
"name": "com.unity.textmeshpro",
"displayName": "TextMeshPro",
- "version": "3.0.6",
- "unity": "2020.1",
- "unityRelease": "0a10",
- "description": "TextMeshPro is the ultimate text solution for Unity. It's the perfect replacement for Unity's UI Text and the legacy Text Mesh.\n\nPowerful and easy to use, TextMeshPro (also known as TMP) uses Advanced Text Rendering techniques along with a set of custom shaders; delivering substantial visual quality improvements while giving users incredible flexibility when it comes to text styling and texturing.\n\nTextMeshPro provides Improved Control over text formatting and layout with features like character, word, line and paragraph spacing, kerning, justified text, Links, over 30 Rich Text Tags available, support for Multi Font & Sprites, Custom Styles and more.\n\nGreat performance. Since the geometry created by TextMeshPro uses two triangles per character just like Unity's text components, this improved visual quality and flexibility comes at no additional performance cost.",
+ "version": "3.2.0-pre.1",
+ "unity": "2020.3",
+ "description": "TextMeshPro is the ultimate text solution for Unity. It's the perfect replacement for Unity's UI Text and the legacy Text Mesh.\n\nPowerful and easy to use, TextMeshPro (also known as TMP) uses Advanced Text Rendering techniques along with a set of custom shaders; delivering substantial visual quality improvements while giving users incredible flexibility when it comes to text styling and texturing.\n\nTextMeshPro provides Improved Control over text formatting and layout with features like character, word, line and paragraph spacing, kerning, justified text, Links, over 30 Rich Text Tags available, support for Multi Font & Sprites, Custom Styles and more.\n\nGreat performance. Since the geometry created by TextMeshPro uses two triangles per character just like Unity's text components, this improved visual quality and flexibility comes at no additional performance cost.\n\n\n\nUPGRADE NOTE\n--------------------\nThis latest release of the TMP package includes updated TMP Essential Resources and TMP Examples & Extras. Be sure to update those via the \"Window - TextMeshPro - Import...\" menu options.",
"keywords": [
"TextMeshPro",
"TextMesh Pro",
@@ -19,9 +18,9 @@
"repository": {
"url": "https://github.cds.internal.unity3d.com/unity/com.unity.textmeshpro.git",
"type": "git",
- "revision": "01e57e3b7de18af9dfe9baaa0a0ff5cc4765c899"
+ "revision": "38d43e0ed4859fa888049f3a65fa5b6109210dbd"
},
"upmCi": {
- "footprint": "bfe9ad7192cdd29486fc5980b5ac7d0b3fafcec6"
+ "footprint": "ec24329e088da4547721e7cb0e1400c64b32b68f"
}
}