diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2019-10-11 10:26:57 +0300 |
|---|---|---|
| committer | Yuri Roubinsky <chaosus89@gmail.com> | 2019-10-11 10:36:04 +0300 |
| commit | b217babca2374575a5b725c48e6dc044c1b78aab (patch) | |
| tree | 60c9c2a7ec02abbe8b496763a93c450ea902f893 /scene/resources/visual_shader.cpp | |
| parent | 01481127301b7defadb69cd712f82ad7f840340e (diff) | |
| download | redot-engine-b217babca2374575a5b725c48e6dc044c1b78aab.tar.gz | |
[VShaders] Added sampler port to CubeMap, fixed parsing in expresssion s
Diffstat (limited to 'scene/resources/visual_shader.cpp')
| -rw-r--r-- | scene/resources/visual_shader.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index cd77c8a850..bd6835f816 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -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 |