maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't add multiple component instances and interpolate between gltf and dynamic bone animation

Browse Source
This commit is contained in:
Nick Fisher
2024-06-03 22:30:45 +08:00
parent 52204ddd5b
commit 7af0f6f00d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dart_filament/native/include/components/AnimationComponentManager.hpp
View File

@@ -105,20 +105,26 @@ namespace flutter_filament
void addAnimationComponent(std::variant<FilamentInstance *, Entity> target) void addAnimationComponent(std::variant<FilamentInstance *, Entity> target)
{ {
AnimationComponent animationComponent; AnimationComponent animationComponent;
animationComponent.target = target; animationComponent.target = target;
EntityInstanceBase::Type componentInstance; EntityInstanceBase::Type componentInstance;
if (std::holds_alternative<FilamentInstance *>(target)) if (std::holds_alternative<FilamentInstance *>(target))
{ {
auto instance = std::get<FilamentInstance *>(target); auto instance = std::get<FilamentInstance *>(target);
componentInstance = addComponent(instance->getRoot()); if(!hasComponent(instance->getRoot())) {
componentInstance = addComponent(instance->getRoot());
this->elementAt<0>(componentInstance) = animationComponent;
}
} }
else else
{ {
componentInstance = addComponent(std::get<Entity>(target)); auto entity = std::get<Entity>(target);
if(!hasComponent(entity)) {
componentInstance = addComponent(entity);
this->elementAt<0>(componentInstance) = animationComponent;
}
} }
this->elementAt<0>(componentInstance) = animationComponent;
} }
@@ -235,7 +241,7 @@ namespace flutter_filament
} }
} }
// simple linear interpolation // linear interpolation for this animation
math::mat4f curr = (1 - delta) * animationStatus.frameData[currFrame]; math::mat4f curr = (1 - delta) * animationStatus.frameData[currFrame];
math::mat4f next = delta * animationStatus.frameData[nextFrame]; math::mat4f next = delta * animationStatus.frameData[nextFrame];
math::mat4f localTransform = curr + next; math::mat4f localTransform = curr + next;
@@ -243,8 +249,14 @@ namespace flutter_filament
const Entity joint = target->getJointsAt(animationStatus.skinIndex)[animationStatus.boneIndex]; const Entity joint = target->getJointsAt(animationStatus.skinIndex)[animationStatus.boneIndex];
auto jointTransform = _transformManager.getInstance(joint); auto jointTransform = _transformManager.getInstance(joint);
auto currentTransform = _transformManager.getTransform(jointTransform);
_transformManager.setTransform(jointTransform, localTransform); // linear interpolation between the current transform (e.g. if set by the gltf frame)
math::mat4f curr2 = (1 - delta) * animationStatus.frameData[currFrame];
math::mat4f next2 = delta * currentTransform;
math::mat4f localTransform2 = curr + next;
_transformManager.setTransform(jointTransform, localTransform2);
animator->updateBoneMatrices(); animator->updateBoneMatrices();