itdominator
/
SWBF2-Classic-Msh-Viewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add normal to VertexData

This commit is contained in:
Anakin 2017-01-08 14:41:53 +01:00
parent 5c2f5503fc
commit 948578f506
4 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
QtMeshViewer/Header/FileInterface.h
View File

@ -21,6 +21,7 @@ struct VertexData
{ {
QVector3D position; QVector3D position;
QVector2D texCoord; QVector2D texCoord;
QVector3D normal;
}; };
struct Segment { struct Segment {

1
QtMeshViewer/Resources/vshader.glsl
View File

@ -10,6 +10,7 @@ uniform mat4 m_matrix;
attribute vec4 a_position; attribute vec4 a_position;
attribute vec2 a_texcoord; attribute vec2 a_texcoord;
attribute vec3 a_normal;
varying vec2 v_texcoord; varying vec2 v_texcoord;

8
QtMeshViewer/Source/GeometryEngine.cpp
View File

@ -196,6 +196,14 @@ void GeometryEngine::drawGeometry(QOpenGLShaderProgram *program)
program->enableAttributeArray(texcoordLocation); program->enableAttributeArray(texcoordLocation);
program->setAttributeBuffer(texcoordLocation, GL_FLOAT, offset, 2, sizeof(VertexData)); program->setAttributeBuffer(texcoordLocation, GL_FLOAT, offset, 2, sizeof(VertexData));
//Offset for normal
offset += sizeof(QVector2D);
// Tell OpenGL programmable pipeline how to locate vertex normal data
int normLocation = program->attributeLocation("a_normal");
program->enableAttributeArray(normLocation);
program->setAttributeBuffer(normLocation, GL_FLOAT, offset, 3, sizeof(VertexData));
// Paint // Paint
for (auto& it : m_drawList) for (auto& it : m_drawList)

35
QtMeshViewer/Source/MshFile.cpp
View File

@ -384,15 +384,31 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*>
} }
// normals // normals
/*else if (!strcmp("NRML", it->name)) else if (!strcmp("NRML", it->name))
{ {
fsMesh.seekg(it->position); std::uint32_t tmp_size;
std::uint32_t tempSize; m_file.seekg(it->position);
fsMesh.read(reinterpret_cast<char*>(&tempSize), sizeof(tempSize)); m_file.read(F2V(tmp_size), sizeof(tmp_size));
// List of normals
// long int - 4 - number of normal vectores stored in this list if (tmp_size < new_segment->vertices.size())
// float[3][] - 12 each - UVW vector for each vertex {
}*/ emit sendMessage("WARNING: too less normals " + QString::number(tmp_size) + " < " + QString::number(new_segment->vertices.size()), 1);
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;
}
else if (tmp_size > new_segment->vertices.size())
{
emit sendMessage("WARNING: too many normals " + QString::number(tmp_size) + " > " + QString::number(new_segment->vertices.size()), 1);
tmp_size = new_segment->vertices.size();
}
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));
}
// uv // uv
else if (!strcmp("UV0L", it->name)) else if (!strcmp("UV0L", it->name))
@ -584,11 +600,8 @@ void MshFile::readUV(Segment * dataDestination, std::streampos position)
} }
for (unsigned int i = 0; i < tmp_size; i++) for (unsigned int i = 0; i < tmp_size; i++)
{
float tmp[2];
for (unsigned int j = 0; j < 2; j++) for (unsigned int j = 0; j < 2; j++)
m_file.read(F2V(dataDestination->vertices[i].texCoord[j]), sizeof(float)); m_file.read(F2V(dataDestination->vertices[i].texCoord[j]), sizeof(float));
}
} }
QMatrix4x4 MshFile::getParentMatrix(std::string parent) const QMatrix4x4 MshFile::getParentMatrix(std::string parent) const