summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorMariano Javier Suligoy <marianognu.easyrpg@gmail.com>2015-07-19 01:48:46 -0300
committerMariano Javier Suligoy <marianognu.easyrpg@gmail.com>2015-07-19 01:48:46 -0300
commitbdd12744fe340152cef5bf88de9e2d183bff1790 (patch)
treebd6a5f454c02eee7c3d4d8a7939a66f004a2e1a4 /scene
parent5b71fc45b703d2ea44cc1aa99830ec3e0966b3e6 (diff)
Select and move multiple nodes at once
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/graph_edit.cpp861
-rw-r--r--scene/gui/graph_edit.h106
-rw-r--r--scene/gui/graph_node.cpp686
-rw-r--r--scene/gui/graph_node.h125
-rw-r--r--scene/resources/default_theme/default_theme.cpp2
-rw-r--r--scene/resources/default_theme/graph_node_selected.pngbin0 -> 738 bytes
-rw-r--r--scene/resources/default_theme/theme_data.h5
7 files changed, 946 insertions, 839 deletions
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index d0ff4e48d3..4569c71d0b 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -3,388 +3,385 @@
#include "os/keyboard.h"
bool GraphEditFilter::has_point(const Point2& p_point) const {
- return ge->_filter_input(p_point);
+ return ge->_filter_input(p_point);
}
GraphEditFilter::GraphEditFilter(GraphEdit *p_edit) {
- ge=p_edit;
+ ge=p_edit;
}
Error GraphEdit::connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port) {
- if (is_node_connected(p_from,p_from_port,p_to,p_to_port))
- return OK;
- Connection c;
- c.from=p_from;
- c.from_port=p_from_port;
- c.to=p_to;
- c.to_port=p_to_port;
- connections.push_back(c);
- top_layer->update();
-
- return OK;
+ if (is_node_connected(p_from,p_from_port,p_to,p_to_port))
+ return OK;
+ Connection c;
+ c.from=p_from;
+ c.from_port=p_from_port;
+ c.to=p_to;
+ c.to_port=p_to_port;
+ connections.push_back(c);
+ top_layer->update();
+
+ return OK;
}
bool GraphEdit::is_node_connected(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port) {
- for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
+ for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
- if (E->get().from==p_from && E->get().from_port==p_from_port && E->get().to==p_to && E->get().to_port==p_to_port)
- return true;
- }
+ if (E->get().from==p_from && E->get().from_port==p_from_port && E->get().to==p_to && E->get().to_port==p_to_port)
+ return true;
+ }
- return false;
+ return false;
}
void GraphEdit::disconnect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port){
- for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
+ for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
- if (E->get().from==p_from && E->get().from_port==p_from_port && E->get().to==p_to && E->get().to_port==p_to_port) {
+ if (E->get().from==p_from && E->get().from_port==p_from_port && E->get().to==p_to && E->get().to_port==p_to_port) {
- connections.erase(E);
- top_layer->update();
- return;
- }
- }
+ connections.erase(E);
+ top_layer->update();
+ return;
+ }
+ }
}
void GraphEdit::get_connection_list(List<Connection> *r_connections) const {
- *r_connections=connections;
+ *r_connections=connections;
}
void GraphEdit::_scroll_moved(double) {
- _update_scroll_offset();
- top_layer->update();
+ _update_scroll_offset();
+ top_layer->update();
}
void GraphEdit::_update_scroll_offset() {
- for(int i=0;i<get_child_count();i++) {
+ for(int i=0;i<get_child_count();i++) {
- GraphNode *gn=get_child(i)->cast_to<GraphNode>();
- if (!gn)
- continue;
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
- Point2 pos=gn->get_offset();
- pos-=Point2(h_scroll->get_val(),v_scroll->get_val());
- gn->set_pos(pos);
- }
+ Point2 pos=gn->get_offset();
+ pos-=Point2(h_scroll->get_val(),v_scroll->get_val());
+ gn->set_pos(pos);
+ }
}
void GraphEdit::_update_scroll() {
- if (updating)
- return;
+ if (updating)
+ return;
- updating=true;
- Rect2 screen;
- for(int i=0;i<get_child_count();i++) {
+ updating=true;
+ Rect2 screen;
+ for(int i=0;i<get_child_count();i++) {
- GraphNode *gn=get_child(i)->cast_to<GraphNode>();
- if (!gn)
- continue;
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
- Rect2 r;
- r.pos=gn->get_offset();
- r.size=gn->get_size();
- screen = screen.merge(r);
- }
+ Rect2 r;
+ r.pos=gn->get_offset();
+ r.size=gn->get_size();
+ screen = screen.merge(r);
+ }
- screen.pos-=get_size();
- screen.size+=get_size()*2.0;
+ screen.pos-=get_size();
+ screen.size+=get_size()*2.0;
- h_scroll->set_min(screen.pos.x);
- h_scroll->set_max(screen.pos.x+screen.size.x);
- h_scroll->set_page(get_size().x);
- if (h_scroll->get_max() - h_scroll->get_min() <= h_scroll->get_page())
- h_scroll->hide();
- else
- h_scroll->show();
+ h_scroll->set_min(screen.pos.x);
+ h_scroll->set_max(screen.pos.x+screen.size.x);
+ h_scroll->set_page(get_size().x);
+ if (h_scroll->get_max() - h_scroll->get_min() <= h_scroll->get_page())
+ h_scroll->hide();
+ else
+ h_scroll->show();
- v_scroll->set_min(screen.pos.y);
- v_scroll->set_max(screen.pos.y+screen.size.y);
- v_scroll->set_page(get_size().y);
+ v_scroll->set_min(screen.pos.y);
+ v_scroll->set_max(screen.pos.y+screen.size.y);
+ v_scroll->set_page(get_size().y);
- if (v_scroll->get_max() - v_scroll->get_min() <= v_scroll->get_page())
- v_scroll->hide();
- else
- v_scroll->show();
+ if (v_scroll->get_max() - v_scroll->get_min() <= v_scroll->get_page())
+ v_scroll->hide();
+ else
+ v_scroll->show();
- _update_scroll_offset();
- updating=false;
+ _update_scroll_offset();
+ updating=false;
}
void GraphEdit::_graph_node_raised(Node* p_gn) {
- GraphNode *gn=p_gn->cast_to<GraphNode>();
- ERR_FAIL_COND(!gn);
- gn->raise();
- top_layer->raise();
+ GraphNode *gn=p_gn->cast_to<GraphNode>();
+ ERR_FAIL_COND(!gn);
+ gn->raise();
+ top_layer->raise();
}
void GraphEdit::_graph_node_moved(Node *p_gn) {
- GraphNode *gn=p_gn->cast_to<GraphNode>();
- ERR_FAIL_COND(!gn);
-
- //gn->set_pos(gn->get_offset()+scroll_offset);
-
- top_layer->update();
+ GraphNode *gn=p_gn->cast_to<GraphNode>();
+ ERR_FAIL_COND(!gn);
+ top_layer->update();
}
void GraphEdit::add_child_notify(Node *p_child) {
- top_layer->call_deferred("raise"); //top layer always on top!
- GraphNode *gn = p_child->cast_to<GraphNode>();
- if (gn) {
- gn->connect("offset_changed",this,"_graph_node_moved",varray(gn));
- gn->connect("raise_request",this,"_graph_node_raised",varray(gn));
- _graph_node_moved(gn);
- gn->set_stop_mouse(false);
- }
+ top_layer->call_deferred("raise"); //top layer always on top!
+ GraphNode *gn = p_child->cast_to<GraphNode>();
+ if (gn) {
+ gn->connect("offset_changed",this,"_graph_node_moved",varray(gn));
+ gn->connect("raise_request",this,"_graph_node_raised",varray(gn));
+ _graph_node_moved(gn);
+ gn->set_stop_mouse(false);
+ }
}
void GraphEdit::remove_child_notify(Node *p_child) {
- top_layer->call_deferred("raise"); //top layer always on top!
- GraphNode *gn = p_child->cast_to<GraphNode>();
- if (gn) {
- gn->disconnect("offset_changed",this,"_graph_node_moved");
- gn->disconnect("raise_request",this,"_graph_node_raised");
- }
+ top_layer->call_deferred("raise"); //top layer always on top!
+ GraphNode *gn = p_child->cast_to<GraphNode>();
+ if (gn) {
+ gn->disconnect("offset_changed",this,"_graph_node_moved");
+ gn->disconnect("raise_request",this,"_graph_node_raised");
+ }
}
void GraphEdit::_notification(int p_what) {
- if (p_what==NOTIFICATION_READY) {
- Size2 size = top_layer->get_size();
- Size2 hmin = h_scroll->get_combined_minimum_size();
- Size2 vmin = v_scroll->get_combined_minimum_size();
+ if (p_what==NOTIFICATION_READY) {
+ Size2 size = top_layer->get_size();
+ Size2 hmin = h_scroll->get_combined_minimum_size();
+ Size2 vmin = v_scroll->get_combined_minimum_size();
- v_scroll->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_END,vmin.width);
- v_scroll->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,0);
- v_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN,0);
- v_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
+ v_scroll->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_END,vmin.width);
+ v_scroll->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,0);
+ v_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN,0);
+ v_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
- h_scroll->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,0);
- h_scroll->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,0);
- h_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,hmin.height);
- h_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
+ h_scroll->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,0);
+ h_scroll->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,0);
+ h_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,hmin.height);
+ h_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
- }
- if (p_what==NOTIFICATION_DRAW) {
- VS::get_singleton()->canvas_item_set_clip(get_canvas_item(),true);
+ }
+ if (p_what==NOTIFICATION_DRAW) {
+ VS::get_singleton()->canvas_item_set_clip(get_canvas_item(),true);
- }
+ }
- if (p_what==NOTIFICATION_RESIZED) {
- _update_scroll();
- top_layer->update();
- }
+ if (p_what==NOTIFICATION_RESIZED) {
+ _update_scroll();
+ top_layer->update();
+ }
}
bool GraphEdit::_filter_input(const Point2& p_point) {
- Ref<Texture> port =get_icon("port","GraphNode");
+ Ref<Texture> port =get_icon("port","GraphNode");
- float grab_r=port->get_width()*0.5;
- for(int i=get_child_count()-1;i>=0;i--) {
+ float grab_r=port->get_width()*0.5;
+ for(int i=get_child_count()-1;i>=0;i--) {
- GraphNode *gn=get_child(i)->cast_to<GraphNode>();
- if (!gn)
- continue;
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
- for(int j=0;j<gn->get_connection_output_count();j++) {
+ for(int j=0;j<gn->get_connection_output_count();j++) {
- Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
- if (pos.distance_to(p_point)<grab_r)
- return true;
+ Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
+ if (pos.distance_to(p_point)<grab_r)
+ return true;
- }
+ }
- for(int j=0;j<gn->get_connection_input_count();j++) {
+ for(int j=0;j<gn->get_connection_input_count();j++) {
- Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
- if (pos.distance_to(p_point)<grab_r)
- return true;
+ Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
+ if (pos.distance_to(p_point)<grab_r)
+ return true;
- }
+ }
- }
+ }
- return false;
+ return false;
}
void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
- if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && p_ev.mouse_button.pressed) {
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && p_ev.mouse_button.pressed) {
- Ref<Texture> port =get_icon("port","GraphNode");
- Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
- float grab_r=port->get_width()*0.5;
- for(int i=get_child_count()-1;i>=0;i--) {
+ Ref<Texture> port =get_icon("port","GraphNode");
+ Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
+ float grab_r=port->get_width()*0.5;
+ for(int i=get_child_count()-1;i>=0;i--) {
- GraphNode *gn=get_child(i)->cast_to<GraphNode>();
- if (!gn)
- continue;
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
- for(int j=0;j<gn->get_connection_output_count();j++) {
+ for(int j=0;j<gn->get_connection_output_count();j++) {
- Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
- if (pos.distance_to(mpos)<grab_r) {
+ Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
+ if (pos.distance_to(mpos)<grab_r) {
- connecting=true;
- connecting_from=gn->get_name();
- connecting_index=j;
- connecting_out=true;
- connecting_type=gn->get_connection_output_type(j);
- connecting_color=gn->get_connection_output_color(j);
- connecting_target=false;
- connecting_to=pos;
- return;
- }
+ connecting=true;
+ connecting_from=gn->get_name();
+ connecting_index=j;
+ connecting_out=true;
+ connecting_type=gn->get_connection_output_type(j);
+ connecting_color=gn->get_connection_output_color(j);
+ connecting_target=false;
+ connecting_to=pos;
+ return;
+ }
- }
+ }
- for(int j=0;j<gn->get_connection_input_count();j++) {
+ for(int j=0;j<gn->get_connection_input_count();j++) {
- Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
+ Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
- if (pos.distance_to(mpos)<grab_r) {
+ if (pos.distance_to(mpos)<grab_r) {
- if (right_disconnects) {
- //check disconnect
- for (List<Connection>::Element*E=connections.front();E;E=E->next()) {
+ if (right_disconnects) {
+ //check disconnect
+ for (List<Connection>::Element*E=connections.front();E;E=E->next()) {
- if (E->get().to==gn->get_name() && E->get().to_port==j) {
+ if (E->get().to==gn->get_name() && E->get().to_port==j) {
- Node*fr = get_node(String(E->get().from));
- if (fr && fr->cast_to<GraphNode>()) {
+ Node*fr = get_node(String(E->get().from));
+ if (fr && fr->cast_to<GraphNode>()) {
- connecting_from=E->get().from;
- connecting_index=E->get().from_port;
- connecting_out=true;
- connecting_type=fr->cast_to<GraphNode>()->get_connection_output_type(E->get().from_port);
- connecting_color=fr->cast_to<GraphNode>()->get_connection_output_color(E->get().from_port);
- connecting_target=false;
- connecting_to=pos;
+ connecting_from=E->get().from;
+ connecting_index=E->get().from_port;
+ connecting_out=true;
+ connecting_type=fr->cast_to<GraphNode>()->get_connection_output_type(E->get().from_port);
+ connecting_color=fr->cast_to<GraphNode>()->get_connection_output_color(E->get().from_port);
+ connecting_target=false;
+ connecting_to=pos;
- emit_signal("disconnection_request",E->get().from,E->get().from_port,E->get().to,E->get().to_port);
- fr = get_node(String(connecting_from)); //maybe it was erased
- if (fr && fr->cast_to<GraphNode>()) {
- connecting=true;
- }
- return;
- }
+ emit_signal("disconnection_request",E->get().from,E->get().from_port,E->get().to,E->get().to_port);
+ fr = get_node(String(connecting_from)); //maybe it was erased
+ if (fr && fr->cast_to<GraphNode>()) {
+ connecting=true;
+ }
+ return;
+ }
- }
- }
- }
+ }
+ }
+ }
- connecting=true;
- connecting_from=gn->get_name();
- connecting_index=j;
- connecting_out=false;
- connecting_type=gn->get_connection_input_type(j);
- connecting_color=gn->get_connection_input_color(j);
- connecting_target=false;
- connecting_to=pos;
- return;
- }
+ connecting=true;
+ connecting_from=gn->get_name();
+ connecting_index=j;
+ connecting_out=false;
+ connecting_type=gn->get_connection_input_type(j);
+ connecting_color=gn->get_connection_input_color(j);
+ connecting_target=false;
+ connecting_to=pos;
+ return;
+ }
- }
- }
- }
+ }
+ }
+ }
- if (p_ev.type==InputEvent::MOUSE_MOTION && connecting) {
+ if (p_ev.type==InputEvent::MOUSE_MOTION && connecting) {
- connecting_to=Vector2(p_ev.mouse_motion.x,p_ev.mouse_motion.y);
- connecting_target=false;
- top_layer->update();
+ connecting_to=Vector2(p_ev.mouse_motion.x,p_ev.mouse_motion.y);
+ connecting_target=false;
+ top_layer->update();
- Ref<Texture> port =get_icon("port","GraphNode");
- Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
- float grab_r=port->get_width()*0.5;
- for(int i=get_child_count()-1;i>=0;i--) {
+ Ref<Texture> port =get_icon("port","GraphNode");
+ Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
+ float grab_r=port->get_width()*0.5;
+ for(int i=get_child_count()-1;i>=0;i--) {
- GraphNode *gn=get_child(i)->cast_to<GraphNode>();
- if (!gn)
- continue;
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
- if (!connecting_out) {
- for(int j=0;j<gn->get_connection_output_count();j++) {
+ if (!connecting_out) {
+ for(int j=0;j<gn->get_connection_output_count();j++) {
- Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
- int type =gn->get_connection_output_type(j);
- if (type==connecting_type && pos.distance_to(mpos)<grab_r) {
+ Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
+ int type =gn->get_connection_output_type(j);
+ if (type==connecting_type && pos.distance_to(mpos)<grab_r) {
- connecting_target=true;
- connecting_to=pos;
- connecting_target_to=gn->get_name();
- connecting_target_index=j;
- return;
- }
+ connecting_target=true;
+ connecting_to=pos;
+ connecting_target_to=gn->get_name();
+ connecting_target_index=j;
+ return;
+ }
- }
- } else {
+ }
+ } else {
- for(int j=0;j<gn->get_connection_input_count();j++) {
+ for(int j=0;j<gn->get_connection_input_count();j++) {
- Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
- int type =gn->get_connection_input_type(j);
- if (type==connecting_type && pos.distance_to(mpos)<grab_r) {
- connecting_target=true;
- connecting_to=pos;
- connecting_target_to=gn->get_name();
- connecting_target_index=j;
- return;
- }
- }
- }
- }
- }
+ Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
+ int type =gn->get_connection_input_type(j);
+ if (type==connecting_type && pos.distance_to(mpos)<grab_r) {
+ connecting_target=true;
+ connecting_to=pos;
+ connecting_target_to=gn->get_name();
+ connecting_target_index=j;
+ return;
+ }
+ }
+ }
+ }
+ }
- if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && !p_ev.mouse_button.pressed) {
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && !p_ev.mouse_button.pressed) {
- if (connecting && connecting_target) {
+ if (connecting && connecting_target) {
- String from = connecting_from;
- int from_slot = connecting_index;
- String to =connecting_target_to;
- int to_slot = connecting_target_index;
+ String from = connecting_from;
+ int from_slot = connecting_index;
+ String to =connecting_target_to;
+ int to_slot = connecting_target_index;
- if (!connecting_out) {
- SWAP(from,to);
- SWAP(from_slot,to_slot);
- }
- emit_signal("connection_request",from,from_slot,to,to_slot);
-
- }
- connecting=false;
- top_layer->update();
+ if (!connecting_out) {
+ SWAP(from,to);
+ SWAP(from_slot,to_slot);
+ }
+ emit_signal("connection_request",from,from_slot,to,to_slot);
- }
+ }
+ connecting=false;
+ top_layer->update();
+
+ }
@@ -392,203 +389,295 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
void GraphEdit::_draw_cos_line(const Vector2& p_from, const Vector2& p_to,const Color& p_color) {
- static const int steps = 20;
+ static const int steps = 20;
- Rect2 r;
- r.pos=p_from;
- r.expand_to(p_to);
- Vector2 sign=Vector2((p_from.x < p_to.x) ? 1 : -1,(p_from.y < p_to.y) ? 1 : -1);
- bool flip = sign.x * sign.y < 0;
+ Rect2 r;
+ r.pos=p_from;
+ r.expand_to(p_to);
+ Vector2 sign=Vector2((p_from.x < p_to.x) ? 1 : -1,(p_from.y < p_to.y) ? 1 : -1);
+ bool flip = sign.x * sign.y < 0;
- Vector2 prev;
- for(int i=0;i<=steps;i++) {
+ Vector2 prev;
+ for(int i=0;i<=steps;i++) {
- float d = i/float(steps);
- float c=-Math::cos(d*Math_PI) * 0.5+0.5;
- if (flip)
- c=1.0-c;
- Vector2 p = r.pos+Vector2(d*r.size.width,c*r.size.height);
+ float d = i/float(steps);
+ float c=-Math::cos(d*Math_PI) * 0.5+0.5;
+ if (flip)
+ c=1.0-c;
+ Vector2 p = r.pos+Vector2(d*r.size.width,c*r.size.height);
- if (i>0) {
+ if (i>0) {
- top_layer->draw_line(prev,p,p_color,2);
- }
+ top_layer->draw_line(prev,p,p_color,2);
+ }
- prev=p;
- }
+ prev=p;
+ }
}
void GraphEdit::_top_layer_draw() {
- _update_scroll();
-
- if (connecting) {
-
- Node *fromn = get_node(connecting_from);
- ERR_FAIL_COND(!fromn);
- GraphNode *from = fromn->cast_to<GraphNode>();
- ERR_FAIL_COND(!from);
- Vector2 pos;
- if (connecting_out)
- pos=from->get_connection_output_pos(connecting_index);
- else
- pos=from->get_connection_input_pos(connecting_index);
- pos+=from->get_pos();
-
- Vector2 topos;
- topos=connecting_to;
-
- Color col=connecting_color;
-
- if (connecting_target) {
- col.r+=0.4;
- col.g+=0.4;
- col.b+=0.4;
- }
- _draw_cos_line(pos,topos,col);
- }
-
- List<List<Connection>::Element* > to_erase;
- for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
-
- NodePath fromnp(E->get().from);
-
- Node * from = get_node(fromnp);
- if (!from) {
- to_erase.push_back(E);
- continue;
- }
-
- GraphNode *gfrom = from->cast_to<GraphNode>();
-
- if (!gfrom) {
- to_erase.push_back(E);
- continue;
- }
-
- NodePath tonp(E->get().to);
- Node * to = get_node(tonp);
- if (!to) {
- to_erase.push_back(E);
- continue;
- }
-
- GraphNode *gto = to->cast_to<GraphNode>();
-
- if (!gto) {
- to_erase.push_back(E);
- continue;
- }
-
- Vector2 frompos=gfrom->get_connection_output_pos(E->get().from_port)+gfrom->get_pos();
- Color color = gfrom->get_connection_output_color(E->get().from_port);
- Vector2 topos=gto->get_connection_input_pos(E->get().to_port)+gto->get_pos();
- _draw_cos_line(frompos,topos,color);
-
- }
-
- while(to_erase.size()) {
- connections.erase(to_erase.front()->get());
- to_erase.pop_front();
- }
- //draw connections
+ _update_scroll();
+
+ if (connecting) {
+
+ Node *fromn = get_node(connecting_from);
+ ERR_FAIL_COND(!fromn);
+ GraphNode *from = fromn->cast_to<GraphNode>();
+ ERR_FAIL_COND(!from);
+ Vector2 pos;
+ if (connecting_out)
+ pos=from->get_connection_output_pos(connecting_index);
+ else
+ pos=from->get_connection_input_pos(connecting_index);
+ pos+=from->get_pos();
+
+ Vector2 topos;
+ topos=connecting_to;
+
+ Color col=connecting_color;
+
+ if (connecting_target) {
+ col.r+=0.4;
+ col.g+=0.4;
+ col.b+=0.4;
+ }
+ _draw_cos_line(pos,topos,col);
+ }
+
+ List<List<Connection>::Element* > to_erase;
+ for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
+
+ NodePath fromnp(E->get().from);
+
+ Node * from = get_node(fromnp);
+ if (!from) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ GraphNode *gfrom = from->cast_to<GraphNode>();
+
+ if (!gfrom) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ NodePath tonp(E->get().to);
+ Node * to = get_node(tonp);
+ if (!to) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ GraphNode *gto = to->cast_to<GraphNode>();
+
+ if (!gto) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ Vector2 frompos=gfrom->get_connection_output_pos(E->get().from_port)+gfrom->get_pos();
+ Color color = gfrom->get_connection_output_color(E->get().from_port);
+ Vector2 topos=gto->get_connection_input_pos(E->get().to_port)+gto->get_pos();
+ _draw_cos_line(frompos,topos,color);
+
+ }
+
+ while(to_erase.size()) {
+ connections.erase(to_erase.front()->get());
+ to_erase.pop_front();
+ }
+ //draw connections
}
void GraphEdit::_input_event(const InputEvent& p_ev) {
- if (p_ev.type==InputEvent::MOUSE_MOTION && (p_ev.mouse_motion.button_mask&BUTTON_MASK_MIDDLE || (p_ev.mouse_motion.button_mask&BUTTON_MASK_LEFT && Input::get_singleton()->is_key_pressed(KEY_SPACE)))) {
- h_scroll->set_val( h_scroll->get_val() - p_ev.mouse_motion.relative_x );
- v_scroll->set_val( v_scroll->get_val() - p_ev.mouse_motion.relative_y );
- } else if (p_ev.type== InputEvent::MOUSE_BUTTON) {
+ if (p_ev.type==InputEvent::MOUSE_MOTION && (p_ev.mouse_motion.button_mask&BUTTON_MASK_MIDDLE || (p_ev.mouse_motion.button_mask&BUTTON_MASK_LEFT && Input::get_singleton()->is_key_pressed(KEY_SPACE)))) {
+ h_scroll->set_val( h_scroll->get_val() - p_ev.mouse_motion.relative_x );
+ v_scroll->set_val( v_scroll->get_val() - p_ev.mouse_motion.relative_y );
+ }
+
+ if (p_ev.type==InputEvent::MOUSE_MOTION && dragging) {
+
+ just_selected=true;
+ drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y);
+ for(int i=get_child_count()-1;i>=0;i--) {
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (gn && gn->is_selected())
+ gn->set_offset(gn->get_drag_from()+drag_accum);
+ }
+ }
+
+ if (p_ev.type== InputEvent::MOUSE_BUTTON) {
const InputEventMouseButton &b=p_ev.mouse_button;
- if (b.button_index==2 && b.pressed)
+ if (b.button_index==BUTTON_RIGHT && b.pressed)
{
emit_signal("popup_request", Vector2(b.global_x, b.global_y));
}
+
+ if (b.button_index==BUTTON_LEFT && !b.pressed && dragging) {
+ if (!just_selected && drag_accum==Vector2() && Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
+ //deselect current node
+ for(int i=get_child_count()-1;i>=0;i--) {
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+
+ if (gn && gn->get_rect().has_point(get_local_mouse_pos()))
+ gn->set_selected(false);
+ }
+ }
+
+ if (drag_accum!=Vector2()) {
+
+ emit_signal("_begin_node_move");
+
+ for(int i=get_child_count()-1;i>=0;i--) {
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (gn && gn->is_selected())
+ gn->set_drag(false);
+ }
+
+ emit_signal("_end_node_move");
+ }
+
+ dragging = false;
+
+ top_layer->update();
+ }
+
+ if (b.button_index==BUTTON_LEFT && b.pressed) {
+
+ GraphNode *gn;
+ for(int i=get_child_count()-1;i>=0;i--) {
+
+ gn=get_child(i)->cast_to<GraphNode>();
+
+ if (gn && gn->get_rect().has_point(get_local_mouse_pos()))
+ break;
+ }
+
+ if (gn) {
+
+ if (_filter_input(Vector2(b.x,b.y)))
+ return;
+
+ dragging = true;
+ drag_accum = Vector2();
+ just_selected = !gn->is_selected();
+ if(!gn->is_selected() && !Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
+ for (int i = 0; i < get_child_count(); i++) {
+ GraphNode *o_gn = get_child(i)->cast_to<GraphNode>();
+ if (o_gn)
+ o_gn->set_selected(o_gn == gn);
+ }
+ }
+
+ gn->set_selected(true);
+ for (int i = 0; i < get_child_count(); i++) {
+ GraphNode *o_gn = get_child(i)->cast_to<GraphNode>();
+ if (!o_gn)
+ continue;
+ if (o_gn->is_selected())
+ o_gn->set_drag(true);
+ }
+
+ } else {
+ for(int i=get_child_count()-1;i>=0;i--) {
+
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
+
+ gn->set_selected(false);
+ }
+ }
+ }
}
}
void GraphEdit::clear_connections() {
- connections.clear();
- update();
+ connections.clear();
+ update();
}
void GraphEdit::set_right_disconnects(bool p_enable) {
- right_disconnects=p_enable;
+ right_disconnects=p_enable;
}
bool GraphEdit::is_right_disconnects_enabled() const{
- return right_disconnects;
+ return right_disconnects;
}
Array GraphEdit::_get_connection_list() const {
- List<Connection> conns;
- get_connection_list(&conns);
- Array arr;
- for(List<Connection>::Element *E=conns.front();E;E=E->next()) {
- Dictionary d;
- d["from"]=E->get().from;
- d["from_port"]=E->get().from_port;
- d["to"]=E->get().to;
- d["to_port"]=E->get().to_port;
- arr.push_back(d);
- }
- return arr;
+ List<Connection> conns;
+ get_connection_list(&conns);
+ Array arr;
+ for(List<Connection>::Element *E=conns.front();E;E=E->next()) {
+ Dictionary d;
+ d["from"]=E->get().from;
+ d["from_port"]=E->get().from_port;
+ d["to"]=E->get().to;
+ d["to_port"]=E->get().to_port;
+ arr.push_back(d);
+ }
+ return arr;
}
void GraphEdit::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("connect_node:Error","from","from_port","to","to_port"),&GraphEdit::connect_node);
- ObjectTypeDB::bind_method(_MD("is_node_connected","from","from_port","to","to_port"),&GraphEdit::is_node_connected);
- ObjectTypeDB::bind_method(_MD("disconnect_node","from","from_port","to","to_port"),&GraphEdit::disconnect_node);
- ObjectTypeDB::bind_method(_MD("get_connection_list"),&GraphEdit::_get_connection_list);
+ ObjectTypeDB::bind_method(_MD("connect_node:Error","from","from_port","to","to_port"),&GraphEdit::connect_node);
+ ObjectTypeDB::bind_method(_MD("is_node_connected","from","from_port","to","to_port"),&GraphEdit::is_node_connected);
+ ObjectTypeDB::bind_method(_MD("disconnect_node","from","from_port","to","to_port"),&GraphEdit::disconnect_node);
+ ObjectTypeDB::bind_method(_MD("get_connection_list"),&GraphEdit::_get_connection_list);
- ObjectTypeDB::bind_method(_MD("set_right_disconnects","enable"),&GraphEdit::set_right_disconnects);
- ObjectTypeDB::bind_method(_MD("is_right_disconnects_enabled"),&GraphEdit::is_right_disconnects_enabled);
+ ObjectTypeDB::bind_method(_MD("set_right_disconnects","enable"),&GraphEdit::set_right_disconnects);
+ ObjectTypeDB::bind_method(_MD("is_right_disconnects_enabled"),&GraphEdit::is_right_disconnects_enabled);
- ObjectTypeDB::bind_method(_MD("_graph_node_moved"),&GraphEdit::_graph_node_moved);
- ObjectTypeDB::bind_method(_MD("_graph_node_raised"),&GraphEdit::_graph_node_raised);
+ ObjectTypeDB::bind_method(_MD("_graph_node_moved"),&GraphEdit::_graph_node_moved);
+ ObjectTypeDB::bind_method(_MD("_graph_node_raised"),&GraphEdit::_graph_node_raised);
- ObjectTypeDB::bind_method(_MD("_top_layer_input"),&GraphEdit::_top_layer_input);
- ObjectTypeDB::bind_method(_MD("_top_layer_draw"),&GraphEdit::_top_layer_draw);
- ObjectTypeDB::bind_method(_MD("_scroll_moved"),&GraphEdit::_scroll_moved);
+ ObjectTypeDB::bind_method(_MD("_top_layer_input"),&GraphEdit::_top_layer_input);
+ ObjectTypeDB::bind_method(_MD("_top_layer_draw"),&GraphEdit::_top_layer_draw);
+ ObjectTypeDB::bind_method(_MD("_scroll_moved"),&GraphEdit::_scroll_moved);
- ObjectTypeDB::bind_method(_MD("_input_event"),&GraphEdit::_input_event);
+ ObjectTypeDB::bind_method(_MD("_input_event"),&GraphEdit::_input_event);
- ADD_SIGNAL(MethodInfo("connection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
+ ADD_SIGNAL(MethodInfo("connection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
ADD_SIGNAL(MethodInfo("disconnection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
ADD_SIGNAL(MethodInfo("popup_request", PropertyInfo(Variant::VECTOR2,"p_position")));
+ ADD_SIGNAL(MethodInfo("_begin_node_move"));
+ ADD_SIGNAL(MethodInfo("_end_node_move"));
}
GraphEdit::GraphEdit() {
- top_layer=NULL;
- top_layer=memnew(GraphEditFilter(this));
- add_child(top_layer);
- top_layer->set_stop_mouse(false);
- top_layer->set_area_as_parent_rect();
- top_layer->connect("draw",this,"_top_layer_draw");
+ top_layer=NULL;
+ top_layer=memnew(GraphEditFilter(this));
+ add_child(top_layer);
+ top_layer->set_stop_mouse(false);
+ top_layer->set_area_as_parent_rect();
+ top_layer->connect("draw",this,"_top_layer_draw");
top_layer->set_stop_mouse(false);
- top_layer->connect("input_event",this,"_top_layer_input");
+ top_layer->connect("input_event",this,"_top_layer_input");
- h_scroll = memnew(HScrollBar);
- h_scroll->set_name("_h_scroll");
- top_layer->add_child(h_scroll);
+ h_scroll = memnew(HScrollBar);
+ h_scroll->set_name("_h_scroll");
+ top_layer->add_child(h_scroll);
- v_scroll = memnew(VScrollBar);
- v_scroll->set_name("_v_scroll");
- top_layer->add_child(v_scroll);
- updating=false;
- connecting=false;
- right_disconnects=false;
+ v_scroll = memnew(VScrollBar);
+ v_scroll->set_name("_v_scroll");
+ top_layer->add_child(v_scroll);
+ updating=false;
+ connecting=false;
+ right_disconnects=false;
- h_scroll->connect("value_changed", this,"_scroll_moved");
- v_scroll->connect("value_changed", this,"_scroll_moved");
+ h_scroll->connect("value_changed", this,"_scroll_moved");
+ v_scroll->connect("value_changed", this,"_scroll_moved");
}
diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h
index 0a9da73ab6..2f9a5fc954 100644
--- a/scene/gui/graph_edit.h
+++ b/scene/gui/graph_edit.h
@@ -8,93 +8,95 @@ class GraphEdit;
class GraphEditFilter : public Control {
- OBJ_TYPE(GraphEditFilter,Control);
+ OBJ_TYPE(GraphEditFilter,Control);
friend class GraphEdit;
- GraphEdit *ge;
- virtual bool has_point(const Point2& p_point) const;
+ GraphEdit *ge;
+ virtual bool has_point(const Point2& p_point) const;
public:
- GraphEditFilter(GraphEdit *p_edit);
+ GraphEditFilter(GraphEdit *p_edit);
};
class GraphEdit : public Control {
- OBJ_TYPE(GraphEdit,Control);
+ OBJ_TYPE(GraphEdit,Control);
public:
- struct Connection {
- StringName from;
- StringName to;
- int from_port;
- int to_port;
+ struct Connection {
+ StringName from;
+ StringName to;
+ int from_port;
+ int to_port;
- };
+ };
private:
- HScrollBar* h_scroll;
- VScrollBar* v_scroll;
+ HScrollBar* h_scroll;
+ VScrollBar* v_scroll;
- bool connecting;
- String connecting_from;
- bool connecting_out;
- int connecting_index;
- int connecting_type;
- Color connecting_color;
- bool connecting_target;
- Vector2 connecting_to;
- String connecting_target_to;
- int connecting_target_index;
+ bool connecting;
+ String connecting_from;
+ bool connecting_out;
+ int connecting_index;
+ int connecting_type;
+ Color connecting_color;
+ bool connecting_target;
+ Vector2 connecting_to;
+ String connecting_target_to;
+ int connecting_target_index;
+ bool dragging;
+ bool just_selected;
+ Vector2 drag_accum;
+ bool right_disconnects;
+ bool updating;
+ List<Connection> connections;
- bool right_disconnects;
- bool updating;
- List<Connection> connections;
+ void _draw_cos_line(const Vector2& p_from, const Vector2& p_to,const Color& p_color);
- void _draw_cos_line(const Vector2& p_from, const Vector2& p_to,const Color& p_color);
+ void _graph_node_raised(Node* p_gn);
+ void _graph_node_moved(Node *p_gn);
- void _graph_node_raised(Node* p_gn);
- void _graph_node_moved(Node *p_gn);
+ void _update_scroll();
+ void _scroll_moved(double);
+ void _input_event(const InputEvent& p_ev);
- void _update_scroll();
- void _scroll_moved(double);
- void _input_event(const InputEvent& p_ev);
+ GraphEditFilter *top_layer;
+ void _top_layer_input(const InputEvent& p_ev);
+ void _top_layer_draw();
+ void _update_scroll_offset();
- GraphEditFilter *top_layer;
- void _top_layer_input(const InputEvent& p_ev);
- void _top_layer_draw();
- void _update_scroll_offset();
-
- Array _get_connection_list() const;
+ Array _get_connection_list() const;
friend class GraphEditFilter;
- bool _filter_input(const Point2& p_point);
+ bool _filter_input(const Point2& p_point);
protected:
- static void _bind_methods();
- virtual void add_child_notify(Node *p_child);
- virtual void remove_child_notify(Node *p_child);
- void _notification(int p_what);
+ static void _bind_methods();
+ virtual void add_child_notify(Node *p_child);
+ virtual void remove_child_notify(Node *p_child);
+ void _notification(int p_what);
public:
- Error connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
- bool is_node_connected(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
- void disconnect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
- void clear_connections();
+ Error connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
+ bool is_node_connected(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
+ void disconnect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
+ void clear_connections();
- GraphEditFilter *get_top_layer() const { return top_layer; }
- void get_connection_list(List<Connection> *r_connections) const;
+ GraphEditFilter *get_top_layer() const { return top_layer; }
+ void get_connection_list(List<Connection> *r_connections) const;
- void set_right_disconnects(bool p_enable);
- bool is_right_disconnects_enabled() const;
+ void set_right_disconnects(bool p_enable);
+ bool is_right_disconnects_enabled() const;
- GraphEdit();
+ GraphEdit();
};
#endif // GRAPHEdit_H
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
index 444b37855f..760eb6ceed 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -4,91 +4,91 @@
bool GraphNode::_set(const StringName& p_name, const Variant& p_value) {
- if (!p_name.operator String().begins_with("slot/"))
- return false;
+ if (!p_name.operator String().begins_with("slot/"))
+ return false;
- int idx=p_name.operator String().get_slice("/",1).to_int();
- String what = p_name.operator String().get_slice("/",2);
+ int idx=p_name.operator String().get_slice("/",1).to_int();
+ String what = p_name.operator String().get_slice("/",2);
- Slot si;
- if (slot_info.has(idx))
- si=slot_info[idx];
+ Slot si;
+ if (slot_info.has(idx))
+ si=slot_info[idx];
- if (what=="left_enabled")
- si.enable_left=p_value;
- else if (what=="left_type")
- si.type_left=p_value;
- else if (what=="left_color")
- si.color_left=p_value;
- else if (what=="right_enabled")
- si.enable_right=p_value;
- else if (what=="right_type")
- si.type_right=p_value;
- else if (what=="right_color")
- si.color_right=p_value;
- else
- return false;
+ if (what=="left_enabled")
+ si.enable_left=p_value;
+ else if (what=="left_type")
+ si.type_left=p_value;
+ else if (what=="left_color")
+ si.color_left=p_value;
+ else if (what=="right_enabled")
+ si.enable_right=p_value;
+ else if (what=="right_type")
+ si.type_right=p_value;
+ else if (what=="right_color")
+ si.color_right=p_value;
+ else
+ return false;
- set_slot(idx,si.enable_left,si.type_left,si.color_left,si.enable_right,si.type_right,si.color_right);
- update();
- return true;
+ set_slot(idx,si.enable_left,si.type_left,si.color_left,si.enable_right,si.type_right,si.color_right);
+ update();
+ return true;
}
bool GraphNode::_get(const StringName& p_name,Variant &r_ret) const{
- if (!p_name.operator String().begins_with("slot/")) {
- return false;
- }
+ if (!p_name.operator String().begins_with("slot/")) {
+ return false;
+ }
- int idx=p_name.operator String().get_slice("/",1).to_int();
- String what = p_name.operator String().get_slice("/",2);
+ int idx=p_name.operator String().get_slice("/",1).to_int();
+ String what = p_name.operator String().get_slice("/",2);
- Slot si;
- if (slot_info.has(idx))
- si=slot_info[idx];
+ Slot si;
+ if (slot_info.has(idx))
+ si=slot_info[idx];
- if (what=="left_enabled")
- r_ret=si.enable_left;
- else if (what=="left_type")
- r_ret=si.type_left;
- else if (what=="left_color")
- r_ret=si.color_left;
- else if (what=="right_enabled")
- r_ret=si.enable_right;
- else if (what=="right_type")
- r_ret=si.type_right;
- else if (what=="right_color")
- r_ret=si.color_right;
- else
- return false;
+ if (what=="left_enabled")
+ r_ret=si.enable_left;
+ else if (what=="left_type")
+ r_ret=si.type_left;
+ else if (what=="left_color")
+ r_ret=si.color_left;
+ else if (what=="right_enabled")
+ r_ret=si.enable_right;
+ else if (what=="right_type")
+ r_ret=si.type_right;
+ else if (what=="right_color")
+ r_ret=si.color_right;
+ else
+ return false;
- return true;
+ return true;
}
void GraphNode::_get_property_list( List<PropertyInfo> *p_list) const{
- int idx=0;
- for(int i=0;i<get_child_count();i++) {
- Control *c=get_child(i)->cast_to<Control>();
- if (!c || c->is_set_as_toplevel() )
- continue;
+ int idx=0;
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c || c->is_set_as_toplevel() )
+ continue;
- String base="slot/"+itos(idx)+"/";
+ String base="slot/"+itos(idx)+"/";
- p_list->push_back(PropertyInfo(Variant::BOOL,base+"left_enabled"));
- p_list->push_back(PropertyInfo(Variant::INT,base+"left_type"));
- p_list->push_back(PropertyInfo(Variant::COLOR,base+"left_color"));
- p_list->push_back(PropertyInfo(Variant::BOOL,base+"right_enabled"));
- p_list->push_back(PropertyInfo(Variant::INT,base+"right_type"));
- p_list->push_back(PropertyInfo(Variant::COLOR,base+"right_color"));
+ p_list->push_back(PropertyInfo(Variant::BOOL,base+"left_enabled"));
+ p_list->push_back(PropertyInfo(Variant::INT,base+"left_type"));
+ p_list->push_back(PropertyInfo(Variant::COLOR,base+"left_color"));
+ p_list->push_back(PropertyInfo(Variant::BOOL,base+"right_enabled"));
+ p_list->push_back(PropertyInfo(Variant::INT,base+"right_type"));
+ p_list->push_back(PropertyInfo(Variant::COLOR,base+"right_color"));
- idx++;
- }
+ idx++;
+ }
}
@@ -96,61 +96,61 @@ void GraphNode::_resort() {
- int sep=get_constant("separation");
- Ref<StyleBox> sb=get_stylebox("frame");
- bool first=true;
+ int sep=get_constant("separation");
+ Ref<StyleBox> sb=get_stylebox("frame");
+ bool first=true;
- Size2 minsize;
+ Size2 minsize;
- for(int i=0;i<get_child_count();i++) {
- Control *c=get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
- Size2i size=c->get_combined_minimum_size();
+ Size2i size=c->get_combined_minimum_size();
- minsize.y+=size.y;
- minsize.x=MAX(minsize.x,size.x);
+ minsize.y+=size.y;
+ minsize.x=MAX(minsize.x,size.x);
- if (first)
- first=false;
- else
- minsize.y+=sep;
+ if (first)
+ first=false;
+ else
+ minsize.y+=sep;
- }
+ }
- int vofs=0;
- int w = get_size().x - sb->get_minimum_size().x;
+ int vofs=0;
+ int w = get_size().x - sb->get_minimum_size().x;
- cache_y.clear();
- for(int i=0;i<get_child_count();i++) {
- Control *c=get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ cache_y.clear();
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
- Size2i size=c->get_combined_minimum_size();
+ Size2i size=c->get_combined_minimum_size();
- Rect2 r(sb->get_margin(MARGIN_LEFT),sb->get_margin(MARGIN_TOP)+vofs,w,size.y);
+ Rect2 r(sb->get_margin(MARGIN_LEFT),sb->get_margin(MARGIN_TOP)+vofs,w,size.y);
- fit_child_in_rect(c,r);
- cache_y.push_back(vofs+size.y*0.5);
+ fit_child_in_rect(c,r);
+ cache_y.push_back(vofs+size.y*0.5);
- if (vofs>0)
- vofs+=sep;
- vofs+=size.y;
+ if (vofs>0)
+ vofs+=sep;
+ vofs+=size.y;
- }
+ }
- _change_notify();
- update();
- connpos_dirty=true;
+ _change_notify();
+ update();
+ connpos_dirty=true;
}
@@ -158,124 +158,124 @@ void GraphNode::_resort() {
void GraphNode::_notification(int p_what) {
- if (p_what==NOTIFICATION_DRAW) {
+ if (p_what==NOTIFICATION_DRAW) {
- Ref<StyleBox> sb=get_stylebox("frame");
- Ref<Texture> port =get_icon("port");
- Ref<Texture> close =get_icon("close");
- int close_offset = get_constant("close_offset");
- Ref<Font> title_font = get_font("title_font");
- int title_offset = get_constant("title_offset");
- Color title_color = get_color("title_color");
- Point2i icofs = -port->get_size()*0.5;
- int edgeofs=get_constant("port_offset");
- icofs.y+=sb->get_margin(MARGIN_TOP);
- draw_style_box(sb,Rect2(Point2(),get_size()));
+ Ref<StyleBox> sb=get_stylebox(selected ? "selectedframe" : "frame");
+ Ref<Texture> port =get_icon("port");
+ Ref<Texture> close =get_icon("close");
+ int close_offset = get_constant("close_offset");
+ Ref<Font> title_font = get_font("title_font");
+ int title_offset = get_constant("title_offset");
+ Color title_color = get_color("title_color");
+ Point2i icofs = -port->get_size()*0.5;
+ int edgeofs=get_constant("port_offset");
+ icofs.y+=sb->get_margin(MARGIN_TOP);
+ draw_style_box(sb,Rect2(Point2(),get_size()));
- int w = get_size().width-sb->get_minimum_size().x;
+ int w = get_size().width-sb->get_minimum_size().x;
- if (show_close)
- w-=close->get_width();
+ if (show_close)
+ w-=close->get_width();
- draw_string(title_font,Point2(sb->get_margin(MARGIN_LEFT),-title_font->get_height()+title_font->get_ascent()+title_offset),title,title_color,w);
- if (show_close) {
- Vector2 cpos = Point2(w+sb->get_margin(MARGIN_LEFT),-close->get_height()+close_offset);
- draw_texture(close,cpos);
- close_rect.pos=cpos;
- close_rect.size=close->get_size();
- } else {
- close_rect=Rect2();
- }
+ draw_string(title_font,Point2(sb->get_margin(MARGIN_LEFT),-title_font->get_height()+title_font->get_ascent()+title_offset),title,title_color,w);
+ if (show_close) {
+ Vector2 cpos = Point2(w+sb->get_margin(MARGIN_LEFT),-close->get_height()+close_offset);
+ draw_texture(close,cpos);
+ close_rect.pos=cpos;
+ close_rect.size=close->get_size();
+ } else {
+ close_rect=Rect2();
+ }
- for (Map<int,Slot>::Element *E=slot_info.front();E;E=E->next()) {
+ for (Map<int,Slot>::Element *E=slot_info.front();E;E=E->next()) {
- if (E->key() < 0 || E->key()>=cache_y.size())
- continue;
- if (!slot_info.has(E->key()))
- continue;
- const Slot &s=slot_info[E->key()];
- //left
- if (s.enable_left)
- port->draw(get_canvas_item(),icofs+Point2(edgeofs,cache_y[E->key()]),s.color_left);
- if (s.enable_right)
- port->draw(get_canvas_item(),icofs+Point2(get_size().x-edgeofs,cache_y[E->key()]),s.color_right);
+ if (E->key() < 0 || E->key()>=cache_y.size())
+ continue;
+ if (!slot_info.has(E->key()))
+ continue;
+ const Slot &s=slot_info[E->key()];
+ //left
+ if (s.enable_left)
+ port->draw(get_canvas_item(),icofs+Point2(edgeofs,cache_y[E->key()]),s.color_left);
+ if (s.enable_right)
+ port->draw(get_canvas_item(),icofs+Point2(get_size().x-edgeofs,cache_y[E->key()]),s.color_right);
- }
- }
+ }
+ }
- if (p_what==NOTIFICATION_SORT_CHILDREN) {
+ if (p_what==NOTIFICATION_SORT_CHILDREN) {
- _resort();
- }
+ _resort();
+ }
}
void GraphNode::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) {
- ERR_FAIL_COND(p_idx<0);
+ ERR_FAIL_COND(p_idx<0);
- if (!p_enable_left && p_type_left==0 && p_color_left==Color(1,1,1,1) && !p_enable_right && p_type_right==0 && p_color_right==Color(1,1,1,1)) {
- slot_info.erase(p_idx);
- return;
- }
+ if (!p_enable_left && p_type_left==0 && p_color_left==Color(1,1,1,1) && !p_enable_right && p_type_right==0 && p_color_right==Color(1,1,1,1)) {
+ slot_info.erase(p_idx);
+ return;
+ }
- Slot s;
- s.enable_left=p_enable_left;
- s.type_left=p_type_left;
- s.color_left=p_color_left;
- s.enable_right=p_enable_right;
- s.type_right=p_type_right;
- s.color_right=p_color_right;
- slot_info[p_idx]=s;
- update();
- connpos_dirty=true;
+ Slot s;
+ s.enable_left=p_enable_left;
+ s.type_left=p_type_left;
+ s.color_left=p_color_left;
+ s.enable_right=p_enable_right;
+ s.type_right=p_type_right;
+ s.color_right=p_color_right;
+ slot_info[p_idx]=s;
+ update();
+ connpos_dirty=true;
}
void GraphNode::clear_slot(int p_idx){
- slot_info.erase(p_idx);
- update();
- connpos_dirty=true;
+ slot_info.erase(p_idx);
+ update();
+ connpos_dirty=true;
}
void GraphNode::clear_all_slots(){
- slot_info.clear();
- update();
- connpos_dirty=true;
+ slot_info.clear();
+ update();
+ connpos_dirty=true;
}
bool GraphNode::is_slot_enabled_left(int p_idx) const{
- if (!slot_info.has(p_idx))
- return false;
- return slot_info[p_idx].enable_left;
+ if (!slot_info.has(p_idx))
+ return false;
+ return slot_info[p_idx].enable_left;
}
int GraphNode::get_slot_type_left(int p_idx) const{
- if (!slot_info.has(p_idx))
- return 0;
- return slot_info[p_idx].type_left;
+ if (!slot_info.has(p_idx))
+ return 0;
+ return slot_info[p_idx].type_left;
}
Color GraphNode::get_slot_color_left(int p_idx) const{
- if (!slot_info.has(p_idx))
- return Color(1,1,1,1);
- return slot_info[p_idx].color_left;
+ if (!slot_info.has(p_idx))
+ return Color(1,1,1,1);
+ return slot_info[p_idx].color_left;
}
bool GraphNode::is_slot_enabled_right(int p_idx) const{
- if (!slot_info.has(p_idx))
- return false;
- return slot_info[p_idx].enable_right;
+ if (!slot_info.has(p_idx))
+ return false;
+ return slot_info[p_idx].enable_right;
}
@@ -283,301 +283,305 @@ bool GraphNode::is_slot_enabled_right(int p_idx) const{
int GraphNode::get_slot_type_right(int p_idx) const{
- if (!slot_info.has(p_idx))
- return 0;
- return slot_info[p_idx].type_right;
+ if (!slot_info.has(p_idx))
+ return 0;
+ return slot_info[p_idx].type_right;
}
Color GraphNode::get_slot_color_right(int p_idx) const{
- if (!slot_info.has(p_idx))
- return Color(1,1,1,1);
- return slot_info[p_idx].color_right;
+ if (!slot_info.has(p_idx))
+ return Color(1,1,1,1);
+ return slot_info[p_idx].color_right;
}
Size2 GraphNode::get_minimum_size() const {
- Ref<Font> title_font = get_font("title_font");
+ Ref<Font> title_font = get_font("title_font");
- int sep=get_constant("separation");
- Ref<StyleBox> sb=get_stylebox("frame");
- bool first=true;
+ int sep=get_constant("separation");
+ Ref<StyleBox> sb=get_stylebox("frame");
+ bool first=true;
- Size2 minsize;
- minsize.x=title_font->get_string_size(title).x;
- if (show_close) {
- Ref<Texture> close =get_icon("close");
- minsize.x+=sep+close->get_width();
- }
+ Size2 minsize;
+ minsize.x=title_font->get_string_size(title).x;
+ if (show_close) {
+ Ref<Texture> close =get_icon("close");
+ minsize.x+=sep+close->get_width();
+ }
- for(int i=0;i<get_child_count();i++) {
+ for(int i=0;i<get_child_count();i++) {
- Control *c=get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
- Size2i size=c->get_combined_minimum_size();
+ Size2i size=c->get_combined_minimum_size();
- minsize.y+=size.y;
- minsize.x=MAX(minsize.x,size.x);
+ minsize.y+=size.y;
+ minsize.x=MAX(minsize.x,size.x);
- if (first)
- first=false;
- else
- minsize.y+=sep;
- }
+ if (first)
+ first=false;
+ else
+ minsize.y+=sep;
+ }
- return minsize+sb->get_minimum_size();
+ return minsize+sb->get_minimum_size();
}
void GraphNode::set_title(const String& p_title) {
- title=p_title;
- minimum_size_changed();
- update();
+ title=p_title;
+ minimum_size_changed();
+ update();
}
String GraphNode::get_title() const{
- return title;
+ return title;
}
void GraphNode::set_offset(const Vector2& p_offset) {
- offset=p_offset;
- emit_signal("offset_changed");
- update();
+ offset=p_offset;
+ emit_signal("offset_changed");
+ update();
}
Vector2 GraphNode::get_offset() const {
- return offset;
+ return offset;
}
+void GraphNode::set_selected(bool p_selected)
+{
+ selected = p_selected;
+ update();
+}
+
+bool GraphNode::is_selected()
+{
+ return selected;
+}
+
+void GraphNode::set_drag(bool p_drag)
+{
+ if (p_drag)
+ drag_from=get_offset();
+ else
+ emit_signal("dragged",drag_from,get_offset()); //useful for undo/redo
+}
+
+Vector2 GraphNode::get_drag_from()
+{
+ return drag_from;
+}
void GraphNode::set_show_close_button(bool p_enable){
- show_close=p_enable;
- update();
+ show_close=p_enable;
+ update();
}
bool GraphNode::is_close_button_visible() const{
- return show_close;
+ return show_close;
}
void GraphNode::_connpos_update() {
- int edgeofs=get_constant("port_offset");
- int sep=get_constant("separation");
+ int edgeofs=get_constant("port_offset");
+ int sep=get_constant("separation");
- Ref<StyleBox> sb=get_stylebox("frame");
- Ref<Texture> port =get_icon("port");
- conn_input_cache.clear();
- conn_output_cache.clear();
- int vofs=0;
+ Ref<StyleBox> sb=get_stylebox("frame");
+ conn_input_cache.clear();
+ conn_output_cache.clear();
+ int vofs=0;
- int idx=0;
+ int idx=0;
- for(int i=0;i<get_child_count();i++) {
- Control *c=get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
- Size2i size=c->get_combined_minimum_size();
+ Size2i size=c->get_combined_minimum_size();
- int y = sb->get_margin(MARGIN_TOP)+vofs;
- int h = size.y;
+ int y = sb->get_margin(MARGIN_TOP)+vofs;
+ int h = size.y;
- if (slot_info.has(idx)) {
+ if (slot_info.has(idx)) {
- if (slot_info[idx].enable_left) {
- ConnCache cc;
- cc.pos=Point2i(edgeofs,y+h/2);
- cc.type=slot_info[idx].type_left;
- cc.color=slot_info[idx].color_left;
- conn_input_cache.push_back(cc);
- }
- if (slot_info[idx].enable_right) {
- ConnCache cc;
- cc.pos=Point2i(get_size().width-edgeofs,y+h/2);
- cc.type=slot_info[idx].type_right;
- cc.color=slot_info[idx].color_right;
- conn_output_cache.push_back(cc);
- }
- }
+ if (slot_info[idx].enable_left) {
+ ConnCache cc;
+ cc.pos=Point2i(edgeofs,y+h/2);
+ cc.type=slot_info[idx].type_left;
+ cc.color=slot_info[idx].color_left;
+ conn_input_cache.push_back(cc);
+ }
+ if (slot_info[idx].enable_right) {
+ ConnCache cc;
+ cc.pos=Point2i(get_size().width-edgeofs,y+h/2);
+ cc.type=slot_info[idx].type_right;
+ cc.color=slot_info[idx].color_right;
+ conn_output_cache.push_back(cc);
+ }
+ }
- if (vofs>0)
- vofs+=sep;
- vofs+=size.y;
- idx++;
+ if (vofs>0)
+ vofs+=sep;
+ vofs+=size.y;
+ idx++;
- }
+ }
- connpos_dirty=false;
+ connpos_dirty=false;
}
int GraphNode::get_connection_input_count() {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- return conn_input_cache.size();
+ return conn_input_cache.size();
}
int GraphNode::get_connection_output_count() {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- return conn_output_cache.size();
+ return conn_output_cache.size();
}
Vector2 GraphNode::get_connection_input_pos(int p_idx) {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),Vector2());
- return conn_input_cache[p_idx].pos;
+ ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),Vector2());
+ return conn_input_cache[p_idx].pos;
}
int GraphNode::get_connection_input_type(int p_idx) {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),0);
- return conn_input_cache[p_idx].type;
+ ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),0);
+ return conn_input_cache[p_idx].type;
}
Color GraphNode::get_connection_input_color(int p_idx) {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),Color());
- return conn_input_cache[p_idx].color;
+ ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),Color());
+ return conn_input_cache[p_idx].color;
}
Vector2 GraphNode::get_connection_output_pos(int p_idx){
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),Vector2());
- return conn_output_cache[p_idx].pos;
+ ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),Vector2());
+ return conn_output_cache[p_idx].pos;
}
int GraphNode::get_connection_output_type(int p_idx) {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),0);
- return conn_output_cache[p_idx].type;
+ ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),0);
+ return conn_output_cache[p_idx].type;
}
Color GraphNode::get_connection_output_color(int p_idx) {
- if (connpos_dirty)
- _connpos_update();
+ if (connpos_dirty)
+ _connpos_update();
- ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),Color());
- return conn_output_cache[p_idx].color;
+ ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),Color());
+ return conn_output_cache[p_idx].color;
}
void GraphNode::_input_event(const InputEvent& p_ev) {
- if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
- Vector2 mpos = Vector2(p_ev.mouse_button.x,p_ev.mouse_button.y);
- if (close_rect.size!=Size2() && close_rect.has_point(mpos)) {
- emit_signal("close_request");
- return;
- }
+ Vector2 mpos = Vector2(p_ev.mouse_button.x,p_ev.mouse_button.y);
+ if (close_rect.size!=Size2() && close_rect.has_point(mpos)) {
+ emit_signal("close_request");
+ return;
+ }
+ emit_signal("raise_request");
- drag_from=get_offset();
- drag_accum=Vector2();
- dragging=true;
- emit_signal("raise_request");
-
- }
-
- if (p_ev.type==InputEvent::MOUSE_BUTTON && !p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
-
- dragging=false;
- emit_signal("dragged",drag_from,get_offset()); //useful for undo/redo
- }
-
- if (p_ev.type==InputEvent::MOUSE_MOTION && dragging) {
-
- drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y);
- set_offset(drag_from+drag_accum);
- }
+ }
}
void GraphNode::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("set_title","title"),&GraphNode::set_title);
- ObjectTypeDB::bind_method(_MD("get_title"),&GraphNode::get_title);
- ObjectTypeDB::bind_method(_MD("_input_event"),&GraphNode::_input_event);
+ ObjectTypeDB::bind_method(_MD("set_title","title"),&GraphNode::set_title);
+ ObjectTypeDB::bind_method(_MD("get_title"),&GraphNode::get_title);
+ ObjectTypeDB::bind_method(_MD("_input_event"),&GraphNode::_input_event);
- ObjectTypeDB::bind_method(_MD("set_slot","idx","enable_left","type_left","color_left","enable_right","type_right","color_right"),&GraphNode::set_slot);
- ObjectTypeDB::bind_method(_MD("clear_slot","idx"),&GraphNode::clear_slot);
- ObjectTypeDB::bind_method(_MD("clear_all_slots","idx"),&GraphNode::clear_all_slots);
- ObjectTypeDB::bind_method(_MD("is_slot_enabled_left","idx"),&GraphNode::is_slot_enabled_left);
- ObjectTypeDB::bind_method(_MD("get_slot_type_left","idx"),&GraphNode::get_slot_type_left);
- ObjectTypeDB::bind_method(_MD("get_slot_color_left","idx"),&GraphNode::get_slot_color_left);
- ObjectTypeDB::bind_method(_MD("is_slot_enabled_right","idx"),&GraphNode::is_slot_enabled_right);
- ObjectTypeDB::bind_method(_MD("get_slot_type_right","idx"),&GraphNode::get_slot_type_right);
- ObjectTypeDB::bind_method(_MD("get_slot_color_right","idx"),&GraphNode::get_slot_color_right);
+ ObjectTypeDB::bind_method(_MD("set_slot","idx","enable_left","type_left","color_left","enable_right","type_right","color_right"),&GraphNode::set_slot);
+ ObjectTypeDB::bind_method(_MD("clear_slot","idx"),&GraphNode::clear_slot);
+ ObjectTypeDB::bind_method(_MD("clear_all_slots","idx"),&GraphNode::clear_all_slots);
+ ObjectTypeDB::bind_method(_MD("is_slot_enabled_left","idx"),&GraphNode::is_slot_enabled_left);
+ ObjectTypeDB::bind_method(_MD("get_slot_type_left","idx"),&GraphNode::get_slot_type_left);
+ ObjectTypeDB::bind_method(_MD("get_slot_color_left","idx"),&GraphNode::get_slot_color_left);
+ ObjectTypeDB::bind_method(_MD("is_slot_enabled_right","idx"),&GraphNode::is_slot_enabled_right);
+ ObjectTypeDB::bind_method(_MD("get_slot_type_right","idx"),&GraphNode::get_slot_type_right);
+ ObjectTypeDB::bind_method(_MD("get_slot_color_right","idx"),&GraphNode::get_slot_color_right);
- ObjectTypeDB::bind_method(_MD("set_offset","offset"),&GraphNode::set_offset);
- ObjectTypeDB::bind_method(_MD("get_offset"),&GraphNode::get_offset);
+ ObjectTypeDB::bind_method(_MD("set_offset","offset"),&GraphNode::set_offset);
+ ObjectTypeDB::bind_method(_MD("get_offset"),&GraphNode::get_offset);
- ObjectTypeDB::bind_method(_MD("get_connection_output_count"),&GraphNode::get_connection_output_count);
- ObjectTypeDB::bind_method(_MD("get_connection_input_count"),&GraphNode::get_connection_input_count);
+ ObjectTypeDB::bind_method(_MD("get_connection_output_count"),&GraphNode::get_connection_output_count);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_count"),&GraphNode::get_connection_input_count);
- ObjectTypeDB::bind_method(_MD("get_connection_output_pos","idx"),&GraphNode::get_connection_output_pos);
- ObjectTypeDB::bind_method(_MD("get_connection_output_type","idx"),&GraphNode::get_connection_output_type);
- ObjectTypeDB::bind_method(_MD("get_connection_output_color","idx"),&GraphNode::get_connection_output_color);
- ObjectTypeDB::bind_method(_MD("get_connection_input_pos","idx"),&GraphNode::get_connection_input_pos);
- ObjectTypeDB::bind_method(_MD("get_connection_input_type","idx"),&GraphNode::get_connection_input_type);
- ObjectTypeDB::bind_method(_MD("get_connection_input_color","idx"),&GraphNode::get_connection_input_color);
+ ObjectTypeDB::bind_method(_MD("get_connection_output_pos","idx"),&GraphNode::get_connection_output_pos);
+ ObjectTypeDB::bind_method(_MD("get_connection_output_type","idx"),&GraphNode::get_connection_output_type);
+ ObjectTypeDB::bind_method(_MD("get_connection_output_color","idx"),&GraphNode::get_connection_output_color);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_pos","idx"),&GraphNode::get_connection_input_pos);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_type","idx"),&GraphNode::get_connection_input_type);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_color","idx"),&GraphNode::get_connection_input_color);
- ObjectTypeDB::bind_method(_MD("set_show_close_button","show"),&GraphNode::set_show_close_button);
- ObjectTypeDB::bind_method(_MD("is_close_button_visible"),&GraphNode::is_close_button_visible);
+ ObjectTypeDB::bind_method(_MD("set_show_close_button","show"),&GraphNode::set_show_close_button);
+ ObjectTypeDB::bind_method(_MD("is_close_button_visible"),&GraphNode::is_close_button_visible);
- ADD_PROPERTY( PropertyInfo(Variant::STRING,"title"),_SCS("set_title"),_SCS("get_title"));
- ADD_PROPERTY( PropertyInfo(Variant::BOOL,"show_close"),_SCS("set_show_close_button"),_SCS("is_close_button_visible"));
+ ADD_PROPERTY( PropertyInfo(Variant::STRING,"title"),_SCS("set_title"),_SCS("get_title"));
+ ADD_PROPERTY( PropertyInfo(Variant::BOOL,"show_close"),_SCS("set_show_close_button"),_SCS("is_close_button_visible"));
- ADD_SIGNAL(MethodInfo("offset_changed"));
- ADD_SIGNAL(MethodInfo("dragged",PropertyInfo(Variant::VECTOR2,"from"),PropertyInfo(Variant::VECTOR2,"to")));
- ADD_SIGNAL(MethodInfo("raise_request"));
- ADD_SIGNAL(MethodInfo("close_request"));
+ ADD_SIGNAL(MethodInfo("offset_changed"));
+ ADD_SIGNAL(MethodInfo("dragged",PropertyInfo(Variant::VECTOR2,"from"),PropertyInfo(Variant::VECTOR2,"to")));
+ ADD_SIGNAL(MethodInfo("raise_request"));
+ ADD_SIGNAL(MethodInfo("close_request"));
}
GraphNode::GraphNode() {
-
- dragging=false;
- show_close=false;
- connpos_dirty=true;
+ show_close=false;
+ connpos_dirty=true;
}
diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h
index 0d5cbf8dd3..6bece22ac5 100644
--- a/scene/gui/graph_node.h
+++ b/scene/gui/graph_node.h
@@ -5,96 +5,101 @@
class GraphNode : public Container {
- OBJ_TYPE(GraphNode,Container);
+ OBJ_TYPE(GraphNode,Container);
- struct Slot {
- bool enable_left;
- int type_left;
- Color color_left;
- bool enable_right;
- int type_right;
- Color color_right;
+ struct Slot {
+ bool enable_left;
+ int type_left;
+ Color color_left;
+ bool enable_right;
+ int type_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); };
- };
+ 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); }
+ };
- String title;
- bool show_close;
- Vector2 offset;
+ String title;
+ bool show_close;
+ Vector2 offset;
- Rect2 close_rect;
+ Rect2 close_rect;
- Vector<int> cache_y;
+ Vector<int> cache_y;
- struct ConnCache {
- Vector2 pos;
- int type;
- Color color;
- };
+ struct ConnCache {
+ Vector2 pos;
+ int type;
+ Color color;
+ };
- Vector<ConnCache> conn_input_cache;
- Vector<ConnCache> conn_output_cache;
+ Vector<ConnCache> conn_input_cache;
+ Vector<ConnCache> conn_output_cache;
- Map<int,Slot> slot_info;
+ Map<int,Slot> slot_info;
- bool connpos_dirty;
+ bool connpos_dirty;
- void _connpos_update();
- void _resort();
+ void _connpos_update();
+ void _resort();
- Vector2 drag_from;
- Vector2 drag_accum;
- bool dragging;
+ Vector2 drag_from;
+ bool selected;
protected:
- void _input_event(const InputEvent& p_ev);
- void _notification(int p_what);
- static void _bind_methods();
+ void _input_event(const InputEvent& p_ev);
+ 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<PropertyInfo> *p_list) const;
+ 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<PropertyInfo> *p_list) const;
public:
- 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;
- 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;
- Color get_slot_color_right(int p_idx) const;
+ 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;
+ 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;
+ Color get_slot_color_right(int p_idx) const;
- void set_title(const String& p_title);
- String get_title() const;
+ void set_title(const String& p_title);
+ String get_title() const;
- void set_offset(const Vector2& p_offset);
- Vector2 get_offset() const;
+ void set_offset(const Vector2& p_offset);
+ Vector2 get_offset() const;
- void set_show_close_button(bool p_enable);
- bool is_close_button_visible() const;
+ void set_selected(bool p_selected);
+ bool is_selected();
- int get_connection_input_count() ;
- int get_connection_output_count() ;
- Vector2 get_connection_input_pos(int p_idx);
- int get_connection_input_type(int p_idx);
- Color get_connection_input_color(int p_idx);
- Vector2 get_connection_output_pos(int p_idx);
- int get_connection_output_type(int p_idx);
- Color get_connection_output_color(int p_idx);
+ void set_drag(bool p_drag);
+ Vector2 get_drag_from();
+ void set_show_close_button(bool p_enable);
+ bool is_close_button_visible() const;
- virtual Size2 get_minimum_size() const;
+ int get_connection_input_count() ;
+ int get_connection_output_count() ;
+ Vector2 get_connection_input_pos(int p_idx);
+ int get_connection_input_type(int p_idx);
+ Color get_connection_input_color(int p_idx);
+ Vector2 get_connection_output_pos(int p_idx);
+ int get_connection_output_type(int p_idx);
+ Color get_connection_output_color(int p_idx);
- GraphNode();
+
+ virtual Size2 get_minimum_size() const;
+
+ GraphNode();
};
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 9a9048e3e5..667dfd4632 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -558,9 +558,11 @@ void make_default_theme() {
// GraphNode
Ref<StyleBoxTexture> graphsb = make_stylebox(graph_node_png,6,24,6,5,16,24,16,5);
+ Ref<StyleBoxTexture> graphsbselected = make_stylebox(graph_node_selected_png,6,24,6,5,16,24,16,5);
//graphsb->set_expand_margin_size(MARGIN_LEFT,10);
//graphsb->set_expand_margin_size(MARGIN_RIGHT,10);
t->set_stylebox("frame","GraphNode", graphsb );
+ t->set_stylebox("selectedframe","GraphNode", graphsbselected );
t->set_constant("separation","GraphNode", 1 );
t->set_icon("port","GraphNode", make_icon( graph_port_png ) );
t->set_icon("close","GraphNode", make_icon( graph_node_close_png ) );
diff --git a/scene/resources/default_theme/graph_node_selected.png b/scene/resources/default_theme/graph_node_selected.png
new file mode 100644
index 0000000000..06a9db4409
--- /dev/null
+++ b/scene/resources/default_theme/graph_node_selected.png
Binary files differ
diff --git a/scene/resources/default_theme/theme_data.h b/scene/resources/default_theme/theme_data.h
index 03d851e749..a00651a0b3 100644
--- a/scene/resources/default_theme/theme_data.h
+++ b/scene/resources/default_theme/theme_data.h
@@ -114,6 +114,11 @@ static const unsigned char graph_node_close_png[]={
};
+static const unsigned char graph_node_selected_png[]={
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0x13,0x7d,0xf7,0x96,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x7,0x12,0x1,0xc,0x6,0x23,0x98,0xc7,0x50,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x2,0x46,0x49,0x44,0x41,0x54,0x58,0xc3,0xed,0x97,0xcd,0x6a,0x13,0x51,0x14,0xc7,0x7f,0xe7,0xce,0x34,0x49,0xd,0xa6,0xb1,0x2a,0xe2,0x7,0x74,0xa1,0x6e,0x4,0x85,0xe2,0x3,0xb8,0x72,0x21,0xba,0x16,0x5c,0xb9,0x16,0x4,0x7d,0x84,0x3e,0x82,0x82,0xe0,0xda,0x95,0x2f,0x60,0x71,0xe1,0xca,0x7,0xd0,0x82,0xa5,0x6e,0xd4,0x45,0xc1,0x8f,0x4a,0x6c,0x9a,0x46,0x62,0x66,0xa6,0x73,0xef,0x71,0xe1,0x4c,0x92,0x99,0x4c,0x93,0x36,0xdd,0xc9,0xfc,0x37,0x77,0x3e,0xee,0xfd,0xdd,0x73,0xfe,0xf7,0xc,0xcc,0x11,0x86,0x12,0xc0,0x0,0x5e,0x32,0xa,0x59,0x29,0xe0,0x0,0x9b,0x8c,0xca,0xc8,0x24,0x3,0x1c,0x3,0x16,0x81,0xd3,0x40,0x3,0x98,0xcb,0x1,0xf6,0x80,0x2e,0xd0,0x2,0xda,0xc0,0x1f,0xc0,0xa5,0xbb,0xd6,0x81,0x4b,0xb,0xc7,0x9b,0xf,0x6a,0xd5,0xda,0xad,0x4a,0xa5,0x7a,0x81,0x2,0x45,0x51,0xf8,0x35,0x8,0x83,0xd7,0xbb,0xbf,0x3b,0xcf,0x81,0xcf,0x40,0x4f,0x92,0x9d,0x96,0x16,0x9b,0x27,0x9f,0x5c,0x5c,0xba,0x7c,0xfb,0xfe,0xcb,0x3b,0x34,0x2b,0x27,0x8a,0xd6,0xd3,0x89,0x76,0x78,0x71,0xef,0x15,0x5f,0x36,0x3f,0xad,0xb6,0x3b,0xdb,0x8f,0x81,0x4d,0x1,0x6a,0xc0,0xf2,0xd9,0x33,0xe7,0xdf,0xac,0xbc,0x7d,0x54,0xdf,0x73,0x11,0x81,0xed,0x17,0x2,0x6a,0xde,0x3c,0x73,0xa6,0xc2,0xca,0x8d,0xa7,0xbd,0x1f,0x3f,0xbf,0xdd,0x4,0xd6,0xfc,0xc4,0x87,0xba,0xef,0xf9,0xf5,0x6e,0xb4,0xc3,0x24,0xf5,0xe3,0x1e,0x7d,0x7a,0xf8,0x9e,0x5f,0x4f,0xd2,0x96,0x14,0xe0,0x1,0x58,0xb5,0x39,0xdb,0x1d,0x82,0x19,0x5c,0xe7,0xe4,0xa5,0x0,0x4d,0x8f,0x44,0x71,0xa8,0x2a,0x22,0x92,0x81,0x4c,0x92,0x3f,0x7a,0xe3,0xd4,0xe2,0x54,0x41,0xc1,0x13,0xf,0xc5,0xe1,0x54,0x31,0x22,0x8,0xa6,0x10,0x96,0x1,0x58,0x1d,0x4e,0x88,0x35,0x1e,0x79,0x9e,0xd6,0xd0,0x94,0x8,0x54,0xb3,0x93,0x1c,0x8a,0x41,0x6,0x63,0xfa,0x6c,0x5f,0x40,0xe4,0xa2,0xcc,0x4b,0x23,0x32,0xd8,0x37,0x4e,0x52,0x99,0x1c,0x41,0x2e,0x4c,0x9b,0xdd,0x6c,0xec,0xbe,0x20,0x5,0xe5,0xb0,0xca,0x99,0x68,0x93,0x48,0x14,0x41,0x30,0x22,0x3,0x63,0x5,0x41,0x51,0x3c,0x31,0x93,0x8f,0x31,0xf3,0xed,0x6a,0xf6,0x5b,0xfe,0xe7,0x85,0x9b,0x0,0x98,0x52,0x34,0x7,0x2a,0xa4,0xb4,0x74,0x8b,0x4c,0x2d,0x2a,0xa6,0xb1,0x42,0x32,0x8c,0x1b,0x39,0x3c,0x7b,0x37,0xbd,0x90,0xec,0x51,0x52,0x88,0x5d,0x3c,0x36,0x21,0xd,0x39,0x4d,0x4d,0x72,0xc5,0x94,0x1,0xac,0xde,0x7d,0x3f,0xbb,0x89,0xf1,0x9e,0x65,0xf9,0xea,0xf5,0x3,0x2d,0x5a,0x5b,0x7f,0x57,0x1c,0xc1,0x6e,0xb7,0x73,0xe8,0x8,0xc,0x47,0x54,0x9,0x28,0x1,0x25,0xa0,0x4,0x94,0x80,0x12,0x50,0x2,0xfe,0x4b,0x80,0x14,0xf4,0x88,0x87,0x8e,0xc0,0xcd,0xb0,0xd6,0xa5,0x0,0x7,0x4,0xd6,0xda,0xb0,0xe0,0x27,0x6d,0x7c,0x55,0xc,0xd6,0xda,0x10,0x8,0x0,0x67,0x92,0x56,0x76,0x3b,0x8,0xfb,0x1b,0xad,0xf6,0x16,0x93,0x20,0x2e,0x86,0x56,0x7b,0x8b,0x20,0xec,0x6f,0x0,0xdb,0x80,0x4d,0x3b,0xd7,0x5,0xe0,0x5a,0xa3,0xde,0x7c,0x56,0xab,0xce,0x5f,0xf1,0x3c,0xaf,0xd0,0x5c,0x6b,0xad,0xb,0xc2,0xfe,0xc7,0x6e,0xaf,0xf3,0x10,0xf8,0x0,0xec,0xca,0x48,0xb,0xd7,0x0,0xce,0x1,0xa7,0x80,0xea,0x3e,0xcd,0x77,0x8,0xfc,0x2,0xbe,0x27,0x7d,0xb4,0x95,0x9c,0xa1,0x7e,0xda,0xf,0xee,0x93,0x85,0x26,0x29,0xc7,0x33,0x1a,0x3f,0xae,0xbf,0xf0,0x27,0xf6,0x42,0xf6,0xf5,0xfd,0xae,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+};
+
+
static const unsigned char graph_port_png[]={
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x6,0x0,0x0,0x0,0x8d,0x32,0xcf,0xbd,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0xc,0x14,0x17,0x20,0x3,0xeb,0x8f,0x3a,0xdb,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x65,0x49,0x44,0x41,0x54,0x18,0xd3,0x4d,0xd0,0x4f,0x6b,0xda,0x70,0x1c,0x7,0xe0,0xcf,0x37,0x7f,0x7e,0x49,0x66,0xd2,0x64,0x61,0x5,0x61,0x76,0x47,0xf1,0xa4,0x2d,0xdb,0x75,0x5,0x11,0x84,0xb0,0x5e,0xeb,0xd9,0xeb,0xf4,0x6d,0xec,0x2d,0xf8,0x26,0xb6,0x77,0xe0,0x45,0xba,0xa3,0x6c,0xa0,0x3b,0xad,0x39,0xb6,0x36,0x8,0x1b,0x4b,0x32,0xd2,0xc6,0x6c,0x9a,0x4f,0x4f,0x85,0x3e,0x2f,0xe1,0x11,0x0,0x20,0x29,0xd3,0xe9,0xd4,0xda,0x6e,0xb7,0x23,0xdf,0xf7,0xbb,0x0,0x90,0xe7,0xf9,0x8f,0x66,0xb3,0xf9,0x79,0x36,0x9b,0x55,0x22,0x42,0x83,0xa4,0x44,0x51,0xf4,0xea,0xe2,0xe2,0xc3,0xf7,0xf1,0x78,0xdc,0xa,0x82,0x40,0x8,0x20,0xcf,0x32,0x2e,0x97,0xcb,0x4f,0x51,0x14,0xbd,0x25,0xf9,0x5b,0x26,0x93,0x89,0xdd,0xe9,0x74,0xe2,0xf7,0xe7,0xe7,0x27,0x59,0xfa,0x87,0x65,0xb9,0x13,0x0,0xb0,0x1d,0x9b,0xe1,0xcb,0x50,0xbe,0x5e,0x5d,0xdd,0xfe,0xbc,0xbe,0x6e,0x6b,0x49,0x92,0x8c,0x4e,0x7b,0xa7,0xad,0xbf,0x79,0x4e,0xd3,0x54,0x12,0x86,0x21,0xc2,0x30,0x84,0x32,0x95,0xe4,0x79,0xc6,0xde,0xd9,0x59,0x2b,0x49,0xee,0x46,0x86,0xeb,0xba,0x5d,0xfb,0x85,0x23,0x87,0xfd,0x1e,0xb6,0xed,0x40,0xd7,0x35,0x0,0x40,0x7d,0x38,0xa0,0xdc,0xed,0x44,0x37,0x74,0xb8,0xae,0xd7,0x35,0x48,0x62,0xff,0xff,0x1f,0xfc,0x20,0x80,0xae,0xe9,0x78,0x42,0x0,0xca,0xb2,0x90,0x65,0x19,0x58,0xd7,0xd0,0x8a,0xa2,0x58,0xa7,0x69,0x56,0x6b,0xa2,0x51,0x29,0x5,0xcb,0x52,0xb0,0x94,0x5,0x4b,0x29,0x88,0x8,0xd3,0x34,0xad,0x8b,0xfb,0x62,0xad,0xf,0x6,0x83,0xb8,0xaa,0xaa,0xb1,0xe7,0x79,0xbe,0x77,0x74,0x44,0xb7,0xe1,0x89,0x69,0x1a,0x28,0xcb,0x92,0x9b,0xcd,0x46,0x56,0xab,0xd5,0x86,0xe4,0x47,0x21,0x29,0xc3,0xe1,0xf0,0xb8,0xdf,0xef,0x7f,0x6b,0xb7,0xdb,0xaf,0x1b,0x8d,0x86,0x46,0x10,0xf,0xf7,0xf,0x75,0x1c,0xc7,0x77,0x8b,0xc5,0xe2,0xdd,0x7c,0x3e,0xff,0x25,0xcf,0xc3,0x6f,0x6e,0x6f,0x2e,0x1d,0xdb,0xe9,0x9,0x80,0xb2,0x2a,0xd7,0x27,0xad,0x37,0x5f,0x9e,0xc2,0x1f,0x1,0x3a,0xe6,0xa5,0x7b,0xef,0xf2,0xf3,0xcd,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};