Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TSL: More consistent names shadowPositionWorld, materialAO #1453

Merged
merged 2 commits into from
Dec 20, 2024
Merged

TSL: More consistent names shadowPositionWorld, materialAO #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84ca1fe
TSL: More consistent names shadowPositionWorld, materialAO
Methuselah96 Dec 20, 2024
f5ba38d
Update three.js
Methuselah96 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 27 files
+7 −7 examples/jsm/loaders/PLYLoader.js
+7 −7 examples/jsm/loaders/VRMLLoader.js
+1 −1 examples/jsm/tsl/display/AnamorphicNode.js
+1 −1 package.json
+2 −2 src/Three.TSL.js
+17 −2 src/materials/nodes/LineBasicNodeMaterial.js
+77 −4 src/materials/nodes/LineDashedNodeMaterial.js
+56 −0 src/materials/nodes/MeshBasicNodeMaterial.js
+35 −0 src/materials/nodes/MeshLambertNodeMaterial.js
+22 −2 src/materials/nodes/MeshMatcapNodeMaterial.js
+21 −2 src/materials/nodes/MeshNormalNodeMaterial.js
+64 −1 src/materials/nodes/MeshPhongNodeMaterial.js
+78 −0 src/materials/nodes/MeshStandardNodeMaterial.js
+28 −0 src/materials/nodes/MeshToonNodeMaterial.js
+434 −6 src/materials/nodes/NodeMaterial.js
+22 −13 src/materials/nodes/PointsNodeMaterial.js
+29 −0 src/materials/nodes/ShadowNodeMaterial.js
+70 −5 src/materials/nodes/SpriteNodeMaterial.js
+4 −4 src/nodes/accessors/MaterialNode.js
+3 −3 src/nodes/code/ScriptableNode.js
+187 −1 src/nodes/core/PropertyNode.js
+54 −50 src/nodes/gpgpu/AtomicFunctionNode.js
+10 −4 src/nodes/gpgpu/BarrierNode.js
+3 −3 src/nodes/lighting/ShadowBaseNode.js
+2 −2 src/nodes/lighting/ShadowNode.js
+19 −3 src/renderers/WebGLRenderer.js
+4 −1 utils/docs/jsdoc.config.json
4 changes: 2 additions & 2 deletions types/three/src/Three.TSL.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export const mat2: typeof TSL.mat2;
export const mat3: typeof TSL.mat3;
export const mat4: typeof TSL.mat4;
export const matcapUV: typeof TSL.matcapUV;
export const materialAOMap: typeof TSL.materialAOMap;
export const materialAO: typeof TSL.materialAO;
export const materialAlphaTest: typeof TSL.materialAlphaTest;
export const materialAnisotropy: typeof TSL.materialAnisotropy;
export const materialAnisotropyVector: typeof TSL.materialAnisotropyVector;
Expand Down Expand Up @@ -410,7 +410,7 @@ export const select: typeof TSL.select;
export const setCurrentStack: typeof TSL.setCurrentStack;
export const shaderStages: typeof TSL.shaderStages;
export const shadow: typeof TSL.shadow;
export const shadowWorldPosition: typeof TSL.shadowWorldPosition;
export const shadowPositionWorld: typeof TSL.shadowPositionWorld;
export const sharedUniformGroup: typeof TSL.sharedUniformGroup;
export const sheen: typeof TSL.sheen;
export const sheenRoughness: typeof TSL.sheenRoughness;
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/nodes/accessors/MaterialNode.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export type MaterialNodeScope =
| typeof MaterialNode.POINT_WIDTH
| typeof MaterialNode.DISPERSION
| typeof MaterialNode.LIGHT_MAP
| typeof MaterialNode.AO_MAP
| typeof MaterialNode.AO
| typeof MaterialNode.REFRACTION_RATIO;

export default class MaterialNode extends Node {
Expand Down Expand Up @@ -80,7 +80,7 @@ export default class MaterialNode extends Node {
static POINT_WIDTH: "pointWidth";
static DISPERSION: "dispersion";
static LIGHT_MAP: "light";
static AO_MAP: "ao";
static AO: "ao";
static REFRACTION_RATIO: "refractionRatio";

scope: MaterialNodeScope;
Expand Down Expand Up @@ -125,5 +125,5 @@ export const materialLineDashOffset: ShaderNodeObject<MaterialNode>;
export const materialPointWidth: ShaderNodeObject<MaterialNode>;
export const materialDispersion: ShaderNodeObject<MaterialNode>;
export const materialLightMap: ShaderNodeObject<MaterialNode>;
export const materialAOMap: ShaderNodeObject<MaterialNode>;
export const materialAO: ShaderNodeObject<MaterialNode>;
export const materialAnisotropyVector: ShaderNodeObject<UniformNode<Vector2>>;
2 changes: 1 addition & 1 deletion types/three/src/nodes/lighting/ShadowBaseNode.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ declare class ShadowBaseNode extends Node {
constructor(light: Light);
}

export const shadowWorldPosition: ShaderNodeObject<Node>;
export const shadowPositionWorld: ShaderNodeObject<Node>;

export default ShadowBaseNode;
Loading