diff --git a/.all-contributorsrc b/.all-contributorsrc
index 19c0251c4..e6056c4aa 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -772,6 +772,15 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "ybt-new",
+ "name": "Botao Yang",
+ "avatar_url": "https://avatars.githubusercontent.com/u/131513278?v=4",
+ "profile": "https://github.com/ybt-new",
+ "contributions": [
+ "code"
+ ]
}
],
"skipCi": true,
diff --git a/README.md b/README.md
index 51891df26..c7ca53647 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Michał Mrozek
💻 |
- 
puxiao
💻 |
+
puxiao
💻 |
ycw
💻 |
Jazcash
💻 |
Bjorn Stromberg
💻 |
@@ -140,10 +140,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Mikael Pettersson
💻 |
- 
Tom Harley
💻 |
+
Tom Harley
💻 |
Ondřej Španěl
🐛 💻 📖 🚧 |
Yönet
💻 |
Eric Benn
💻 |
+ 
Botao Yang
💻 |
diff --git a/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts b/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts
index 9492861af..807f14613 100644
--- a/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts
+++ b/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts
@@ -5,7 +5,5 @@ import { AnyJson } from '../core/constants.js';
export default class NodeObjectLoader extends ObjectLoader {
parseNodes(json: AnyJson, textures: { [key: string]: Texture }): NodeLoaderResult;
- // tslint:disable-next-line:comment-format
- //@ts-expect-error
parseMaterials(json: AnyJson, textures: { [key: string]: Texture }): { [key: string]: Material };
}
diff --git a/types/three/src/loaders/ObjectLoader.d.ts b/types/three/src/loaders/ObjectLoader.d.ts
index 646d12e25..b2b4ac784 100644
--- a/types/three/src/loaders/ObjectLoader.d.ts
+++ b/types/three/src/loaders/ObjectLoader.d.ts
@@ -1,9 +1,9 @@
import { Loader } from './Loader.js';
import { LoadingManager } from './LoadingManager.js';
-import { Object3D } from './../core/Object3D.js';
-import { Texture } from './../textures/Texture.js';
-import { Material } from './../materials/Material.js';
-import { AnimationClip } from './../animation/AnimationClip.js';
+import { Object3D } from '../core/Object3D.js';
+import { Texture } from '../textures/Texture.js';
+import { Material } from '../materials/Material.js';
+import { AnimationClip } from '../animation/AnimationClip.js';
import { InstancedBufferGeometry } from '../core/InstancedBufferGeometry.js';
import { BufferGeometry } from '../core/BufferGeometry.js';
import { Source } from '../textures/Source.js';
@@ -26,12 +26,12 @@ export class ObjectLoader extends Loader {
parse(json: any, onLoad?: (object: Object3D) => void): T;
// tslint:disable-next-line:no-unnecessary-generics
parseAsync(json: any): Promise;
- parseGeometries(json: any): { [key: string]: InstancedBufferGeometry | BufferGeometry }; // Array of BufferGeometry or Geometry or Geometry2.
- parseMaterials(json: any, textures: { [key: string]: Texture }): Material[]; // Array of Classes that inherits from Matrial.
+ parseGeometries(json: any): { [key: string]: InstancedBufferGeometry | BufferGeometry };
+ parseMaterials(json: any, textures: { [key: string]: Texture }): { [key: string]: Material };
parseAnimations(json: any): AnimationClip[];
parseImages(json: any, onLoad?: () => void): { [key: string]: Source };
parseImagesAsync(json: any): Promise<{ [key: string]: Source }>;
- parseTextures(json: any, images: any): Texture[];
+ parseTextures(json: any, images: { [key: string]: Source }): { [key: string]: Texture };
parseObject(
data: any,
geometries: any[],