godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIx visual issues with GraphEdit minimap

Browse Source
This commit is contained in:
Yuri Sizov 2020-12-17 20:40:32 +03:00
parent 2c0d1c3b91
commit f5bcbd8325
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/GraphEdit.xml
View File

@ -178,7 +178,7 @@
<member name="minimap_enabled" type="bool" setter="set_minimap_enabled" getter="is_minimap_enabled" default="true"> <member name="minimap_enabled" type="bool" setter="set_minimap_enabled" getter="is_minimap_enabled" default="true">
If [code]true[/code], the minimap is visible. If [code]true[/code], the minimap is visible.
</member> </member>
<member name="minimap_opacity" type="float" setter="set_minimap_opacity" getter="get_minimap_opacity" default="0.45"> <member name="minimap_opacity" type="float" setter="set_minimap_opacity" getter="get_minimap_opacity" default="0.65">
The opacity of the minimap rectangle. The opacity of the minimap rectangle.
</member> </member>
<member name="minimap_size" type="Vector2" setter="set_minimap_size" getter="get_minimap_size" default="Vector2(240, 160)"> <member name="minimap_size" type="Vector2" setter="set_minimap_size" getter="get_minimap_size" default="Vector2(240, 160)">

26
scene/gui/graph_edit.cpp
View File

