Skip to content

Commit f4b0c7a

Browse files
ChaosusChaosus
authored
Merge pull request godotengine#60175 from Geometror/visual-shader-vector4
2 parents 7f38488 + cf58d23 commit f4b0c7a

27 files changed

+952
-64
lines changed

‎doc/classes/VisualShader.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,13 @@
214214
</constant>
215215
<constant name="VARYING_TYPE_VECTOR_3D" value="2" enum="VaryingType">
216216
</constant>
217-
<constant name="VARYING_TYPE_COLOR" value="3" enum="VaryingType">
217+
<constant name="VARYING_TYPE_VECTOR_4D" value="3" enum="VaryingType">
218218
</constant>
219-
<constant name="VARYING_TYPE_TRANSFORM" value="4" enum="VaryingType">
219+
<constant name="VARYING_TYPE_COLOR" value="4" enum="VaryingType">
220220
</constant>
221-
<constant name="VARYING_TYPE_MAX" value="5" enum="VaryingType">
221+
<constant name="VARYING_TYPE_TRANSFORM" value="5" enum="VaryingType">
222+
</constant>
223+
<constant name="VARYING_TYPE_MAX" value="6" enum="VaryingType">
222224
</constant>
223225
<constant name="NODE_ID_INVALID" value="-1">
224226
</constant>

‎doc/classes/VisualShaderNode.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,19 @@
7878
<constant name="PORT_TYPE_VECTOR_3D" value="3" enum="PortType">
7979
3D vector of floating-point values. Translated to [code]vec3[/code] type in shader code.
8080
</constant>
81-
<constant name="PORT_TYPE_BOOLEAN" value="4" enum="PortType">
81+
<constant name="PORT_TYPE_VECTOR_4D" value="4" enum="PortType">
82+
4D vector of floating-point values. Translated to [code]vec4[/code] type in shader code.
83+
</constant>
84+
<constant name="PORT_TYPE_BOOLEAN" value="5" enum="PortType">
8285
Boolean type. Translated to [code]bool[/code] type in shader code.
8386
</constant>
84-
<constant name="PORT_TYPE_TRANSFORM" value="5" enum="PortType">
87+
<constant name="PORT_TYPE_TRANSFORM" value="6" enum="PortType">
8588
Transform type. Translated to [code]mat4[/code] type in shader code.
8689
</constant>
87-
<constant name="PORT_TYPE_SAMPLER" value="6" enum="PortType">
90+
<constant name="PORT_TYPE_SAMPLER" value="7" enum="PortType">
8891
Sampler type. Translated to reference of sampler uniform in shader code. Can only be used for input ports in non-uniform nodes.
8992
</constant>
90-
<constant name="PORT_TYPE_MAX" value="7" enum="PortType">
93+
<constant name="PORT_TYPE_MAX" value="8" enum="PortType">
9194
Represents the size of the [enum PortType] enum.
9295
</constant>
9396
</constants>

‎doc/classes/VisualShaderNodeClamp.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
<constant name="OP_TYPE_VECTOR_3D" value="3" enum="OpType">
2727
A 3D vector type.
2828
</constant>
29-
<constant name="OP_TYPE_MAX" value="4" enum="OpType">
29+
<constant name="OP_TYPE_VECTOR_4D" value="4" enum="OpType">
30+
A 4D vector type.
31+
</constant>
32+
<constant name="OP_TYPE_MAX" value="5" enum="OpType">
3033
Represents the size of the [enum OpType] enum.
3134
</constant>
3235
</constants>

‎doc/classes/VisualShaderNodeCompare.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@
3232
<constant name="CTYPE_VECTOR_3D" value="3" enum="ComparisonType">
3333
A 3D vector type.
3434
</constant>
35-
<constant name="CTYPE_BOOLEAN" value="4" enum="ComparisonType">
35+
<constant name="CTYPE_VECTOR_4D" value="4" enum="ComparisonType">
36+
A 4D vector type.
37+
</constant>
38+
<constant name="CTYPE_BOOLEAN" value="5" enum="ComparisonType">
3639
A boolean type.
3740
</constant>
38-
<constant name="CTYPE_TRANSFORM" value="5" enum="ComparisonType">
41+
<constant name="CTYPE_TRANSFORM" value="6" enum="ComparisonType">
3942
A transform ([code]mat4[/code]) type.
4043
</constant>
41-
<constant name="CTYPE_MAX" value="6" enum="ComparisonType">
44+
<constant name="CTYPE_MAX" value="7" enum="ComparisonType">
4245
Represents the size of the [enum ComparisonType] enum.
4346
</constant>
4447
<constant name="FUNC_EQUAL" value="0" enum="Function">

