diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-08 00:41:34 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-08 00:41:34 -0300 |
| commit | 78f4b937034c8bc24c2a871b1fc08ecbe39d0e5e (patch) | |
| tree | 634848f2464ff7f8699e9f7a7ebff608bf78b338 /scene/resources/shader_graph.h | |
| parent | 3f1dd9c57ff684e1d2441da43c6da8a19b507973 (diff) | |
| download | redot-engine-78f4b937034c8bc24c2a871b1fc08ecbe39d0e5e.tar.gz | |
Fixes to GraphEdit:
-Working area is bigger now, solves #1148
-Using Position now works, fixes #1141
-RGB ops now work, fixes #1139
-Missing bindings to GraphEdit and GraphNode added
-Shader Graph Editor Shows errors on cyclic links and missing connections
Diffstat (limited to 'scene/resources/shader_graph.h')
| -rw-r--r-- | scene/resources/shader_graph.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/resources/shader_graph.h b/scene/resources/shader_graph.h index 984164b449..55d09b4c38 100644 --- a/scene/resources/shader_graph.h +++ b/scene/resources/shader_graph.h @@ -267,9 +267,8 @@ public: RGB_MAX_OP }; - void rgb_op_node_set_op(ShaderType p_which,float p_id,RGBOp p_op,float p_c); + void rgb_op_node_set_op(ShaderType p_which,float p_id,RGBOp p_op); RGBOp rgb_op_node_get_op(ShaderType p_which,float p_id) const; - float rgb_op_node_get_c(ShaderType p_which,float p_id) const; void xform_vec_mult_node_set_no_translation(ShaderType p_which,int p_id,bool p_no_translation); bool xform_vec_mult_node_get_no_translation(ShaderType p_which,int p_id) const; @@ -349,6 +348,8 @@ public: Variant node_get_state(ShaderType p_type, int p_node) const; void node_set_state(ShaderType p_type, int p_id, const Variant& p_state); + GraphError get_graph_error(ShaderType p_type) const; + static int get_type_input_count(NodeType p_type); static int get_type_output_count(NodeType p_type); static SlotType get_type_input_type(NodeType p_type,int p_idx); @@ -388,6 +389,7 @@ VARIANT_ENUM_CAST( ShaderGraph::VecScalarOp ); VARIANT_ENUM_CAST( ShaderGraph::RGBOp ); VARIANT_ENUM_CAST( ShaderGraph::ScalarFunc ); VARIANT_ENUM_CAST( ShaderGraph::VecFunc ); +VARIANT_ENUM_CAST( ShaderGraph::GraphError ); class MaterialShaderGraph : public ShaderGraph { |