Skip to content

Switch to single animation mixer #126

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

Open
memelotsqui wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Switch to single animation mixer #126

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
747a056
removing multiple mixers, adding only 1 to manage all animations
memelotsqui Aug 9, 2022
d5cdc17
playing all animations instead of the first one to keep consistency
memelotsqui Aug 9, 2022
49d67fc
extracted fetch actions by string to be reusable
memelotsqui Aug 9, 2022
8cfc5dd
Ass play animations call
memelotsqui Aug 9, 2022
93d4035
Add Array validation
memelotsqui Aug 9, 2022
5953f6b
Add further validations and warnings
memelotsqui Aug 9, 2022
326250c
added loop argument and animation clamp on end
memelotsqui Aug 10, 2022
5f16144
Add More descriptive Warning when no animation was found
memelotsqui Aug 10, 2022
d003a27
remove playAnimations api call
memelotsqui Aug 10, 2022
d4ace6e
cleanup spaces
memelotsqui Aug 10, 2022
121ffc1
removed set loop line since its no longer necessary here
memelotsqui Aug 10, 2022
6313803
cleared functions and made it more consistent with current code
memelotsqui Aug 10, 2022
b87ea8e
code cleanup
memelotsqui Aug 10, 2022
f0c5811
add idleAnimation component
memelotsqui Aug 10, 2022
3ade253
Merge branch 'main' into WIP-single-AnimationMixer
memelotsqui Aug 15, 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
31 changes: 17 additions & 14 deletions type_templates/glb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default e => {
}

app.glb = null;
const animationMixers = [];
app.mixer = null;
const uvScrolls = [];
const physicsIds = [];
app.physicsIds = physicsIds;
Expand Down Expand Up @@ -77,17 +77,21 @@ export default e => {
const _loadHubsComponents = () => {
const _loadAnimations = () => {
const animationEnabled = !!(app.getComponent('animation') ?? true);
if (animationEnabled) {
const idleAnimation = animations.find(a => a.name === 'idle');

if (animationEnabled && animations.length > 0){

app.mixer = new THREE.AnimationMixer(o); // create the animation mixer with the root of the glb file

const userIdle = app.getComponent('idleAnimation');
const idleString = typeof userIdle === 'string' ? userIdle : 'idle';

const idleAnimation = animations.find(a => a.name === idleString);
const clips = idleAnimation ? [idleAnimation] : animations;
for (const clip of clips) {
const mixer = new THREE.AnimationMixer(o);

const action = mixer.clipAction(clip);
const action = app.mixer.clipAction(clip);
action.play();

animationMixers.push(mixer);
}

}
};
const petComponent = app.getComponent('pet');
Expand Down Expand Up @@ -286,8 +290,8 @@ export default e => {
useFrame(({timestamp, timeDiff}) => {
const _updateAnimation = () => {
const deltaSeconds = timeDiff / 1000;
for (const mixer of animationMixers) {
mixer.update(deltaSeconds);
if (app.mixer){
app.mixer.update(deltaSeconds);
app.updateMatrixWorld();
}
};
Expand All @@ -313,11 +317,10 @@ export default e => {
});

app.stop = () => {
for (const mixer of animationMixers) {
console.log('got mixer', mixer);
mixer.stopAllAction();
if (app.mixer){
app.mixer.stopAllAction();
app.mixer = null;
}
animationMixers.length = 0;
};

return app;
Expand Down