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

Make bones have more contrast with outline

Browse Source
This commit is contained in:
Juan Linietsky 2018-05-04 11:54:04 -03:00
parent 3bd0ca2a2d
commit e68cbec1fa
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_settings.cpp
View File

@ -454,9 +454,11 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("editors/2d/guides_color", Color(0.6, 0.0, 0.8)); _initial_set("editors/2d/guides_color", Color(0.6, 0.0, 0.8));
_initial_set("editors/2d/bone_width", 5); _initial_set("editors/2d/bone_width", 5);
_initial_set("editors/2d/bone_color1", Color(1.0, 1.0, 1.0, 0.9)); _initial_set("editors/2d/bone_color1", Color(1.0, 1.0, 1.0, 0.9));
_initial_set("editors/2d/bone_color2", Color(0.75, 0.75, 0.75, 0.9)); _initial_set("editors/2d/bone_color2", Color(0.6, 0.6, 0.6, 0.9));
_initial_set("editors/2d/bone_selected_color", Color(0.9, 0.45, 0.45, 0.9)); _initial_set("editors/2d/bone_selected_color", Color(0.9, 0.45, 0.45, 0.9));
_initial_set("editors/2d/bone_ik_color", Color(0.9, 0.9, 0.45, 0.9)); _initial_set("editors/2d/bone_ik_color", Color(0.9, 0.9, 0.45, 0.9));
_initial_set("editors/2d/bone_outline_color", Color(0.35, 0.35, 0.35));
_initial_set("editors/2d/bone_outline_size", 2);
_initial_set("editors/2d/keep_margins_when_changing_anchors", false); _initial_set("editors/2d/keep_margins_when_changing_anchors", false);
_initial_set("editors/2d/warped_mouse_panning", true); _initial_set("editors/2d/warped_mouse_panning", true);
_initial_set("editors/2d/simple_spacebar_panning", false); _initial_set("editors/2d/simple_spacebar_panning", false);

36
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -2586,7 +2586,9 @@ void CanvasItemEditor::_draw_bones() {
Color bone_color1 = EditorSettings::get_singleton()->get("editors/2d/bone_color1"); Color bone_color1 = EditorSettings::get_singleton()->get("editors/2d/bone_color1");
Color bone_color2 = EditorSettings::get_singleton()->get("editors/2d/bone_color2"); Color bone_color2 = EditorSettings::get_singleton()->get("editors/2d/bone_color2");
Color bone_ik_color = EditorSettings::get_singleton()->get("editors/2d/bone_ik_color"); Color bone_ik_color = EditorSettings::get_singleton()->get("editors/2d/bone_ik_color");
Color bone_outline_color = EditorSettings::get_singleton()->get("editors/2d/bone_outline_color");
Color bone_selected_color = EditorSettings::get_singleton()->get("editors/2d/bone_selected_color"); Color bone_selected_color = EditorSettings::get_singleton()->get("editors/2d/bone_selected_color");
int bone_outline_size = EditorSettings::get_singleton()->get("editors/2d/bone_outline_size");
for (Map<ObjectID, BoneList>::Element *E = bone_list.front(); E; E = E->next()) { for (Map<ObjectID, BoneList>::Element *E = bone_list.front(); E; E = E->next()) {
@ -2615,12 +2617,23 @@ void CanvasItemEditor::_draw_bones() {
Vector2 rel = to - from; Vector2 rel = to - from;
Vector2 relt = rel.tangent().normalized() * bone_width; Vector2 relt = rel.tangent().normalized() * bone_width;
Vector2 reln = rel.normalized();
Vector2 reltn = relt.normalized();
Vector<Vector2> bone_shape; Vector<Vector2> bone_shape;
bone_shape.push_back(from); bone_shape.push_back(from);
bone_shape.push_back(from + rel * 0.2 + relt); bone_shape.push_back(from + rel * 0.2 + relt);
bone_shape.push_back(to); bone_shape.push_back(to);
bone_shape.push_back(from + rel * 0.2 - relt); bone_shape.push_back(from + rel * 0.2 - relt);
Vector<Vector2> bone_shape_outline;
bone_shape_outline.push_back(from + (-reln - reltn) * bone_outline_size);
bone_shape_outline.push_back(from + (-reln + reltn) * bone_outline_size);
bone_shape_outline.push_back(from + rel * 0.2 + relt + reltn * bone_outline_size);
bone_shape_outline.push_back(to + (reln + reltn) * bone_outline_size);
bone_shape_outline.push_back(to + (reln - reltn) * bone_outline_size);
bone_shape_outline.push_back(from + rel * 0.2 - relt - reltn * bone_outline_size);
Vector<Color> colors; Vector<Color> colors;
if (pi->has_meta("_edit_ik_")) { if (pi->has_meta("_edit_ik_")) {
@ -2635,14 +2648,25 @@ void CanvasItemEditor::_draw_bones() {
colors.push_back(bone_color2); colors.push_back(bone_color2);
} }
VisualServer::get_singleton()->canvas_item_add_primitive(ci, bone_shape, colors, Vector<Vector2>(), RID()); Vector<Color> outline_colors;
if (editor_selection->is_selected(pi)) { if (editor_selection->is_selected(pi)) {
for (int i = 0; i < bone_shape.size(); i++) { outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
VisualServer::get_singleton()->canvas_item_add_line(ci, bone_shape[i], bone_shape[(i + 1) % bone_shape.size()], bone_selected_color, 2); outline_colors.push_back(bone_selected_color);
} outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
} else {
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
} }
VisualServer::get_singleton()->canvas_item_add_polygon(ci, bone_shape_outline, outline_colors);
VisualServer::get_singleton()->canvas_item_add_primitive(ci, bone_shape, colors, Vector<Vector2>(), RID());
} }
} }
} }