OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "SkFloatBits.h" | 8 #include "SkFloatBits.h" |
9 #include "SkMatrix.h" | 9 #include "SkMatrix.h" |
10 #include "SkNx.h" | 10 #include "SkNx.h" |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
283 } else { | 283 } else { |
284 this->reset(); | 284 this->reset(); |
285 } | 285 } |
286 } | 286 } |
287 | 287 |
288 void SkMatrix::preTranslate(SkScalar dx, SkScalar dy) { | 288 void SkMatrix::preTranslate(SkScalar dx, SkScalar dy) { |
289 if (!dx && !dy) { | 289 if (!dx && !dy) { |
290 return; | 290 return; |
291 } | 291 } |
292 | 292 |
293 if (this->hasPerspective()) { | 293 if (fTypeMask == kTranslate_Mask) { |
294 fMat[kMTransX] += dx; | |
295 fMat[kMTransY] += dy; | |
296 // Translate x Translate == Translate | |
297 SkASSERT(kTranslate_Mask == this->computeTypeMask()); | |
reed1
2016/08/18 19:28:18
This could fail if the translate sent those fields
mtklein_C
2016/08/18 19:35:59
Good catch. Fixed.
| |
298 } else if (this->hasPerspective()) { | |
294 SkMatrix m; | 299 SkMatrix m; |
295 m.setTranslate(dx, dy); | 300 m.setTranslate(dx, dy); |
296 this->preConcat(m); | 301 this->preConcat(m); |
297 } else { | 302 } else { |
298 fMat[kMTransX] += sdot(fMat[kMScaleX], dx, fMat[kMSkewX], dy); | 303 fMat[kMTransX] += sdot(fMat[kMScaleX], dx, fMat[kMSkewX], dy); |
299 fMat[kMTransY] += sdot(fMat[kMSkewY], dx, fMat[kMScaleY], dy); | 304 fMat[kMTransY] += sdot(fMat[kMSkewY], dx, fMat[kMScaleY], dy); |
300 this->setTypeMask(kUnknown_Mask | kOnlyPerspectiveValid_Mask); | 305 this->setTypeMask(kUnknown_Mask | kOnlyPerspectiveValid_Mask); |
301 } | 306 } |
302 } | 307 } |
303 | 308 |
(...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1886 const SkScalar m10 = -m01; | 1891 const SkScalar m10 = -m01; |
1887 const SkScalar m11 = m00; | 1892 const SkScalar m11 = m00; |
1888 const SkScalar m12 = fTy; | 1893 const SkScalar m12 = fTy; |
1889 | 1894 |
1890 quad[0].set(m02, m12); | 1895 quad[0].set(m02, m12); |
1891 quad[1].set(m00 * width + m02, m10 * width + m12); | 1896 quad[1].set(m00 * width + m02, m10 * width + m12); |
1892 quad[2].set(m00 * width + m01 * height + m02, m10 * width + m11 * height + m 12); | 1897 quad[2].set(m00 * width + m01 * height + m02, m10 * width + m11 * height + m 12); |
1893 quad[3].set(m01 * height + m02, m11 * height + m12); | 1898 quad[3].set(m01 * height + m02, m11 * height + m12); |
1894 #endif | 1899 #endif |
1895 } | 1900 } |
OLD | NEW |