diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualization/utils/meshloader.cpp | |
parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualization/utils/meshloader.cpp')
-rw-r--r-- | src/datavisualization/utils/meshloader.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index 119cde3a..49bdf710 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -24,9 +24,7 @@ #include <QVector2D> #include <QVector3D> -#include <QDebug> - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION QString slashTag = QStringLiteral("/"); @@ -35,8 +33,6 @@ bool MeshLoader::loadOBJ(const QString &path, QVector<QVector2D> &out_uvs, QVector<QVector3D> &out_normals) { - //qDebug() << "Loading OBJ file" << path; - QVector<unsigned int> vertexIndices, uvIndices, normalIndices; QVector<QVector3D> temp_vertices; QVector<QVector2D> temp_uvs; @@ -96,9 +92,6 @@ bool MeshLoader::loadOBJ(const QString &path, normalIndices.append(normalIndex[1]); normalIndices.append(normalIndex[2]); } - else { - //qWarning("Line did not contain usable data"); - } } // For each vertex of each triangle @@ -122,4 +115,4 @@ bool MeshLoader::loadOBJ(const QString &path, return true; } -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION |