Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Smooth the normals.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-31 14:26:06 -07:00
parent a15bff3857
commit 1a532be845
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/renderer/FBXReader.cpp
View file

@ -563,7 +563,6 @@ void appendModelIDs(const QString& parentID, const QMultiHash<QString, QString>&
class Vertex { class Vertex {
public: public:
int originalIndex; int originalIndex;
glm::vec3 normal;
glm::vec2 texCoord; glm::vec2 texCoord;
}; };
@ -572,7 +571,7 @@ uint qHash(const Vertex& vertex, uint seed = 0) {
} }
bool operator==(const Vertex& v1, const Vertex& v2) { bool operator==(const Vertex& v1, const Vertex& v2) {
return v1.originalIndex == v2.originalIndex && v1.normal == v2.normal && v1.texCoord == v2.texCoord; return v1.originalIndex == v2.originalIndex && v1.texCoord == v2.texCoord;
} }
class ExtractedMesh { class ExtractedMesh {
@ -604,13 +603,14 @@ void appendIndex(MeshData& data, QVector<int>& indices, int index) {
Vertex vertex; Vertex vertex;
vertex.originalIndex = vertexIndex; vertex.originalIndex = vertexIndex;
glm::vec3 normal;
if (data.normalIndices.isEmpty()) { if (data.normalIndices.isEmpty()) {
vertex.normal = data.normals.at(data.normalsByVertex ? vertexIndex : index); normal = data.normals.at(data.normalsByVertex ? vertexIndex : index);
} else { } else {
int normalIndex = data.normalIndices.at(data.normalsByVertex ? vertexIndex : index); int normalIndex = data.normalIndices.at(data.normalsByVertex ? vertexIndex : index);
if (normalIndex >= 0) { if (normalIndex >= 0) {
vertex.normal = data.normals.at(normalIndex); normal = data.normals.at(normalIndex);
} }
} }
@ -631,11 +631,12 @@ void appendIndex(MeshData& data, QVector<int>& indices, int index) {
data.indices.insert(vertex, newIndex); data.indices.insert(vertex, newIndex);
data.extracted.newIndices.insert(vertexIndex, newIndex); data.extracted.newIndices.insert(vertexIndex, newIndex);
data.extracted.mesh.vertices.append(data.vertices.at(vertexIndex)); data.extracted.mesh.vertices.append(data.vertices.at(vertexIndex));
data.extracted.mesh.normals.append(vertex.normal); data.extracted.mesh.normals.append(normal);
data.extracted.mesh.texCoords.append(vertex.texCoord); data.extracted.mesh.texCoords.append(vertex.texCoord);
} else { } else {
indices.append(*it); indices.append(*it);
data.extracted.mesh.normals[*it] += normal;
} }
} }
@ -714,7 +715,7 @@ ExtractedMesh extractMesh(const FBXNode& object) {
} }
void setTangents(FBXMesh& mesh, int firstIndex, int secondIndex) { void setTangents(FBXMesh& mesh, int firstIndex, int secondIndex) {
glm::vec3 normal = mesh.normals.at(firstIndex); glm::vec3 normal = glm::normalize(mesh.normals.at(firstIndex));
glm::vec3 bitangent = glm::cross(normal, mesh.vertices.at(secondIndex) - mesh.vertices.at(firstIndex)); glm::vec3 bitangent = glm::cross(normal, mesh.vertices.at(secondIndex) - mesh.vertices.at(firstIndex));
if (glm::length(bitangent) < EPSILON) { if (glm::length(bitangent) < EPSILON) {
return; return;