summaryrefslogtreecommitdiffstats
path: root/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
diff options
context:
space:
mode:
authorJere Tuliniemi <jere.tuliniemi@qt.io>2019-05-03 15:31:34 +0300
committerJere Tuliniemi <jere.tuliniemi@qt.io>2019-05-06 11:15:27 +0000
commit655c1952563a31179fefb46eb178caa662bc3bee (patch)
tree6596fd66d209d65cf6e54777226425c3b83fb21b /src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
parente40d5ffa94622c316ff89bc4a0515c804cb2570e (diff)
Implement fixes to the distance field renderer
- Change modelView matrix to mvp for sharper texts - Support global opacity from parents - Allow changing alpha from the text color picker - Change shadow color to be the same as the text color Task-number: QT3DS-3343 Task-number: QT3DS-3363 Change-Id: I37178abe6c9239619a3f9de440d2b9245a138a82 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h')
-rw-r--r--src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
index deca9c47..39e73e8e 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
@@ -399,17 +399,14 @@ namespace render {
{
Q3DSDistanceFieldRenderer &m_distanceFieldText;
QT3DSMat44 m_mvp;
- QT3DSMat44 m_modelView;
SText &m_text;
SDistanceFieldRenderable(SRenderableObjectFlags flags, QT3DSVec3 worldCenterPt,
- SText &text, const NVBounds3 &bounds,
- const QT3DSMat44 &mvp, const QT3DSMat44 &modelView,
+ SText &text, const NVBounds3 &bounds, const QT3DSMat44 &mvp,
Q3DSDistanceFieldRenderer &distanceFieldText)
: SRenderableObject(flags, worldCenterPt, text.m_GlobalTransform, bounds)
, m_distanceFieldText(distanceFieldText)
, m_mvp(mvp)
- , m_modelView(modelView)
, m_text(text)
{
m_RenderableFlags.SetDefaultMaterialMeshSubset(false);