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

Fix screen position based queries in threaded rendering environment 

QtQuick's threaded renderer doesn't seem to always pair up sync and
render (or more accurately, beforeSynchronizing and node's
preprocess calls). Sometimes sync comes without a followup render,
or there are two syncs in a row, even though the sync is using
direct connection. Both of these cases broke the old
logic for handling position based queries.

Changed the logic to actually ensure we have resolved the query
before emitting the relevant signal.

Task-number: QTRD-3358
Change-Id: Ica6c8c311f53a06311c21532aaabc18c28556655
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
This commit is contained in:
Miikka Heikkinen 2014-10-08 15:35:15 +03:00
parent a350868f0e
commit f3a7378273
8 changed files with 64 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/datavisualization/engine/abstract3dcontroller.cpp
View File

@ -170,16 +170,14 @@ void Abstract3DController::synchDataToRenderer()
{
// Subclass implementations check for renderer validity already, so no need to check here.
// If there are pending queries, handle those first
if (m_renderer->isGraphPositionQueryPending()) {
handlePendingGraphPositionQuery();
m_renderer->clearGraphPositionQueryPending();
}
m_renderPending = false;
if (m_renderer->isClickPending()) {
// If there are pending queries, handle those first
if (m_renderer->isGraphPositionQueryResolved())
handlePendingGraphPositionQuery();
if (m_renderer->isClickQueryResolved())
handlePendingClick();
m_renderer->clearClickPending();
}
startRecordingRemovesAndInserts();
@ -518,8 +516,6 @@ void Abstract3DController::synchDataToRenderer()
void Abstract3DController::render(const GLuint defaultFboHandle)
{
m_renderPending = false;
// If not initialized, do nothing.
if (!m_renderer)
return;
@ -1489,12 +1485,27 @@ void Abstract3DController::handlePendingClick()
m_selectedLabelIndex = m_renderer->m_selectedLabelIndex;
m_selectedCustomItemIndex = m_renderer->m_selectedCustomItemIndex;
// Invalidate query position to indicate the query has been handled, unless another
// point has been queried.
if (m_renderer->cachedClickQuery() == m_scene->selectionQueryPosition())
m_scene->setSelectionQueryPosition(Q3DScene::invalidSelectionPoint());
m_renderer->clearClickQueryResolved();
emit elementSelected(m_clickedType);
}
void Abstract3DController::handlePendingGraphPositionQuery()
{
m_queriedGraphPosition = m_renderer->queriedGraphPosition();
// Invalidate query position to indicate the query has been handled, unless another
// point has been queried.
if (m_renderer->cachedGraphPositionQuery() == m_scene->graphPositionQuery())
m_scene->setGraphPositionQuery(Q3DScene::invalidSelectionPoint());
m_renderer->clearGraphPositionQueryResolved();
emit queriedGraphPositionChanged(m_queriedGraphPosition);
}

19
src/datavisualization/engine/abstract3drenderer.cpp
View File

@ -53,8 +53,9 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
m_selectionState(SelectNone),
m_devicePixelRatio(1.0f),
m_selectionLabelDirty(true),
m_clickPending(false),
m_clickResolved(false),
m_graphPositionQueryPending(false),
m_graphPositionQueryResolved(false),
m_clickedSeries(0),
m_clickedType(QAbstract3DGraph::ElementNone),
m_selectedLabelIndex(-1),
@ -337,10 +338,6 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene)
if (Q3DScene::invalidSelectionPoint() == logicalPixelPosition) {
updateSelectionState(SelectNone);
} else {
// Selections are one-shot, reset selection active to false before processing
scene->setSelectionQueryPosition(Q3DScene::invalidSelectionPoint());
m_clickPending = true;
if (scene->isSlicingActive()) {
if (scene->isPointInPrimarySubView(logicalPixelPosition))
updateSelectionState(SelectOnOverview);
@ -353,10 +350,14 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene)
}
}
if (Q3DScene::invalidSelectionPoint() != logicalGraphPosition) {
if (Q3DScene::invalidSelectionPoint() != logicalGraphPosition)
m_graphPositionQueryPending = true;
scene->setGraphPositionQuery(Q3DScene::invalidSelectionPoint());
}
// Queue up another render when we have a query that needs resolving.
// This is needed because QtQuick scene graph can sometimes do a sync without following it up
// with a render.
if (m_graphPositionQueryPending || m_selectionState != SelectNone)
emit needRender();
}
void Abstract3DRenderer::updateTextures()
@ -1767,6 +1768,8 @@ void Abstract3DRenderer::queriedGraphPosition(const QMatrix4x4 &projectionViewMa
m_queriedGraphPosition = QVector3D(normalizedValues.x(),
normalizedValues.y(),
normalizedValues.z());
m_graphPositionQueryResolved = true;
m_graphPositionQueryPending = false;
}
void Abstract3DRenderer::calculatePolarXZ(const QVector3D &dataPos, float &x, float &z) const

