parent
f81f03353d
commit
b3a8b4bb81
|
@ -342,10 +342,16 @@ void OpenGLController::updateScene()
|
||||||
// give the MVP to the shader
|
// give the MVP to the shader
|
||||||
glUniformMatrix4fv(gluiMatrixID, 1, GL_FALSE, &getMVPMatrix(modelIndex)[0][0]);
|
glUniformMatrix4fv(gluiMatrixID, 1, GL_FALSE, &getMVPMatrix(modelIndex)[0][0]);
|
||||||
|
|
||||||
glDrawArrays(GL_TRIANGLES, instanceOffset, segIt->meshIndices.size() * 3);
|
// calculate the number of vertex
|
||||||
|
unsigned int vertexCount(0);
|
||||||
|
for (auto& it : segIt->meshIndices)
|
||||||
|
vertexCount += (it->size() - 2) * 3;
|
||||||
|
|
||||||
|
|
||||||
|
glDrawArrays(GL_TRIANGLES, instanceOffset, vertexCount);
|
||||||
|
|
||||||
// increase the offset
|
// increase the offset
|
||||||
instanceOffset += segIt->meshIndices.size() * 3;
|
instanceOffset += vertexCount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -407,8 +413,34 @@ void OpenGLController::loadMsh(const char * path)
|
||||||
}
|
}
|
||||||
else if (mshIt->size() > 3) // needs to be triangulated
|
else if (mshIt->size() > 3) // needs to be triangulated
|
||||||
{
|
{
|
||||||
//TODO: triangulate;
|
// for every triangle of the multi polygon
|
||||||
MessageBox(NULL, "Ooops!", "MeshViewer 2.0 Error", MB_OK | MB_ICONERROR);
|
for (int tri = 0; tri < mshIt->size() - 2; tri++)
|
||||||
|
{
|
||||||
|
// for every edge of the triangle
|
||||||
|
for (int triEdge = 0; triEdge < 3; triEdge++)
|
||||||
|
{
|
||||||
|
Vertex tempVertex;
|
||||||
|
// every edge has 3 coordinates
|
||||||
|
for (int j = 0; j < 3; j++)
|
||||||
|
tempVertex.position[j] = (GLfloat)segIt->vertex[(*mshIt)[triEdge > 0 ? tri + triEdge : 0] * 3 + j];
|
||||||
|
|
||||||
|
// and 2 UV
|
||||||
|
if (segIt->uv == NULL)
|
||||||
|
{
|
||||||
|
tempVertex.uv[0] = 1.0;
|
||||||
|
tempVertex.uv[1] = 1.0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (int j = 0; j < 2; j++)
|
||||||
|
tempVertex.uv[j] = (GLfloat)segIt->uv[(*mshIt)[triEdge > 0 ? tri + triEdge : 0] * 2 + j];
|
||||||
|
}
|
||||||
|
tempBufferData.push_back(tempVertex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: test triangulation
|
||||||
|
//MessageBox(NULL, "Ooops!", "MeshViewer 2.0 Error", MB_OK | MB_ICONERROR);
|
||||||
}
|
}
|
||||||
else // this shouldn't happen (polygon with less then 3 vertex)
|
else // this shouldn't happen (polygon with less then 3 vertex)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,10 +14,9 @@ licence, too.
|
||||||
|
|
||||||
### To Do
|
### To Do
|
||||||
- cluster seam to use wrong textures
|
- cluster seam to use wrong textures
|
||||||
|
- multipoly testing
|
||||||
- cloth testing
|
- cloth testing
|
||||||
- colisions are displayed (dont touch hiden things)
|
- optional display bones, shadow, collision,...
|
||||||
- bones are not triangulated,
|
|
||||||
- nulls are not triangulated,
|
|
||||||
- integrate into a software:
|
- integrate into a software:
|
||||||
-> gui open file ( + drag and drop),
|
-> gui open file ( + drag and drop),
|
||||||
-> list all msh under a directory,
|
-> list all msh under a directory,
|
||||||
|
|
Loading…
Reference in New Issue