Skip to content

Commit f135980

Browse files
authored
🤖 Merge PR DefinitelyTyped#72919 [three] r177 by @Methuselah96
1 parent e5f0221 commit f135980

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+364
-145
lines changed

types/three/examples/jsm/Addons.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export * from "./effects/AnaglyphEffect.js";
2828
export * from "./effects/AsciiEffect.js";
2929
export * from "./effects/OutlineEffect.js";
3030
export * from "./effects/ParallaxBarrierEffect.js";
31-
export * from "./effects/PeppersGhostEffect.js";
3231
export * from "./effects/StereoEffect.js";
3332

3433
export * from "./environments/DebugEnvironment.js";

types/three/examples/jsm/effects/PeppersGhostEffect.d.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

types/three/examples/jsm/loaders/LDrawLoader.d.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@ export class LDrawLoader extends Loader<Group> {
1919
): this;
2020

2121
preloadMaterials(url: string): Promise<void>;
22-
setFileMap(fileMap: Record<string, string>): void;
23-
setMaterials(materials: Material[]): void;
2422

2523
parse(text: string, path: string, onLoad: (data: Group) => void, onError?: (error: unknown) => void): void;
2624

27-
addMaterial(material: Material): void;
25+
setMaterials(materials: Material[]): this;
26+
clearMaterials(): this;
27+
addMaterials(materials: Material[]): this;
28+
addDefaultMaterials(): this;
29+
30+
setFileMap(fileMap: Record<string, string>): this;
31+
32+
addMaterial(material: Material): this;
2833
getMaterial(colourCode: string): Material | null;
2934
}

