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

Remove unused mesh.part.materialID

Browse source
This commit is contained in:
sabrina-shanman 2019-11-11 14:20:13 -08:00
parent 9a65d78cdf
commit 2169952613
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/fbx/src/FBXSerializer.cpp
View file

@ -1485,12 +1485,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
shape.mesh = meshIndex; shape.mesh = meshIndex;
shape.meshPart = i; shape.meshPart = i;
shape.joint = transformIndex; shape.joint = transformIndex;
auto matName = mesh.parts[i].materialID;
auto materialIt = materialNameToID.find(matName.toStdString());
if (materialIt != materialNameToID.end()) {
shape.material = materialIt->second;
}
} }
// For FBX_DRACO_MESH_VERSION < 2, or unbaked models, get materials from the partMaterialTextures // For FBX_DRACO_MESH_VERSION < 2, or unbaked models, get materials from the partMaterialTextures

7
libraries/fbx/src/OBJSerializer.cpp
View file

@ -174,11 +174,6 @@ glm::vec2 OBJTokenizer::getVec2() {
return v; return v;
} }
void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID) {
meshPart.materialID = materialID;
}
// OBJFace // OBJFace
// NOTE (trent, 7/20/17): The vertexColors vector being passed-in isn't necessary here, but I'm just // NOTE (trent, 7/20/17): The vertexColors vector being passed-in isn't necessary here, but I'm just
// pairing it with the vertices vector for consistency. // pairing it with the vertices vector for consistency.
@ -501,8 +496,6 @@ bool OBJSerializer::parseOBJGroup(OBJTokenizer& tokenizer, const hifi::VariantHa
bool anyVertexColor { false }; bool anyVertexColor { false };
int vertexCount { 0 }; int vertexCount { 0 };
setMeshPartDefaults(meshPart, QString("dontknow") + QString::number(mesh.parts.size()));
while (true) { while (true) {
int tokenType = tokenizer.nextToken(); int tokenType = tokenizer.nextToken();
if (tokenType == OBJTokenizer::COMMENT_TOKEN) { if (tokenType == OBJTokenizer::COMMENT_TOKEN) {

2
libraries/hfm/src/hfm/HFM.h
View file

@ -160,8 +160,6 @@ public:
QVector<int> quadIndices; // original indices from the FBX mesh QVector<int> quadIndices; // original indices from the FBX mesh
QVector<int> quadTrianglesIndices; // original indices from the FBX mesh of the quad converted as triangles QVector<int> quadTrianglesIndices; // original indices from the FBX mesh of the quad converted as triangles
QVector<int> triangleIndices; // original indices from the FBX mesh QVector<int> triangleIndices; // original indices from the FBX mesh
QString materialID; // DEPRECATED
}; };
class Material { class Material {