diff options
Diffstat (limited to 'src/render/geometry/geometry.cpp')
-rw-r--r-- | src/render/geometry/geometry.cpp | 61 |
1 files changed, 20 insertions, 41 deletions
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index dd099fc44..58bbcc3ad 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -5,8 +5,7 @@ ** ** This file is part of the Qt3D module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -15,25 +14,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** +** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -55,8 +55,6 @@ namespace Render { Geometry::Geometry() : BackendNode(ReadWrite) , m_geometryDirty(false) - , m_shouldNotifyMinExtentChanged(false) - , m_shouldNotifyMaxExtentChanged(false) { } @@ -72,8 +70,6 @@ void Geometry::cleanup() m_boundingPositionAttribute = Qt3DCore::QNodeId(); m_min = QVector3D(); m_max = QVector3D(); - m_shouldNotifyMinExtentChanged = false; - m_shouldNotifyMaxExtentChanged = false; } void Geometry::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) @@ -113,27 +109,10 @@ void Geometry::updateExtent(const QVector3D &min, const QVector3D &max) // Send notification to frontend if (m_min != min) { m_min = min; - m_shouldNotifyMinExtentChanged = true; } if (m_max != max) { m_max = max; - m_shouldNotifyMaxExtentChanged = true; - } -} - -// Called from calcboundingvolumejob after all bounding volumes have been -// updated (in an aspect thread) -void Geometry::notifyExtentChanged() -{ - if (m_shouldNotifyMinExtentChanged || m_shouldNotifyMaxExtentChanged) { - auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId()); - change->setDeliveryFlags(Qt3DCore::QSceneChange::Nodes); - change->setPropertyName("extent"); - change->setValue(QVariant::fromValue(QPair<QVector3D, QVector3D>(m_min, m_max))); - notifyObservers(change); - m_shouldNotifyMinExtentChanged = false; - m_shouldNotifyMaxExtentChanged = false; } } |