‎doc/classes/VisualShaderNodeDerivativeFunc.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
<constant name="OP_TYPE_VECTOR_3D" value="2" enum="OpType">
2727
A 3D vector type.
2828
</constant>
29-
<constant name="OP_TYPE_MAX" value="3" enum="OpType">
29+
<constant name="OP_TYPE_VECTOR_4D" value="3" enum="OpType">
30+
A 4D vector type.
31+
</constant>
32+
<constant name="OP_TYPE_MAX" value="4" enum="OpType">
3033
Represents the size of the [enum OpType] enum.
3134
</constant>
3235
<constant name="FUNC_SUM" value="0" enum="Function">

‎doc/classes/VisualShaderNodeMix.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@
2929
<constant name="OP_TYPE_VECTOR_3D_SCALAR" value="4" enum="OpType">
3030
The [code]a[/code] and [code]b[/code] ports use a 3D vector type. The [code]weight[/code] port uses a scalar type.
3131
</constant>
32-
<constant name="OP_TYPE_MAX" value="5" enum="OpType">
32+
<constant name="OP_TYPE_VECTOR_4D" value="5" enum="OpType">
33+
A 4D vector type.
34+
</constant>
35+
<constant name="OP_TYPE_VECTOR_4D_SCALAR" value="6" enum="OpType">
36+
The [code]a[/code] and [code]b[/code] ports use a 4D vector type. The [code]weight[/code] port uses a scalar type.
37+
</constant>
38+
<constant name="OP_TYPE_MAX" value="7" enum="OpType">
3339
Represents the size of the [enum OpType] enum.
3440
</constant>
3541
</constants>

‎doc/classes/VisualShaderNodeMultiplyAdd.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
<constant name="OP_TYPE_VECTOR_3D" value="2" enum="OpType">
2424
A 3D vector type.
2525
</constant>
26-
<constant name="OP_TYPE_MAX" value="3" enum="OpType">
26+
<constant name="OP_TYPE_VECTOR_4D" value="3" enum="OpType">
27+
A 4D vector type.
28+
</constant>
29+
<constant name="OP_TYPE_MAX" value="4" enum="OpType">
2730
Represents the size of the [enum OpType] enum.
2831
</constant>
2932
</constants>

‎doc/classes/VisualShaderNodeSmoothStep.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@
3030
<constant name="OP_TYPE_VECTOR_3D_SCALAR" value="4" enum="OpType">
3131
The [code]x[/code] port uses a 3D vector type. The first two ports use a floating-point scalar type.
3232
</constant>
33-
<constant name="OP_TYPE_MAX" value="5" enum="OpType">
33+
<constant name="OP_TYPE_VECTOR_4D" value="5" enum="OpType">
34+
A 4D vector type.
35+
</constant>
36+
<constant name="OP_TYPE_VECTOR_4D_SCALAR" value="6" enum="OpType">
37+
The [code]a[/code] and [code]b[/code] ports use a 4D vector type. The [code]weight[/code] port uses a scalar type.
38+
</constant>
39+
<constant name="OP_TYPE_MAX" value="7" enum="OpType">
3440
Represents the size of the [enum OpType] enum.
3541
</constant>
3642
</constants>

‎doc/classes/VisualShaderNodeStep.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@
3030
<constant name="OP_TYPE_VECTOR_3D_SCALAR" value="4" enum="OpType">
3131
The [code]x[/code] port uses a 3D vector type, while the [code]edge[/code] port uses a floating-point scalar type.
3232
</constant>
33-
<constant name="OP_TYPE_MAX" value="5" enum="OpType">
33+
<constant name="OP_TYPE_VECTOR_4D" value="5" enum="OpType">
34+
A 4D vector type.
35+
</constant>
36+
<constant name="OP_TYPE_VECTOR_4D_SCALAR" value="6" enum="OpType">
37+
The [code]a[/code] and [code]b[/code] ports use a 4D vector type. The [code]weight[/code] port uses a scalar type.
38+
</constant>
39+
<constant name="OP_TYPE_MAX" value="7" enum="OpType">
3440
Represents the size of the [enum OpType] enum.
3541
</constant>
3642
</constants>

‎doc/classes/VisualShaderNodeSwitch.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@
2626
<constant name="OP_TYPE_VECTOR_3D" value="3" enum="OpType">
2727
A 3D vector type.
2828
</constant>
29-
<constant name="OP_TYPE_BOOLEAN" value="4" enum="OpType">
29+
<constant name="OP_TYPE_VECTOR_4D" value="4" enum="OpType">
30+
A 4D vector type.
31+
</constant>
32+
<constant name="OP_TYPE_BOOLEAN" value="5" enum="OpType">
3033
A boolean type.
3134
</constant>
32-
<constant name="OP_TYPE_TRANSFORM" value="5" enum="OpType">
35+
<constant name="OP_TYPE_TRANSFORM" value="6" enum="OpType">
3336
A transform type.
3437
</constant>
35-
<constant name="OP_TYPE_MAX" value="6" enum="OpType">
38+
<constant name="OP_TYPE_MAX" value="7" enum="OpType">
3639
Represents the size of the [enum OpType] enum.
3740
</constant>
3841
</constants>

0 commit comments

Comments
 (0)