Browse Source

Merge pull request #18855 from Longi94/anim-mixer

TS: AnimationMixer to accept AnimationObjectGroup.
Michael Herzog 5 years ago
parent
commit
baa6cdf05c
1 changed files with 7 additions and 6 deletions
  1. 7 6
      src/animation/AnimationMixer.d.ts

+ 7 - 6
src/animation/AnimationMixer.d.ts

@@ -2,22 +2,23 @@ import { AnimationClip } from './AnimationClip';
 import { AnimationAction } from './AnimationAction';
 import { EventDispatcher } from './../core/EventDispatcher';
 import { Object3D } from '../core/Object3D';
+import { AnimationObjectGroup } from './AnimationObjectGroup';
 
 export class AnimationMixer extends EventDispatcher {
 
-	constructor( root: Object3D );
+	constructor( root: Object3D | AnimationObjectGroup );
 
 	time: number;
 	timeScale: number;
 
-	clipAction( clip: AnimationClip, root?: Object3D ): AnimationAction;
-	existingAction( clip: AnimationClip, root?: Object3D ): AnimationAction | null;
+	clipAction( clip: AnimationClip, root?: Object3D | AnimationObjectGroup ): AnimationAction;
+	existingAction( clip: AnimationClip, root?: Object3D | AnimationObjectGroup ): AnimationAction | null;
 	stopAllAction(): AnimationMixer;
 	update( deltaTime: number ): AnimationMixer;
 	setTime( timeInSeconds: number ): AnimationMixer;
-	getRoot(): Object3D;
+	getRoot(): Object3D | AnimationObjectGroup;
 	uncacheClip( clip: AnimationClip ): void;
-	uncacheRoot( root: Object3D ): void;
-	uncacheAction( clip: AnimationClip, root?: Object3D ): void;
+	uncacheRoot( root: Object3D | AnimationObjectGroup ): void;
+	uncacheAction( clip: AnimationClip, root?: Object3D | AnimationObjectGroup ): void;
 
 }