@ -392,6 +392,7 @@ void GraphEdit::add_child_notify(Node *p_child) {
gn->connect("offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved), varray(gn)); gn->connect("offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved), varray(gn));
gn->connect("raise_request", callable_mp(this, &GraphEdit::_graph_node_raised), varray(gn)); gn->connect("raise_request", callable_mp(this, &GraphEdit::_graph_node_raised), varray(gn));
gn->connect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::update)); gn->connect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::update));
gn->connect("item_rect_changed", callable_mp((CanvasItem *)minimap, &GraphEditMinimap::update));
_graph_node_moved(gn); _graph_node_moved(gn);
gn->set_mouse_filter(MOUSE_FILTER_PASS); gn->set_mouse_filter(MOUSE_FILTER_PASS);
} }
@ -409,6 +410,7 @@ void GraphEdit::remove_child_notify(Node *p_child) {
gn->disconnect("offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved)); gn->disconnect("offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved));
gn->disconnect("raise_request", callable_mp(this, &GraphEdit::_graph_node_raised)); gn->disconnect("raise_request", callable_mp(this, &GraphEdit::_graph_node_raised));
gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::update)); gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)connections_layer, &CanvasItem::update));
gn->disconnect("item_rect_changed", callable_mp((CanvasItem *)minimap, &GraphEditMinimap::update));
} }
} }
@ -782,7 +784,7 @@ void GraphEdit::_bake_segment2d(Vector<Vector2> &points, Vector<Color> &colors,
} }
} }
void GraphEdit::_draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color, float p_bezier_ratio) { void GraphEdit::_draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color, float p_width = 2.0, float p_bezier_ratio = 1.0) {
//cubic bezier code //cubic bezier code
float diff = p_to.x - p_from.x; float diff = p_to.x - p_from.x;
float cp_offset; float cp_offset;
@ -809,9 +811,9 @@ void GraphEdit::_draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const
colors.push_back(p_to_color); colors.push_back(p_to_color);
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
p_where->draw_polyline_colors(points, colors, Math::floor(2 * EDSCALE), true); p_where->draw_polyline_colors(points, colors, Math::floor(p_width * EDSCALE), true);
#else #else
p_where->draw_polyline_colors(points, colors, 2, true); p_where->draw_polyline_colors(points, colors, p_width, true);
#endif #endif
} }
@ -858,7 +860,7 @@ void GraphEdit::_connections_layer_draw() {
color = color.lerp(activity_color, E->get().activity); color = color.lerp(activity_color, E->get().activity);
tocolor = tocolor.lerp(activity_color, E->get().activity); tocolor = tocolor.lerp(activity_color, E->get().activity);
} }
_draw_cos_line(connections_layer, frompos, topos, color, tocolor, 1.0); _draw_cos_line(connections_layer, frompos, topos, color, tocolor);
} }
while (to_erase.size()) { while (to_erase.size()) {
@ -897,7 +899,7 @@ void GraphEdit::_top_layer_draw() {
if (!connecting_out) { if (!connecting_out) {
SWAP(pos, topos); SWAP(pos, topos);
} }
_draw_cos_line(top_layer, pos, topos, col, col, 1.0); _draw_cos_line(top_layer, pos, topos, col, col);
} }
if (box_selecting) { if (box_selecting) {
@ -990,18 +992,18 @@ void GraphEdit::_minimap_draw() {
continue; continue;
} }
Vector2 from_slot_position = gfrom->get_offset() + gfrom->get_connection_output_position(E->get().from_port); Vector2 from_slot_position = gfrom->get_offset() * zoom + gfrom->get_connection_output_position(E->get().from_port);
Vector2 from_position = minimap->_convert_from_graph_position(from_slot_position * zoom - graph_offset) + minimap_offset; Vector2 from_position = minimap->_convert_from_graph_position(from_slot_position - graph_offset) + minimap_offset;
Color from_color = gfrom->get_connection_output_color(E->get().from_port); Color from_color = gfrom->get_connection_output_color(E->get().from_port);
Vector2 to_slot_position = gto->get_offset() + gto->get_connection_input_position(E->get().to_port); Vector2 to_slot_position = gto->get_offset() * zoom + gto->get_connection_input_position(E->get().to_port);
Vector2 to_position = minimap->_convert_from_graph_position(to_slot_position * zoom - graph_offset) + minimap_offset; Vector2 to_position = minimap->_convert_from_graph_position(to_slot_position - graph_offset) + minimap_offset;
Color to_color = gto->get_connection_input_color(E->get().to_port); Color to_color = gto->get_connection_input_color(E->get().to_port);
if (E->get().activity > 0) { if (E->get().activity > 0) {
from_color = from_color.lerp(activity_color, E->get().activity); from_color = from_color.lerp(activity_color, E->get().activity);
to_color = to_color.lerp(activity_color, E->get().activity); to_color = to_color.lerp(activity_color, E->get().activity);
} }
_draw_cos_line(minimap, from_position, to_position, from_color, to_color, 0.5); _draw_cos_line(minimap, from_position, to_position, from_color, to_color, 1.0, 0.5);
} }
// Draw the "camera" viewport. // Draw the "camera" viewport.
@ -1495,8 +1497,6 @@ void GraphEdit::_snap_value_changed(double) {
update(); update();
} }
// _minimap_toggled
void GraphEdit::set_minimap_size(Vector2 p_size) { void GraphEdit::set_minimap_size(Vector2 p_size) {
minimap->set_size(p_size); minimap->set_size(p_size);
Vector2 minimap_size = minimap->get_size(); // The size might've been adjusted by the minimum size. Vector2 minimap_size = minimap->get_size(); // The size might've been adjusted by the minimum size.
@ -1709,7 +1709,7 @@ GraphEdit::GraphEdit() {
zoom_hb->add_child(minimap_button); zoom_hb->add_child(minimap_button);
Vector2 minimap_size = Vector2(240, 160); Vector2 minimap_size = Vector2(240, 160);
float minimap_opacity = 0.45; float minimap_opacity = 0.65;
minimap = memnew(GraphEditMinimap(this)); minimap = memnew(GraphEditMinimap(this));
top_layer->add_child(minimap); top_layer->add_child(minimap);

2
scene/gui/graph_edit.h
View File

@ -160,7 +160,7 @@ private:
void _bake_segment2d(Vector<Vector2> &points, Vector<Color> &colors, float p_begin, float p_end, const Vector2 &p_a, const Vector2 &p_out, const Vector2 &p_b, const Vector2 &p_in, int p_depth, int p_min_depth, int p_max_depth, float p_tol, const Color &p_color, const Color &p_to_color, int &lines) const; void _bake_segment2d(Vector<Vector2> &points, Vector<Color> &colors, float p_begin, float p_end, const Vector2 &p_a, const Vector2 &p_out, const Vector2 &p_b, const Vector2 &p_in, int p_depth, int p_min_depth, int p_max_depth, float p_tol, const Color &p_color, const Color &p_to_color, int &lines) const;
void _draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color, float p_bezier_ratio); void _draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color, float p_width, float p_bezier_ratio);
void _graph_node_raised(Node *p_gn); void _graph_node_raised(Node *p_gn);
void _graph_node_moved(Node *p_gn); void _graph_node_moved(Node *p_gn);