From 0a9103fdc58263365f6f79d4874618801902a441 Mon Sep 17 00:00:00 2001 From: Anakin Date: Mon, 23 Jan 2017 13:49:29 +0100 Subject: [PATCH] differ vertexNormal and triangleNormal --- QtMeshViewer/Header/FileInterface.h | 2 +- QtMeshViewer/Source/MshFile.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/QtMeshViewer/Header/FileInterface.h b/QtMeshViewer/Header/FileInterface.h index c044630..3c040de 100644 --- a/QtMeshViewer/Header/FileInterface.h +++ b/QtMeshViewer/Header/FileInterface.h @@ -23,7 +23,7 @@ struct VertexData { QVector3D position; QVector2D texCoord; - QVector3D normal; + QVector3D vertexNormal; }; struct Segment { diff --git a/QtMeshViewer/Source/MshFile.cpp b/QtMeshViewer/Source/MshFile.cpp index eafc798..a402a1f 100644 --- a/QtMeshViewer/Source/MshFile.cpp +++ b/QtMeshViewer/Source/MshFile.cpp @@ -510,7 +510,7 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list for (unsigned int i = new_segment->vertices.size(); i != tmp_size; i--) for (unsigned int j = 0; j < 3; j++) - new_segment->vertices[i - 1].normal[j] = 0; + new_segment->vertices[i - 1].vertexNormal[j] = 0; } else if (tmp_size > new_segment->vertices.size()) { @@ -520,7 +520,7 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list for (unsigned int i = 0; i < tmp_size; i++) for (unsigned int j = 0; j < 3; j++) - m_file.read(F2V(new_segment->vertices[i].normal[j]), sizeof(float)); + m_file.read(F2V(new_segment->vertices[i].vertexNormal[j]), sizeof(float)); }