Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # HG changeset patch
- # User apocriva
- # Date 1391132786 14400
- # Node ID 59aedd4e75a93bafcde575ec0d9bbcb03d05cf65
- # Parent d5595fdc4e39bd3236e43f2a696e27358519f6de
- - Reapplying UV fix to NGUI.
- diff --git a/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIMath.cs b/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIMath.cs
- --- a/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIMath.cs
- +++ b/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIMath.cs
- @@ -212,10 +212,10 @@
- if (width != 0f && height != 0f)
- {
- - final.xMin = rect.xMin / width;
- - final.xMax = rect.xMax / width;
- - final.yMin = 1f - rect.yMax / height;
- - final.yMax = 1f - rect.yMin / height;
- + final.xMin = rect.xMin / width + 0.00002f;
- + final.xMax = rect.xMax / width + 0.00002f;
- + final.yMin = 1f - rect.yMax / height - 0.00001f;
- + final.yMax = 1f - rect.yMin / height - 0.00001f;
- }
- return final;
- }
- diff --git a/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIText.cs b/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIText.cs
- --- a/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIText.cs
- +++ b/Unity/Pollen/Assets/NGUI/Scripts/Internal/NGUIText.cs
- @@ -1104,10 +1104,10 @@
- {
- if (bitmapFont != null)
- {
- - glyph.u0.x = uvRect.xMin + invX * glyph.u0.x;
- - glyph.u1.x = uvRect.xMin + invX * glyph.u1.x;
- - glyph.u0.y = uvRect.yMax - invY * glyph.u0.y;
- - glyph.u1.y = uvRect.yMax - invY * glyph.u1.y;
- + glyph.u0.x = uvRect.xMin + invX * glyph.u0.x + 0.00002f;
- + glyph.u1.x = uvRect.xMin + invX * glyph.u1.x + 0.00002f;
- + glyph.u0.y = uvRect.yMax - invY * glyph.u0.y - 0.00001f;
- + glyph.u1.y = uvRect.yMax - invY * glyph.u1.y - 0.00001f;
- }
- for (int j = 0, jmax = (bold ? 4 : 1); j < jmax; ++j)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement