merge in changes from web/js branch by hand (bone animation updates)
This commit is contained in:
@@ -62,17 +62,17 @@ namespace polyvox {
|
||||
// Use this to construct a dynamic (i.e. non-glTF embedded) bone/joint animation.
|
||||
//
|
||||
struct BoneAnimation : AnimationStatus {
|
||||
uint8_t boneIndex;
|
||||
size_t boneIndex;
|
||||
vector<utils::Entity> meshTargets;
|
||||
size_t skinIndex = 0;
|
||||
int lengthInFrames;
|
||||
float frameLengthInMs = 0;
|
||||
vector<math::quatf> frameData;
|
||||
vector<math::mat4f> frameData;
|
||||
};
|
||||
|
||||
struct SceneAsset {
|
||||
FilamentAsset* asset = nullptr;
|
||||
|
||||
vector<math::mat4f> initialJointTransforms;
|
||||
vector<GltfAnimation> gltfAnimations;
|
||||
vector<MorphAnimation> morphAnimations;
|
||||
vector<BoneAnimation> boneAnimations;
|
||||
|
||||
Reference in New Issue
Block a user