From 21699526137993589f36fca5527fc0e5f8f42733 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Mon, 11 Nov 2019 14:20:13 -0800 Subject: [PATCH] Remove unused mesh.part.materialID --- libraries/fbx/src/FBXSerializer.cpp | 6 ------ libraries/fbx/src/OBJSerializer.cpp | 7 ------- libraries/hfm/src/hfm/HFM.h | 2 -- 3 files changed, 15 deletions(-) diff --git a/libraries/fbx/src/FBXSerializer.cpp b/libraries/fbx/src/FBXSerializer.cpp index f09182c0e6..de6117eff3 100644 --- a/libraries/fbx/src/FBXSerializer.cpp +++ b/libraries/fbx/src/FBXSerializer.cpp @@ -1485,12 +1485,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const shape.mesh = meshIndex; shape.meshPart = i; 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 diff --git a/libraries/fbx/src/OBJSerializer.cpp b/libraries/fbx/src/OBJSerializer.cpp index 31f92555f1..99299dcdec 100644 --- a/libraries/fbx/src/OBJSerializer.cpp +++ b/libraries/fbx/src/OBJSerializer.cpp @@ -174,11 +174,6 @@ glm::vec2 OBJTokenizer::getVec2() { return v; } - -void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID) { - meshPart.materialID = materialID; -} - // OBJFace // 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. @@ -501,8 +496,6 @@ bool OBJSerializer::parseOBJGroup(OBJTokenizer& tokenizer, const hifi::VariantHa bool anyVertexColor { false }; int vertexCount { 0 }; - setMeshPartDefaults(meshPart, QString("dontknow") + QString::number(mesh.parts.size())); - while (true) { int tokenType = tokenizer.nextToken(); if (tokenType == OBJTokenizer::COMMENT_TOKEN) { diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h index f092c91e99..c7b6789094 100644 --- a/libraries/hfm/src/hfm/HFM.h +++ b/libraries/hfm/src/hfm/HFM.h @@ -160,8 +160,6 @@ public: QVector quadIndices; // original indices from the FBX mesh QVector quadTrianglesIndices; // original indices from the FBX mesh of the quad converted as triangles QVector triangleIndices; // original indices from the FBX mesh - - QString materialID; // DEPRECATED }; class Material {