Skip to content

Commit

Permalink
[three] r138 (#59045)
Browse files Browse the repository at this point in the history
* [three] – r129

* fix: export MathUtils under namespace in index

* fix: export Pass and FullScreenQuad from EffectComposer

* fix: use long export method to avoid ts bump

* r130

* feat: minor amends to r130

* [three] r131

* feat: add static slerp to Quaternion

* chore: update OTHER_FILES.txt

* chore: incl WebGLCubeUVMaps in exports

* minor fixes to current release

* [three]: r132 release

* three: r133

* Update OTHER_FILES.txt

* Update OTHER_FILES.txt

* Update OTHER_FILES.txt

* Update ArcballControls.d.ts

* feat: add default to `Intersection` generic

* chore: add test

* r134

* r135

* fix: tslint

* r136

* fix: export FramebufferTexture from THREE

* [three] r137

* [three] r138

* fix stupid OSS bot rule
  • Loading branch information
joshuaellis committed Mar 2, 2022
1 parent 8c078db commit 0dccb24
Show file tree
Hide file tree
Showing 121 changed files with 389 additions and 1,952 deletions.
81 changes: 2 additions & 79 deletions types/three/OTHER_FILES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ examples/jsm/effects/PeppersGhostEffect.d.ts
examples/jsm/effects/StereoEffect.d.ts
examples/jsm/exporters/ColladaExporter.d.ts
examples/jsm/exporters/DRACOExporter.d.ts
examples/jsm/exporters/EXRExporter.d.ts
examples/jsm/exporters/GLTFExporter.d.ts
examples/jsm/exporters/MMDExporter.d.ts
examples/jsm/exporters/OBJExporter.d.ts
Expand All @@ -29,6 +30,7 @@ examples/jsm/geometries/LightningStrike.d.ts
examples/jsm/geometries/RoundedBoxGeometry.d.ts
examples/jsm/geometries/TeapotGeometry.d.ts
examples/jsm/helpers/LightProbeHelper.d.ts
examples/jsm/helpers/OctreeHelper.d.ts
examples/jsm/helpers/PositionalAudioHelper.d.ts
examples/jsm/helpers/VertexNormalsHelper.d.ts
examples/jsm/helpers/VertexTangentsHelper.d.ts
Expand Down Expand Up @@ -69,7 +71,6 @@ examples/jsm/loaders/TDSLoader.d.ts
examples/jsm/loaders/TiltLoader.d.ts
examples/jsm/loaders/TTFLoader.d.ts
examples/jsm/loaders/VRMLLoader.d.ts
examples/jsm/loaders/VRMLoader.d.ts
examples/jsm/loaders/VTKLoader.d.ts
examples/jsm/loaders/XYZLoader.d.ts
examples/jsm/math/Capsule.d.ts
Expand All @@ -92,87 +93,9 @@ examples/jsm/misc/VolumeSlice.d.ts
examples/jsm/modifiers/CurveModifier.d.ts
examples/jsm/modifiers/EdgeSplitModifier.d.ts
examples/jsm/modifiers/SimplifyModifier.d.ts
examples/jsm/nodes/accessors/CameraNode.d.ts
examples/jsm/nodes/accessors/ColorsNode.d.ts
examples/jsm/nodes/accessors/LightNode.d.ts
examples/jsm/nodes/accessors/NormalNode.d.ts
examples/jsm/nodes/accessors/PositionNode.d.ts
examples/jsm/nodes/accessors/ReflectNode.d.ts
examples/jsm/nodes/accessors/ResolutionNode.d.ts
examples/jsm/nodes/accessors/ScreenUVNode.d.ts
examples/jsm/nodes/accessors/UVNode.d.ts
examples/jsm/nodes/core/AttributeNode.d.ts
examples/jsm/nodes/core/ConstNode.d.ts
examples/jsm/nodes/core/ExpressionNode.d.ts
examples/jsm/nodes/core/FunctionCallNode.d.ts
examples/jsm/nodes/core/FunctionNode.d.ts
examples/jsm/nodes/core/InputNode.d.ts
examples/jsm/nodes/core/Node.d.ts
examples/jsm/nodes/core/NodeBuilder.d.ts
examples/jsm/nodes/core/NodeFrame.d.ts
examples/jsm/nodes/core/NodeLib.d.ts
examples/jsm/nodes/core/NodeUniform.d.ts
examples/jsm/nodes/core/NodeUtils.d.ts
examples/jsm/nodes/core/StructNode.d.ts
examples/jsm/nodes/core/TempNode.d.ts
examples/jsm/nodes/core/VarNode.d.ts
examples/jsm/nodes/effects/BlurNode.d.ts
examples/jsm/nodes/effects/ColorAdjustmentNode.d.ts
examples/jsm/nodes/effects/LuminanceNode.d.ts
examples/jsm/nodes/inputs/BoolNode.d.ts
examples/jsm/nodes/inputs/ColorNode.d.ts
examples/jsm/nodes/inputs/CubeTextureNode.d.ts
examples/jsm/nodes/inputs/FloatNode.d.ts
examples/jsm/nodes/inputs/IntNode.d.ts
examples/jsm/nodes/inputs/Matrix3Node.d.ts
examples/jsm/nodes/inputs/Matrix4Node.d.ts
examples/jsm/nodes/inputs/PropertyNode.d.ts
examples/jsm/nodes/inputs/ReflectorNode.d.ts
examples/jsm/nodes/inputs/RTTNode.d.ts
examples/jsm/nodes/inputs/ScreenNode.d.ts
examples/jsm/nodes/inputs/TextureNode.d.ts
examples/jsm/nodes/inputs/Vector2Node.d.ts
examples/jsm/nodes/inputs/Vector3Node.d.ts
examples/jsm/nodes/inputs/Vector4Node.d.ts
examples/jsm/nodes/inputs/ReflectorNode.d.ts
examples/jsm/nodes/materials/nodes/BasicNode.d.ts
examples/jsm/nodes/materials/nodes/MeshStandardNode.d.ts
examples/jsm/nodes/materials/nodes/PhongNode.d.ts
examples/jsm/nodes/materials/nodes/RawNode.d.ts
examples/jsm/nodes/materials/nodes/SpriteNode.d.ts
examples/jsm/nodes/materials/nodes/StandardNode.d.ts
examples/jsm/nodes/materials/BasicNodeMaterial.d.ts
examples/jsm/nodes/materials/MeshStandardNodeMaterial.d.ts
examples/jsm/nodes/materials/NodeMaterial.d.ts
examples/jsm/nodes/materials/PhongNodeMaterial.d.ts
examples/jsm/nodes/materials/SpriteNodeMaterial.d.ts
examples/jsm/nodes/materials/StandardNodeMaterial.d.ts
examples/jsm/nodes/math/CondNode.d.ts
examples/jsm/nodes/math/MathNode.d.ts
examples/jsm/nodes/math/OperatorNode.d.ts
examples/jsm/nodes/misc/BumpMapNode.d.ts
examples/jsm/nodes/misc/NormalMapNode.d.ts
examples/jsm/nodes/misc/TextureCubeNode.d.ts
examples/jsm/nodes/misc/TextureCubeUVNode.d.ts
examples/jsm/nodes/postprocessing/NodePass.d.ts
examples/jsm/nodes/postprocessing/NodePostProcessing.d.ts
examples/jsm/nodes/procedural/CheckerNode.d.ts
examples/jsm/nodes/procedural/NoiseNode.d.ts
examples/jsm/nodes/utils/BypassNode.d.ts
examples/jsm/nodes/utils/ColorSpaceNode.d.ts
examples/jsm/nodes/utils/JoinNode.d.ts
examples/jsm/nodes/utils/MaxMIPLevelNode.d.ts
examples/jsm/nodes/utils/SpecularMIPLevelNode.d.ts
examples/jsm/nodes/utils/SubSlot.d.ts
examples/jsm/nodes/utils/SwitchNode.d.ts
examples/jsm/nodes/utils/TimerNode.d.ts
examples/jsm/nodes/utils/UVTransformNode.d.ts
examples/jsm/nodes/utils/VelocityNode.d.ts
examples/jsm/nodes/Nodes.d.ts
examples/jsm/objects/Lensflare.d.ts
examples/jsm/objects/LightningStorm.d.ts
examples/jsm/objects/LightningStorm.d.ts
examples/jsm/objects/ReflectorRTT.d.ts
examples/jsm/objects/Refractor.d.ts
examples/jsm/objects/ShadowMesh.d.ts
examples/jsm/objects/Sky.d.ts
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
export namespace WEBGL {
declare namespace WEBGL {
function isWebGLAvailable(): boolean;
function isWebGL2Available(): boolean;
function getWebGLErrorMessage(): HTMLElement;
function getWebGL2ErrorMessage(): HTMLElement;
function getErrorMessage(version: number): HTMLElement;
}

export default WEBGL;
1 change: 0 additions & 1 deletion types/three/examples/jsm/controls/OrbitControls.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export class OrbitControls {
autoRotate: boolean;
autoRotateSpeed: number;

enableKeys: boolean;
keys: { LEFT: string; UP: string; RIGHT: string; BOTTOM: string };
mouseButtons: { LEFT: MOUSE; MIDDLE: MOUSE; RIGHT: MOUSE };
touches: { ONE: TOUCH; TWO: TOUCH };
Expand Down
106 changes: 52 additions & 54 deletions types/three/examples/jsm/curves/CurveExtras.d.ts
Original file line number Diff line number Diff line change
@@ -1,70 +1,68 @@
import { Curve, Vector3 } from '../../../src/Three';

export namespace Curves {
class GrannyKnot extends Curve<Vector3> {
constructor();
}
export class GrannyKnot extends Curve<Vector3> {
constructor();
}

class HeartCurve extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class HeartCurve extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class VivianiCurve extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class VivianiCurve extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class KnotCurve extends Curve<Vector3> {
constructor();
}
export class KnotCurve extends Curve<Vector3> {
constructor();
}

class HelixCurve extends Curve<Vector3> {
constructor();
}
export class HelixCurve extends Curve<Vector3> {
constructor();
}

class TrefoilKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class TrefoilKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class TorusKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class TorusKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class CinquefoilKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class CinquefoilKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class TrefoilPolynomialKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class TrefoilPolynomialKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class FigureEightPolynomialKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class FigureEightPolynomialKnot extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class DecoratedTorusKnot4a extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class DecoratedTorusKnot4a extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class DecoratedTorusKnot4b extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class DecoratedTorusKnot4b extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class DecoratedTorusKnot5a extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class DecoratedTorusKnot5a extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}

class DecoratedTorusKnot5c extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
export class DecoratedTorusKnot5c extends Curve<Vector3> {
constructor(scale?: number);
scale: number;
}
20 changes: 20 additions & 0 deletions types/three/examples/jsm/exporters/EXRExporter.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/**
* @author sciecode / https://github.com/sciecode
*
* EXR format references: https://www.openexr.com/documentation/openexrfilelayout.pdf
*/

import { WebGLRenderer, WebGLRenderTarget, TextureDataType } from '../../../src/Three';

export const NO_COMPRESSION: 0;
export const ZIPS_COMPRESSION: 2;
export const ZIP_COMPRESSION: 3;

export interface EXRExporterParseOptions {
compression?: number;
type?: TextureDataType;
}

export class EXRExporter {
parse(renderer: WebGLRenderer, renderTarget: WebGLRenderTarget, options?: EXRExporterParseOptions): Uint8Array;
}
14 changes: 14 additions & 0 deletions types/three/examples/jsm/helpers/OctreeHelper.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { ColorRepresentation, LineSegments } from '../../../src/Three';
import { Octree } from '../math/Octree';

export class OctreeHelper extends LineSegments {
constructor(octree: Octree, color: ColorRepresentation);

octree: Octree;
color: ColorRepresentation;

/**
* @default 'OctreeHelper'
*/
type: 'OctreeHelper' | string;
}
1 change: 1 addition & 0 deletions types/three/examples/jsm/interactive/HTMLMesh.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ import { Mesh } from 'three';

export class HTMLMesh extends Mesh {
constructor(dom: HTMLElement);
dispose(): void;
}
11 changes: 2 additions & 9 deletions types/three/examples/jsm/loaders/GLTFLoader.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,8 @@ export class GLTFParser {
loadBufferView: (bufferViewIndex: number) => Promise<ArrayBuffer>;
loadAccessor: (accessorIndex: number) => Promise<BufferAttribute | InterleavedBufferAttribute>;
loadTexture: (textureIndex: number) => Promise<Texture>;
loadTextureImage: (
textureIndex: number,
/**
* GLTF.Image
* See: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/schema/image.schema.json
*/
source: { [key: string]: any },
loader: Loader,
) => Promise<Texture>;
loadTextureImage: (textureIndex: number, sourceIndex: number, loader: Loader) => Promise<Texture>;
loadImageSource: (sourceIndex: number, loader: Loader) => Promise<Texture>;
assignTexture: (
materialParams: { [key: string]: any },
mapName: string,
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/loaders/LUT3dlLoader.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Loader, LoadingManager, DataTexture, DataTexture3D } from '../../../src/Three';
import { Loader, LoadingManager, DataTexture, Data3DTexture } from '../../../src/Three';

export interface LUT3dlResult {
size: number;
texture: DataTexture;
texture3D: DataTexture3D;
texture3D: Data3DTexture;
}

export class LUT3dlLoader extends Loader {
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/loaders/LUTCubeLoader.d.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Loader, LoadingManager, Vector3, DataTexture, DataTexture3D } from '../../../src/Three';
import { Loader, LoadingManager, Vector3, DataTexture, Data3DTexture } from '../../../src/Three';

export interface LUTCubeResult {
title: string;
size: number;
domainMin: Vector3;
domainMax: Vector3;
texture: DataTexture;
texture3D: DataTexture3D;
texture3D: Data3DTexture;
}

export class LUTCubeLoader extends Loader {
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/loaders/VOXLoader.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataTexture3D, Mesh, Loader, LoadingManager } from '../../../src/Three';
import { Data3DTexture, Mesh, Loader, LoadingManager } from '../../../src/Three';

export interface Chunk {
palette: number[];
Expand All @@ -23,6 +23,6 @@ export class VOXMesh extends Mesh {
constructor(chunk: Chunk);
}

export class VOXDataTexture3D extends DataTexture3D {
export class VOXData3DTexture extends Data3DTexture {
constructor(chunk: Chunk);
}
19 changes: 0 additions & 19 deletions types/three/examples/jsm/loaders/VRMLoader.d.ts

This file was deleted.

Loading

0 comments on commit 0dccb24

Please sign in to comment.