Browse Source

Merge pull request #18632 from PaulKElliott/ts-audio

TS: Fixes passing PositionalAudio to AudioAnalyser
Mr.doob 5 years ago
parent
commit
064970abe7
3 changed files with 4 additions and 10 deletions
  1. 2 2
      src/audio/Audio.d.ts
  2. 1 1
      src/audio/AudioAnalyser.d.ts
  3. 1 7
      src/audio/PositionalAudio.d.ts

+ 2 - 2
src/audio/Audio.d.ts

@@ -4,7 +4,7 @@ import { AudioContext } from './AudioContext';
 
 // Extras / Audio /////////////////////////////////////////////////////////////////////
 
-export class Audio extends Object3D {
+export class Audio<NodeType extends AudioNode = GainNode> extends Object3D {
 
 	constructor( listener: AudioListener );
 	type: 'Audio';
@@ -27,7 +27,7 @@ export class Audio extends Object3D {
 	source: AudioBufferSourceNode;
 	filters: any[];
 
-	getOutput(): GainNode;
+	getOutput(): NodeType;
 	setNodeSource( audioNode: AudioBufferSourceNode ): this;
 	setMediaElementSource( mediaElement: HTMLMediaElement ): this;
 	setMediaStreamSource( mediaStream: MediaStream ): this;

+ 1 - 1
src/audio/AudioAnalyser.d.ts

@@ -2,7 +2,7 @@ import { Audio } from './Audio';
 
 export class AudioAnalyser {
 
-	constructor( audio: Audio, fftSize: number );
+	constructor( audio: Audio<AudioNode>, fftSize: number );
 
 	analyser: AnalyserNode;
 	data: Uint8Array;

+ 1 - 7
src/audio/PositionalAudio.d.ts

@@ -1,13 +1,7 @@
 import { AudioListener } from './AudioListener';
 import { Audio } from './Audio';
 
-export class AudioWeaken extends Audio {
-
-	getOutput(): any;
-
-}
-
-export class PositionalAudio extends AudioWeaken {
+export class PositionalAudio extends Audio<PannerNode> {
 
 	constructor( listener: AudioListener );