Ubujira
/
skinview3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support IAnimation in invokeAnimation

This commit is contained in:
yushijinhun 2018-08-17 12:15:02 +08:00
parent 6477c7c707
commit e78138b856
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/animation.ts
View File

@ -1,12 +1,11 @@
import { PlayerObject } from "./model"; import { PlayerObject } from "./model";
export function invokeAnimation(animation: Animation, player: PlayerObject, time: number) { export function invokeAnimation(animation: Animation, player: PlayerObject, time: number) {
if (animation instanceof CompositeAnimation) { if (animation instanceof Function) {
animation.play(player, time);
} else if (animation instanceof Function) {
animation(player, time); animation(player, time);
} else { } else {
throw new Error(`Not an animation: ${animation}`); // must be IAnimation here
animation.play(player, time);
} }
} }
@ -78,7 +77,7 @@ export class CompositeAnimation {
} }
} }
export const WalkingAnimation: Animation = (player: PlayerObject, time: number) => { export const WalkingAnimation: Animation = (player, time) => {
const skin = player.skin; const skin = player.skin;
// Multiply by animation's natural speed // Multiply by animation's natural speed
@ -104,7 +103,7 @@ export const WalkingAnimation: Animation = (player: PlayerObject, time: number)
player.cape.rotation.x = Math.sin(time / 1.5) * 0.06 + basicCapeRotationX; player.cape.rotation.x = Math.sin(time / 1.5) * 0.06 + basicCapeRotationX;
}; };
export const RunningAnimation: Animation = (player: PlayerObject, time: number) => { export const RunningAnimation: Animation = (player, time) => {
const skin = player.skin; const skin = player.skin;
time *= 15; time *= 15;
@ -137,6 +136,6 @@ export const RunningAnimation: Animation = (player: PlayerObject, time: number)
// You shouldn't glance right and left when running dude :P // You shouldn't glance right and left when running dude :P
}; };
export const RotatingAnimation: Animation = (player: PlayerObject, time: number) => { export const RotatingAnimation: Animation = (player, time) => {
player.rotation.y = time; player.rotation.y = time;
}; };