Skip to content

Commit 3cb78b3

Browse files
authored
🤖 Merge PR DefinitelyTyped#71810 [three] r173 by @Methuselah96
1 parent 32e93e9 commit 3cb78b3

Some content is hidden

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

71 files changed

+718
-240
lines changed

types/three/examples/jsm/geometries/InstancedPointsGeometry.d.ts

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

types/three/examples/jsm/geometries/TextGeometry.d.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ export interface TextGeometryParameters extends ExtrudeGeometryOptions {
1212
*/
1313
size?: number | undefined;
1414

15-
/**
16-
* Thickness to extrude text.
17-
* Expects a `Float`.
18-
* @defaultValue `50`
19-
* @deprecated THREE.TextGeometry: .height is now deprecated. Please use .depth instead
20-
*/
21-
height?: number | undefined;
22-
2315
/**
2416
* Thickness to extrude text.
2517
* Expects a `Float`.

types/three/examples/jsm/interactive/InteractiveGroup.d.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Camera, Group, Object3D, Object3DEventMap, Vector2, WebGLRenderer, XRTargetRaySpace } from "three";
1+
import { Camera, Group, Object3D, Object3DEventMap, Raycaster, Vector2, WebGLRenderer, XRTargetRaySpace } from "three";
22

33
export interface InteractiveObject3DEventMap extends Object3DEventMap {
44
hoveron: { data: Vector2 };
@@ -14,7 +14,15 @@ export interface InteractiveObject3DEventMap extends Object3DEventMap {
1414
export class InteractiveObject3D extends Object3D<InteractiveObject3DEventMap> {}
1515

1616
export class InteractiveGroup extends Group {
17+
raycaster: Raycaster;
18+
1719
listenToPointerEvents(renderer: WebGLRenderer, camera: Camera): void;
1820

21+
disconnectionPointerEvents(): void;
22+
1923
listenToXRControllerEvents(controller: XRTargetRaySpace): void;
24+
25+
disconnectXrControllerEvents(): void;
26+
27+
disconnect(): void;
2028
}

types/three/examples/jsm/materials/MeshGouraudMaterial.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
import { ShaderMaterial, ShaderMaterialParameters } from "three";
88

9+
/**
10+
* @deprecated Use THREE.MeshLambertMaterial instead.
11+
*/
912
export class MeshGouraudMaterial extends ShaderMaterial {
1013
isMeshGouraudMaterial: true;
1114

types/three/examples/jsm/objects/InstancedPoints.d.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import { WebGLRenderer } from "three";
1+
export interface XRButtonRenderer {
2+
xr: { setSession(session: XRSession): Promise<void> };
3+
}
24

35
export class XRButton {
4-
static createButton(renderer: WebGLRenderer, sessionInit?: XRSessionInit): HTMLElement;
6+
static createButton(renderer: XRButtonRenderer, sessionInit?: XRSessionInit): HTMLElement;
57
}

types/three/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@types/three",
4-
"version": "0.172.9999",
4+
"version": "0.173.9999",
55
"projects": [
66
"https://threejs.org/"
77
],

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ export * from "./renderers/WebGL3DRenderTarget.js";
140140
export * from "./renderers/WebGLArrayRenderTarget.js";
141141
export * from "./renderers/WebGLCubeRenderTarget.js";
142142
export * from "./renderers/WebGLRenderTarget.js";
143+
export * from "./renderers/webxr/WebXRController.js";
143144
export * from "./scenes/Fog.js";
144145
export * from "./scenes/FogExp2.js";
145146
export * from "./scenes/Scene.js";
@@ -155,5 +156,6 @@ export * from "./textures/DepthTexture.js";
155156
export * from "./textures/FramebufferTexture.js";
156157
export * from "./textures/Source.js";
157158
export * from "./textures/Texture.js";
159+
export * from "./textures/VideoFrameTexture.js";
158160
export * from "./textures/VideoTexture.js";
159161
export { createCanvasElement } from "./utils.js";

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export const anisotropyB: typeof TSL.anisotropyB;
4343
export const anisotropyT: typeof TSL.anisotropyT;
4444
export const any: typeof TSL.any;
4545
export const append: typeof TSL.append;
46+
export const array: typeof TSL.array;
4647
export const arrayBuffer: typeof TSL.arrayBuffer;
4748
export const asin: typeof TSL.asin;
4849
export const assign: typeof TSL.assign;
@@ -57,6 +58,7 @@ export const atomicOr: typeof TSL.atomicOr;
5758
export const atomicStore: typeof TSL.atomicStore;
5859
export const atomicSub: typeof TSL.atomicSub;
5960
export const atomicXor: typeof TSL.atomicXor;
61+
export const atomicLoad: typeof TSL.atomicLoad;
6062
export const attenuationColor: typeof TSL.attenuationColor;
6163
export const attenuationDistance: typeof TSL.attenuationDistance;
6264
export const attribute: typeof TSL.attribute;
@@ -93,6 +95,7 @@ export const bypass: typeof TSL.bypass;
9395
export const cache: typeof TSL.cache;
9496
export const call: typeof TSL.call;
9597
export const cameraFar: typeof TSL.cameraFar;
98+
export const cameraIndex: typeof TSL.cameraIndex;
9699
export const cameraNear: typeof TSL.cameraNear;
97100
export const cameraNormalMatrix: typeof TSL.cameraNormalMatrix;
98101
export const cameraPosition: typeof TSL.cameraPosition;
@@ -114,6 +117,7 @@ export const colorSpaceToWorking: typeof TSL.colorSpaceToWorking;
114117
export const colorToDirection: typeof TSL.colorToDirection;
115118
export const compute: typeof TSL.compute;
116119
export const cond: typeof TSL.cond;
120+
export const Const: typeof TSL.Const;
117121
export const context: typeof TSL.context;
118122
export const convert: typeof TSL.convert;
119123
export const convertColorSpace: typeof TSL.convertColorSpace;
@@ -219,6 +223,7 @@ export const lights: typeof TSL.lights;
219223
export const linearDepth: typeof TSL.linearDepth;
220224
export const linearToneMapping: typeof TSL.linearToneMapping;
221225
export const localId: typeof TSL.localId;
226+
export const globalId: typeof TSL.globalId;
222227
export const log: typeof TSL.log;
223228
export const log2: typeof TSL.log2;
224229
export const logarithmicDepthToViewZ: typeof TSL.logarithmicDepthToViewZ;
@@ -254,7 +259,7 @@ export const materialLineWidth: typeof TSL.materialLineWidth;
254259
export const materialMetalness: typeof TSL.materialMetalness;
255260
export const materialNormal: typeof TSL.materialNormal;
256261
export const materialOpacity: typeof TSL.materialOpacity;
257-
export const materialPointWidth: typeof TSL.materialPointWidth;
262+
export const materialPointSize: typeof TSL.materialPointSize;
258263
export const materialReference: typeof TSL.materialReference;
259264
export const materialReflectivity: typeof TSL.materialReflectivity;
260265
export const materialRefractionRatio: typeof TSL.materialRefractionRatio;
@@ -413,6 +418,7 @@ export const shaderStages: typeof TSL.shaderStages;
413418
export const shadow: typeof TSL.shadow;
414419
export const shadowPositionWorld: typeof TSL.shadowPositionWorld;
415420
export const sharedUniformGroup: typeof TSL.sharedUniformGroup;
421+
export const shapeCircle: typeof TSL.shapeCircle;
416422
export const sheen: typeof TSL.sheen;
417423
export const sheenRoughness: typeof TSL.sheenRoughness;
418424
export const shiftLeft: typeof TSL.shiftLeft;
@@ -438,6 +444,7 @@ export const storageBarrier: typeof TSL.storageBarrier;
438444
export const storageObject: typeof TSL.storageObject;
439445
export const storageTexture: typeof TSL.storageTexture;
440446
export const string: typeof TSL.string;
447+
export const struct: typeof TSL.struct;
441448
export const sub: typeof TSL.sub;
442449
export const subgroupIndex: typeof TSL.subgroupIndex;
443450
export const subgroupSize: typeof TSL.subgroupSize;
@@ -496,6 +503,7 @@ export const uv: typeof TSL.uv;
496503
export const uvec2: typeof TSL.uvec2;
497504
export const uvec3: typeof TSL.uvec3;
498505
export const uvec4: typeof TSL.uvec4;
506+
export const Var: typeof TSL.Var;
499507
export const varying: typeof TSL.varying;
500508
export const varyingProperty: typeof TSL.varyingProperty;
501509
export const vec2: typeof TSL.vec2;

types/three/src/animation/AnimationClip.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class AnimationClip {
4141
validate(): boolean;
4242
optimize(): AnimationClip;
4343
clone(): this;
44-
toJSON(clip: AnimationClip): any;
44+
toJSON(): AnimationClipJSON;
4545

4646
static CreateFromMorphTargetSequence(
4747
name: string,

0 commit comments

Comments
 (0)