Skip to content

Commit 2953ec3

Browse files
authored
🤖 Merge PR DefinitelyTyped#73398 [three] r179 by @Methuselah96
1 parent c4780d9 commit 2953ec3

55 files changed

Lines changed: 509 additions & 191 deletions

Some content is hidden

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export * from "./loaders/TGALoader.js";
116116
export * from "./loaders/TIFFLoader.js";
117117
export * from "./loaders/TTFLoader.js";
118118
export * from "./loaders/UltraHDRLoader.js";
119-
export * from "./loaders/USDZLoader.js";
119+
export * from "./loaders/USDLoader.js";
120120
export * from "./loaders/VOXLoader.js";
121121
export * from "./loaders/VRMLLoader.js";
122122
export * from "./loaders/VTKLoader.js";
@@ -145,7 +145,6 @@ export * from "./misc/MorphAnimMesh.js";
145145
export * from "./misc/MorphBlendMesh.js";
146146
export * from "./misc/ProgressiveLightMap.js";
147147
export * from "./misc/RollerCoaster.js";
148-
export * from "./misc/Timer.js";
149148
export * from "./misc/TubePainter.js";
150149
export * from "./misc/Volume.js";
151150
export * from "./misc/VolumeSlice.js";

types/three/examples/jsm/exporters/USDZExporter.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as WebGPUTextureUtils from "../utils/WebGPUTextureUtils.js";
55
export interface USDZExporterOptions {
66
ar?: { anchoring: { type: "plane" }; planeAnchoring: { alignment: "horizontal" | "vertical" | "any" } } | undefined;
77
includeAnchoringProperties?: boolean | undefined;
8+
onlyVisible?: boolean | undefined;
89
quickLookCompatible?: boolean | undefined;
910
maxTextureSize?: number | undefined;
1011
}
Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
import { DataTextureLoader, LoadingManager, PixelFormat, TextureDataType } from "three";
1+
import {
2+
DataTextureLoader,
3+
FloatType,
4+
HalfFloatType,
5+
LoadingManager,
6+
PixelFormat,
7+
RedFormat,
8+
RGBAFormat,
9+
RGFormat,
10+
TextureDataType,
11+
} from "three";
212

313
export interface EXR {
414
header: object;
@@ -7,13 +17,16 @@ export interface EXR {
717
data: Float32Array | Uint16Array;
818
format: PixelFormat;
919
colorSpace: string;
10-
type: TextureDataType;
20+
type: typeof HalfFloatType | typeof FloatType;
1121
}
1222

13-
export class EXRLoader extends DataTextureLoader {
14-
constructor(manager?: LoadingManager);
23+
declare class EXRLoader extends DataTextureLoader {
1524
type: TextureDataType;
25+
outputFormat: typeof RGBAFormat | typeof RGFormat | typeof RedFormat;
26+
27+
constructor(manager?: LoadingManager);
1628

1729
parse(buffer: ArrayBuffer): EXR;
18-
setDataType(type: TextureDataType): this;
30+
setDataType(type: typeof HalfFloatType | typeof FloatType): this;
31+
setOutputFormat(value: typeof RGBAFormat | typeof RGFormat | typeof RedFormat): this;
1932
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { Group, Loader, LoadingManager } from "three";
2+
3+
declare class USDLoader extends Loader<Group> {
4+
constructor(manager?: LoadingManager);
5+
6+
parse(buffer: ArrayBuffer | string): Group;
7+
}
8+
9+
export { USDLoader };
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
import { Group, Loader, LoadingManager, Mesh } from "three";
1+
import { LoadingManager } from "three";
2+
import { USDLoader } from "./USDLoader.js";
23

3-
export class USDAParser {
4-
parse(text: string): object;
5-
}
6-
7-
export class USDZLoader extends Loader<Mesh> {
4+
/**
5+
* @deprecated USDZLoader has been deprecated. Please use USDLoader instead.
6+
*/
7+
declare class USDZLoader extends USDLoader {
8+
/**
9+
* @deprecated USDZLoader has been deprecated. Please use USDLoader instead.
10+
*/
811
constructor(manager?: LoadingManager);
9-
10-
parse(buffer: ArrayBuffer | string): Group;
1112
}
13+
14+
export { USDZLoader };
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { ShaderNodeObject } from "three/tsl";
2+
import { Camera, Node, TempNode, TextureNode } from "three/webgpu";
3+
4+
declare class TRAANode extends TempNode {
5+
readonly isTRAANode: true;
6+
7+
beautyNode: TextureNode;
8+
depthNode: TextureNode;
9+
velocityNode: TextureNode;
10+
camera: Camera;
11+
12+
constructor(beautyNode: TextureNode, depthNode: TextureNode, velocityNode: TextureNode, camera: Camera);
13+
}
14+
15+
export default TRAANode;
16+
17+
export const traa: (
18+
beautyNode: Node,
19+
depthNode: TextureNode,
20+
velocityNode: TextureNode,
21+
camera: Camera,
22+
) => ShaderNodeObject<TRAANode>;

types/three/examples/jsm/tsl/display/TRAAPassNode.d.ts

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

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.178.9999",
4+
"version": "0.179.9999",
55
"projects": [
66
"https://threejs.org/"
77
],
@@ -26,7 +26,7 @@
2626
"@types/webxr": "*",
2727
"@webgpu/types": "*",
2828
"fflate": "~0.8.2",
29-
"meshoptimizer": "~0.18.1"
29+
"meshoptimizer": "~0.22.0"
3030
},
3131
"devDependencies": {
3232
"@types/three": "workspace:."

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ 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/Timer.js";
4243
export * from "./core/Uniform.js";
4344
export * from "./core/UniformsGroup.js";
4445
export * from "./extras/Controls.js";

0 commit comments

Comments
 (0)