mirror of
https://github.com/godotengine/godot
synced 2024-09-05 07:39:34 +00:00
Improve viewport rotation gizmo drawing
This commit is contained in:
parent
374807f427
commit
a9ef6cd418
|
@ -325,11 +325,11 @@ void ViewportRotationControl::_notification(int p_what) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void ViewportRotationControl::_draw() {
|
void ViewportRotationControl::_draw() {
|
||||||
const Vector2i center = get_size() / 2.0;
|
const Vector2 center = get_size() / 2.0;
|
||||||
const real_t radius = get_size().x / 2.0;
|
const real_t radius = get_size().x / 2.0;
|
||||||
|
|
||||||
if (focused_axis > -2 || orbiting_index != -1) {
|
if (focused_axis > -2 || orbiting_index != -1) {
|
||||||
draw_circle(center, radius, Color(0.5, 0.5, 0.5, 0.25));
|
draw_circle(center, radius, Color(0.5, 0.5, 0.5, 0.25), true, -1.0, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector<Axis2D> axis_to_draw;
|
Vector<Axis2D> axis_to_draw;
|
||||||
|
@ -345,34 +345,42 @@ void ViewportRotationControl::_draw_axis(const Axis2D &p_axis) {
|
||||||
const int direction = p_axis.axis % 3;
|
const int direction = p_axis.axis % 3;
|
||||||
|
|
||||||
const Color axis_color = axis_colors[direction];
|
const Color axis_color = axis_colors[direction];
|
||||||
const double alpha = focused ? 1.0 : ((p_axis.z_axis + 1.0) / 2.0) * 0.5 + 0.5;
|
const double min_alpha = 0.35;
|
||||||
const Color c = focused ? Color(0.9, 0.9, 0.9) : Color(axis_color, alpha);
|
const double alpha = focused ? 1.0 : Math::remap((p_axis.z_axis + 1.0) / 2.0, 0, 0.5, min_alpha, 1.0);
|
||||||
|
const Color c = focused ? Color(axis_color.lightened(0.75), 1.0) : Color(axis_color, alpha);
|
||||||
|
|
||||||
if (positive) {
|
if (positive) {
|
||||||
// Draw axis lines for the positive axes.
|
// Draw axis lines for the positive axes.
|
||||||
const Vector2i center = get_size() / 2.0;
|
const Vector2 center = get_size() / 2.0;
|
||||||
draw_line(center, p_axis.screen_point, c, 1.5 * EDSCALE);
|
const Vector2 diff = p_axis.screen_point - center;
|
||||||
|
const float line_length = MAX(diff.length() - AXIS_CIRCLE_RADIUS - 0.5 * EDSCALE, 0);
|
||||||
|
|
||||||
draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS, c);
|
draw_line(center + diff.limit_length(0.5 * EDSCALE), center + diff.limit_length(line_length), c, 1.5 * EDSCALE, true);
|
||||||
|
|
||||||
|
draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS, c, true, -1.0, true);
|
||||||
|
|
||||||
// Draw the axis letter for the positive axes.
|
// Draw the axis letter for the positive axes.
|
||||||
const String axis_name = direction == 0 ? "X" : (direction == 1 ? "Y" : "Z");
|
const String axis_name = direction == 0 ? "X" : (direction == 1 ? "Y" : "Z");
|
||||||
draw_char(get_theme_font(SNAME("rotation_control"), EditorStringName(EditorFonts)), p_axis.screen_point + Vector2i(Math::round(-4.0 * EDSCALE), Math::round(5.0 * EDSCALE)), axis_name, get_theme_font_size(SNAME("rotation_control_size"), EditorStringName(EditorFonts)), Color(0.0, 0.0, 0.0, alpha));
|
const Ref<Font> &font = get_theme_font(SNAME("rotation_control"), EditorStringName(EditorFonts));
|
||||||
|
const int font_size = get_theme_font_size(SNAME("rotation_control_size"), EditorStringName(EditorFonts));
|
||||||
|
const Size2 char_size = font->get_char_size(axis_name[0], font_size);
|
||||||
|
const Vector2 char_offset = Vector2(-char_size.width / 2.0, char_size.height * 0.25);
|
||||||
|
draw_char(font, p_axis.screen_point + char_offset, axis_name, font_size, Color(0.0, 0.0, 0.0, alpha * 0.6));
|
||||||
} else {
|
} else {
|
||||||
// Draw an outline around the negative axes.
|
// Draw an outline around the negative axes.
|
||||||
draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS, c);
|
draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS, c, true, -1.0, true);
|
||||||
draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS * 0.8, c.darkened(0.4));
|
draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS * 0.8, c.darkened(0.4), true, -1.0, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) {
|
void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) {
|
||||||
const Vector2i center = get_size() / 2.0;
|
const Vector2 center = get_size() / 2.0;
|
||||||
const real_t radius = get_size().x / 2.0 - AXIS_CIRCLE_RADIUS - 2.0 * EDSCALE;
|
const real_t radius = get_size().x / 2.0 - AXIS_CIRCLE_RADIUS - 2.0 * EDSCALE;
|
||||||
const Basis camera_basis = viewport->to_camera_transform(viewport->cursor).get_basis().inverse();
|
const Basis camera_basis = viewport->to_camera_transform(viewport->cursor).get_basis().inverse();
|
||||||
|
|
||||||
for (int i = 0; i < 3; ++i) {
|
for (int i = 0; i < 3; ++i) {
|
||||||
Vector3 axis_3d = camera_basis.get_column(i);
|
Vector3 axis_3d = camera_basis.get_column(i);
|
||||||
Vector2i axis_vector = Vector2(axis_3d.x, -axis_3d.y) * radius;
|
Vector2 axis_vector = Vector2(axis_3d.x, -axis_3d.y) * radius;
|
||||||
|
|
||||||
if (Math::abs(axis_3d.z) <= 1.0) {
|
if (Math::abs(axis_3d.z) <= 1.0) {
|
||||||
Axis2D pos_axis;
|
Axis2D pos_axis;
|
||||||
|
@ -5432,6 +5440,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
|
||||||
frame_time_gradient->add_point(0.5, Color());
|
frame_time_gradient->add_point(0.5, Color());
|
||||||
|
|
||||||
top_right_vbox = memnew(VBoxContainer);
|
top_right_vbox = memnew(VBoxContainer);
|
||||||
|
top_right_vbox->add_theme_constant_override("separation", 10.0 * EDSCALE);
|
||||||
top_right_vbox->set_anchors_and_offsets_preset(PRESET_TOP_RIGHT, PRESET_MODE_MINSIZE, 10.0 * EDSCALE);
|
top_right_vbox->set_anchors_and_offsets_preset(PRESET_TOP_RIGHT, PRESET_MODE_MINSIZE, 10.0 * EDSCALE);
|
||||||
top_right_vbox->set_h_grow_direction(GROW_DIRECTION_BEGIN);
|
top_right_vbox->set_h_grow_direction(GROW_DIRECTION_BEGIN);
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ class ViewportRotationControl : public Control {
|
||||||
GDCLASS(ViewportRotationControl, Control);
|
GDCLASS(ViewportRotationControl, Control);
|
||||||
|
|
||||||
struct Axis2D {
|
struct Axis2D {
|
||||||
Vector2i screen_point;
|
Vector2 screen_point;
|
||||||
float z_axis = -99.0;
|
float z_axis = -99.0;
|
||||||
int axis = -1;
|
int axis = -1;
|
||||||
};
|
};
|
||||||
|
|
|
@ -443,7 +443,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
|
||||||
p_theme->set_font("rulers", EditorStringName(EditorFonts), default_fc);
|
p_theme->set_font("rulers", EditorStringName(EditorFonts), default_fc);
|
||||||
|
|
||||||
// Rotation widget font
|
// Rotation widget font
|
||||||
p_theme->set_font_size("rotation_control_size", EditorStringName(EditorFonts), 14 * EDSCALE);
|
p_theme->set_font_size("rotation_control_size", EditorStringName(EditorFonts), 13 * EDSCALE);
|
||||||
p_theme->set_font("rotation_control", EditorStringName(EditorFonts), default_fc);
|
p_theme->set_font("rotation_control", EditorStringName(EditorFonts), default_fc);
|
||||||
|
|
||||||
// Code font
|
// Code font
|
||||||
|
|
Loading…
Reference in a new issue