godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

[VShaders] Added sampler port to CubeMap, fixed parsing in expresssion s

Browse Source
This commit is contained in:
Yuri Roubinsky
2019-10-11 10:26:57 +03:00
parent 0148112730
commit b217babca2
4 changed files with 91 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/resources/visual_shader.cpp
View File

@@ -1067,16 +1067,7 @@ Error VisualShader::_write_node(Type type, StringBuilder &global_code, StringBui
VisualShaderNodeUniform *uniform = (VisualShaderNodeUniform *)graph[type].nodes[from_node].node.ptr();
if (uniform) {
inputs[i] = "";
switch (uniform->get_uniform_type()) {
case VisualShaderNodeUniform::UTYPE_CUBEMAP:
inputs[i] += "cube_";
break;
case VisualShaderNodeUniform::UTYPE_SAMPLER2D:
inputs[i] += "s2d_";
break;
}
inputs[i] += uniform->get_uniform_name();
inputs[i] = uniform->get_uniform_name();
} else {
inputs[i] = "";
}
@@ -1981,16 +1972,7 @@ void VisualShaderNodeUniform::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "uniform_name"), "set_uniform_name", "get_uniform_name");
}
int VisualShaderNodeUniform::get_uniform_type() const {
return (int)uniform_type;
}
void VisualShaderNodeUniform::set_uniform_type(int p_type) {
uniform_type = (UniformType)p_type;
}
VisualShaderNodeUniform::VisualShaderNodeUniform() {
uniform_type = UTYPE_NONE;
}
////////////// GroupBase