Skip to content

Move getDistanceAttenuation to LightUtils #444

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

Merged
merged 2 commits into from
May 1, 2023
Merged

Move getDistanceAttenuation to LightUtils #444

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
c995ed2
Move getDistanceAttenuation to LightUtils
Methuselah96 May 1, 2023
fe57043
Fix build
Methuselah96 May 1, 2023
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
5 changes: 3 additions & 2 deletions types/three/examples/jsm/nodes/Nodes.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export { default as UniformNode } from './core/UniformNode';
export { default as VarNode } from './core/VarNode';
export { default as VaryingNode } from './core/VaryingNode';

export * as NodeUtils from './core/NodeUtils.js';
import * as NodeUtils from './core/NodeUtils.js';
export { NodeUtils };

// math
export {
Expand Down Expand Up @@ -141,7 +142,7 @@ export { default as DFGApprox } from './functions/BSDF/DFGApprox';
export { default as F_Schlick } from './functions/BSDF/F_Schlick';
export { default as V_GGX_SmithCorrelated } from './functions/BSDF/V_GGX_SmithCorrelated';

export { default as getDistanceAttenuation } from './functions/light/getDistanceAttenuation';
export { getDistanceAttenuation } from './lighting/LightUtils';

export { default as getGeometryRoughness } from './functions/material/getGeometryRoughness';
export { default as getRoughness } from './functions/material/getRoughness';
Expand Down
1 change: 1 addition & 0 deletions types/three/examples/jsm/nodes/core/constants.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const NodeShaderStage: {
export const NodeUpdateType: {
NONE: 'none';
FRAME: 'frame';
RENDER: 'render';
OBJECT: 'object';
};

Expand Down
5 changes: 0 additions & 5 deletions types/three/examples/jsm/nodes/functions/light/getDistanceAttenuation.d.ts
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions types/three/examples/jsm/nodes/lighting/LightUtils.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { ShaderNode } from '../shadernode/ShaderNode';
import Node from '../core/Node';

export const getDistanceAttenuation: ShaderNode<{ lightDistance: Node; cutoffDistance: Node; decayExponent: Node }>;
2 changes: 0 additions & 2 deletions types/three/examples/jsm/nodes/shadernode/ShaderNodeElements.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ export { default as DFGApprox } from '../functions/BSDF/DFGApprox';
export { default as F_Schlick } from '../functions/BSDF/F_Schlick';
export { default as V_GGX_SmithCorrelated } from '../functions/BSDF/V_GGX_SmithCorrelated';

export { default as getDistanceAttenuation } from '../functions/light/getDistanceAttenuation';

export { default as getGeometryRoughness } from '../functions/material/getGeometryRoughness';
export { default as getRoughness } from '../functions/material/getRoughness';

Expand Down