Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-08 06:47:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add hfm::Shape::transformedExtents. Mark select hfm fields as

Browse source 
deprecated.
This commit is contained in:
sabrina-shanman 2019-09-25 15:22:29 -07:00
parent 09b04e8a89
commit af460d7f5f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ public:
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; QString materialID; // DEPRECATED
}; };
class Material { class Material {
@ -238,14 +238,14 @@ public:
QVector<glm::vec3> colors; QVector<glm::vec3> colors;
QVector<glm::vec2> texCoords; QVector<glm::vec2> texCoords;
QVector<glm::vec2> texCoords1; QVector<glm::vec2> texCoords1;
QVector<uint16_t> clusterIndices; QVector<uint16_t> clusterIndices; // DEPRECATED (see hfm::Shape::dynamicTransform, hfm::DynamicTransform::deformers, hfm::Deformer)
QVector<uint16_t> clusterWeights; QVector<uint16_t> clusterWeights; // DEPRECATED (see hfm::Shape::dynamicTransform, hfm::DynamicTransform::deformers, hfm::Deformer)
QVector<int32_t> originalIndices; QVector<int32_t> originalIndices;
QVector<Cluster> clusters; QVector<Cluster> clusters; // DEPRECATED (see hfm::Shape::dynamicTransform, hfm::DynamicTransform::clusters)
Extents meshExtents; Extents meshExtents; // DEPRECATED (see hfm::Shape::transformedExtents)
glm::mat4 modelTransform; glm::mat4 modelTransform; // DEPRECATED (see hfm::Shape::transform, hfm::TransformNode, hfm::Model::transforms)
QVector<Blendshape> blendshapes; QVector<Blendshape> blendshapes;
@ -317,6 +317,8 @@ public:
uint32_t meshPart { UNDEFINED_KEY }; uint32_t meshPart { UNDEFINED_KEY };
uint32_t material { UNDEFINED_KEY }; uint32_t material { UNDEFINED_KEY };
uint32_t transform { UNDEFINED_KEY }; // The static transform node when not taking into account rigging/skinning uint32_t transform { UNDEFINED_KEY }; // The static transform node when not taking into account rigging/skinning
// TODO: Have all serializers calculate hfm::Shape::transformedExtents in world space where they previously calculated hfm::Mesh::meshExtents. Change all code that uses hfm::Mesh::meshExtents to use this instead.
Extents transformedExtents; // The precise extents of the meshPart vertices in world space, after the transform node and parent transform nodes are applied, while not taking into account rigging/skinning
uint32_t dynamicTransform { UNDEFINED_KEY }; uint32_t dynamicTransform { UNDEFINED_KEY };
}; };