diff options
| -rw-r--r-- | src/render/io/gltfparser.cpp | 2 | ||||
| -rw-r--r-- | src/render/io/qmeshdata.cpp | 4 | ||||
| -rw-r--r-- | src/render/io/qmeshdata.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 6866f2b0d..1792014a1 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -700,7 +700,7 @@ void GLTFParser::processJSONMesh( QString id, QJsonObject jsonObj ) continue; } - QMeshDataPtr md( new QMeshData( static_cast<QMeshData::PrimitiveTypes>(type) ) ); + QMeshDataPtr md(new QMeshData(static_cast<QMeshData::PrimitiveType>(type))); m_meshMaterialDict[md.data()] = material; QJsonObject attrs = primObj.value(KEY_ATTRIBUTES).toObject(); diff --git a/src/render/io/qmeshdata.cpp b/src/render/io/qmeshdata.cpp index efc5f9a44..3314cd455 100644 --- a/src/render/io/qmeshdata.cpp +++ b/src/render/io/qmeshdata.cpp @@ -56,7 +56,7 @@ QMeshDataPrivate::QMeshDataPrivate(QMeshData *qq) { } -QMeshData::QMeshData(PrimitiveTypes primitiveType) +QMeshData::QMeshData(PrimitiveType primitiveType) : d_ptr(new QMeshDataPrivate(this)) { setPrimitiveType(primitiveType); @@ -174,7 +174,7 @@ QAxisAlignedBoundingBox QMeshData::boundingBox() const return d->m_bbox; } -void QMeshData::setPrimitiveType(PrimitiveTypes primitiveType) +void QMeshData::setPrimitiveType(PrimitiveType primitiveType) { Q_D(QMeshData); d->m_primitiveType = primitiveType; diff --git a/src/render/io/qmeshdata.h b/src/render/io/qmeshdata.h index 20b4008fb..a48659152 100644 --- a/src/render/io/qmeshdata.h +++ b/src/render/io/qmeshdata.h @@ -60,7 +60,7 @@ typedef QSharedPointer<QAbstractBuffer> QAbstractBufferPtr; class QT3DRENDERERSHARED_EXPORT QMeshData { public: - enum PrimitiveTypes { + enum PrimitiveType { Points = 0x0000, Lines = 0x0001, LineLoop = 0x0002, @@ -75,7 +75,7 @@ public: Patches = 0x000E }; - explicit QMeshData(PrimitiveTypes primitiveType = Triangles); + explicit QMeshData(PrimitiveType primitiveType = Triangles); virtual ~QMeshData(); void addAttribute(const QString &name, const QAbstractAttributePtr &attr); @@ -91,7 +91,7 @@ public: static const QString defaultTextureCoordinateAttributeName() { return QStringLiteral("vertexTexCoord"); } static const QString defaultTangentAttributeName() { return QStringLiteral("vertexTangent"); } - void setPrimitiveType(PrimitiveTypes primitiveType); + void setPrimitiveType(PrimitiveType primitiveType); int primitiveType() const; void setVerticesPerPatch(int verticesPerPatch); |