From de5a8128d7bb79be59fe5138b2e36db0f1bf2b3b Mon Sep 17 00:00:00 2001 From: Yuri Roubinsky Date: Mon, 18 Jan 2021 12:23:04 +0300 Subject: Unified several visual shader nodes --- doc/classes/VisualShaderNodeClamp.xml | 32 +++++++++++++++++++++ doc/classes/VisualShaderNodeIntFunc.xml | 9 ++---- doc/classes/VisualShaderNodeMix.xml | 32 +++++++++++++++++++++ doc/classes/VisualShaderNodeScalarClamp.xml | 15 ---------- doc/classes/VisualShaderNodeScalarInterp.xml | 15 ---------- doc/classes/VisualShaderNodeScalarSmoothStep.xml | 16 ----------- doc/classes/VisualShaderNodeScalarSwitch.xml | 15 ---------- doc/classes/VisualShaderNodeSmoothStep.xml | 33 ++++++++++++++++++++++ doc/classes/VisualShaderNodeStep.xml | 33 ++++++++++++++++++++++ doc/classes/VisualShaderNodeSwitch.xml | 27 ++++++++++++++++-- doc/classes/VisualShaderNodeVectorClamp.xml | 15 ---------- doc/classes/VisualShaderNodeVectorInterp.xml | 15 ---------- doc/classes/VisualShaderNodeVectorScalarMix.xml | 15 ---------- .../VisualShaderNodeVectorScalarSmoothStep.xml | 16 ----------- doc/classes/VisualShaderNodeVectorScalarStep.xml | 16 ----------- doc/classes/VisualShaderNodeVectorSmoothStep.xml | 16 ----------- 16 files changed, 158 insertions(+), 162 deletions(-) create mode 100644 doc/classes/VisualShaderNodeClamp.xml create mode 100644 doc/classes/VisualShaderNodeMix.xml delete mode 100644 doc/classes/VisualShaderNodeScalarClamp.xml delete mode 100644 doc/classes/VisualShaderNodeScalarInterp.xml delete mode 100644 doc/classes/VisualShaderNodeScalarSmoothStep.xml delete mode 100644 doc/classes/VisualShaderNodeScalarSwitch.xml create mode 100644 doc/classes/VisualShaderNodeSmoothStep.xml create mode 100644 doc/classes/VisualShaderNodeStep.xml delete mode 100644 doc/classes/VisualShaderNodeVectorClamp.xml delete mode 100644 doc/classes/VisualShaderNodeVectorInterp.xml delete mode 100644 doc/classes/VisualShaderNodeVectorScalarMix.xml delete mode 100644 doc/classes/VisualShaderNodeVectorScalarSmoothStep.xml delete mode 100644 doc/classes/VisualShaderNodeVectorScalarStep.xml delete mode 100644 doc/classes/VisualShaderNodeVectorSmoothStep.xml (limited to 'doc/classes') diff --git a/doc/classes/VisualShaderNodeClamp.xml b/doc/classes/VisualShaderNodeClamp.xml new file mode 100644 index 0000000000..504171bb13 --- /dev/null +++ b/doc/classes/VisualShaderNodeClamp.xml @@ -0,0 +1,32 @@ + + + + Clamps a value within the visual shader graph. + + + Constrains a value to lie between [code]min[/code] and [code]max[/code] values. + + + + + + + + A type of operands and returned value. + + + + + A floating-point scalar. + + + An integer scalar. + + + A vector type. + + + Represents the size of the [enum OpType] enum. + + + diff --git a/doc/classes/VisualShaderNodeIntFunc.xml b/doc/classes/VisualShaderNodeIntFunc.xml index 5c68c0ec71..a9f4144a01 100644 --- a/doc/classes/VisualShaderNodeIntFunc.xml +++ b/doc/classes/VisualShaderNodeIntFunc.xml @@ -11,7 +11,7 @@ - + A function to be applied to the scalar. See [enum Function] for options. @@ -19,13 +19,10 @@ Returns the absolute value of the parameter. Translates to [code]abs(x)[/code] in the Godot Shader Language. - - Constrains a parameter between [code]min[/code] and [code]max[/code]. Translates to [code]clamp(x, min, max)[/code] in the Godot Shader Language. - - + Negates the [code]x[/code] using [code]-(x)[/code]. - + Extracts the sign of the parameter. Translates to [code]sign(x)[/code] in the Godot Shader Language. diff --git a/doc/classes/VisualShaderNodeMix.xml b/doc/classes/VisualShaderNodeMix.xml new file mode 100644 index 0000000000..c70ac7e599 --- /dev/null +++ b/doc/classes/VisualShaderNodeMix.xml @@ -0,0 +1,32 @@ + + + + Linearly interpolates between two values within the visual shader graph. + + + Translates to [code]mix(a, b, weight)[/code] in the shader language. + + + + + + + + A type of operands and returned value. + + + + + A scalar type. + + + A vector type. + + + A vector type. [code]weight[/code] port is using a scalar type. + + + Represents the size of the [enum OpType] enum. + + + diff --git a/doc/classes/VisualShaderNodeScalarClamp.xml b/doc/classes/VisualShaderNodeScalarClamp.xml deleted file mode 100644 index 7432e8dfca..0000000000 --- a/doc/classes/VisualShaderNodeScalarClamp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Clamps a scalar value within the visual shader graph. - - - Constrains a value to lie between [code]min[/code] and [code]max[/code] values. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeScalarInterp.xml b/doc/classes/VisualShaderNodeScalarInterp.xml deleted file mode 100644 index 393ea70e1a..0000000000 --- a/doc/classes/VisualShaderNodeScalarInterp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Linearly interpolates between two scalars within the visual shader graph. - - - Translates to [code]mix(a, b, weight)[/code] in the shader language. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeScalarSmoothStep.xml b/doc/classes/VisualShaderNodeScalarSmoothStep.xml deleted file mode 100644 index e619cc8571..0000000000 --- a/doc/classes/VisualShaderNodeScalarSmoothStep.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Calculates a scalar SmoothStep function within the visual shader graph. - - - Translates to [code]smoothstep(edge0, edge1, x)[/code] in the shader language. - Returns [code]0.0[/code] if [code]x[/code] is smaller than [code]edge0[/code] and [code]1.0[/code] if [code]x[/code] is larger than [code]edge1[/code]. Otherwise the return value is interpolated between [code]0.0[/code] and [code]1.0[/code] using Hermite polynomials. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeScalarSwitch.xml b/doc/classes/VisualShaderNodeScalarSwitch.xml deleted file mode 100644 index 2ad5202745..0000000000 --- a/doc/classes/VisualShaderNodeScalarSwitch.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - A boolean/scalar function for use within the visual shader graph. - - - Returns an associated scalar if the provided boolean value is [code]true[/code] or [code]false[/code]. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeSmoothStep.xml b/doc/classes/VisualShaderNodeSmoothStep.xml new file mode 100644 index 0000000000..fa22d16da8 --- /dev/null +++ b/doc/classes/VisualShaderNodeSmoothStep.xml @@ -0,0 +1,33 @@ + + + + Calculates a SmoothStep function within the visual shader graph. + + + Translates to [code]smoothstep(edge0, edge1, x)[/code] in the shader language. + Returns [code]0.0[/code] if [code]x[/code] is smaller than [code]edge0[/code] and [code]1.0[/code] if [code]x[/code] is larger than [code]edge1[/code]. Otherwise the return value is interpolated between [code]0.0[/code] and [code]1.0[/code] using Hermite polynomials. + + + + + + + + A type of operands and returned value. + + + + + A scalar type. + + + A vector type. + + + A vector type. [code]edge0[/code] and [code]edge1[/code] are using a scalar type. + + + Represents the size of the [enum OpType] enum. + + + diff --git a/doc/classes/VisualShaderNodeStep.xml b/doc/classes/VisualShaderNodeStep.xml new file mode 100644 index 0000000000..694c144445 --- /dev/null +++ b/doc/classes/VisualShaderNodeStep.xml @@ -0,0 +1,33 @@ + + + + Calculates a Step function within the visual shader graph. + + + Translates to [code]step(edge, x)[/code] in the shader language. + Returns [code]0.0[/code] if [code]x[/code] is smaller than [code]edge[/code] and [code]1.0[/code] otherwise. + + + + + + + + A type of operands and returned value. + + + + + A scalar type. + + + A vector type. + + + A vector type. [code]edge[/code] port is using a scalar type. + + + Represents the size of the [enum OpType] enum. + + + diff --git a/doc/classes/VisualShaderNodeSwitch.xml b/doc/classes/VisualShaderNodeSwitch.xml index 9f8a12c0fd..3961070a74 100644 --- a/doc/classes/VisualShaderNodeSwitch.xml +++ b/doc/classes/VisualShaderNodeSwitch.xml @@ -1,15 +1,38 @@ - A boolean/vector function for use within the visual shader graph. + A selector function for use within the visual shader graph. - Returns an associated vector if the provided boolean value is [code]true[/code] or [code]false[/code]. + Returns an associated value of the [code]op_type[/code] type if the provided boolean value is [code]true[/code] or [code]false[/code]. + + + A type of operands and returned value. + + + + A floating-point scalar. + + + An integer scalar. + + + A vector type. + + + A boolean type. + + + A transform type. + + + Represents the size of the [enum OpType] enum. + diff --git a/doc/classes/VisualShaderNodeVectorClamp.xml b/doc/classes/VisualShaderNodeVectorClamp.xml deleted file mode 100644 index 567fed8a41..0000000000 --- a/doc/classes/VisualShaderNodeVectorClamp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Clamps a vector value within the visual shader graph. - - - Constrains a value to lie between [code]min[/code] and [code]max[/code] values. The operation is performed on each component of the vector individually. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeVectorInterp.xml b/doc/classes/VisualShaderNodeVectorInterp.xml deleted file mode 100644 index b63d34b742..0000000000 --- a/doc/classes/VisualShaderNodeVectorInterp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Linearly interpolates between two vectors within the visual shader graph. - - - Translates to [code]mix(a, b, weight)[/code] in the shader language, where [code]weight[/code] is a [Vector3] with weights for each component. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeVectorScalarMix.xml b/doc/classes/VisualShaderNodeVectorScalarMix.xml deleted file mode 100644 index 791a9e6be1..0000000000 --- a/doc/classes/VisualShaderNodeVectorScalarMix.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Linearly interpolates between two vectors using a scalar. For use within the visual shader graph. - - - Translates to [code]mix(a, b, weight)[/code] in the shader language, where [code]a[/code] and [code]b[/code] are vectors and [code]weight[/code] is a scalar. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeVectorScalarSmoothStep.xml b/doc/classes/VisualShaderNodeVectorScalarSmoothStep.xml deleted file mode 100644 index 580abaf5fe..0000000000 --- a/doc/classes/VisualShaderNodeVectorScalarSmoothStep.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Calculates a vector SmoothStep function using scalar within the visual shader graph. - - - Translates to [code]smoothstep(edge0, edge1, x)[/code] in the shader language, where [code]x[/code] is a scalar. - Returns [code]0.0[/code] if [code]x[/code] is smaller than [code]edge0[/code] and [code]1.0[/code] if [code]x[/code] is larger than [code]edge1[/code]. Otherwise the return value is interpolated between [code]0.0[/code] and [code]1.0[/code] using Hermite polynomials. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeVectorScalarStep.xml b/doc/classes/VisualShaderNodeVectorScalarStep.xml deleted file mode 100644 index d61414f3a8..0000000000 --- a/doc/classes/VisualShaderNodeVectorScalarStep.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Calculates a vector Step function within the visual shader graph. - - - Translates to [code]step(edge, x)[/code] in the shader language. - Returns [code]0.0[/code] if [code]x[/code] is smaller than [code]edge[/code] and [code]1.0[/code] otherwise. - - - - - - - - diff --git a/doc/classes/VisualShaderNodeVectorSmoothStep.xml b/doc/classes/VisualShaderNodeVectorSmoothStep.xml deleted file mode 100644 index 1b77a3c535..0000000000 --- a/doc/classes/VisualShaderNodeVectorSmoothStep.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Calculates a vector SmoothStep function within the visual shader graph. - - - Translates to [code]smoothstep(edge0, edge1, x)[/code] in the shader language, where [code]x[/code] is a vector. - Returns [code]0.0[/code] if [code]x[/code] is smaller than [code]edge0[/code] and [code]1.0[/code] if [code]x[/code] is larger than [code]edge1[/code]. Otherwise the return value is interpolated between [code]0.0[/code] and [code]1.0[/code] using Hermite polynomials. - - - - - - - - -- cgit v1.2.3