diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-10-03 13:16:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-03 16:18:44 +0200 |
commit | 661e624121004dd73467300e467aacae6d8d2f66 (patch) | |
tree | ec50b080d2ef38295ef7d830c1eb7d3912a3d2c4 /examples/quick/animation | |
parent | c20ce89e6e92c403e9b50462a0e000056a2eff73 (diff) |
Separate and fix 8/24-bit text mask materials.
The logic was a bit cluttered, trying to handle two rather
different pieces of logic in one material shader. The 8-bit
shader does not try to be fancy in any way, it just takes the
alpha * color which gives similar intensities as the distance
fields. The logic for 24-bit contains a tiny fix for opacity.
The patch also includes a change from QColor -> QVector4D and
QPointF -> QVector2D to simplify the conversion needed and
be consistent with what kind of types we use.
Task-number: QTBUG-33805
Task-number: QTBUG-33633
Task-number: QTCREATORBUG-10176
Change-Id: Ia8c464f98a1fc2c190a1d323fc21466a4d7b0dfd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'examples/quick/animation')
0 files changed, 0 insertions, 0 deletions