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

Re-order hfm::Model variables and add shapeTransforms list

Browse source
This commit is contained in:
sabrina-shanman 2019-09-11 16:56:29 -07:00
parent b944db3e79
commit ccdfb11de2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,14 +315,14 @@ public:
std::vector<Shape> shapes; std::vector<Shape> shapes;
std::vector<Mesh> meshes; std::vector<Mesh> meshes;
std::vector<Material> materials;
std::vector<ShapeTransform> shapeTransforms;
std::vector<Joint> joints; std::vector<Joint> joints;
QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
bool hasSkeletonJoints; bool hasSkeletonJoints;
QVector<QString> scripts; QVector<QString> scripts;
std::vector<Material> materials;
glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
glm::vec3 neckPivot; glm::vec3 neckPivot;