diff options
| author |  aelias@chromium.org <aelias@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-04 22:26:28 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-04 22:26:28 +0000 |
| commit | 851af07b11ad1d5482958dcef5689bd8841b4a94 (patch) | |
| tree | 982cd0dc44b7ac63c8f99ffa21edc7a448a3278e /src/utils | |
| parent | 761f860a427e9ebb088c4d1e5fba04deb29b5a6f (diff) | |
Revert "Add perspective support to SkMatrix44 initializers."
This reverts commit 93db1bcae0863feed8d00a61ae2cf72a90a0083c.
git-svn-id: http://skia.googlecode.com/svn/trunk@11623 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkMatrix44.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/utils/SkMatrix44.cpp b/src/utils/SkMatrix44.cpp index 9803b52095..1e48f393ac 100644 --- a/src/utils/SkMatrix44.cpp +++ b/src/utils/SkMatrix44.cpp @@ -902,6 +902,8 @@ void SkMatrix44::dump() const { /////////////////////////////////////////////////////////////////////////////// +// TODO: make this support src' perspective elements +// static void initFromMatrix(SkMScalar dst[4][4], const SkMatrix& src) { dst[0][0] = SkScalarToMScalar(src[SkMatrix::kMScaleX]); dst[1][0] = SkScalarToMScalar(src[SkMatrix::kMSkewX]); @@ -915,10 +917,10 @@ static void initFromMatrix(SkMScalar dst[4][4], const SkMatrix& src) { dst[1][2] = 0; dst[2][2] = 1; dst[3][2] = 0; - dst[0][3] = SkScalarToMScalar(src[SkMatrix::kMPersp0]); - dst[1][3] = SkScalarToMScalar(src[SkMatrix::kMPersp1]); + dst[0][3] = 0; + dst[1][3] = 0; dst[2][3] = 0; - dst[3][3] = SkScalarToMScalar(src[SkMatrix::kMPersp2]); + dst[3][3] = 1; } SkMatrix44::SkMatrix44(const SkMatrix& src) { @@ -936,8 +938,11 @@ SkMatrix44& SkMatrix44::operator=(const SkMatrix& src) { return *this; } +// TODO: make this support our perspective elements +// SkMatrix44::operator SkMatrix() const { SkMatrix dst; + dst.reset(); // setup our perspective correctly for identity dst[SkMatrix::kMScaleX] = SkMScalarToScalar(fMat[0][0]); dst[SkMatrix::kMSkewX] = SkMScalarToScalar(fMat[1][0]); @@ -947,9 +952,5 @@ SkMatrix44::operator SkMatrix() const { dst[SkMatrix::kMScaleY] = SkMScalarToScalar(fMat[1][1]); dst[SkMatrix::kMTransY] = SkMScalarToScalar(fMat[3][1]); - dst[SkMatrix::kMPersp0] = SkMScalarToScalar(fMat[0][3]); - dst[SkMatrix::kMPersp1] = SkMScalarToScalar(fMat[1][3]); - dst[SkMatrix::kMPersp2] = SkMScalarToScalar(fMat[3][3]); - return dst; } |