godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Merge pull request #32119 from Calinou/unify-axis-colors

Browse Source 
Use the same axis colors consistently in the 2D and 3D editors
This commit is contained in:
Rémi Verschelde
2019-09-25 13:03:47 +02:00
committed by GitHub
parent 9b8c355eab c2bcc3f700
commit 076dc9803a
6 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/spatial_editor_gizmos.cpp
View File

@@ -1560,12 +1560,12 @@ Position3DSpatialGizmoPlugin::Position3DSpatialGizmoPlugin() {
cursor_points.push_back(Vector3(0, -cs, 0));
cursor_points.push_back(Vector3(0, 0, +cs));
cursor_points.push_back(Vector3(0, 0, -cs));
cursor_colors.push_back(Color(1, 0.5, 0.5, 0.7));
cursor_colors.push_back(Color(1, 0.5, 0.5, 0.7));
cursor_colors.push_back(Color(0.5, 1, 0.5, 0.7));
cursor_colors.push_back(Color(0.5, 1, 0.5, 0.7));
cursor_colors.push_back(Color(0.5, 0.5, 1, 0.7));
cursor_colors.push_back(Color(0.5, 0.5, 1, 0.7));
cursor_colors.push_back(EditorNode::get_singleton()->get_gui_base()->get_color("axis_x_color", "Editor"));
cursor_colors.push_back(EditorNode::get_singleton()->get_gui_base()->get_color("axis_x_color", "Editor"));
cursor_colors.push_back(EditorNode::get_singleton()->get_gui_base()->get_color("axis_y_color", "Editor"));
cursor_colors.push_back(EditorNode::get_singleton()->get_gui_base()->get_color("axis_y_color", "Editor"));
cursor_colors.push_back(EditorNode::get_singleton()->get_gui_base()->get_color("axis_z_color", "Editor"));
cursor_colors.push_back(EditorNode::get_singleton()->get_gui_base()->get_color("axis_z_color", "Editor"));
Ref<SpatialMaterial> mat = memnew(SpatialMaterial);
mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);