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

Merge pull request #18525 from Calinou/improve-3d-grid

Browse Source 
Improve the 3D editor grid
This commit is contained in:
Juan Linietsky
2018-05-07 13:09:03 -03:00
committed by GitHub
parent 4db0da0fcc 098f9b51b5
commit d8ea68195a
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editor/plugins/spatial_editor_plugin.cpp
View File

@@ -4598,7 +4598,10 @@ void SpatialEditor::_init_grid() {
PoolVector<Color> grid_colors[3];
PoolVector<Vector3> grid_points[3];
Color grid_color = EditorSettings::get_singleton()->get("editors/3d/grid_color");
Color primary_grid_color = EditorSettings::get_singleton()->get("editors/3d/primary_grid_color");
Color secondary_grid_color = EditorSettings::get_singleton()->get("editors/3d/secondary_grid_color");
int grid_size = EditorSettings::get_singleton()->get("editors/3d/grid_size");
int primary_grid_steps = EditorSettings::get_singleton()->get("editors/3d/primary_grid_steps");
for (int i = 0; i < 3; i++) {
Vector3 axis;
@@ -4608,19 +4611,17 @@ void SpatialEditor::_init_grid() {
Vector3 axis_n2;
axis_n2[(i + 2) % 3] = 1;
#define ORIGIN_GRID_SIZE 50
for (int j = -ORIGIN_GRID_SIZE; j <= ORIGIN_GRID_SIZE; j++) {
Vector3 p1 = axis_n1 * j + axis_n2 * -ORIGIN_GRID_SIZE;
for (int j = -grid_size; j <= grid_size; j++) {
Vector3 p1 = axis_n1 * j + axis_n2 * -grid_size;
Vector3 p1_dest = p1 * (-axis_n2 + axis_n1);
Vector3 p2 = axis_n2 * j + axis_n1 * -ORIGIN_GRID_SIZE;
Vector3 p2 = axis_n2 * j + axis_n1 * -grid_size;
Vector3 p2_dest = p2 * (-axis_n1 + axis_n2);
Color line_color = grid_color;
Color line_color = secondary_grid_color;
if (j == 0) {
continue;
} else if (j % 10 == 0) {
line_color *= 1.5;
} else if (j % primary_grid_steps == 0) {
line_color = primary_grid_color;
}
grid_points[i].push_back(p1);