diff options
Diffstat (limited to 'src/labs/wavefrontmesh/qwavefrontmesh.cpp')
| -rw-r--r-- | src/labs/wavefrontmesh/qwavefrontmesh.cpp | 53 |
1 files changed, 10 insertions, 43 deletions
diff --git a/src/labs/wavefrontmesh/qwavefrontmesh.cpp b/src/labs/wavefrontmesh/qwavefrontmesh.cpp index 472b663509..844ebfbd84 100644 --- a/src/labs/wavefrontmesh/qwavefrontmesh.cpp +++ b/src/labs/wavefrontmesh/qwavefrontmesh.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 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 "qwavefrontmesh_p.h" @@ -99,7 +63,7 @@ public: /*! \qmltype WavefrontMesh \inqmlmodule Qt.labs.wavefrontmesh - \instantiates QWavefrontMesh +//! \instantiates QWavefrontMesh \ingroup qtquick-effects \brief The WavefrontMesh provides a mesh based on a Wavefront .obj file. \since 5.12 @@ -161,8 +125,9 @@ public: \endqml \endtable - \note Since the input is a 3D torus, we need to define the projection plane. This would not be necessary when - using a 2D shape as input. We use the XY plane in this case, because of the orientation of the input. + \note Since the input is a 3D torus, we need to define the projection plane. This would not be +necessary when using a 2D shape as input. We use the XY plane in this case, because of the +orientation of the input. */ QWavefrontMesh::QWavefrontMesh(QObject *parent) @@ -280,7 +245,7 @@ void QWavefrontMesh::readData() d->textureCoordinates.append(QVector2D(u, v)); } else if (command == "v") { // Format: v <x> <y> <z> [w] - if (tokens.length() < 4 || tokens.length() > 5) { + if (tokens.size() < 4 || tokens.size() > 5) { setLastError(InvalidSourceError); return; } @@ -473,7 +438,7 @@ QString QWavefrontMesh::log() const bool QWavefrontMesh::validateAttributes(const QList<QByteArray> &attributes, int *posIndex) { Q_D(QWavefrontMesh); - const int attrCount = attributes.count(); + const int attrCount = attributes.size(); int positionIndex = attributes.indexOf(qtPositionAttributeName()); int texCoordIndex = attributes.indexOf(qtTexCoordAttributeName()); @@ -695,3 +660,5 @@ QVector3D QWavefrontMesh::projectionPlaneW() const QT_END_NAMESPACE + +#include "moc_qwavefrontmesh_p.cpp" |