types/three/examples/jsm/math/Octree.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ export class Octree {
1010
triangles: Triangle[];
1111
layers: Layers;
1212

13+
trianglesPerLeaf: number;
14+
maxLevel: number;
15+
1316
constructor(box?: Box3 | null);
1417

1518
addTriangle(triangle: Triangle): this;
Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
import { IUniform, ShaderMaterial, WebGLRenderTarget } from "three";
1+
import { IUniform, ShaderMaterial } from "three";
22

3-
import { FullScreenQuad, Pass } from "./Pass.js";
3+
import { Pass } from "./Pass.js";
44

5-
export class AfterimagePass extends Pass {
6-
constructor(damp?: number);
7-
shader: object;
5+
declare class AfterimagePass extends Pass {
86
uniforms: Record<string, IUniform>;
9-
textureComp: WebGLRenderTarget;
10-
textureOld: WebGLRenderTarget;
11-
shaderMaterial: ShaderMaterial;
12-
compFsQuad: FullScreenQuad;
13-
copyFsQuad: FullScreenQuad;
7+
8+
compFsMaterial: ShaderMaterial;
9+
copyFsMaterial: ShaderMaterial;
10+
11+
constructor(damp?: number);
12+
13+
get damp(): number;
14+
set damp(value: number);
1415
}
16+
17+
export { AfterimagePass };
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { ShaderPass } from "./ShaderPass.js";
2+
3+
declare class FXAAPass extends ShaderPass {
4+
constructor();
5+
}
6+
7+
export { FXAAPass };
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
22
import { Node } from "three/webgpu";
33

4+
interface HashBlurOptions {
5+
repeats?: NodeRepresentation | undefined;
6+
mask?: NodeRepresentation | null | undefined;
7+
premultipliedAlpha?: boolean | undefined;
8+
}
9+
410
export const hashBlur: (
511
textureNode: NodeRepresentation,
612
bluramount?: NodeRepresentation,
7-
repeats?: NodeRepresentation,
13+
options?: HashBlurOptions,
814
) => ShaderNodeObject<Node>;

types/three/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@types/three",
4-
"version": "0.176.9999",
4+
"version": "0.177.9999",
55
"projects": [
66
"https://threejs.org/"
77
],
@@ -20,7 +20,7 @@
2020
"./tsl": "./build/three.tsl.js"
2121
},
2222
"dependencies": {
23-
"@dimforge/rapier3d-compat": "^0.12.0",
23+
"@dimforge/rapier3d-compat": "~0.12.0",
2424
"@tweenjs/tween.js": "~23.1.3",
2525
"@types/stats.js": "*",
2626
"@types/webxr": "*",

types/three/src/Three.Core.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export * from "./core/Object3D.js";
3939
export * from "./core/Raycaster.js";
4040
export * from "./core/RenderTarget.js";
4141
export * from "./core/RenderTarget3D.js";
42-
export * from "./core/RenderTargetArray.js";
4342
export * from "./core/Uniform.js";
4443
export * from "./core/UniformsGroup.js";
4544
export * from "./extras/Controls.js";
@@ -153,7 +152,6 @@ export * from "./textures/CubeTexture.js";
153152
export * from "./textures/Data3DTexture.js";
154153
export * from "./textures/DataArrayTexture.js";
155154
export * from "./textures/DataTexture.js";
156-
export * from "./textures/DepthArrayTexture.js";
157155
export * from "./textures/DepthTexture.js";
158156
export * from "./textures/FramebufferTexture.js";
159157
export * from "./textures/Source.js";

types/three/src/Three.TSL.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ export const mx_transform_uv: typeof TSL.mx_transform_uv;
327327
export const mx_worley_noise_float: typeof TSL.mx_worley_noise_float;
328328
export const mx_worley_noise_vec2: typeof TSL.mx_worley_noise_vec2;
329329
export const mx_worley_noise_vec3: typeof TSL.mx_worley_noise_vec3;
330+
export const namespace: typeof TSL.namespace;
330331
export const negate: typeof TSL.negate;
331332
export const neutralToneMapping: typeof TSL.neutralToneMapping;
332333
export const nodeArray: typeof TSL.nodeArray;
@@ -385,6 +386,7 @@ export const pow: typeof TSL.pow;
385386
export const pow2: typeof TSL.pow2;
386387
export const pow3: typeof TSL.pow3;
387388
export const pow4: typeof TSL.pow4;
389+
export const premult: typeof TSL.premult;
388390
export const property: typeof TSL.property;
389391
export const radians: typeof TSL.radians;
390392
export const rand: typeof TSL.rand;
@@ -477,13 +479,10 @@ export const textureLoad: typeof TSL.textureLoad;
477479
export const textureSize: typeof TSL.textureSize;
478480
export const textureStore: typeof TSL.textureStore;
479481
export const thickness: typeof TSL.thickness;
480-
export const threshold: typeof TSL.threshold;
481482
export const time: typeof TSL.time;
482483
export const timerDelta: typeof TSL.timerDelta;
483484
export const timerGlobal: typeof TSL.timerGlobal;
484485
export const timerLocal: typeof TSL.timerLocal;
485-
export const toOutputColorSpace: typeof TSL.toOutputColorSpace;
486-
export const toWorkingColorSpace: typeof TSL.toWorkingColorSpace;
487486
export const toneMapping: typeof TSL.toneMapping;
488487
export const toneMappingExposure: typeof TSL.toneMappingExposure;
489488
export const toonOutlinePass: typeof TSL.toonOutlinePass;
@@ -500,18 +499,19 @@ export const transformedTangentView: typeof TSL.transformedTangentView;
500499
export const transformedTangentWorld: typeof TSL.transformedTangentWorld;
501500
export const transmission: typeof TSL.transmission;
502501
export const transpose: typeof TSL.transpose;
503-
export const tri: typeof TSL.tri;
504-
export const tri3: typeof TSL.tri3;
505502
export const triNoise3D: typeof TSL.triNoise3D;
506503
export const triplanarTexture: typeof TSL.triplanarTexture;
507504
export const triplanarTextures: typeof TSL.triplanarTextures;
508505
export const trunc: typeof TSL.trunc;
509506
export const tslFn: typeof TSL.tslFn;
510507
export const uint: typeof TSL.uint;
511508
export const uniform: typeof TSL.uniform;
509+
export const uniformCubeTexture: typeof TSL.uniformCubeTexture;
512510
export const uniformArray: typeof TSL.uniformArray;
513511
export const uniformGroup: typeof TSL.uniformGroup;
512+
export const uniformTexture: typeof TSL.uniformTexture;
514513
export const uniforms: typeof TSL.uniforms;
514+
export const unpremult: typeof TSL.unpremult;
515515
export const userData: typeof TSL.userData;
516516
export const uv: typeof TSL.uv;
517517
export const uvec2: typeof TSL.uvec2;

0 commit comments

Comments
 (0)