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

Fixes to OBJReader.cpp style inconsistencies.

Browse source
This commit is contained in:
trent 2017-04-03 21:54:19 -04:00
parent 5cc87ccc4a
commit 362ffba117
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/fbx/src/OBJReader.cpp
View file

@ -497,7 +497,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
if (specifiesUV) { if (specifiesUV) {
material.userSpecifiesUV = true; // Note might not be true in a later usage. material.userSpecifiesUV = true; // Note might not be true in a later usage.
} }
if (specifiesUV || (0 != groupMaterialName.compare("none", Qt::CaseInsensitive))) { if (specifiesUV || (groupMaterialName.compare("none", Qt::CaseInsensitive) != 0)) {
// Blender has a convention that a material named "None" isn't really used (or defined). // Blender has a convention that a material named "None" isn't really used (or defined).
material.used = true; material.used = true;
needsMaterialLibrary = groupMaterialName != SMART_DEFAULT_MATERIAL_NAME; needsMaterialLibrary = groupMaterialName != SMART_DEFAULT_MATERIAL_NAME;
@ -545,21 +545,21 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
n0 = checked_at(normals, face.normalIndices[0]); n0 = checked_at(normals, face.normalIndices[0]);
n1 = checked_at(normals, face.normalIndices[1]); n1 = checked_at(normals, face.normalIndices[1]);
n2 = checked_at(normals, face.normalIndices[2]); n2 = checked_at(normals, face.normalIndices[2]);
} } else {
else {
// generate normals from triangle plane if not provided // generate normals from triangle plane if not provided
n0 = n1 = n2 = glm::cross(v1 - v0, v2 - v0); n0 = n1 = n2 = glm::cross(v1 - v0, v2 - v0);
} }
mesh.normals.append(n0); mesh.normals.append(n0);
mesh.normals.append(n1); mesh.normals.append(n1);
mesh.normals.append(n2); mesh.normals.append(n2);
if (face.textureUVIndices.count()) { if (face.textureUVIndices.count()) {
mesh.texCoords << mesh.texCoords <<
checked_at(textureUVs, face.textureUVIndices[0]) << checked_at(textureUVs, face.textureUVIndices[0]) <<
checked_at(textureUVs, face.textureUVIndices[1]) << checked_at(textureUVs, face.textureUVIndices[1]) <<
checked_at(textureUVs, face.textureUVIndices[2]); checked_at(textureUVs, face.textureUVIndices[2]);
} } else {
else {
glm::vec2 corner(0.0f, 1.0f); glm::vec2 corner(0.0f, 1.0f);
mesh.texCoords << corner << corner << corner; mesh.texCoords << corner << corner << corner;
} }
@ -580,7 +580,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
qCDebug(modelformat) << "OBJ reader fail: " << e.what(); qCDebug(modelformat) << "OBJ reader fail: " << e.what();
} }
QString queryPart = _url.query(); QString queryPart = _url.query();
bool suppressMaterialsHack = queryPart.contains("hifiusemat"); // If this appears in query string, don't fetch mtl even if used. bool suppressMaterialsHack = queryPart.contains("hifiusemat"); // If this appears in query string, don't fetch mtl even if used.
OBJMaterial& preDefinedMaterial = materials[SMART_DEFAULT_MATERIAL_NAME]; OBJMaterial& preDefinedMaterial = materials[SMART_DEFAULT_MATERIAL_NAME];
preDefinedMaterial.used = true; preDefinedMaterial.used = true;