From fb55cdb2b4d4cd7eeee7e263b3420a2c353b814d Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 6 Jan 2021 10:21:33 +0000 Subject: [PATCH] TS: Clean up. --- examples/jsm/loaders/3DMLoader.d.ts | 3 +-- examples/jsm/loaders/3MFLoader.d.ts | 5 ++--- examples/jsm/loaders/AMFLoader.d.ts | 3 +-- examples/jsm/loaders/AssimpLoader.d.ts | 3 +-- examples/jsm/loaders/BVHLoader.d.ts | 3 +-- examples/jsm/loaders/BasisTextureLoader.d.ts | 3 +-- examples/jsm/loaders/ColladaLoader.d.ts | 3 +-- examples/jsm/loaders/DRACOLoader.d.ts | 3 +-- examples/jsm/loaders/FBXLoader.d.ts | 3 +-- examples/jsm/loaders/GCodeLoader.d.ts | 3 +-- examples/jsm/loaders/GLTFLoader.d.ts | 4 ++-- examples/jsm/loaders/HDRCubeTextureLoader.d.ts | 3 +-- examples/jsm/loaders/KMZLoader.d.ts | 3 +-- examples/jsm/loaders/LDrawLoader.d.ts | 3 +-- examples/jsm/loaders/LUT3dlLoader.d.ts | 3 +-- examples/jsm/loaders/LUTCubeLoader.d.ts | 3 +-- examples/jsm/loaders/LWOLoader.d.ts | 3 +-- examples/jsm/loaders/LottieLoader.d.ts | 3 +-- examples/jsm/loaders/MD2Loader.d.ts | 3 +-- examples/jsm/loaders/MDDLoader.d.ts | 3 +-- examples/jsm/loaders/MMDLoader.d.ts | 3 +-- examples/jsm/loaders/OBJLoader.d.ts | 3 +-- examples/jsm/loaders/OBJLoader2.d.ts | 3 +-- examples/jsm/loaders/PCDLoader.d.ts | 3 +-- examples/jsm/loaders/PDBLoader.d.ts | 3 +-- examples/jsm/loaders/PLYLoader.d.ts | 3 +-- examples/jsm/loaders/PRWMLoader.d.ts | 3 +-- examples/jsm/loaders/STLLoader.d.ts | 3 +-- examples/jsm/loaders/SVGLoader.d.ts | 3 +-- examples/jsm/loaders/TDSLoader.d.ts | 3 +-- examples/jsm/loaders/TGALoader.d.ts | 3 +-- examples/jsm/loaders/TTFLoader.d.ts | 3 +-- examples/jsm/loaders/TiltLoader.d.ts | 3 +-- examples/jsm/loaders/VOXLoader.d.ts | 3 +-- examples/jsm/loaders/VRMLLoader.d.ts | 3 +-- examples/jsm/loaders/VRMLoader.d.ts | 3 +-- examples/jsm/loaders/VTKLoader.d.ts | 3 +-- examples/jsm/loaders/XLoader.d.ts | 3 +-- examples/jsm/loaders/XYZLoader.d.ts | 3 +-- src/loaders/AnimationLoader.d.ts | 3 +-- src/loaders/BufferGeometryLoader.d.ts | 3 +-- src/loaders/FileLoader.d.ts | 3 +-- src/loaders/FontLoader.d.ts | 3 +-- src/loaders/MaterialLoader.d.ts | 3 +-- src/loaders/ObjectLoader.d.ts | 3 +-- 45 files changed, 47 insertions(+), 91 deletions(-) diff --git a/examples/jsm/loaders/3DMLoader.d.ts b/examples/jsm/loaders/3DMLoader.d.ts index 79dced64c60147..981954a8d9e009 100644 --- a/examples/jsm/loaders/3DMLoader.d.ts +++ b/examples/jsm/loaders/3DMLoader.d.ts @@ -9,11 +9,10 @@ export class Rhino3dmLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( object: Object3D ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; parse( data: ArrayBufferLike, onLoad: ( object: Object3D ) => void, onError?: ( event: ErrorEvent ) => void ): void; setLibraryPath( path: string ): Rhino3dmLoader; setWorkerLimit( workerLimit: number ): Rhino3dmLoader; dispose(): Rhino3dmLoader; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/3MFLoader.d.ts b/examples/jsm/loaders/3MFLoader.d.ts index 327ddeed5021eb..5a52717516b41e 100644 --- a/examples/jsm/loaders/3MFLoader.d.ts +++ b/examples/jsm/loaders/3MFLoader.d.ts @@ -10,9 +10,8 @@ export class ThreeMFLoader extends Loader { availableExtensions: object[]; load( url: string, onLoad: ( object: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer ): Group; - addExtension( extension: object ):void - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ): Group; + addExtension( extension: object ): void } diff --git a/examples/jsm/loaders/AMFLoader.d.ts b/examples/jsm/loaders/AMFLoader.d.ts index 5b24dd08d644f0..6791ffb83336a9 100644 --- a/examples/jsm/loaders/AMFLoader.d.ts +++ b/examples/jsm/loaders/AMFLoader.d.ts @@ -9,8 +9,7 @@ export class AMFLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( object: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer ): Group; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ): Group; } diff --git a/examples/jsm/loaders/AssimpLoader.d.ts b/examples/jsm/loaders/AssimpLoader.d.ts index 4737154e559b56..3ea87269465eba 100644 --- a/examples/jsm/loaders/AssimpLoader.d.ts +++ b/examples/jsm/loaders/AssimpLoader.d.ts @@ -15,8 +15,7 @@ export class AssimpLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( result: Assimp ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( buffer: ArrayBuffer, path: string ) : Assimp; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( buffer: ArrayBuffer, path: string ) : Assimp; } diff --git a/examples/jsm/loaders/BVHLoader.d.ts b/examples/jsm/loaders/BVHLoader.d.ts index 3a6385a17cac66..9b5ff31b36f1fd 100644 --- a/examples/jsm/loaders/BVHLoader.d.ts +++ b/examples/jsm/loaders/BVHLoader.d.ts @@ -18,8 +18,7 @@ export class BVHLoader extends Loader { animateBoneRotations: boolean; load( url: string, onLoad: ( bvh: BVH ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( text: string ) : BVH; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( text: string ) : BVH; } diff --git a/examples/jsm/loaders/BasisTextureLoader.d.ts b/examples/jsm/loaders/BasisTextureLoader.d.ts index 900221d291a39e..39f4b7397fb585 100644 --- a/examples/jsm/loaders/BasisTextureLoader.d.ts +++ b/examples/jsm/loaders/BasisTextureLoader.d.ts @@ -25,11 +25,10 @@ export class BasisTextureLoader extends Loader { workerSourceURL: string; detectSupport( renderer: WebGLRenderer ): this; - dispose(): void; load( url: string, onLoad: ( texture: CompressedTexture ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - setTranscoderPath( path: string ): this; setWorkerLimit( workerLimit: number ): this; + dispose(): void; } diff --git a/examples/jsm/loaders/ColladaLoader.d.ts b/examples/jsm/loaders/ColladaLoader.d.ts index 361da00c227608..e3b49228bc62a0 100644 --- a/examples/jsm/loaders/ColladaLoader.d.ts +++ b/examples/jsm/loaders/ColladaLoader.d.ts @@ -16,8 +16,7 @@ export class ColladaLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( collada: Collada ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( text: string, path: string ) : Collada; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( text: string, path: string ) : Collada; } diff --git a/examples/jsm/loaders/DRACOLoader.d.ts b/examples/jsm/loaders/DRACOLoader.d.ts index ee5521321cc03c..65031c5a5107d6 100644 --- a/examples/jsm/loaders/DRACOLoader.d.ts +++ b/examples/jsm/loaders/DRACOLoader.d.ts @@ -9,12 +9,11 @@ export class DRACOLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; setDecoderPath( path: string ): DRACOLoader; setDecoderConfig( config: object ): DRACOLoader; setWorkerLimit( workerLimit: number ): DRACOLoader; preload(): DRACOLoader; dispose(): DRACOLoader; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/FBXLoader.d.ts b/examples/jsm/loaders/FBXLoader.d.ts index 88f0a7dce941cc..8a8cd7be04f5b6 100644 --- a/examples/jsm/loaders/FBXLoader.d.ts +++ b/examples/jsm/loaders/FBXLoader.d.ts @@ -9,8 +9,7 @@ export class FBXLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( object: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( FBXBuffer: ArrayBuffer | string, path: string ) : Group; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( FBXBuffer: ArrayBuffer | string, path: string ) : Group; } diff --git a/examples/jsm/loaders/GCodeLoader.d.ts b/examples/jsm/loaders/GCodeLoader.d.ts index d3364bea3e0c9c..b6ad7b784873da 100644 --- a/examples/jsm/loaders/GCodeLoader.d.ts +++ b/examples/jsm/loaders/GCodeLoader.d.ts @@ -10,8 +10,7 @@ export class GCodeLoader extends Loader { splitLayer: boolean; load( url: string, onLoad: ( object: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: string ) : Group; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: string ) : Group; } diff --git a/examples/jsm/loaders/GLTFLoader.d.ts b/examples/jsm/loaders/GLTFLoader.d.ts index 2ac7648b420336..c1f03d4631fbdf 100644 --- a/examples/jsm/loaders/GLTFLoader.d.ts +++ b/examples/jsm/loaders/GLTFLoader.d.ts @@ -39,6 +39,8 @@ export class GLTFLoader extends Loader { ddsLoader: DDSLoader | null; load( url: string, onLoad: ( gltf: GLTF ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + setDRACOLoader( dracoLoader: DRACOLoader ): GLTFLoader; setDDSLoader( ddsLoader: DDSLoader ): GLTFLoader; @@ -50,8 +52,6 @@ export class GLTFLoader extends Loader { parse( data: ArrayBuffer | string, path: string, onLoad: ( gltf: GLTF ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } export interface GLTFReference { diff --git a/examples/jsm/loaders/HDRCubeTextureLoader.d.ts b/examples/jsm/loaders/HDRCubeTextureLoader.d.ts index 261d2687b69c04..72a57413cd13bd 100644 --- a/examples/jsm/loaders/HDRCubeTextureLoader.d.ts +++ b/examples/jsm/loaders/HDRCubeTextureLoader.d.ts @@ -14,8 +14,7 @@ export class HDRCubeTextureLoader extends Loader { type: TextureDataType; load( urls: string[], onLoad: ( texture: CubeTexture ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - setDataType( type: TextureDataType ): this; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + setDataType( type: TextureDataType ): this; } diff --git a/examples/jsm/loaders/KMZLoader.d.ts b/examples/jsm/loaders/KMZLoader.d.ts index ddca93a6dbad16..c6c85214c07c58 100644 --- a/examples/jsm/loaders/KMZLoader.d.ts +++ b/examples/jsm/loaders/KMZLoader.d.ts @@ -10,8 +10,7 @@ export class KMZLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( kmz: Collada ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer ): Collada; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ): Collada; } diff --git a/examples/jsm/loaders/LDrawLoader.d.ts b/examples/jsm/loaders/LDrawLoader.d.ts index 43e2ab55d08847..a9b8aed8a26ced 100644 --- a/examples/jsm/loaders/LDrawLoader.d.ts +++ b/examples/jsm/loaders/LDrawLoader.d.ts @@ -10,6 +10,7 @@ export class LDrawLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( data: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; setFileMap( fileMap: Record ): void; setMaterials( materials: Material[] ): void; @@ -18,6 +19,4 @@ export class LDrawLoader extends Loader { addMaterial( material: Material ): void; getMaterial( colourCode: string ): Material | null; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/LUT3dlLoader.d.ts b/examples/jsm/loaders/LUT3dlLoader.d.ts index 715a26fc30b4bb..3852c004df7238 100644 --- a/examples/jsm/loaders/LUT3dlLoader.d.ts +++ b/examples/jsm/loaders/LUT3dlLoader.d.ts @@ -23,8 +23,7 @@ export class LUT3dlLoader extends Loader { onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: Error ) => void ); - parse( data: string ): LUT3dlResult; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: string ): LUT3dlResult; } diff --git a/examples/jsm/loaders/LUTCubeLoader.d.ts b/examples/jsm/loaders/LUTCubeLoader.d.ts index 8bd23a9b316a26..101a01a9438701 100644 --- a/examples/jsm/loaders/LUTCubeLoader.d.ts +++ b/examples/jsm/loaders/LUTCubeLoader.d.ts @@ -27,8 +27,7 @@ export class LUTCubeLoader extends Loader { onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: Error ) => void ); - parse( data: string ): LUTCubeResult; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: string ): LUTCubeResult; } diff --git a/examples/jsm/loaders/LWOLoader.d.ts b/examples/jsm/loaders/LWOLoader.d.ts index 4ba458c3cb854f..7c7a20af41f4ed 100644 --- a/examples/jsm/loaders/LWOLoader.d.ts +++ b/examples/jsm/loaders/LWOLoader.d.ts @@ -24,8 +24,7 @@ export class LWOLoader extends Loader { constructor( manager?: LoadingManager, parameters?: LWOLoaderParameters ); load( url: string, onLoad: ( lwo: LWO ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: ArrayBuffer, path: string, modelName: string ): LWO; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer, path: string, modelName: string ): LWO; } diff --git a/examples/jsm/loaders/LottieLoader.d.ts b/examples/jsm/loaders/LottieLoader.d.ts index cae57698dbdb0b..1593dad44cf920 100644 --- a/examples/jsm/loaders/LottieLoader.d.ts +++ b/examples/jsm/loaders/LottieLoader.d.ts @@ -9,9 +9,8 @@ export class LottieLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( texture: CanvasTexture ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; setQuality( value: Number ) : void; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/MD2Loader.d.ts b/examples/jsm/loaders/MD2Loader.d.ts index 7dade846afec6a..9959b136615eb4 100644 --- a/examples/jsm/loaders/MD2Loader.d.ts +++ b/examples/jsm/loaders/MD2Loader.d.ts @@ -9,8 +9,7 @@ export class MD2Loader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer ): BufferGeometry; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ): BufferGeometry; } diff --git a/examples/jsm/loaders/MDDLoader.d.ts b/examples/jsm/loaders/MDDLoader.d.ts index 856a8e83e2a001..188d7ae60068f2 100644 --- a/examples/jsm/loaders/MDDLoader.d.ts +++ b/examples/jsm/loaders/MDDLoader.d.ts @@ -15,8 +15,7 @@ export class MDDLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( result: MDD ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: ArrayBuffer ) : MDD; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ) : MDD; } diff --git a/examples/jsm/loaders/MMDLoader.d.ts b/examples/jsm/loaders/MMDLoader.d.ts index 0bfc9f336ef09e..9be5c09a8cb431 100644 --- a/examples/jsm/loaders/MMDLoader.d.ts +++ b/examples/jsm/loaders/MMDLoader.d.ts @@ -21,6 +21,7 @@ export class MMDLoader extends Loader { parser: object | null; load( url: string, onLoad: ( mesh: SkinnedMesh ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; loadAnimation( url: string, object: SkinnedMesh | THREE.Camera, onLoad: ( object: SkinnedMesh | AnimationClip ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; loadPMD( url: string, onLoad: ( object: object ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; loadPMX( url: string, onLoad: ( object: object ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; @@ -29,6 +30,4 @@ export class MMDLoader extends Loader { loadWithAnimation( url: string, vmdUrl: string | string[], onLoad: ( object: MMDLoaderAnimationObject ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; setAnimationPath( animationPath: string ): this; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/OBJLoader.d.ts b/examples/jsm/loaders/OBJLoader.d.ts index 00bc922a59f24d..f65e1929cfec76 100644 --- a/examples/jsm/loaders/OBJLoader.d.ts +++ b/examples/jsm/loaders/OBJLoader.d.ts @@ -13,9 +13,8 @@ export class OBJLoader extends Loader { materials: MTLLoader.MaterialCreator; load( url: string, onLoad: ( group: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; parse( data: string ) : Group; setMaterials( materials: MTLLoader.MaterialCreator ) : this; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/OBJLoader2.d.ts b/examples/jsm/loaders/OBJLoader2.d.ts index d72e5f82bc3c1b..896cd52ef315c3 100644 --- a/examples/jsm/loaders/OBJLoader2.d.ts +++ b/examples/jsm/loaders/OBJLoader2.d.ts @@ -40,8 +40,7 @@ export class OBJLoader2 extends Loader { setCallbackOnLoadMaterials( onLoadMaterials: Function ): this; load( url: string, onLoad: ( object3d: Object3D ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void, onMeshAlter?: ( meshData: object ) => void ): void; - parse( content: ArrayBuffer | string ): Object3D; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( content: ArrayBuffer | string ): Object3D; } diff --git a/examples/jsm/loaders/PCDLoader.d.ts b/examples/jsm/loaders/PCDLoader.d.ts index 6ccd362b906371..e667a769cab128 100644 --- a/examples/jsm/loaders/PCDLoader.d.ts +++ b/examples/jsm/loaders/PCDLoader.d.ts @@ -11,8 +11,7 @@ export class PCDLoader extends Loader { littleEndian: boolean; load( url: string, onLoad: ( points: Points ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: ArrayBuffer | string, url: string ) : Points; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer | string, url: string ) : Points; } diff --git a/examples/jsm/loaders/PDBLoader.d.ts b/examples/jsm/loaders/PDBLoader.d.ts index d70fcfa3d85e80..b02bd4362e4a19 100644 --- a/examples/jsm/loaders/PDBLoader.d.ts +++ b/examples/jsm/loaders/PDBLoader.d.ts @@ -18,8 +18,7 @@ export class PDBLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( pdb: PDB ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( text: string ) : PDB; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( text: string ) : PDB; } diff --git a/examples/jsm/loaders/PLYLoader.d.ts b/examples/jsm/loaders/PLYLoader.d.ts index 9674abfa5789d4..35b1f72c06318c 100644 --- a/examples/jsm/loaders/PLYLoader.d.ts +++ b/examples/jsm/loaders/PLYLoader.d.ts @@ -11,9 +11,8 @@ export class PLYLoader extends Loader { propertyNameMapping: object; load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; setPropertyNameMapping( mapping: object ) : void; parse( data: ArrayBuffer | string ) : BufferGeometry; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/PRWMLoader.d.ts b/examples/jsm/loaders/PRWMLoader.d.ts index cc9af874eebde8..8ddb95d2798a68 100644 --- a/examples/jsm/loaders/PRWMLoader.d.ts +++ b/examples/jsm/loaders/PRWMLoader.d.ts @@ -10,9 +10,8 @@ export class PRWMLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: ArrayBuffer ) : BufferGeometry; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ) : BufferGeometry; static isBigEndianPlatform(): boolean; diff --git a/examples/jsm/loaders/STLLoader.d.ts b/examples/jsm/loaders/STLLoader.d.ts index 443bc1adc1c7e1..fd47161492b751 100644 --- a/examples/jsm/loaders/STLLoader.d.ts +++ b/examples/jsm/loaders/STLLoader.d.ts @@ -10,8 +10,7 @@ export class STLLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: ArrayBuffer | string ) : BufferGeometry; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer | string ) : BufferGeometry; } diff --git a/examples/jsm/loaders/SVGLoader.d.ts b/examples/jsm/loaders/SVGLoader.d.ts index 6f4140465e739a..de999b4d4e0fcd 100644 --- a/examples/jsm/loaders/SVGLoader.d.ts +++ b/examples/jsm/loaders/SVGLoader.d.ts @@ -27,9 +27,8 @@ export class SVGLoader extends Loader { defaultUnit: string; load( url: string, onLoad: ( data: SVGResult ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( text: string ) : SVGResult; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( text: string ) : SVGResult; static getStrokeStyle( width?: number, color?: string, lineJoin?: string, lineCap?: string, miterLimit?: number ): StrokeStyle; static pointsToStroke( points: Vector3[], style: StrokeStyle, arcDivisions?: number, minDistance?: number ): BufferGeometry; diff --git a/examples/jsm/loaders/TDSLoader.d.ts b/examples/jsm/loaders/TDSLoader.d.ts index c1abeb8146001a..5a16cc42d7d809 100644 --- a/examples/jsm/loaders/TDSLoader.d.ts +++ b/examples/jsm/loaders/TDSLoader.d.ts @@ -19,9 +19,8 @@ export class TDSLoader extends Loader { position: number; load( url: string, onLoad: ( object: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( arraybuffer: ArrayBuffer, path: string ): Group; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( arraybuffer: ArrayBuffer, path: string ): Group; debugMessage( message: object ): void; endChunk( chunk: object ): void; diff --git a/examples/jsm/loaders/TGALoader.d.ts b/examples/jsm/loaders/TGALoader.d.ts index fbf3caa687eb07..ed071859b3e27b 100644 --- a/examples/jsm/loaders/TGALoader.d.ts +++ b/examples/jsm/loaders/TGALoader.d.ts @@ -9,8 +9,7 @@ export class TGALoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( texture: Texture ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: ArrayBuffer ) : Texture; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ) : Texture; } diff --git a/examples/jsm/loaders/TTFLoader.d.ts b/examples/jsm/loaders/TTFLoader.d.ts index 4de4256e04aa76..f3c37a6ab5a9cf 100644 --- a/examples/jsm/loaders/TTFLoader.d.ts +++ b/examples/jsm/loaders/TTFLoader.d.ts @@ -9,8 +9,7 @@ export class TTFLoader extends Loader { reversed: boolean; load( url: string, onLoad: ( json: object ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( arraybuffer: ArrayBuffer ): object; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( arraybuffer: ArrayBuffer ): object; } diff --git a/examples/jsm/loaders/TiltLoader.d.ts b/examples/jsm/loaders/TiltLoader.d.ts index 4d3898934bce32..f2911ae55c83bb 100644 --- a/examples/jsm/loaders/TiltLoader.d.ts +++ b/examples/jsm/loaders/TiltLoader.d.ts @@ -9,8 +9,7 @@ export class TiltLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( object: Group ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer ): Group; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer ): Group; } diff --git a/examples/jsm/loaders/VOXLoader.d.ts b/examples/jsm/loaders/VOXLoader.d.ts index ad0139cbded4d2..4780761c2002d8 100644 --- a/examples/jsm/loaders/VOXLoader.d.ts +++ b/examples/jsm/loaders/VOXLoader.d.ts @@ -8,8 +8,7 @@ export class VOXLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( chunks: Array ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer ): Array; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise>; + parse( data: ArrayBuffer ): Array; } diff --git a/examples/jsm/loaders/VRMLLoader.d.ts b/examples/jsm/loaders/VRMLLoader.d.ts index 7cc9f42b312d91..d6eb14ece93436 100644 --- a/examples/jsm/loaders/VRMLLoader.d.ts +++ b/examples/jsm/loaders/VRMLLoader.d.ts @@ -9,8 +9,7 @@ export class VRMLLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( scene: Scene ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; - parse( data: string, path: string ) : Scene; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: string, path: string ) : Scene; } diff --git a/examples/jsm/loaders/VRMLoader.d.ts b/examples/jsm/loaders/VRMLoader.d.ts index b843dbdd80085f..f138025b0d86a9 100644 --- a/examples/jsm/loaders/VRMLoader.d.ts +++ b/examples/jsm/loaders/VRMLoader.d.ts @@ -12,9 +12,8 @@ export class VRMLoader extends Loader { gltfLoader: GLTFLoader; load( url: string, onLoad: ( scene: GLTF ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; parse( gltf: GLTF, onLoad: ( scene: GLTF ) => void ): void; setDRACOLoader( dracoLoader: DRACOLoader ): this; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/examples/jsm/loaders/VTKLoader.d.ts b/examples/jsm/loaders/VTKLoader.d.ts index 46391692478680..f90ae666ed8bfb 100644 --- a/examples/jsm/loaders/VTKLoader.d.ts +++ b/examples/jsm/loaders/VTKLoader.d.ts @@ -9,8 +9,7 @@ export class VTKLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer | string, path: string ): BufferGeometry; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer | string, path: string ): BufferGeometry; } diff --git a/examples/jsm/loaders/XLoader.d.ts b/examples/jsm/loaders/XLoader.d.ts index 40b4874e087d79..3b7928b4fa1b79 100644 --- a/examples/jsm/loaders/XLoader.d.ts +++ b/examples/jsm/loaders/XLoader.d.ts @@ -14,8 +14,7 @@ export class XLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( object: XResult ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: ArrayBuffer | string, onLoad: ( object: object ) => void ): object; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: ArrayBuffer | string, onLoad: ( object: object ) => void ): object; } diff --git a/examples/jsm/loaders/XYZLoader.d.ts b/examples/jsm/loaders/XYZLoader.d.ts index 239669ca422389..e89ef1a4e7277d 100644 --- a/examples/jsm/loaders/XYZLoader.d.ts +++ b/examples/jsm/loaders/XYZLoader.d.ts @@ -9,8 +9,7 @@ export class XYZLoader extends Loader { constructor( manager?: LoadingManager ); load( url: string, onLoad: ( geometry: BufferGeometry ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( data: string, onLoad: ( geometry: BufferGeometry ) => void ): object; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( data: string, onLoad: ( geometry: BufferGeometry ) => void ): object; } diff --git a/src/loaders/AnimationLoader.d.ts b/src/loaders/AnimationLoader.d.ts index 34a05a49a1780b..66ed9fe3653863 100644 --- a/src/loaders/AnimationLoader.d.ts +++ b/src/loaders/AnimationLoader.d.ts @@ -12,8 +12,7 @@ export class AnimationLoader extends Loader { onProgress?: ( request: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( json: any ): AnimationClip[]; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( json: any ): AnimationClip[]; } diff --git a/src/loaders/BufferGeometryLoader.d.ts b/src/loaders/BufferGeometryLoader.d.ts index 4f78a0350894d5..8618bc121c4196 100644 --- a/src/loaders/BufferGeometryLoader.d.ts +++ b/src/loaders/BufferGeometryLoader.d.ts @@ -13,8 +13,7 @@ export class BufferGeometryLoader extends Loader { onProgress?: ( request: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( json: any ): InstancedBufferGeometry | BufferGeometry; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( json: any ): InstancedBufferGeometry | BufferGeometry; } diff --git a/src/loaders/FileLoader.d.ts b/src/loaders/FileLoader.d.ts index 10e2c6e9690c69..6b45e09b74e779 100644 --- a/src/loaders/FileLoader.d.ts +++ b/src/loaders/FileLoader.d.ts @@ -14,9 +14,8 @@ export class FileLoader extends Loader { onProgress?: ( request: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): any; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; setMimeType( mimeType: MimeType ): FileLoader; setResponseType( responseType: string ): FileLoader; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/src/loaders/FontLoader.d.ts b/src/loaders/FontLoader.d.ts index 229f1fec785e2e..be15d66ca14ffa 100644 --- a/src/loaders/FontLoader.d.ts +++ b/src/loaders/FontLoader.d.ts @@ -12,8 +12,7 @@ export class FontLoader extends Loader { onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ): void; - parse( json: any ): Font; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; + parse( json: any ): Font; } diff --git a/src/loaders/MaterialLoader.d.ts b/src/loaders/MaterialLoader.d.ts index fdf001edb6bb9c..f4b1f92cb05098 100644 --- a/src/loaders/MaterialLoader.d.ts +++ b/src/loaders/MaterialLoader.d.ts @@ -18,9 +18,8 @@ export class MaterialLoader extends Loader { onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: Error | ErrorEvent ) => void ): void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; setTextures( textures: { [key: string]: Texture } ): this; parse( json: any ): Material; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - } diff --git a/src/loaders/ObjectLoader.d.ts b/src/loaders/ObjectLoader.d.ts index e25d686b042356..c38dd77068f19a 100644 --- a/src/loaders/ObjectLoader.d.ts +++ b/src/loaders/ObjectLoader.d.ts @@ -15,6 +15,7 @@ export class ObjectLoader extends Loader { onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: Error | ErrorEvent ) => void ): void; + loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; parse( json: any, onLoad?: ( object: Object3D ) => void ): T; parseGeometries( json: any ): any[]; // Array of BufferGeometry or Geometry or Geometry2. parseMaterials( json: any, textures: Texture[] ): Material[]; // Array of Classes that inherits from Matrial. @@ -31,6 +32,4 @@ export class ObjectLoader extends Loader { animations: AnimationClip[] ): T; - loadAsync( url: string, onProgress?: ( event: ProgressEvent ) => void ): Promise; - }