Skip to content

Commit

Permalink
Update imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Methuselah96 committed Dec 14, 2024
1 parent 3eaed27 commit 6964cd4
Show file tree
Hide file tree
Showing 36 changed files with 85 additions and 54 deletions.
3 changes: 1 addition & 2 deletions types/three/examples/jsm/csm/CSMShadowNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Camera, DirectionalLightShadow, Light, Object3D } from "three";
import { Node } from "three/tsl";
import { Camera, DirectionalLightShadow, Light, Node, Object3D } from "three/webgpu";
import { CSMFrustum } from "./CSMFrustum.js";

export type CSMShadowNodeMode = "uniform" | "logarithmic" | "practical" | "custom";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NodeMaterial, NodeMaterialParameters } from "three/tsl";
import { NodeMaterial, NodeMaterialParameters } from "three/webgpu";

declare class LDrawConditionalLineMaterial extends NodeMaterial {
readonly isLDrawConditionalLineMaterial: true;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/objects/SkyMesh.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ShaderNodeObject, UniformNode } from "three/tsl";
import { BoxGeometry, Mesh, NodeMaterial, Vector3 } from "three/webgpu";
import { ShaderNodeObject } from "three/tsl";
import { BoxGeometry, Mesh, NodeMaterial, UniformNode, Vector3 } from "three/webgpu";

declare class SkyMesh extends Mesh<BoxGeometry, NodeMaterial> {
turbidity: ShaderNodeObject<UniformNode<number>>;
Expand Down
15 changes: 13 additions & 2 deletions types/three/examples/jsm/objects/Water2Mesh.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import { TempNode, TextureNode, UniformNode, Vector2, Vector3 } from "three/tsl";
import { BufferGeometry, Color, ColorRepresentation, Mesh, NodeMaterial, Texture } from "three/webgpu";
import {
BufferGeometry,
Color,
ColorRepresentation,
Mesh,
NodeMaterial,
TempNode,
Texture,
TextureNode,
UniformNode,
Vector2,
Vector3,
} from "three/webgpu";

export interface WaterMeshOptions {
normalMap0: Texture;
Expand Down
13 changes: 11 additions & 2 deletions types/three/examples/jsm/objects/WaterMesh.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
import { TextureNode, UniformNode } from "three/tsl";
import { BufferGeometry, Color, ColorRepresentation, Mesh, NodeMaterial, Texture, Vector3 } from "three/webgpu";
import {
BufferGeometry,
Color,
ColorRepresentation,
Mesh,
NodeMaterial,
Texture,
TextureNode,
UniformNode,
Vector3,
} from "three/webgpu";

export interface WaterMeshOptions {
resolution?: number | undefined;
Expand Down
2 changes: 1 addition & 1 deletion types/three/examples/jsm/tsl/display/AfterImageNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Node, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { Node, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/webgpu";

Check failure on line 1 in types/three/examples/jsm/tsl/display/AfterImageNode.d.ts

View workflow job for this annotation

GitHub Actions / type-check

Module '"three/webgpu"' has no exported member 'ShaderNodeObject'.

export default class AfterImageNode extends TempNode {
textureNode: TextureNode;
Expand Down
2 changes: 1 addition & 1 deletion types/three/examples/jsm/tsl/display/AnaglyphPassNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Scene } from "three";
import { ShaderNodeObject } from "three/tsl";
import { Camera, Scene } from "three/webgpu";
import StereoCompositePassNode from "./StereoCompositePassNode.js";

declare class AnaglyphPassNode extends StereoCompositePassNode {
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/AnamorphicNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Vector2 } from "three";
import { Node, NodeRepresentation, ShaderNodeObject, TempNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode, Vector2 } from "three/webgpu";

export default class AnamorphicNode extends TempNode {
textureNode: Node;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/BleachBypass.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Node, NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node } from "three/webgpu";

export const bleach: (color: NodeRepresentation, opacity?: number) => ShaderNodeObject<Node>;
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/BloomNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode, TextureNode, UniformNode } from "three/webgpu";

declare class BloomNode extends TempNode {
inputNode: Node;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/DenoiseNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Matrix4 } from "three";
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Camera, Node, TempNode, UniformNode } from "three/webgpu";

declare class DenoiseNode extends TempNode {
textureNode: Node;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/DepthOfFieldNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode, TextureNode, UniformNode } from "three/webgpu";

declare class DepthOfFieldNode extends TempNode {
textureNode: TextureNode;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/DotScreenNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Vector2 } from "three";
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode, UniformNode, Vector2 } from "three/webgpu";

declare class DotScreenNode extends TempNode {
inputNode: Node;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/FXAANode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NodeRepresentation, ShaderNodeObject, TempNode, TextureNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { TempNode, TextureNode } from "three/webgpu";

declare class FXAANode extends TempNode {
textureNode: TextureNode;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/FilmNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject, TempNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode } from "three/webgpu";

declare class FilmNode extends TempNode {
inputNode: Node;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/GTAONode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Vector2 } from "three";
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Camera, Node, TempNode, TextureNode, UniformNode, Vector2 } from "three/webgpu";

declare class GTAONode extends TempNode {
depthNode: Node;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/GaussianBlurNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Vector2 } from "three";
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode, TextureNode, Vector2 } from "three/webgpu";

