commit 874f5c6e4ac655b4f118074c90d51e6a44abe50c
author Romain Guy <romainguy@google.com> Fri Mar 01 18:07:35 2013 -0800
committer Romain Guy <romainguy@google.com> Fri Mar 01 18:07:35 2013 -0800
tree 3b7ac8426834bbe35a25a2c835d685188e8c0691
parent 0f6675332c04c74909425d1d328f02b32c0ff40e

Fix math issue when transforming text in perspective

Change-Id: Iad6b4e477c11bd1ef5f0ceab2fabcd440030154d

libs/hwui/font/Font.cpp

diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp
index e804644..bf522b7 100644
--- a/libs/hwui/font/Font.cpp
+++ b/libs/hwui/font/Font.cpp
@@ -57,6 +57,9 @@
     mLookupTransform[SkMatrix::kMScaleY] = matrix.data[mat4::kScaleY];
     mLookupTransform[SkMatrix::kMSkewX] = matrix.data[mat4::kSkewX];
     mLookupTransform[SkMatrix::kMSkewY] = matrix.data[mat4::kSkewY];
+    if (!mLookupTransform.invert(&mInverseLookupTransform)) {
+        ALOGW("Could not query the inverse lookup transform for this font");
+    }
 }
 
 Font::~Font() {
@@ -184,18 +187,13 @@
 
 void Font::drawCachedGlyphPerspective(CachedGlyphInfo* glyph, int x, int y,
         uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* pos) {
-    SkMatrix i;
-    if (!mDescription.mLookupTransform.invert(&i)) {
-        return;
-    }
-
     SkPoint p[4];
-    p[0].set(glyph->mBitmapLeft, glyph->mBitmapTop + glyph->mBitmapHeight);
-    p[1].set(glyph->mBitmapLeft + glyph->mBitmapWidth, glyph->mBitmapTop + glyph->mBitmapHeight);
-    p[2].set(glyph->mBitmapLeft + glyph->mBitmapWidth, glyph->mBitmapTop);
-    p[3].set(glyph->mBitmapLeft, glyph->mBitmapTop);
+    p[0].iset(glyph->mBitmapLeft, glyph->mBitmapTop + glyph->mBitmapHeight);
+    p[1].iset(glyph->mBitmapLeft + glyph->mBitmapWidth, glyph->mBitmapTop + glyph->mBitmapHeight);
+    p[2].iset(glyph->mBitmapLeft + glyph->mBitmapWidth, glyph->mBitmapTop);
+    p[3].iset(glyph->mBitmapLeft, glyph->mBitmapTop);
 
-    i.mapPoints(p, 4);
+    mDescription.mInverseLookupTransform.mapPoints(p, 4);
 
     p[0].offset(x, y);
     p[1].offset(x, y);
@@ -208,10 +206,10 @@
     float v2 = glyph->mBitmapMaxV;
 
     mState->appendRotatedMeshQuad(
-            p[0].fX, p[0].fY, u1, v2,
-            p[1].fX, p[1].fY, u2, v2,
-            p[2].fX, p[2].fY, u2, v1,
-            p[3].fX, p[3].fY, u1, v1, glyph->mCacheTexture);
+            p[0].x(), p[0].y(), u1, v2,
+            p[1].x(), p[1].y(), u2, v2,
+            p[2].x(), p[2].y(), u2, v1,
+            p[3].x(), p[3].y(), u1, v1, glyph->mCacheTexture);
 }
 
 void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y,
@@ -265,14 +263,14 @@
     const float v2 = glyph->mBitmapMaxV;
 
     mState->appendRotatedMeshQuad(
-            position->fX + destination[0].fX,
-            position->fY + destination[0].fY, u1, v2,
-            position->fX + destination[1].fX,
-            position->fY + destination[1].fY, u2, v2,
-            position->fX + destination[2].fX,
-            position->fY + destination[2].fY, u2, v1,
-            position->fX + destination[3].fX,
-            position->fY + destination[3].fY, u1, v1,
+            position->x() + destination[0].x(),
+            position->y() + destination[0].y(), u1, v2,
+            position->x() + destination[1].x(),
+            position->y() + destination[1].y(), u2, v2,
+            position->x() + destination[2].x(),
+            position->y() + destination[2].y(), u2, v1,
+            position->x() + destination[3].x(),
+            position->y() + destination[3].y(), u1, v1,
             glyph->mCacheTexture);
 }