TSL: NormalNode - Improve tree shaking using TSL (#968)

three-types · May 18, 2024 · 20192c2 · 20192c2
1 parent 45ab48b
commit 20192c2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/types/three/examples/jsm/nodes/Nodes.d.ts b/types/three/examples/jsm/nodes/Nodes.d.ts
@@ -266,15 +266,7 @@ export {
     modelWorldMatrix,
 } from "./accessors/ModelNode.js";
 export { default as ModelViewProjectionNode, modelViewProjection } from "./accessors/ModelViewProjectionNode.js";
-export {
-    default as NormalNode,
-    normalGeometry,
-    normalLocal,
-    NormalNodeScope,
-    normalView,
-    normalWorld,
-    transformedNormalView,
-} from "./accessors/NormalNode.js";
+export * from "./accessors/NormalNode.js";
 export {
     default as Object3DNode,
     objectDirection,

diff --git a/types/three/examples/jsm/nodes/accessors/NormalNode.d.ts b/types/three/examples/jsm/nodes/accessors/NormalNode.d.ts
@@ -1,20 +1,12 @@
-import Node from "../core/Node.js";
+import AttributeNode from "../core/AttributeNode.js";
+import PropertyNode from "../core/PropertyNode.js";
 import VarNode from "../core/VarNode.js";
+import MathNode from "../math/MathNode.js";
 import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
 
-export type NormalNodeScope = typeof NormalNode.GEOMETRY | typeof NormalNode.LOCAL | typeof NormalNode.VIEW;
-
-export default class NormalNode extends Node {
-    static GEOMETRY: "geometry";
-    static LOCAL: "local";
-    static VIEW: "view";
-    scope: NormalNodeScope;
-
-    constructor(scope?: NormalNodeScope);
-}
-
-export const normalGeometry: ShaderNodeObject<NormalNode>;
-export const normalLocal: ShaderNodeObject<NormalNode>;
-export const normalView: ShaderNodeObject<NormalNode>;
-export const normalWorld: ShaderNodeObject<NormalNode>;
-export const transformedNormalView: ShaderNodeObject<VarNode>;
+export const normalGeometry: ShaderNodeObject<AttributeNode>;
+export const normalLocal: ShaderNodeObject<VarNode>;
+export const normalView: ShaderNodeObject<MathNode>;
+export const normalWorld: ShaderNodeObject<MathNode>;
+export const transformedNormalView: ShaderNodeObject<PropertyNode>;
+export const transformedClearcoatNormalView: ShaderNodeObject<PropertyNode>;
diff --git a/types/three/examples/jsm/nodes/core/AttributeNode.d.ts b/types/three/examples/jsm/nodes/core/AttributeNode.d.ts
@@ -1,4 +1,4 @@
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
 import { NodeTypeOption } from "./constants.js";
 import Node from "./Node.js";
 import NodeBuilder from "./NodeBuilder.js";
@@ -13,4 +13,8 @@ export default class AttributeNode extends Node {
     getAttributeName(builder: NodeBuilder): string;
 }
 
-export const attribute: (name: string, nodeType: NodeTypeOption) => ShaderNodeObject<Node>;
+export const attribute: (
+    name: string,
+    nodeType?: NodeTypeOption | null,
+    defaultNode?: NodeRepresentation,
+) => ShaderNodeObject<Node>;