declare class GaussianBlurNode extends TempNode {
textureNode: TextureNode;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/LensflareNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Vector3 } from "three";
import { NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { TempNode, TextureNode, UniformNode, Vector3 } from "three/webgpu";

interface LensflareNodeParams {
ghostTint?: NodeRepresentation | undefined;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/Lut3DNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Data3DTexture } from "three";
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, Texture3DNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Data3DTexture, Node, TempNode, Texture3DNode, UniformNode } from "three/webgpu";

declare class Lut3DNode extends TempNode {
inputNode: Node;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/MotionBlur.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node } from "three/webgpu";

export const motionBlur: (
inputNode: NodeRepresentation,
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/OutlineNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { Camera, Object3D, Scene } from "three/webgpu";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Camera, Node, Object3D, Scene, TempNode, TextureNode, UniformNode } from "three/webgpu";

export interface OutlineNodeParams {
selectedObjects?: Object3D[] | undefined;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Scene } from "three";
import { ShaderNodeObject } from "three/tsl";
import { Camera, Scene } from "three/webgpu";
import StereoCompositePassNode from "./StereoCompositePassNode.js";

declare class ParallaxBarrierPassNode extends StereoCompositePassNode {
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/PixelationPassNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Scene } from "three";
import { PassNode, ShaderNodeObject, UniformNode } from "three/tsl";
import { ShaderNodeObject } from "three/tsl";
import { Camera, PassNode, Scene, UniformNode } from "three/webgpu";

declare class PixelationPassNode extends PassNode {
pixelSize: UniformNode<number>;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/RGBShiftNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { TempNode, TextureNode, UniformNode } from "three/webgpu";

export default class RGBShiftNode extends TempNode {
textureNode: TextureNode;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/SMAANode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NodeRepresentation, ShaderNodeObject, TempNode, TextureNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { TempNode, TextureNode } from "three/webgpu";

declare class SMAANode extends TempNode {
textureNode: TextureNode;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/SSAAPassNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Color, RenderTarget, Scene } from "three";
import { PassNode, ShaderNodeObject, UniformNode } from "three/tsl";
import { ShaderNodeObject } from "three/tsl";
import { Camera, Color, PassNode, RenderTarget, Scene, UniformNode } from "three/webgpu";

declare class SSAAPassNode extends PassNode {
readonly isSSAAPassNode: boolean;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/SSRNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { Camera } from "three/webgpu";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Camera, Node, TempNode, TextureNode, UniformNode } from "three/webgpu";

declare class SSRNode extends TempNode {
colorNode: ShaderNodeObject<Node>;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/Sepia.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Node, NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node } from "three/webgpu";

export const sepia: (color: NodeRepresentation) => ShaderNodeObject<Node>;
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/SobelOperatorNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NodeRepresentation, ShaderNodeObject, TempNode, TextureNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { TempNode, TextureNode } from "three/webgpu";

declare class SobelOperatorNode extends TempNode {
textureNode: TextureNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Camera, CoordinateSystem, Scene, StereoCamera } from "three";
import { PassNode } from "three/tsl";
import { Camera, CoordinateSystem, PassNode, Scene, StereoCamera } from "three/webgpu";

declare class StereoCompositePassNode extends PassNode {
readonly isStereoCompositePassNode: true;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/StereoPassNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, Scene, StereoCamera } from "three";
import { PassNode, ShaderNodeObject } from "three/tsl";
import { ShaderNodeObject } from "three/tsl";
import { Camera, PassNode, Scene, StereoCamera } from "three/webgpu";

declare class StereoPassNode extends PassNode {
readonly isStereoPassNode: true;
Expand Down
4 changes: 2 additions & 2 deletions types/three/examples/jsm/tsl/display/TRAAPassNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Camera, ColorRepresentation, Scene } from "three";
import { PassNode, ShaderNodeObject } from "three/tsl";
import { ShaderNodeObject } from "three/tsl";
import { Camera, ColorRepresentation, PassNode, Scene } from "three/webgpu";

declare class TRAAPassNode extends PassNode {
readonly isTRAAPassNode: true;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/TransitionNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject, TempNode, TextureNode, UniformNode } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node, TempNode, TextureNode, UniformNode } from "three/webgpu";

declare class TransitionNode extends TempNode {
textureNodeA: TextureNode;
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/display/hashBlur.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Node, NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { Node } from "three/webgpu";

export const hashBlur: (
textureNode: NodeRepresentation,
Expand Down
3 changes: 2 additions & 1 deletion types/three/examples/jsm/tsl/lighting/TiledLightsNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { LightsNode, Node, NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { NodeRepresentation, ShaderNodeObject } from "three/tsl";
import { LightsNode, Node } from "three/webgpu";

export const circleIntersectsAABB: (
circleCenter: NodeRepresentation,
Expand Down
2 changes: 1 addition & 1 deletion types/three/src/nodes/gpgpu/WorkgroupInfoNode.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Node from "../core/Node.js";
import { ShaderNodeObject } from '../tsl/TSLCore.js';
import { ShaderNodeObject } from "../tsl/TSLCore.js";

declare class WorkgroupInfoNode extends Node {
bufferType: string;
Expand Down

0 comments on commit 6964cd4

Please sign in to comment.