godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Improve the 3D manipulator gizmo

Browse Source 
Its size now takes into account the editor scale and the viewport's
half resolution setting. It is now also more detailed.
This commit is contained in:
Hugo Locurcio
2018-08-09 16:34:18 +02:00
parent a71a5fc0c3
commit dcca20027c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/plugins/spatial_editor_plugin.cpp
View File

@@ -2867,7 +2867,7 @@ void SpatialEditorViewport::update_transform_gizmo_view() {
dd = 0.0001; dd = 0.0001;
float gsize = EditorSettings::get_singleton()->get("editors/3d/manipulator_gizmo_size"); float gsize = EditorSettings::get_singleton()->get("editors/3d/manipulator_gizmo_size");
gizmo_scale = (gsize / Math::abs(dd)); gizmo_scale = (gsize / Math::abs(dd)) * MAX(1, EDSCALE) / viewport_container->get_stretch_shrink();
Vector3 scale = Vector3(1, 1, 1) * gizmo_scale; Vector3 scale = Vector3(1, 1, 1) * gizmo_scale;
xform.basis.scale(scale); xform.basis.scale(scale);
@@ -4519,9 +4519,9 @@ void SpatialEditor::_init_indicators() {
nivec * 0.0 + ivec * (GIZMO_ARROW_OFFSET + GIZMO_ARROW_SIZE), nivec * 0.0 + ivec * (GIZMO_ARROW_OFFSET + GIZMO_ARROW_SIZE),
}; };
int arrow_sides = 6; int arrow_sides = 16;
for (int k = 0; k < 6; k++) { for (int k = 0; k < arrow_sides; k++) {
Basis ma(ivec, Math_PI * 2 * float(k) / arrow_sides); Basis ma(ivec, Math_PI * 2 * float(k) / arrow_sides);
Basis mb(ivec, Math_PI * 2 * float(k + 1) / arrow_sides); Basis mb(ivec, Math_PI * 2 * float(k + 1) / arrow_sides);
@@ -4605,10 +4605,10 @@ void SpatialEditor::_init_indicators() {
ivec * 0.02 + ivec2 * 0.02 + ivec2 * GIZMO_CIRCLE_SIZE, ivec * 0.02 + ivec2 * 0.02 + ivec2 * GIZMO_CIRCLE_SIZE,
}; };
for (int k = 0; k < 32; k++) { for (int k = 0; k < 64; k++) {
Basis ma(ivec, Math_PI * 2 * float(k) / 32); Basis ma(ivec, Math_PI * 2 * float(k) / 64);
Basis mb(ivec, Math_PI * 2 * float(k + 1) / 32); Basis mb(ivec, Math_PI * 2 * float(k + 1) / 64);
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {