Skip to content

NodeMaterial: Add clamp() function. #15404

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 1 commit into from
Dec 11, 2018
Merged

NodeMaterial: Add clamp() function. #15404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 examples/js/nodes/math/Math1Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Math1Node.FLOOR = 'floor';
Math1Node.CEIL = 'ceil';
Math1Node.NORMALIZE = 'normalize';
Math1Node.FRACT = 'fract';
Math1Node.SAT = 'saturate';
Math1Node.SATURATE = 'saturate';
Math1Node.SIN = 'sin';
Math1Node.COS = 'cos';
Math1Node.TAN = 'tan';
Expand Down
1 change: 1 addition & 0 deletions examples/js/nodes/math/Math3Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function Math3Node( a, b, c, method ) {
}

Math3Node.MIX = 'mix';
Math3Node.CLAMP = 'clamp';
Math3Node.REFRACT = 'refract';
Math3Node.SMOOTHSTEP = 'smoothstep';
Math3Node.FACEFORWARD = 'faceforward';
Expand Down
14 changes: 7 additions & 7 deletions examples/webgl_materials_nodes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@

mtl.color = new THREE.ColorNode( 0x3399FF );
mtl.environment = color;
mtl.environmentAlpha = new THREE.Math1Node( fresnel, THREE.Math1Node.SAT );
mtl.environmentAlpha = new THREE.Math1Node( fresnel, THREE.Math1Node.SATURATE );

// GUI

Expand Down Expand Up @@ -1209,7 +1209,7 @@
THREE.OperatorNode.ADD
);

var clamp0at1 = new THREE.Math1Node( offsetClamp, THREE.Math1Node.SAT );
var clamp0at1 = new THREE.Math1Node( offsetClamp, THREE.Math1Node.SATURATE );

var blend = new THREE.Math3Node( top, bottom, clamp0at1, THREE.Math3Node.MIX );

Expand Down Expand Up @@ -1498,7 +1498,7 @@
var mask = new THREE.SwitchNode( worldNormal, 'y' );

// clamp0at1
mask = new THREE.Math1Node( mask, THREE.Math1Node.SAT );
mask = new THREE.Math1Node( mask, THREE.Math1Node.SATURATE );

var timeOffset = new THREE.OperatorNode(
time,
Expand Down Expand Up @@ -1531,7 +1531,7 @@
var voronoiColors = new THREE.Math3Node(
colorB,
colorA,
new THREE.Math1Node( voronoiIntensity, THREE.Math1Node.SAT ), // mix needs clamp
new THREE.Math1Node( voronoiIntensity, THREE.Math1Node.SATURATE ), // mix needs clamp
THREE.Math3Node.MIX
);

Expand Down Expand Up @@ -1780,7 +1780,7 @@
THREE.OperatorNode.MUL
);

var bloodArea = new THREE.Math1Node( wrappedLightColor, THREE.Math1Node.SAT );
var bloodArea = new THREE.Math1Node( wrappedLightColor, THREE.Math1Node.SATURATE );

var totalLight = new THREE.OperatorNode(
directLight,
Expand Down Expand Up @@ -1903,7 +1903,7 @@
THREE.Math3Node.SMOOTHSTEP
);

var innerContour = new THREE.Math1Node( new THREE.Math1Node( lineScaled, THREE.Math1Node.SAT ), THREE.Math1Node.INVERT );
var innerContour = new THREE.Math1Node( new THREE.Math1Node( lineScaled, THREE.Math1Node.SATURATE ), THREE.Math1Node.INVERT );

// APPLY

Expand Down Expand Up @@ -2550,7 +2550,7 @@
THREE.Math3Node.SMOOTHSTEP
);

var sssAlpha = new THREE.Math1Node( sss, THREE.Math1Node.SAT );
var sssAlpha = new THREE.Math1Node( sss, THREE.Math1Node.SATURATE );

var frontColor, backColor;

Expand Down