diff options
Diffstat (limited to 'src/quick/scenegraph/qsgbasicinternalimagenode.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgbasicinternalimagenode.cpp | 91 |
1 files changed, 36 insertions, 55 deletions
diff --git a/src/quick/scenegraph/qsgbasicinternalimagenode.cpp b/src/quick/scenegraph/qsgbasicinternalimagenode.cpp index d8efda1ecc..5c49bdb54a 100644 --- a/src/quick/scenegraph/qsgbasicinternalimagenode.cpp +++ b/src/quick/scenegraph/qsgbasicinternalimagenode.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $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 -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qsgbasicinternalimagenode_p.h" @@ -46,13 +10,13 @@ QT_BEGIN_NAMESPACE namespace { - struct SmoothVertex + struct SmoothImageVertex { float x, y, u, v; float dx, dy, du, dv; }; - const QSGGeometry::AttributeSet &smoothAttributeSet() + const QSGGeometry::AttributeSet &smoothImageAttributeSet() { static QSGGeometry::Attribute data[] = { QSGGeometry::Attribute::createWithAttributeType(0, 2, QSGGeometry::FloatType, QSGGeometry::PositionAttribute), @@ -60,7 +24,7 @@ namespace QSGGeometry::Attribute::createWithAttributeType(2, 2, QSGGeometry::FloatType, QSGGeometry::TexCoord1Attribute), QSGGeometry::Attribute::createWithAttributeType(3, 2, QSGGeometry::FloatType, QSGGeometry::TexCoord2Attribute) }; - static QSGGeometry::AttributeSet attrs = { 4, sizeof(SmoothVertex), data }; + static QSGGeometry::AttributeSet attrs = { 4, sizeof(SmoothImageVertex), data }; return attrs; } } @@ -69,7 +33,8 @@ QSGBasicInternalImageNode::QSGBasicInternalImageNode() : m_innerSourceRect(0, 0, 1, 1) , m_subSourceRect(0, 0, 1, 1) , m_antialiasing(false) - , m_mirror(false) + , m_mirrorHorizontally(false) + , m_mirrorVertically(false) , m_dirtyGeometry(false) , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) , m_dynamicTexture(nullptr) @@ -132,7 +97,7 @@ void QSGBasicInternalImageNode::setAntialiasing(bool antialiasing) return; m_antialiasing = antialiasing; if (m_antialiasing) { - setGeometry(new QSGGeometry(smoothAttributeSet(), 0)); + setGeometry(new QSGGeometry(smoothImageAttributeSet(), 0)); setFlag(OwnsGeometry, true); } else { setGeometry(&m_geometry); @@ -142,11 +107,12 @@ void QSGBasicInternalImageNode::setAntialiasing(bool antialiasing) m_dirtyGeometry = true; } -void QSGBasicInternalImageNode::setMirror(bool mirror) +void QSGBasicInternalImageNode::setMirror(bool mirrorHorizontally, bool mirrorVertically) { - if (mirror == m_mirror) + if (mirrorHorizontally == m_mirrorHorizontally && mirrorVertically == m_mirrorVertically) return; - m_mirror = mirror; + m_mirrorHorizontally = mirrorHorizontally; + m_mirrorVertically = mirrorVertically; m_dirtyGeometry = true; } @@ -221,7 +187,8 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, const QRectF &innerSourceRect, const QRectF &subSourceRect, QSGGeometry *geometry, - bool mirror, + bool mirrorHorizontally, + bool mirrorVertically, bool antialiasing) { int floorLeft = qFloor(subSourceRect.left()); @@ -282,7 +249,7 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, xs += 2; } Q_ASSERT(xs == xData.data() + xData.size()); - if (mirror) { + if (mirrorHorizontally) { float leftPlusRight = targetRect.left() + targetRect.right(); int count = xData.size(); xs = xData.data(); @@ -323,6 +290,15 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, ys += 2; } Q_ASSERT(ys == yData.data() + yData.size()); + if (mirrorVertically) { + float topPlusBottom = targetRect.top() + targetRect.bottom(); + int count = yData.size(); + ys = yData.data(); + for (int i = 0; i < (count >> 1); ++i) + qSwap(ys[i], ys[count - 1 - i]); + for (int i = 0; i < count; ++i) + ys[i].y = topPlusBottom - ys[i].y; + } QSGGeometry::Type indexType = QSGGeometry::UnsignedShortType; // We can handled up to 0xffff indices, but keep the limit lower here to @@ -332,7 +308,7 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, if (antialiasing) { if (!geometry || geometry->indexType() != indexType) { - geometry = new QSGGeometry(smoothAttributeSet(), + geometry = new QSGGeometry(smoothImageAttributeSet(), hCells * vCells * 4 + (hCells + vCells - 1) * 4, hCells * vCells * 6 + (hCells + vCells) * 12, indexType); @@ -344,7 +320,7 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, Q_ASSERT(g); g->setDrawingMode(QSGGeometry::DrawTriangles); - SmoothVertex *vertices = reinterpret_cast<SmoothVertex *>(g->vertexData()); + auto *vertices = reinterpret_cast<SmoothImageVertex *>(g->vertexData()); memset(vertices, 0, g->vertexCount() * g->sizeOfVertex()); void *indexData = g->indexData(); @@ -384,7 +360,7 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, bool isLeft = i == 0; bool isRight = i == hCells - 1; - SmoothVertex *v = vertices + index; + SmoothImageVertex *v = vertices + index; int topLeft = index; for (int k = (isTop || isLeft ? 2 : 1); k--; ++v, ++index) { @@ -530,22 +506,27 @@ void QSGBasicInternalImageNode::updateGeometry() sr = QRectF(m_subSourceRect.left() - floorLeft, m_subSourceRect.top() - floorTop, m_subSourceRect.width(), m_subSourceRect.height()); } - if (m_mirror) { + if (m_mirrorHorizontally) { qreal oldLeft = sr.left(); sr.setLeft(sr.right()); sr.setRight(oldLeft); } + if (m_mirrorVertically) { + qreal oldTop = sr.top(); + sr.setTop(sr.bottom()); + sr.setBottom(oldTop); + } if (m_antialiasing) { QSGGeometry *g = geometry(); Q_ASSERT(g != &m_geometry); if (g->indexType() != QSGGeometry::UnsignedShortType) { - setGeometry(new QSGGeometry(smoothAttributeSet(), 0)); + setGeometry(new QSGGeometry(smoothImageAttributeSet(), 0)); g = geometry(); } g->allocate(8, 14); g->setDrawingMode(QSGGeometry::DrawTriangleStrip); - SmoothVertex *vertices = reinterpret_cast<SmoothVertex *>(g->vertexData()); + auto *vertices = reinterpret_cast<SmoothImageVertex *>(g->vertexData()); float delta = float(qAbs(m_targetRect.width()) < qAbs(m_targetRect.height()) ? m_targetRect.width() : m_targetRect.height()) * 0.5f; float sx = float(sr.width() / m_targetRect.width()); @@ -580,7 +561,7 @@ void QSGBasicInternalImageNode::updateGeometry() QSGGeometry *g = geometry(); g = updateGeometry(m_targetRect, m_innerTargetRect, sourceRect, innerSourceRect, m_subSourceRect, - g, m_mirror, m_antialiasing); + g, m_mirrorHorizontally, m_mirrorVertically, m_antialiasing); if (g != geometry()) { setGeometry(g); setFlag(OwnsGeometry, true); |