From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 Jan 2014 11:34:59 +0200 Subject: Removed QDataVis and namespace macros - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/vertexindexer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/utils/vertexindexer.cpp') diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index dafe5dbc..ea25b5d6 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -23,7 +23,7 @@ #include -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { int unique_vertices = 0; @@ -150,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector &in_vertices, //qDebug() << "unique vertices" << unique_vertices; } -QT_DATAVISUALIZATION_END_NAMESPACE +} -- cgit v1.2.3 From 3e7dc5bd1769e4578733f7ce0f4eba72346b6d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 09:29:38 +0200 Subject: Docs updated after namespace macro removal - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/vertexindexer.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/datavisualization/utils/vertexindexer.cpp') diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index ea25b5d6..fd90e447 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -25,6 +25,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::VertexIndexer + * \internal + */ + int unique_vertices = 0; // Returns true if v1 can be considered equal to v2 -- cgit v1.2.3 From 8674307d6bafabfcaedfe175b883313f0e7d88b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 13:33:57 +0200 Subject: Reintroduced namespace macros Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/vertexindexer.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/datavisualization/utils/vertexindexer.cpp') diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index fd90e447..cb5d3ffc 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -23,12 +23,7 @@ #include -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::VertexIndexer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION int unique_vertices = 0; @@ -155,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector &in_vertices, //qDebug() << "unique vertices" << unique_vertices; } -} +QT_END_NAMESPACE_DATAVISUALIZATION -- cgit v1.2.3 From 892bd7976b2980947adf216b8afc5c6f2a63ce65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 22 Jan 2014 10:00:08 +0200 Subject: Made jira tasks of TODOs, part 2 + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/vertexindexer.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/datavisualization/utils/vertexindexer.cpp') diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index cb5d3ffc..ba3d20f9 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -18,11 +18,8 @@ #include "vertexindexer_p.h" -#include // for memcmp #include -#include - QT_BEGIN_NAMESPACE_DATAVISUALIZATION int unique_vertices = 0; @@ -33,8 +30,7 @@ bool VertexIndexer::is_near(float v1, float v2) return qAbs(v1 - v2) < 0.01f; } -// Searches through all already exported vertices -// for a similar one. +// Searches through all already exported vertices for a similar one. // Similar = same position + same UVs + same normal bool VertexIndexer::getSimilarVertexIndex(const QVector3D &in_vertex, const QVector2D &in_uv, @@ -44,7 +40,7 @@ bool VertexIndexer::getSimilarVertexIndex(const QVector3D &in_vertex, QVector &out_normals, unsigned short &result) { - // Lame linear search + // Linear search for (int i = 0; i < out_vertices.size(); i++) { if (is_near(in_vertex.x() , out_vertices[i].x()) && is_near(in_vertex.y() , out_vertices[i].y()) @@ -58,8 +54,7 @@ bool VertexIndexer::getSimilarVertexIndex(const QVector3D &in_vertex, return true; } } - // No other vertex could be used instead. - // Looks like we'll have to add it to the VBO. + // No other vertex could be used instead return false; } @@ -107,7 +102,6 @@ void VertexIndexer::indexVBO(const QVector &in_vertices, VertexToOutIndex[packed] = newindex; } } - //qDebug() << "unique vertices" << unique_vertices; } void VertexIndexer::indexVBO_TBN(const QVector &in_vertices, @@ -125,7 +119,6 @@ void VertexIndexer::indexVBO_TBN(const QVector &in_vertices, unique_vertices = 0; // For each input vertex for (int i = 0; i < in_vertices.size(); i++) { - // Try to find a similar vertex in out_XXXX unsigned short index; bool found = getSimilarVertexIndex(in_vertices[i], in_uvs[i], in_normals[i], @@ -133,7 +126,6 @@ void VertexIndexer::indexVBO_TBN(const QVector &in_vertices, if (found) { out_indices.append(index); - // Average the tangents and the bitangents out_tangents[index] += in_tangents[i]; out_bitangents[index] += in_bitangents[i]; @@ -147,7 +139,6 @@ void VertexIndexer::indexVBO_TBN(const QVector &in_vertices, out_indices.append((unsigned short)out_vertices.size() - 1); } } - //qDebug() << "unique vertices" << unique_vertices; } QT_END_NAMESPACE_DATAVISUALIZATION -- cgit v1.2.3 From 3b57eb8aaef9886a9975b7b861f31bdf8ed15fdb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 27 Jan 2014 08:18:03 +0200 Subject: Fix copyright year Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/vertexindexer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/utils/vertexindexer.cpp') diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index ba3d20f9..f089ce6e 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.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 ** -- cgit v1.2.3