add fade in/out to dynamic bone animations
This commit is contained in:
@@ -422,9 +422,11 @@ extern "C"
|
||||
int boneIndex,
|
||||
const float *const frameData,
|
||||
int numFrames,
|
||||
float frameLengthInMs)
|
||||
float frameLengthInMs,
|
||||
float fadeOutInSecs,
|
||||
float fadeInInSecs)
|
||||
{
|
||||
((SceneManager *)sceneManager)->addBoneAnimation(asset, skinIndex, boneIndex, frameData, numFrames, frameLengthInMs);
|
||||
((SceneManager *)sceneManager)->addBoneAnimation(asset, skinIndex, boneIndex, frameData, numFrames, frameLengthInMs, fadeOutInSecs, fadeInInSecs);
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE void set_post_processing(void *const viewer, bool enabled)
|
||||
|
||||
@@ -1025,7 +1025,8 @@ namespace flutter_filament
|
||||
int boneIndex,
|
||||
const float *const frameData,
|
||||
int numFrames,
|
||||
float frameLengthInMs)
|
||||
float frameLengthInMs,
|
||||
float fadeOutInSecs, float fadeInInSecs)
|
||||
{
|
||||
std::lock_guard lock(_mutex);
|
||||
|
||||
@@ -1079,6 +1080,8 @@ namespace flutter_filament
|
||||
animation.durationInSecs = (frameLengthInMs * numFrames) / 1000.0f;
|
||||
animation.lengthInFrames = numFrames;
|
||||
animation.frameLengthInMs = frameLengthInMs;
|
||||
animation.fadeOutInSecs = fadeOutInSecs;
|
||||
animation.fadeInInSecs = fadeInInSecs;
|
||||
animation.skinIndex = skinIndex;
|
||||
if(!_animationComponentManager->hasComponent(instance->getRoot())) {
|
||||
Log("ERROR: specified entity is not animatable (has no animation component attached).");
|
||||
|
||||
Reference in New Issue
Block a user