Added conditional nodes to visual shaders #27980
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
glad to see added If and Switch :) |
Chaosus
force-pushed
the
vs_conditional
branch
4 times, most recently
from
36e85b0
to
c7583c9
Compare
|
Well, I think it fine and @reduz said it's nice at IRC, so let's merge... |
hpvb
reviewed
Apr 20, 2019
| @@ -782,7 +782,7 @@ Error VisualShader::_write_node(Type type, StringBuilder &global_code, StringBui | |||
| } else if (in_type == VisualShaderNode::PORT_TYPE_VECTOR && out_type == VisualShaderNode::PORT_TYPE_SCALAR) { | |||
| inputs[i] = "vec3(" + src_var + ")"; | |||
| } else if (in_type == VisualShaderNode::PORT_TYPE_BOOLEAN && out_type == VisualShaderNode::PORT_TYPE_VECTOR) { | |||
| inputs[i] = "all(" + src_var + ")"; | |||
| inputs[i] = "all(bvec3(" + src_var + "))"; | |||
There was a problem hiding this comment.
Is this an unrelated bugfix? I want to pull this into 3.1.x but I'm not sure about this.
There was a problem hiding this comment.
fixed conversion between vector and boolean.
It's safe to merge because it's not used anywhere before this PR
|
Consider for 3.1.2 |
|
@Chaosus we will look into taking just those from that PR then maybe. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added If and Switch nodes similar to UE4, however, I've changed the order of parameters a bit. Also renamed "Boolean" category to "Conditional", and fixed conversion between vector and boolean.