diff options
Diffstat (limited to 'src/datavisualization')
| -rw-r--r-- | src/datavisualization/data/customrenderitem_p.h | 3 | ||||
| -rw-r--r-- | src/datavisualization/data/qcustom3ditem.cpp | 7 | ||||
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h index 1dce62e5..81a78144 100644 --- a/src/datavisualization/data/customrenderitem_p.h +++ b/src/datavisualization/data/customrenderitem_p.h @@ -49,6 +49,8 @@ public: inline ObjectHelper *mesh() const { return m_object; } inline void setScaling(const QVector3D &scaling) { m_scaling = scaling; } inline QVector3D scaling() const { return m_scaling; } + inline void setPosition(const QVector3D &position) { m_position = position; } + inline QVector3D position() const { return m_position; } inline void setBlendNeeded(bool blend) { m_needBlend = blend; } inline bool isBlendNeeded() const { return m_needBlend; } inline void setVisible(bool visible) { m_visible = visible; } @@ -65,6 +67,7 @@ public: private: GLuint m_texture; QVector3D m_scaling; + QVector3D m_position; ObjectHelper *m_object; bool m_needBlend; bool m_visible; diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp index 3254ac3b..f39a0478 100644 --- a/src/datavisualization/data/qcustom3ditem.cpp +++ b/src/datavisualization/data/qcustom3ditem.cpp @@ -60,14 +60,12 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \note To conserve memory the Image loaded from the file is cleared after a texture is created. */ -// TODO: Position check in task QTRD-3057 /*! \qmlproperty vector3d Custom3DItem::position * * Holds the item \a position as a vector3d. Item position is in data coordinates. Defaults to * \c {vector3d(0.0, 0.0, 0.0)}. * - * \note No validity checks are made for the position of the item, so it is up to the user to - * provide a valid position. Items positioned outside axis ranges are still rendered. + * \note Items positioned outside axis ranges are not rendered. */ /*! \qmlproperty vector3d Custom3DItem::scaling @@ -153,8 +151,7 @@ QString QCustom3DItem::meshFile() const * Holds the item \a position as a QVector3D. Item position is in data coordinates. Defaults to * \c {QVector3D(0.0, 0.0, 0.0)}. * - * \note No validity checks are made for the position of the item, so it is up to the user to - * provide a valid position. Items positioned outside axis ranges are still rendered. + * \note Items positioned outside axis ranges are not rendered. */ void QCustom3DItem::setPosition(const QVector3D &position) { diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 82952a26..684db1a5 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -573,6 +573,7 @@ CustomRenderItem *Abstract3DRenderer::addCustomItem(QCustom3DItem *item) newItem->setItemPointer(item); // Store pointer for render item updates newItem->setMesh(item->meshFile()); newItem->setScaling(item->scaling()); + newItem->setPosition(item->position()); newItem->setRotation(item->rotation()); QImage textureImage = item->d_ptr->textureImage(); newItem->setBlendNeeded(textureImage.hasAlphaChannel()); @@ -614,6 +615,7 @@ void Abstract3DRenderer::updateCustomItem(CustomRenderItem *renderItem) } if (item->d_ptr->m_dirtyBits.positionDirty) { QVector3D translation = convertPositionToTranslation(item->position()); + renderItem->setPosition(item->position()); renderItem->setTranslation(translation); item->d_ptr->m_dirtyBits.positionDirty = false; } @@ -651,7 +653,14 @@ void Abstract3DRenderer::drawCustomItems(RenderingState state, // Draw custom items foreach (CustomRenderItem *item, m_customRenderCache) { - if (!item->isVisible()) + // Check that the render item is visible and within axis ranges, and skip drawing if not + if (!item->isVisible() + || item->position().x() < m_axisCacheX.min() + || item->position().x() > m_axisCacheX.max() + || item->position().z() < m_axisCacheZ.min() + || item->position().z() > m_axisCacheZ.max() + || item->position().y() < m_axisCacheY.min() + || item->position().y() > m_axisCacheY.max()) continue; QMatrix4x4 modelMatrix; |