qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Surface: recalculate bounds in updateModel, always set gradient uniforms 

Fixes: QTBUG-138923
Fixes: QTBUG-138924
Pick-to: 6.10 6.9 6.8
Change-Id: I619fd5382e078b225356fd3d6822164ff7db1512
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
This commit is contained in:
Sakaria Pouke 2025-08-06 10:43:29 +03:00
parent 630b38b3ee
commit f7d363f5f5
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/graphs3d/qml/qquickgraphssurface.cpp
View File

@ -1449,8 +1449,8 @@ void QQuickGraphsSurface::updateModel(SurfaceModel *model)
bool flatShading = model->series->shading() == QSurface3DSeries::Shading::Flat; bool flatShading = model->series->shading() == QSurface3DSeries::Shading::Flat;
QVector3D boundsMin = model->boundsMin; QVector3D boundsMin = QVector3D();
QVector3D boundsMax = model->boundsMax; QVector3D boundsMax = QVector3D();
QVector<QVector4D> heights; QVector<QVector4D> heights;
heights.reserve(totalSize); heights.reserve(totalSize);
@ -1535,8 +1535,14 @@ void QQuickGraphsSurface::updateModel(SurfaceModel *model)
} }
} }
} }
model->boundsMin = boundsMin;
model->boundsMax = boundsMax; if (model->boundsMin != boundsMin || model->boundsMax != boundsMax) {
model->boundsMin = boundsMin;
model->boundsMax = boundsMax;
float range = boundsMax.y() - boundsMin.y();
material->setProperty("gradientMin", -(boundsMin.y() / range));
material->setProperty("gradientHeight", 1.0f / range);
}
QByteArray heightData = QByteArray(reinterpret_cast<char *>(heights.data()), QByteArray heightData = QByteArray(reinterpret_cast<char *>(heights.data()),
heights.size() * sizeof(QVector4D)); heights.size() * sizeof(QVector4D));
@ -1985,15 +1991,9 @@ void QQuickGraphsSurface::updateMaterial(SurfaceModel *model)
material->setProperty("textured", textured); material->setProperty("textured", textured);
if (isSeriesVisualsDirty()) { if (isSeriesVisualsDirty()) {
float minY = model->boundsMin.y();
float maxY = model->boundsMax.y();
float range = maxY - minY;
switch (model->series->colorStyle()) { switch (model->series->colorStyle()) {
case (QGraphsTheme::ColorStyle::ObjectGradient): case (QGraphsTheme::ColorStyle::ObjectGradient):
material->setProperty("colorStyle", 0); material->setProperty("colorStyle", 0);
material->setProperty("gradientMin", -(minY / range));
material->setProperty("gradientHeight", 1.0f / range);
break; break;
case (QGraphsTheme::ColorStyle::RangeGradient): case (QGraphsTheme::ColorStyle::RangeGradient):
material->setProperty("colorStyle", 1); material->setProperty("colorStyle", 1);
@ -2053,7 +2053,8 @@ void QQuickGraphsSurface::updateMaterial(SurfaceModel *model)
texInput->texture()->setSource(QUrl()); texInput->texture()->setSource(QUrl());
} }
} }
material->setProperty("rootScale", rootNode()->scale().y()); material->setProperty("rootScale", rootNode()->scale().y() * scaleWithBackground().y());
bool colorHasTransparency = false; bool colorHasTransparency = false;
if (model->series->colorStyle() == QGraphsTheme::ColorStyle::Uniform) if (model->series->colorStyle() == QGraphsTheme::ColorStyle::Uniform)
colorHasTransparency = model->series->baseColor().alphaF() < 1.0; colorHasTransparency = model->series->baseColor().alphaF() < 1.0;