Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return a sensible value for animation component duration if no animation is playing #4765

Merged
merged 6 commits into from
Oct 19, 2022
Merged

Return a sensible value for animation component duration if no animation is playing #4765

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5cde88
Processing the animation data properties in the original order before…
steveny-sc Oct 6, 2022
05fdd66
Return a sensible value for animation component duration if no animat…
steveny-sc Oct 19, 2022
3ab8057
Return max value instead
steveny-sc Oct 19, 2022
494127a
Merge branch 'main' into animation-return-0-if-no-anim
steveny-sc Oct 19, 2022
6f37241
Reverting value to 0 with warning
steveny-sc Oct 19, 2022
16c1775
Update src/framework/components/animation/component.js
yaustar Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/framework/components/animation/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Skeleton } from '../../../scene/animation/skeleton.js';
import { Asset } from '../../asset/asset.js';

import { Component } from '../component.js';
import { revision, version } from "../../../core/core.js";

/** @typedef {import('../../../scene/animation/animation.js').Animation} Animation */
/** @typedef {import('../../../scene/model.js').Model} Model */
Expand Down Expand Up @@ -216,12 +217,17 @@ class AnimationComponent extends Component {
}

/**
* Get the duration in seconds of the current animation.
* Get the duration in seconds of the current animation. Returns 0 if no animation is playing.
*
* @type {number}
*/
get duration() {
return this.animations[this.currAnim].duration;
if (this.currAnim) {
return this.animations[this.currAnim].duration;
}

Debug.warn(`No animation is playing to get a duration. Returning 0.`);
return 0;
}

/**
Expand Down