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

Remove unused cluster fields from hfm

Browse source
This commit is contained in:
sabrina-shanman 2019-10-31 16:06:48 -07:00
parent ba257634f2
commit c3af8b5da7
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1600,12 +1600,10 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
cluster.jointIndex = transformIndex; cluster.jointIndex = transformIndex;
clusters.push_back(cluster); clusters.push_back(cluster);
std::vector<hfm::SkinCluster> skinClusters;
// Skinned mesh instances have an hfm::SkinDeformer // Skinned mesh instances have an hfm::SkinDeformer
skinDeformer.skinClusterIndices.reserve(clusterIDs.size()); std::vector<hfm::SkinCluster> skinClusters;
for (const auto& clusterID : clusterIDs) { for (const auto& clusterID : clusterIDs) {
const Cluster& fbxCluster = fbxClusters[clusterID]; const Cluster& fbxCluster = fbxClusters[clusterID];
skinDeformer.skinClusterIndices.emplace_back();
skinClusters.emplace_back(); skinClusters.emplace_back();
hfm::SkinCluster& skinCluster = skinClusters.back(); hfm::SkinCluster& skinCluster = skinClusters.back();
size_t indexWeightPairs = (size_t)std::min(fbxCluster.indices.size(), fbxCluster.weights.size()); size_t indexWeightPairs = (size_t)std::min(fbxCluster.indices.size(), fbxCluster.weights.size());

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

@ -251,7 +251,6 @@ public:
QVector<glm::vec2> texCoords; QVector<glm::vec2> texCoords;
QVector<glm::vec2> texCoords1; QVector<glm::vec2> texCoords1;
QVector<Cluster> clusters; // DEPRECATED (see hfm::Shape::dynamicTransform, hfm::DynamicTransform::clusters)
Extents meshExtents; // DEPRECATED (see hfm::Shape::transformedExtents) Extents meshExtents; // DEPRECATED (see hfm::Shape::transformedExtents)
glm::mat4 modelTransform; // DEPRECATED (see hfm::Joint::globalTransform, hfm::Shape::transform, hfm::Model::joints) glm::mat4 modelTransform; // DEPRECATED (see hfm::Joint::globalTransform, hfm::Shape::transform, hfm::Model::joints)
@ -317,7 +316,6 @@ public:
class SkinDeformer { class SkinDeformer {
public: public:
std::vector<uint16_t> skinClusterIndices; // DEPRECATED (see hfm::Mesh.clusterIndices, hfm::Mesh.clusterWeights)
std::vector<Cluster> clusters; std::vector<Cluster> clusters;
}; };