diff --git a/doc/classes/Shader.xml b/doc/classes/Shader.xml index 68176dea143d..4b647eb1ca30 100644 --- a/doc/classes/Shader.xml +++ b/doc/classes/Shader.xml @@ -1,10 +1,10 @@ - A shader implemented in the Godot shading language. + A shader implemented in the GDShader language. - A custom shader program implemented in the Godot shading language, saved with the [code].gdshader[/code] extension. + A custom shader program implemented in Godot's shading language, GDShader, saved with the [code].gdshader[/code] extension. This class is used by a [ShaderMaterial] and allows you to write your own custom behavior for rendering visual items or updating particle information. For a detailed explanation and usage, please see the tutorials linked below. diff --git a/doc/classes/VisualShaderNodeBooleanConstant.xml b/doc/classes/VisualShaderNodeBooleanConstant.xml index d2a7ff3d45df..3447cbf3a3f1 100644 --- a/doc/classes/VisualShaderNodeBooleanConstant.xml +++ b/doc/classes/VisualShaderNodeBooleanConstant.xml @@ -5,7 +5,7 @@ Has only one output port and no inputs. - Translated to [code skip-lint]bool[/code] in the shader language. + Translated to [code skip-lint]bool[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeBooleanParameter.xml b/doc/classes/VisualShaderNodeBooleanParameter.xml index ef64c0948f3d..94e8ab34ded3 100644 --- a/doc/classes/VisualShaderNodeBooleanParameter.xml +++ b/doc/classes/VisualShaderNodeBooleanParameter.xml @@ -4,7 +4,7 @@ A boolean parameter to be used within the visual shader graph. - Translated to [code]uniform bool[/code] in the shader language. + Translated to [code]uniform bool[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeColorConstant.xml b/doc/classes/VisualShaderNodeColorConstant.xml index 3ed754ccdaed..e2baf1bb6120 100644 --- a/doc/classes/VisualShaderNodeColorConstant.xml +++ b/doc/classes/VisualShaderNodeColorConstant.xml @@ -5,7 +5,7 @@ Has two output ports representing RGB and alpha channels of [Color]. - Translated to [code]vec3 rgb[/code] and [code]float alpha[/code] in the shader language. + Translated to [code]vec3 rgb[/code] and [code]float alpha[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeColorParameter.xml b/doc/classes/VisualShaderNodeColorParameter.xml index 49ceec2648ed..591885819169 100644 --- a/doc/classes/VisualShaderNodeColorParameter.xml +++ b/doc/classes/VisualShaderNodeColorParameter.xml @@ -4,7 +4,7 @@ A [Color] parameter to be used within the visual shader graph. - Translated to [code]uniform vec4[/code] in the shader language. + Translated to [code]uniform vec4[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeCubemap.xml b/doc/classes/VisualShaderNodeCubemap.xml index 6f3df9865aa1..b2e22fe51a7a 100644 --- a/doc/classes/VisualShaderNodeCubemap.xml +++ b/doc/classes/VisualShaderNodeCubemap.xml @@ -4,7 +4,7 @@ A [Cubemap] sampling node to be used within the visual shader graph. - Translated to [code]texture(cubemap, vec3)[/code] in the shader language. Returns a color vector and alpha channel as scalar. + Translated to [code]texture(cubemap, vec3)[/code] in the GDShader language. Returns a color vector and alpha channel as scalar. diff --git a/doc/classes/VisualShaderNodeCubemapParameter.xml b/doc/classes/VisualShaderNodeCubemapParameter.xml index 0b2d87c13dfb..ba501128a552 100644 --- a/doc/classes/VisualShaderNodeCubemapParameter.xml +++ b/doc/classes/VisualShaderNodeCubemapParameter.xml @@ -4,7 +4,7 @@ A [Cubemap] parameter node to be used within the visual shader graph. - Translated to [code]uniform samplerCube[/code] in the shader language. The output value can be used as port for [VisualShaderNodeCubemap]. + Translated to [code]uniform samplerCube[/code] in the GDShader language. The output value can be used as port for [VisualShaderNodeCubemap]. diff --git a/doc/classes/VisualShaderNodeDeterminant.xml b/doc/classes/VisualShaderNodeDeterminant.xml index cbb43edfef64..be6776a06fa7 100644 --- a/doc/classes/VisualShaderNodeDeterminant.xml +++ b/doc/classes/VisualShaderNodeDeterminant.xml @@ -4,7 +4,7 @@ Calculates the determinant of a [Transform3D] within the visual shader graph. - Translates to [code]determinant(x)[/code] in the shader language. + Translates to [code]determinant(x)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeDotProduct.xml b/doc/classes/VisualShaderNodeDotProduct.xml index f9c93831fc37..a3109f1a6cfe 100644 --- a/doc/classes/VisualShaderNodeDotProduct.xml +++ b/doc/classes/VisualShaderNodeDotProduct.xml @@ -4,7 +4,7 @@ Calculates a dot product of two vectors within the visual shader graph. - Translates to [code]dot(a, b)[/code] in the shader language. + Translates to [code]dot(a, b)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeExpression.xml b/doc/classes/VisualShaderNodeExpression.xml index c916aecc500a..5fea21cc27b7 100644 --- a/doc/classes/VisualShaderNodeExpression.xml +++ b/doc/classes/VisualShaderNodeExpression.xml @@ -1,17 +1,17 @@ - A custom visual shader graph expression written in Godot Shading Language. + A custom visual shader graph expression written in the GDShader language. - Custom Godot Shading Language expression, with a custom number of input and output ports. + Custom GDShader expression, with a custom number of input and output ports. The provided code is directly injected into the graph's matching shader function ([code]vertex[/code], [code]fragment[/code], or [code]light[/code]), so it cannot be used to declare functions, varyings, uniforms, or global constants. See [VisualShaderNodeGlobalExpression] for such global definitions. - An expression in Godot Shading Language, which will be injected at the start of the graph's matching shader function ([code]vertex[/code], [code]fragment[/code], or [code]light[/code]), and thus cannot be used to declare functions, varyings, uniforms, or global constants. + An expression in the GDShader language, which will be injected at the start of the graph's matching shader function ([code]vertex[/code], [code]fragment[/code], or [code]light[/code]), and thus cannot be used to declare functions, varyings, uniforms, or global constants. diff --git a/doc/classes/VisualShaderNodeFaceForward.xml b/doc/classes/VisualShaderNodeFaceForward.xml index b63602e388ed..112c1151161c 100644 --- a/doc/classes/VisualShaderNodeFaceForward.xml +++ b/doc/classes/VisualShaderNodeFaceForward.xml @@ -4,7 +4,7 @@ Returns the vector that points in the same direction as a reference vector within the visual shader graph. - Translates to [code]faceforward(N, I, Nref)[/code] in the shader language. The function has three vector parameters: [code]N[/code], the vector to orient, [code]I[/code], the incident vector, and [code]Nref[/code], the reference vector. If the dot product of [code]I[/code] and [code]Nref[/code] is smaller than zero the return value is [code]N[/code]. Otherwise, [code]-N[/code] is returned. + Translates to [code]faceforward(N, I, Nref)[/code] in the GDShader language. The function has three vector parameters: [code]N[/code], the vector to orient, [code]I[/code], the incident vector, and [code]Nref[/code], the reference vector. If the dot product of [code]I[/code] and [code]Nref[/code] is smaller than zero the return value is [code]N[/code]. Otherwise, [code]-N[/code] is returned. diff --git a/doc/classes/VisualShaderNodeFloatConstant.xml b/doc/classes/VisualShaderNodeFloatConstant.xml index 2436663f1fbe..9b06831f6206 100644 --- a/doc/classes/VisualShaderNodeFloatConstant.xml +++ b/doc/classes/VisualShaderNodeFloatConstant.xml @@ -4,7 +4,7 @@ A scalar floating-point constant to be used within the visual shader graph. - Translated to [code skip-lint]float[/code] in the shader language. + Translated to [code skip-lint]float[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeFloatFunc.xml b/doc/classes/VisualShaderNodeFloatFunc.xml index 8cde07bfccd0..1a6b5e2fe022 100644 --- a/doc/classes/VisualShaderNodeFloatFunc.xml +++ b/doc/classes/VisualShaderNodeFloatFunc.xml @@ -15,58 +15,58 @@ - Returns the sine of the parameter. Translates to [code]sin(x)[/code] in the Godot Shader Language. + Returns the sine of the parameter. Translates to [code]sin(x)[/code] in the GDShader language. - Returns the cosine of the parameter. Translates to [code]cos(x)[/code] in the Godot Shader Language. + Returns the cosine of the parameter. Translates to [code]cos(x)[/code] in the GDShader language. - Returns the tangent of the parameter. Translates to [code]tan(x)[/code] in the Godot Shader Language. + Returns the tangent of the parameter. Translates to [code]tan(x)[/code] in the GDShader language. - Returns the arc-sine of the parameter. Translates to [code]asin(x)[/code] in the Godot Shader Language. + Returns the arc-sine of the parameter. Translates to [code]asin(x)[/code] in the GDShader language. - Returns the arc-cosine of the parameter. Translates to [code]acos(x)[/code] in the Godot Shader Language. + Returns the arc-cosine of the parameter. Translates to [code]acos(x)[/code] in the GDShader language. - Returns the arc-tangent of the parameter. Translates to [code]atan(x)[/code] in the Godot Shader Language. + Returns the arc-tangent of the parameter. Translates to [code]atan(x)[/code] in the GDShader language. - Returns the hyperbolic sine of the parameter. Translates to [code]sinh(x)[/code] in the Godot Shader Language. + Returns the hyperbolic sine of the parameter. Translates to [code]sinh(x)[/code] in the GDShader language. - Returns the hyperbolic cosine of the parameter. Translates to [code]cosh(x)[/code] in the Godot Shader Language. + Returns the hyperbolic cosine of the parameter. Translates to [code]cosh(x)[/code] in the GDShader language. - Returns the hyperbolic tangent of the parameter. Translates to [code]tanh(x)[/code] in the Godot Shader Language. + Returns the hyperbolic tangent of the parameter. Translates to [code]tanh(x)[/code] in the GDShader language. - Returns the natural logarithm of the parameter. Translates to [code]log(x)[/code] in the Godot Shader Language. + Returns the natural logarithm of the parameter. Translates to [code]log(x)[/code] in the GDShader language. - Returns the natural exponentiation of the parameter. Translates to [code]exp(x)[/code] in the Godot Shader Language. + Returns the natural exponentiation of the parameter. Translates to [code]exp(x)[/code] in the GDShader language. - Returns the square root of the parameter. Translates to [code]sqrt(x)[/code] in the Godot Shader Language. + Returns the square root of the parameter. Translates to [code]sqrt(x)[/code] in the GDShader language. - Returns the absolute value of the parameter. Translates to [code]abs(x)[/code] in the Godot Shader Language. + Returns the absolute value of the parameter. Translates to [code]abs(x)[/code] in the GDShader language. - Extracts the sign of the parameter. Translates to [code]sign(x)[/code] in the Godot Shader Language. + Extracts the sign of the parameter. Translates to [code]sign(x)[/code] in the GDShader language. - Finds the nearest integer less than or equal to the parameter. Translates to [code]floor(x)[/code] in the Godot Shader Language. + Finds the nearest integer less than or equal to the parameter. Translates to [code]floor(x)[/code] in the GDShader language. - Finds the nearest integer to the parameter. Translates to [code]round(x)[/code] in the Godot Shader Language. + Finds the nearest integer to the parameter. Translates to [code]round(x)[/code] in the GDShader language. - Finds the nearest integer that is greater than or equal to the parameter. Translates to [code]ceil(x)[/code] in the Godot Shader Language. + Finds the nearest integer that is greater than or equal to the parameter. Translates to [code]ceil(x)[/code] in the GDShader language. - Computes the fractional part of the argument. Translates to [code]fract(x)[/code] in the Godot Shader Language. + Computes the fractional part of the argument. Translates to [code]fract(x)[/code] in the GDShader language. Clamps the value between [code]0.0[/code] and [code]1.0[/code] using [code]min(max(x, 0.0), 1.0)[/code]. @@ -75,37 +75,37 @@ Negates the [code]x[/code] using [code]-(x)[/code]. - Returns the arc-hyperbolic-cosine of the parameter. Translates to [code]acosh(x)[/code] in the Godot Shader Language. + Returns the arc-hyperbolic-cosine of the parameter. Translates to [code]acosh(x)[/code] in the GDShader language. - Returns the arc-hyperbolic-sine of the parameter. Translates to [code]asinh(x)[/code] in the Godot Shader Language. + Returns the arc-hyperbolic-sine of the parameter. Translates to [code]asinh(x)[/code] in the GDShader language. - Returns the arc-hyperbolic-tangent of the parameter. Translates to [code]atanh(x)[/code] in the Godot Shader Language. + Returns the arc-hyperbolic-tangent of the parameter. Translates to [code]atanh(x)[/code] in the GDShader language. - Convert a quantity in radians to degrees. Translates to [code]degrees(x)[/code] in the Godot Shader Language. + Convert a quantity in radians to degrees. Translates to [code]degrees(x)[/code] in the GDShader language. - Returns 2 raised by the power of the parameter. Translates to [code]exp2(x)[/code] in the Godot Shader Language. + Returns 2 raised by the power of the parameter. Translates to [code]exp2(x)[/code] in the GDShader language. - Returns the inverse of the square root of the parameter. Translates to [code]inversesqrt(x)[/code] in the Godot Shader Language. + Returns the inverse of the square root of the parameter. Translates to [code]inversesqrt(x)[/code] in the GDShader language. - Returns the base 2 logarithm of the parameter. Translates to [code]log2(x)[/code] in the Godot Shader Language. + Returns the base 2 logarithm of the parameter. Translates to [code]log2(x)[/code] in the GDShader language. - Convert a quantity in degrees to radians. Translates to [code]radians(x)[/code] in the Godot Shader Language. + Convert a quantity in degrees to radians. Translates to [code]radians(x)[/code] in the GDShader language. Finds reciprocal value of dividing 1 by [code]x[/code] (i.e. [code]1 / x[/code]). - Finds the nearest even integer to the parameter. Translates to [code]roundEven(x)[/code] in the Godot Shader Language. + Finds the nearest even integer to the parameter. Translates to [code]roundEven(x)[/code] in the GDShader language. - Returns a value equal to the nearest integer to [code]x[/code] whose absolute value is not larger than the absolute value of [code]x[/code]. Translates to [code]trunc(x)[/code] in the Godot Shader Language. + Returns a value equal to the nearest integer to [code]x[/code] whose absolute value is not larger than the absolute value of [code]x[/code]. Translates to [code]trunc(x)[/code] in the GDShader language. Subtracts scalar [code]x[/code] from 1 (i.e. [code]1 - x[/code]). diff --git a/doc/classes/VisualShaderNodeFloatOp.xml b/doc/classes/VisualShaderNodeFloatOp.xml index de95a3f174f2..5cf245a15acc 100644 --- a/doc/classes/VisualShaderNodeFloatOp.xml +++ b/doc/classes/VisualShaderNodeFloatOp.xml @@ -27,22 +27,22 @@ Divides two numbers using [code]a / b[/code]. - Calculates the remainder of two numbers. Translates to [code]mod(a, b)[/code] in the Godot Shader Language. + Calculates the remainder of two numbers. Translates to [code]mod(a, b)[/code] in the GDShader language. - Raises the [code]a[/code] to the power of [code]b[/code]. Translates to [code]pow(a, b)[/code] in the Godot Shader Language. + Raises the [code]a[/code] to the power of [code]b[/code]. Translates to [code]pow(a, b)[/code] in the GDShader language. - Returns the greater of two numbers. Translates to [code]max(a, b)[/code] in the Godot Shader Language. + Returns the greater of two numbers. Translates to [code]max(a, b)[/code] in the GDShader language. - Returns the lesser of two numbers. Translates to [code]min(a, b)[/code] in the Godot Shader Language. + Returns the lesser of two numbers. Translates to [code]min(a, b)[/code] in the GDShader language. - Returns the arc-tangent of the parameters. Translates to [code]atan(a, b)[/code] in the Godot Shader Language. + Returns the arc-tangent of the parameters. Translates to [code]atan(a, b)[/code] in the GDShader language. - Generates a step function by comparing [code]b[/code](x) to [code]a[/code](edge). Returns 0.0 if [code]x[/code] is smaller than [code]edge[/code] and otherwise 1.0. Translates to [code]step(a, b)[/code] in the Godot Shader Language. + Generates a step function by comparing [code]b[/code](x) to [code]a[/code](edge). Returns 0.0 if [code]x[/code] is smaller than [code]edge[/code] and otherwise 1.0. Translates to [code]step(a, b)[/code] in the GDShader language. Represents the size of the [enum Operator] enum. diff --git a/doc/classes/VisualShaderNodeFloatParameter.xml b/doc/classes/VisualShaderNodeFloatParameter.xml index a4a76644a6d5..c4e29a8c14ad 100644 --- a/doc/classes/VisualShaderNodeFloatParameter.xml +++ b/doc/classes/VisualShaderNodeFloatParameter.xml @@ -4,7 +4,7 @@ A scalar float parameter to be used within the visual shader graph. - Translated to [code]uniform float[/code] in the shader language. + Translated to [code]uniform float[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeGlobalExpression.xml b/doc/classes/VisualShaderNodeGlobalExpression.xml index 69204373c287..deae4f170b4b 100644 --- a/doc/classes/VisualShaderNodeGlobalExpression.xml +++ b/doc/classes/VisualShaderNodeGlobalExpression.xml @@ -1,10 +1,10 @@ - A custom global visual shader graph expression written in Godot Shading Language. + A custom global visual shader graph expression written in the GDShader language. - Custom Godot Shader Language expression, which is placed on top of the generated shader. You can place various function definitions inside to call later in [VisualShaderNodeExpression]s (which are injected in the main shader functions). You can also declare varyings, uniforms and global constants. + Custom GDShader expression, which is placed on top of the generated shader. You can place various function definitions inside to call later in [VisualShaderNodeExpression]s (which are injected in the main shader functions). You can also declare varyings, uniforms and global constants. diff --git a/doc/classes/VisualShaderNodeInput.xml b/doc/classes/VisualShaderNodeInput.xml index 79ed8dde9eb1..dfcb3673f539 100644 --- a/doc/classes/VisualShaderNodeInput.xml +++ b/doc/classes/VisualShaderNodeInput.xml @@ -13,7 +13,7 @@ - Returns a translated name of the current constant in the Godot Shader Language. E.g. [code]"ALBEDO"[/code] if the [member input_name] equal to [code]"albedo"[/code]. + Returns a translated name of the current constant in the GDShader language. E.g. [code]"ALBEDO"[/code] if the [member input_name] equal to [code]"albedo"[/code]. diff --git a/doc/classes/VisualShaderNodeIntConstant.xml b/doc/classes/VisualShaderNodeIntConstant.xml index f942bf299f5e..a45b86b2dc8d 100644 --- a/doc/classes/VisualShaderNodeIntConstant.xml +++ b/doc/classes/VisualShaderNodeIntConstant.xml @@ -4,7 +4,7 @@ A scalar integer constant to be used within the visual shader graph. - Translated to [code skip-lint]int[/code] in the shader language. + Translated to [code skip-lint]int[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeIntFunc.xml b/doc/classes/VisualShaderNodeIntFunc.xml index 51e3faecd3f6..89f18264b609 100644 --- a/doc/classes/VisualShaderNodeIntFunc.xml +++ b/doc/classes/VisualShaderNodeIntFunc.xml @@ -15,16 +15,16 @@ - Returns the absolute value of the parameter. Translates to [code]abs(x)[/code] in the Godot Shader Language. + Returns the absolute value of the parameter. Translates to [code]abs(x)[/code] in the GDShader 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. + Extracts the sign of the parameter. Translates to [code]sign(x)[/code] in the GDShader language. - Returns the result of bitwise [code]NOT[/code] operation on the integer. Translates to [code]~a[/code] in the Godot Shader Language. + Returns the result of bitwise [code]NOT[/code] operation on the integer. Translates to [code]~a[/code] in the GDShader language. Represents the size of the [enum Function] enum. diff --git a/doc/classes/VisualShaderNodeIntOp.xml b/doc/classes/VisualShaderNodeIntOp.xml index 1aef337e01fd..82c9c097e33a 100644 --- a/doc/classes/VisualShaderNodeIntOp.xml +++ b/doc/classes/VisualShaderNodeIntOp.xml @@ -30,25 +30,25 @@ Calculates the remainder of two numbers using [code]a % b[/code]. - Returns the greater of two numbers. Translates to [code]max(a, b)[/code] in the Godot Shader Language. + Returns the greater of two numbers. Translates to [code]max(a, b)[/code] in the GDShader language. - Returns the lesser of two numbers. Translates to [code]max(a, b)[/code] in the Godot Shader Language. + Returns the lesser of two numbers. Translates to [code]max(a, b)[/code] in the GDShader language. - Returns the result of bitwise [code]AND[/code] operation on the integer. Translates to [code]a & b[/code] in the Godot Shader Language. + Returns the result of bitwise [code]AND[/code] operation on the integer. Translates to [code]a & b[/code] in the GDShader language. - Returns the result of bitwise [code]OR[/code] operation for two integers. Translates to [code]a | b[/code] in the Godot Shader Language. + Returns the result of bitwise [code]OR[/code] operation for two integers. Translates to [code]a | b[/code] in the GDShader language. - Returns the result of bitwise [code]XOR[/code] operation for two integers. Translates to [code]a ^ b[/code] in the Godot Shader Language. + Returns the result of bitwise [code]XOR[/code] operation for two integers. Translates to [code]a ^ b[/code] in the GDShader language. - Returns the result of bitwise left shift operation on the integer. Translates to [code]a << b[/code] in the Godot Shader Language. + Returns the result of bitwise left shift operation on the integer. Translates to [code]a << b[/code] in the GDShader language. - Returns the result of bitwise right shift operation on the integer. Translates to [code]a >> b[/code] in the Godot Shader Language. + Returns the result of bitwise right shift operation on the integer. Translates to [code]a >> b[/code] in the GDShader language. Represents the size of the [enum Operator] enum. diff --git a/doc/classes/VisualShaderNodeMix.xml b/doc/classes/VisualShaderNodeMix.xml index d4444c888d9b..e031beec2772 100644 --- a/doc/classes/VisualShaderNodeMix.xml +++ b/doc/classes/VisualShaderNodeMix.xml @@ -4,7 +4,7 @@ Linearly interpolates between two values within the visual shader graph. - Translates to [code]mix(a, b, weight)[/code] in the shader language. + Translates to [code]mix(a, b, weight)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeSDFToScreenUV.xml b/doc/classes/VisualShaderNodeSDFToScreenUV.xml index 54df82ef4c63..eb1fd30cace6 100644 --- a/doc/classes/VisualShaderNodeSDFToScreenUV.xml +++ b/doc/classes/VisualShaderNodeSDFToScreenUV.xml @@ -4,7 +4,7 @@ A function to convert an SDF (signed-distance field) to screen UV, to be used within the visual shader graph. - Translates to [code]sdf_to_screen_uv(sdf_pos)[/code] in the shader language. + Translates to [code]sdf_to_screen_uv(sdf_pos)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeScreenUVToSDF.xml b/doc/classes/VisualShaderNodeScreenUVToSDF.xml index 81be77178a04..ec448aa7cc3c 100644 --- a/doc/classes/VisualShaderNodeScreenUVToSDF.xml +++ b/doc/classes/VisualShaderNodeScreenUVToSDF.xml @@ -4,7 +4,7 @@ A function to convert screen UV to an SDF (signed-distance field), to be used within the visual shader graph. - Translates to [code]screen_uv_to_sdf(uv)[/code] in the shader language. If the UV port isn't connected, [code]SCREEN_UV[/code] is used instead. + Translates to [code]screen_uv_to_sdf(uv)[/code] in the GDShader language. If the UV port isn't connected, [code]SCREEN_UV[/code] is used instead. diff --git a/doc/classes/VisualShaderNodeSmoothStep.xml b/doc/classes/VisualShaderNodeSmoothStep.xml index ec1303ce955f..93b7ff490260 100644 --- a/doc/classes/VisualShaderNodeSmoothStep.xml +++ b/doc/classes/VisualShaderNodeSmoothStep.xml @@ -4,7 +4,7 @@ Calculates a SmoothStep function within the visual shader graph. - Translates to [code]smoothstep(edge0, edge1, x)[/code] in the shader language. + Translates to [code]smoothstep(edge0, edge1, x)[/code] in the GDShader 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/VisualShaderNodeStep.xml b/doc/classes/VisualShaderNodeStep.xml index febc960b8c07..c6c54a5412fa 100644 --- a/doc/classes/VisualShaderNodeStep.xml +++ b/doc/classes/VisualShaderNodeStep.xml @@ -4,7 +4,7 @@ Calculates a Step function within the visual shader graph. - Translates to [code]step(edge, x)[/code] in the shader language. + Translates to [code]step(edge, x)[/code] in the GDShader 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/VisualShaderNodeTexture2DArray.xml b/doc/classes/VisualShaderNodeTexture2DArray.xml index bdf5a4282112..2ee4fb35ea48 100644 --- a/doc/classes/VisualShaderNodeTexture2DArray.xml +++ b/doc/classes/VisualShaderNodeTexture2DArray.xml @@ -4,7 +4,7 @@ A 2D texture uniform array to be used within the visual shader graph. - Translated to [code]uniform sampler2DArray[/code] in the shader language. + Translated to [code]uniform sampler2DArray[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeTexture2DParameter.xml b/doc/classes/VisualShaderNodeTexture2DParameter.xml index 39290e6b2aa9..57bb226df106 100644 --- a/doc/classes/VisualShaderNodeTexture2DParameter.xml +++ b/doc/classes/VisualShaderNodeTexture2DParameter.xml @@ -4,7 +4,7 @@ Provides a 2D texture parameter within the visual shader graph. - Translated to [code]uniform sampler2D[/code] in the shader language. + Translated to [code]uniform sampler2D[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeTexture3DParameter.xml b/doc/classes/VisualShaderNodeTexture3DParameter.xml index ceab1834d571..6d1aaf21c7bf 100644 --- a/doc/classes/VisualShaderNodeTexture3DParameter.xml +++ b/doc/classes/VisualShaderNodeTexture3DParameter.xml @@ -4,7 +4,7 @@ Provides a 3D texture parameter within the visual shader graph. - Translated to [code]uniform sampler3D[/code] in the shader language. + Translated to [code]uniform sampler3D[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeTextureSDF.xml b/doc/classes/VisualShaderNodeTextureSDF.xml index ead987e1721b..8d2693fdde18 100644 --- a/doc/classes/VisualShaderNodeTextureSDF.xml +++ b/doc/classes/VisualShaderNodeTextureSDF.xml @@ -4,7 +4,7 @@ Performs an SDF (signed-distance field) texture lookup within the visual shader graph. - Translates to [code]texture_sdf(sdf_pos)[/code] in the shader language. + Translates to [code]texture_sdf(sdf_pos)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeTextureSDFNormal.xml b/doc/classes/VisualShaderNodeTextureSDFNormal.xml index 70ce525dbaed..49ddf5641cef 100644 --- a/doc/classes/VisualShaderNodeTextureSDFNormal.xml +++ b/doc/classes/VisualShaderNodeTextureSDFNormal.xml @@ -4,7 +4,7 @@ Performs an SDF (signed-distance field) normal texture lookup within the visual shader graph. - Translates to [code]texture_sdf_normal(sdf_pos)[/code] in the shader language. + Translates to [code]texture_sdf_normal(sdf_pos)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeTransformParameter.xml b/doc/classes/VisualShaderNodeTransformParameter.xml index 9927ec30fec0..32ff35dced56 100644 --- a/doc/classes/VisualShaderNodeTransformParameter.xml +++ b/doc/classes/VisualShaderNodeTransformParameter.xml @@ -4,7 +4,7 @@ A [Transform3D] parameter for use within the visual shader graph. - Translated to [code]uniform mat4[/code] in the shader language. + Translated to [code]uniform mat4[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeUIntConstant.xml b/doc/classes/VisualShaderNodeUIntConstant.xml index a5b82ea5a922..99b858f15152 100644 --- a/doc/classes/VisualShaderNodeUIntConstant.xml +++ b/doc/classes/VisualShaderNodeUIntConstant.xml @@ -4,7 +4,7 @@ An unsigned scalar integer constant to be used within the visual shader graph. - Translated to [code]uint[/code] in the shader language. + Translated to [code]uint[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeUIntFunc.xml b/doc/classes/VisualShaderNodeUIntFunc.xml index 8f26060a461b..ac5502085af5 100644 --- a/doc/classes/VisualShaderNodeUIntFunc.xml +++ b/doc/classes/VisualShaderNodeUIntFunc.xml @@ -18,7 +18,7 @@ Negates the [code]x[/code] using [code]-(x)[/code]. - Returns the result of bitwise [code]NOT[/code] operation on the integer. Translates to [code]~a[/code] in the Godot Shader Language. + Returns the result of bitwise [code]NOT[/code] operation on the integer. Translates to [code]~a[/code] in the GDShader language. Represents the size of the [enum Function] enum. diff --git a/doc/classes/VisualShaderNodeUIntOp.xml b/doc/classes/VisualShaderNodeUIntOp.xml index a8c3586cc8dc..f9a3e2c26b1e 100644 --- a/doc/classes/VisualShaderNodeUIntOp.xml +++ b/doc/classes/VisualShaderNodeUIntOp.xml @@ -30,25 +30,25 @@ Calculates the remainder of two numbers using [code]a % b[/code]. - Returns the greater of two numbers. Translates to [code]max(a, b)[/code] in the Godot Shader Language. + Returns the greater of two numbers. Translates to [code]max(a, b)[/code] in the GDShader language. - Returns the lesser of two numbers. Translates to [code]max(a, b)[/code] in the Godot Shader Language. + Returns the lesser of two numbers. Translates to [code]max(a, b)[/code] in the GDShader language. - Returns the result of bitwise [code]AND[/code] operation on the integer. Translates to [code]a & b[/code] in the Godot Shader Language. + Returns the result of bitwise [code]AND[/code] operation on the integer. Translates to [code]a & b[/code] in the GDShader language. - Returns the result of bitwise [code]OR[/code] operation for two integers. Translates to [code]a | b[/code] in the Godot Shader Language. + Returns the result of bitwise [code]OR[/code] operation for two integers. Translates to [code]a | b[/code] in the GDShader language. - Returns the result of bitwise [code]XOR[/code] operation for two integers. Translates to [code]a ^ b[/code] in the Godot Shader Language. + Returns the result of bitwise [code]XOR[/code] operation for two integers. Translates to [code]a ^ b[/code] in the GDShader language. - Returns the result of bitwise left shift operation on the integer. Translates to [code]a << b[/code] in the Godot Shader Language. + Returns the result of bitwise left shift operation on the integer. Translates to [code]a << b[/code] in the GDShader language. - Returns the result of bitwise right shift operation on the integer. Translates to [code]a >> b[/code] in the Godot Shader Language. + Returns the result of bitwise right shift operation on the integer. Translates to [code]a >> b[/code] in the GDShader language. Represents the size of the [enum Operator] enum. diff --git a/doc/classes/VisualShaderNodeVec2Parameter.xml b/doc/classes/VisualShaderNodeVec2Parameter.xml index 2e939d382332..bfa53ffa4150 100644 --- a/doc/classes/VisualShaderNodeVec2Parameter.xml +++ b/doc/classes/VisualShaderNodeVec2Parameter.xml @@ -4,7 +4,7 @@ A [Vector2] parameter to be used within the visual shader graph. - Translated to [code]uniform vec2[/code] in the shader language. + Translated to [code]uniform vec2[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeVec3Parameter.xml b/doc/classes/VisualShaderNodeVec3Parameter.xml index f94ce329c792..6fd36a84594e 100644 --- a/doc/classes/VisualShaderNodeVec3Parameter.xml +++ b/doc/classes/VisualShaderNodeVec3Parameter.xml @@ -4,7 +4,7 @@ A [Vector3] parameter to be used within the visual shader graph. - Translated to [code]uniform vec3[/code] in the shader language. + Translated to [code]uniform vec3[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeVec4Parameter.xml b/doc/classes/VisualShaderNodeVec4Parameter.xml index e4153beab643..8ebf2d6a0b29 100644 --- a/doc/classes/VisualShaderNodeVec4Parameter.xml +++ b/doc/classes/VisualShaderNodeVec4Parameter.xml @@ -4,7 +4,7 @@ A 4D vector parameter to be used within the visual shader graph. - Translated to [code]uniform vec4[/code] in the shader language. + Translated to [code]uniform vec4[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeVectorDistance.xml b/doc/classes/VisualShaderNodeVectorDistance.xml index dad2e0366f08..52945bcaf242 100644 --- a/doc/classes/VisualShaderNodeVectorDistance.xml +++ b/doc/classes/VisualShaderNodeVectorDistance.xml @@ -5,7 +5,7 @@ Calculates distance from point represented by vector [code]p0[/code] to vector [code]p1[/code]. - Translated to [code]distance(p0, p1)[/code] in the shader language. + Translated to [code]distance(p0, p1)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeVectorLen.xml b/doc/classes/VisualShaderNodeVectorLen.xml index a458b0b61689..d45fbae61d80 100644 --- a/doc/classes/VisualShaderNodeVectorLen.xml +++ b/doc/classes/VisualShaderNodeVectorLen.xml @@ -4,7 +4,7 @@ Returns the length of a [Vector3] within the visual shader graph. - Translated to [code]length(p0)[/code] in the shader language. + Translated to [code]length(p0)[/code] in the GDShader language. diff --git a/doc/classes/VisualShaderNodeVectorRefract.xml b/doc/classes/VisualShaderNodeVectorRefract.xml index 384175e8d760..057a101e330d 100644 --- a/doc/classes/VisualShaderNodeVectorRefract.xml +++ b/doc/classes/VisualShaderNodeVectorRefract.xml @@ -4,7 +4,7 @@ Returns the vector that points in the direction of refraction. For use within the visual shader graph. - Translated to [code]refract(I, N, eta)[/code] in the shader language, where [code]I[/code] is the incident vector, [code]N[/code] is the normal vector and [code]eta[/code] is the ratio of the indices of the refraction. + Translated to [code]refract(I, N, eta)[/code] in the GDShader language, where [code]I[/code] is the incident vector, [code]N[/code] is the normal vector and [code]eta[/code] is the ratio of the indices of the refraction. diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index c378bf315bc9..5b6284e5c91c 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -6815,7 +6815,7 @@ VisualShaderEditor::VisualShaderEditor() { // INPUT - const String translation_gdsl = "\n\n" + TTR("Translated to '%s' in Godot Shading Language."); + const String translation_gdsl = "\n\n" + TTR("Translated to '%s' in the GDShader language."); const String input_param_shader_modes = TTR("'%s' input parameter for all shader modes.") + translation_gdsl; // NODE3D-FOR-ALL diff --git a/editor/shader_globals_editor.cpp b/editor/shader_globals_editor.cpp index c05f60545d01..3d2e56a1198e 100644 --- a/editor/shader_globals_editor.cpp +++ b/editor/shader_globals_editor.cpp @@ -378,7 +378,7 @@ void ShaderGlobalsEditor::_variable_added() { ShaderLanguage::get_keyword_list(&keywords); if (keywords.find(var) != nullptr || var == "script") { - EditorNode::get_singleton()->show_warning(vformat(TTR("Name '%s' is a reserved shader language keyword."), var)); + EditorNode::get_singleton()->show_warning(vformat(TTR("Name '%s' is a reserved GDShader keyword."), var)); return; }