13
src/datavisualization/engine/abstract3drenderer_p.h
View File

@ -148,13 +148,15 @@ public:
void generateBaseColorTexture(const QColor &color, GLuint *texture);
void fixGradientAndGenerateTexture(QLinearGradient *gradient, GLuint *gradientTexture);
inline bool isClickPending() { return m_clickPending; }
inline void clearClickPending() { m_clickPending = false; }
inline bool isClickQueryResolved() const { return m_clickResolved; }
inline void clearClickQueryResolved() { m_clickResolved = false; }
inline QPoint cachedClickQuery() const { return m_cachedScene->selectionQueryPosition(); }
inline QAbstract3DSeries *clickedSeries() const { return m_clickedSeries; }
inline QAbstract3DGraph::ElementType clickedType() { return m_clickedType; }
inline bool isGraphPositionQueryPending() { return m_graphPositionQueryPending; }
inline void clearGraphPositionQueryPending() { m_graphPositionQueryPending = false; }
inline bool isGraphPositionQueryResolved() const { return m_graphPositionQueryResolved; }
inline void clearGraphPositionQueryResolved() { m_graphPositionQueryResolved = false; }
inline QVector3D queriedGraphPosition() const { return m_queriedGraphPosition; }
inline QPoint cachedGraphPositionQuery() const { return m_cachedScene->graphPositionQuery(); }
LabelItem &selectionLabelItem();
void setSelectionLabel(const QString &label);
@ -253,8 +255,9 @@ protected:
QRect m_secondarySubViewport;
float m_devicePixelRatio;
bool m_selectionLabelDirty;
bool m_clickPending;
bool m_clickResolved;
bool m_graphPositionQueryPending;
bool m_graphPositionQueryResolved;
QAbstract3DSeries *m_clickedSeries;
QAbstract3DGraph::ElementType m_clickedType;
int m_selectedLabelIndex;

1
src/datavisualization/engine/bars3drenderer.cpp
View File

@ -1250,6 +1250,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
QVector4D clickedColor = Utils::getSelection(m_inputPosition, m_viewport.height());
m_clickedPosition = selectionColorToArrayPosition(clickedColor);
m_clickedSeries = selectionColorToSeries(clickedColor);
m_clickResolved = true;
emit needRender();

5
src/datavisualization/engine/q3dscene.cpp
View File

@ -560,6 +560,11 @@ void Q3DScenePrivate::sync(Q3DScenePrivate &other)
m_changeTracker.selectionQueryPositionChanged = false;
other.m_changeTracker.selectionQueryPositionChanged = false;
}
if (m_changeTracker.graphPositionQueryPositionChanged) {
other.q_ptr->setGraphPositionQuery(q_ptr->graphPositionQuery());
m_changeTracker.graphPositionQueryPositionChanged = false;
other.m_changeTracker.graphPositionQueryPositionChanged = false;
}
if (m_changeTracker.cameraChanged) {
m_camera->setDirty(true);
m_changeTracker.cameraChanged = false;

1
src/datavisualization/engine/scatter3drenderer.cpp
View File

@ -802,6 +802,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
QVector4D clickedColor = Utils::getSelection(m_inputPosition,
m_viewport.height());
selectionColorToSeriesAndIndex(clickedColor, m_clickedIndex, m_clickedSeries);
m_clickResolved = true;
emit needRender();

1
src/datavisualization/engine/surface3drenderer.cpp
View File

@ -1353,6 +1353,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
+ uint(clickedColor.w()) * alphaMultiplier;
m_clickedPosition = selectionIdToSurfacePoint(selectionId);
m_clickResolved = true;
emit needRender();

28
tests/qmldynamicdata/qml/qmldynamicdata/main.qml
View File

@ -71,18 +71,16 @@ Rectangle {
isIncreasing = false;
}
} else {
// TODO: Once QTRD-2645 is fixed, change this to remove from
// random index to add coverage.
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(2);
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
graphModel.remove(Math.random() * (graphModel.count - 1));
if (graphModel.count == 2) {
scatterGraph.theme.type = Theme3D.ThemeDigia;
isIncreasing = true;
@ -118,6 +116,12 @@ Rectangle {
shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium
scene.activeCamera.yRotation: 30.0
inputHandler: null
axisX.min: 0
axisY.min: 0
axisZ.min: 0
axisX.max: 1
axisY.max: 1
axisZ.max: 1
Scatter3DSeries {
id: scatterSeries