Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 16:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let's try that again.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-02 18:03:54 -07:00
parent 0c8b3eaf1a
commit 3e8b5c8714
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/fbx/src/FBXReader.cpp
View file

@ -705,17 +705,17 @@ void appendIndex(MeshData& data, QVector<int>& indices, int index) {
if (vertexIndex < 0) { if (vertexIndex < 0) {
vertexIndex = -vertexIndex - 1; vertexIndex = -vertexIndex - 1;
} }
vertexIndex = qMin(vertexIndex, data.vertices.size() - 1);
Vertex vertex; Vertex vertex;
vertex.originalIndex = vertexIndex; vertex.originalIndex = vertexIndex;
glm::vec3 normal; glm::vec3 normal;
if (data.normalIndices.isEmpty()) { int normalIndex = data.normalsByVertex ? vertexIndex : index;
normal = data.normals.at(data.normalsByVertex ? vertexIndex : index); if (data.normalIndices.isEmpty()) {
if (normalIndex < data.normals.size()) {
} else { normal = data.normals.at(normalIndex);
int normalIndex = data.normalIndices.at(data.normalsByVertex ? vertexIndex : index); }
} else if (normalIndex < data.normalIndices.size()) {
normalIndex = data.normalIndices.at(normalIndex);
if (normalIndex >= 0 && normalIndex < data.normals.size()) { if (normalIndex >= 0 && normalIndex < data.normals.size()) {
normal = data.normals.at(normalIndex); normal = data.normals.at(normalIndex);
} }
@ -725,7 +725,7 @@ void appendIndex(MeshData& data, QVector<int>& indices, int index) {
if (index < data.texCoords.size()) { if (index < data.texCoords.size()) {
vertex.texCoord = data.texCoords.at(index); vertex.texCoord = data.texCoords.at(index);
} }
} else { } else if (index < data.texCoordIndices.size()) {
int texCoordIndex = data.texCoordIndices.at(index); int texCoordIndex = data.texCoordIndices.at(index);
if (texCoordIndex >= 0 && texCoordIndex < data.texCoords.size()) { if (texCoordIndex >= 0 && texCoordIndex < data.texCoords.size()) {
vertex.texCoord = data.texCoords.at(texCoordIndex); vertex.texCoord = data.texCoords.at(texCoordIndex);