diff options
Diffstat (limited to 'src/plugins/geometryloaders/default')
5 files changed, 20 insertions, 18 deletions
diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp index 687c39e6a..2943eec2b 100644 --- a/src/plugins/geometryloaders/default/basegeometryloader.cpp +++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -Q_LOGGING_CATEGORY(BaseGeometryLoaderLog, "Qt3D.BaseGeometryLoader") +Q_LOGGING_CATEGORY(BaseGeometryLoaderLog, "Qt3D.BaseGeometryLoader", QtWarningMsg) BaseGeometryLoader::BaseGeometryLoader() : m_loadTextureCoords(true) diff --git a/src/plugins/geometryloaders/default/basegeometryloader_p.h b/src/plugins/geometryloaders/default/basegeometryloader_p.h index 56bdb23a9..fb1ffc6b0 100644 --- a/src/plugins/geometryloaders/default/basegeometryloader_p.h +++ b/src/plugins/geometryloaders/default/basegeometryloader_p.h @@ -154,6 +154,13 @@ struct FaceIndices }; QT3D_DECLARE_TYPEINFO(Qt3DRender, FaceIndices, Q_PRIMITIVE_TYPE) +struct ByteArraySplitterEntry +{ + int start; + int size; +}; +QT3D_DECLARE_TYPEINFO(Qt3DRender, ByteArraySplitterEntry, Q_PRIMITIVE_TYPE) + /* * A helper class to split a QByteArray and access its sections without * additional memory allocations. @@ -169,7 +176,7 @@ public: for (auto it = begin; it != end; ++it) { if (*it == delimiter) { if (position > lastPosition || splitBehavior == QString::KeepEmptyParts) { // skip multiple consecutive delimiters - const Entry entry = { lastPosition, position - lastPosition }; + const ByteArraySplitterEntry entry = { lastPosition, position - lastPosition }; m_entries.append(entry); } lastPosition = position + 1; @@ -178,7 +185,7 @@ public: ++position; } - const Entry entry = { lastPosition, position - lastPosition }; + const ByteArraySplitterEntry entry = { lastPosition, position - lastPosition }; m_entries.append(entry); } @@ -212,17 +219,10 @@ public: return ByteArraySplitter(m_input + m_entries[index].start, m_input + m_entries[index].start + m_entries[index].size, delimiter, splitBehavior); } - struct Entry - { - int start; - int size; - }; - private: - QVarLengthArray<Entry, 16> m_entries; + QVarLengthArray<ByteArraySplitterEntry, 16> m_entries; const char *m_input; }; -QT3D_DECLARE_TYPEINFO(Qt3DRender, ByteArraySplitter::Entry, Q_PRIMITIVE_TYPE) } // namespace Qt3DRender diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp index ad1bde7d4..b1fb1f931 100644 --- a/src/plugins/geometryloaders/default/objgeometryloader.cpp +++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp @@ -40,12 +40,13 @@ #include "objgeometryloader.h" #include <QtCore/QLoggingCategory> +#include <QtCore/QRegularExpression> QT_BEGIN_NAMESPACE namespace Qt3DRender { -Q_LOGGING_CATEGORY(ObjGeometryLoaderLog, "Qt3D.ObjGeometryLoader") +Q_LOGGING_CATEGORY(ObjGeometryLoaderLog, "Qt3D.ObjGeometryLoader", QtWarningMsg) static void addFaceVertex(const FaceIndices &faceIndices, QVector<FaceIndices>& faceIndexVector, @@ -77,7 +78,7 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh) int normalsOffset = 0; int texCoordsOffset = 0; - QRegExp subMeshMatch(subMesh); + QRegularExpression subMeshMatch(subMesh); if (!subMeshMatch.isValid()) subMeshMatch.setPattern(QLatin1String("^(") + subMesh + QLatin1String(")$")); Q_ASSERT(subMeshMatch.isValid()); @@ -196,7 +197,8 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh) } else { if (!subMesh.isEmpty() ) { const QString objName = tokens.stringAt(1); - skipping = subMeshMatch.indexIn(objName) < 0; + QRegularExpressionMatch match = subMeshMatch.match(objName); + skipping = !match.hasMatch(); } } } @@ -217,7 +219,7 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh) if (hasNormals) m_normals.resize(vertexCount); - for (QHash<FaceIndices, unsigned int>::const_iterator it = faceIndexMap.begin(), endIt = faceIndexMap.end(); it != endIt; ++it) { + for (auto it = faceIndexMap.cbegin(), endIt = faceIndexMap.cend(); it != endIt; ++it) { m_points[it.value()] = positions[it.key().positionIndex]; if (hasTexCoords) m_texCoords[it.value()] = std::numeric_limits<unsigned int>::max() != it.key().texCoordIndex ? texCoords[it.key().texCoordIndex] : QVector2D(); @@ -229,7 +231,7 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh) const int indexCount = faceIndexVector.size(); m_indices.clear(); m_indices.reserve(indexCount); - for (const FaceIndices faceIndices : faceIndexVector) { + for (const FaceIndices faceIndices : qAsConst(faceIndexVector)) { const unsigned int i = faceIndexMap.value(faceIndices); m_indices.append(i); } diff --git a/src/plugins/geometryloaders/default/plygeometryloader.cpp b/src/plugins/geometryloaders/default/plygeometryloader.cpp index a7c252174..a51c991af 100644 --- a/src/plugins/geometryloaders/default/plygeometryloader.cpp +++ b/src/plugins/geometryloaders/default/plygeometryloader.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -Q_LOGGING_CATEGORY(PlyGeometryLoaderLog, "Qt3D.PlyGeometryLoader") +Q_LOGGING_CATEGORY(PlyGeometryLoaderLog, "Qt3D.PlyGeometryLoader", QtWarningMsg) namespace { diff --git a/src/plugins/geometryloaders/default/stlgeometryloader.cpp b/src/plugins/geometryloaders/default/stlgeometryloader.cpp index b76698cc7..b4b5333cb 100644 --- a/src/plugins/geometryloaders/default/stlgeometryloader.cpp +++ b/src/plugins/geometryloaders/default/stlgeometryloader.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -Q_LOGGING_CATEGORY(StlGeometryLoaderLog, "Qt3D.StlGeometryLoader") +Q_LOGGING_CATEGORY(StlGeometryLoaderLog, "Qt3D.StlGeometryLoader", QtWarningMsg) bool StlGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh) { |