From cf0a419efae977eba3ed17437f0475a0d7a11bbe Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 20 Dec 2014 12:32:14 -0300 Subject: WIP work on graph nodes and editing --- scene/gui/graph_node.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 scene/gui/graph_node.h (limited to 'scene/gui/graph_node.h') diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h new file mode 100644 index 0000000000..1b2e8cec21 --- /dev/null +++ b/scene/gui/graph_node.h @@ -0,0 +1,54 @@ +#ifndef GRAPH_NODE_H +#define GRAPH_NODE_H + +#include "scene/gui/container.h" + +class GraphNode : public Container { + + OBJ_TYPE(GraphNode,Container); + + + String title; + struct Slot { + int type_left; + int index_left; + Color color_left; + int type_right; + int index_right; + Color color_right; + }; + + Map slot_info; + + void _resort(); +protected: + + void _notification(int p_what); + static void _bind_methods(); +public: + + enum { + TYPE_DISABLED=-1 + }; + + + void set_title(const String& p_title); + String get_title() const; + + void set_slot(int p_idx,int p_type_left,int p_index_left,const Color& p_color_left, int p_type_right,int p_index_right,const Color& p_color_right); + void clear_slot(int p_idx); + void clear_all_slots(); + int get_slot_type_left(int p_idx) const; + int get_slot_index_left(int p_idx) const; + Color get_slot_color_left(int p_idx) const; + int get_slot_type_right(int p_idx) const; + int get_slot_index_right(int p_idx) const; + Color get_slot_color_right(int p_idx) const; + + virtual Size2 get_minimum_size() const; + + GraphNode(); +}; + + +#endif // GRAPH_NODE_H -- cgit v1.2.3 From f7f197c40941ffaf03fcddeb20536dec8074ca00 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 21 Dec 2014 11:42:44 -0300 Subject: -ability to set default textures in shader (needed for visual shader editing) -work in progress new graph system (will replace current one) -crash fix in s3m loader (out of bounds acess) -fixed vbox overriding of separation (fixes empty line between section tabs) --- scene/gui/graph_node.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'scene/gui/graph_node.h') diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h index 1b2e8cec21..3b89da9f0f 100644 --- a/scene/gui/graph_node.h +++ b/scene/gui/graph_node.h @@ -10,14 +10,19 @@ class GraphNode : public Container { String title; struct Slot { + bool enable_left; int type_left; - int index_left; Color color_left; + bool enable_right; int type_right; - int index_right; Color color_right; + + + Slot() { enable_left=false; type_left=0; color_left=Color(1,1,1,1); enable_right=false; type_right=0; color_right=Color(1,1,1,1); }; }; + Vector cache_y; + Map slot_info; void _resort(); @@ -25,24 +30,26 @@ protected: void _notification(int p_what); static void _bind_methods(); + + bool _set(const StringName& p_name, const Variant& p_value); + bool _get(const StringName& p_name,Variant &r_ret) const; + void _get_property_list( List *p_list) const; + public: - enum { - TYPE_DISABLED=-1 - }; void set_title(const String& p_title); String get_title() const; - void set_slot(int p_idx,int p_type_left,int p_index_left,const Color& p_color_left, int p_type_right,int p_index_right,const Color& p_color_right); + void set_slot(int p_idx,bool p_enable_left,int p_type_left,const Color& p_color_left, bool p_enable_right,int p_type_right,const Color& p_color_right); void clear_slot(int p_idx); void clear_all_slots(); + bool is_slot_enabled_left(int p_idx) const; int get_slot_type_left(int p_idx) const; - int get_slot_index_left(int p_idx) const; Color get_slot_color_left(int p_idx) const; + bool is_slot_enabled_right(int p_idx) const; int get_slot_type_right(int p_idx) const; - int get_slot_index_right(int p_idx) const; Color get_slot_color_right(int p_idx) const; virtual Size2 get_minimum_size() const; -- cgit v1.2.3