From fee555c0062eb9c7b36898bb8ba4cc37f2f99a20 Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Tue, 17 Oct 2023 23:09:08 +0200 Subject: [PATCH] =?UTF-8?q?=C3=87a=20ma=20plait=20bien,=20ces=20fl=C3=A8ch?= =?UTF-8?q?es=20dessin=C3=A9es=20par=20un=20seul=20trait.=20C'est=20lisibl?= =?UTF-8?q?e.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/graphics/arrows.c | 47 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/graphics/arrows.c b/src/graphics/arrows.c index 4211a28..4a9b8f7 100644 --- a/src/graphics/arrows.c +++ b/src/graphics/arrows.c @@ -124,30 +124,33 @@ int write_one_arrow_vertex (int offset_vertex, vy = (2 * j / space_Y_int - 1) * space_Y_int / max + (1 / max), vz = (2 * k / space_Z_int - 1) * space_Z_int / max + (1 / max); - // arrow_basis_width donne la dimension de l'étoile centrale - GLfloat arrow_basis_width = (1 / max) / 5; + // ici, arrow_basis_width = 0 <> Plus d'étoile centrale + GLfloat arrow_basis_width = 0; // (1 / max) / 5; + graphics_write_vertex(vx, vy, vz); + graphics_write_color(0.3f, 0.3f, 0.3f); + // décale légèrement les pointes des flèches // pour qu'elles n'aillent pas jusqu'aux faces des cubes GLfloat arrow_tip_padding = (1 / max) / 10; - // X - X axis - central star (basis) - graphics_write_vertex(vx + arrow_basis_width, vy, vz); - graphics_write_vertex(vx - arrow_basis_width, vy, vz); - graphics_write_color(0.3f, 0.3f, 0.3f); - graphics_write_color(0.3f, 0.3f, 0.3f); + /* // X - X axis - central star (basis) */ + /* graphics_write_vertex(vx + arrow_basis_width, vy, vz); */ + /* graphics_write_vertex(vx - arrow_basis_width, vy, vz); */ + /* graphics_write_color(0.3f, 0.3f, 0.3f); */ + /* graphics_write_color(0.3f, 0.3f, 0.3f); */ - // Y - Y axis - central star (basis) - graphics_write_vertex(vx, vy + arrow_basis_width, vz); - graphics_write_vertex(vx, vy - arrow_basis_width, vz); - graphics_write_color(0.3f, 0.3f, 0.3f); - graphics_write_color(0.3f, 0.3f, 0.3f); + /* // Y - Y axis - central star (basis) */ + /* graphics_write_vertex(vx, vy + arrow_basis_width, vz); */ + /* graphics_write_vertex(vx, vy - arrow_basis_width, vz); */ + /* graphics_write_color(0.3f, 0.3f, 0.3f); */ + /* graphics_write_color(0.3f, 0.3f, 0.3f); */ - // Z - Z axis - central star (basis) - graphics_write_vertex(vx, vy, vz + arrow_basis_width); - graphics_write_vertex(vx, vy, vz - arrow_basis_width); - graphics_write_color(0.3f, 0.3f, 0.3f); - graphics_write_color(0.3f, 0.3f, 0.3f); + /* // Z - Z axis - central star (basis) */ + /* graphics_write_vertex(vx, vy, vz + arrow_basis_width); */ + /* graphics_write_vertex(vx, vy, vz - arrow_basis_width); */ + /* graphics_write_color(0.3f, 0.3f, 0.3f); */ + /* graphics_write_color(0.3f, 0.3f, 0.3f); */ GLfloat nuance = 0.24f; @@ -169,7 +172,7 @@ int write_one_arrow_vertex (int offset_vertex, graphics_write_color(0.0f + nuance * 2, 0.0f + nuance * 2, 1.0f - nuance); graphics_write_color(1.0f - nuance / 3, 1.0f - nuance / 3, 0.0f + nuance); - return 12; + return 7;//12; } @@ -182,13 +185,13 @@ int write_one_arrow_lines(int offset_vertex, /* graphics_write_line (offset_vertex + 4, offset_vertex + 5); */ switch(site){ - case EAST: case WEST: write_arrow_lines_east_west (offset_vertex, weight, site); break; - case ZENITH: case NADIR: write_arrow_lines_zenith_nadir (offset_vertex, weight, site); break; - case SOUTH: case NORTH: write_arrow_lines_south_north (offset_vertex, weight, site); break; + case EAST: case WEST: graphics_write_line (offset_vertex + 0, offset_vertex + 1 + site % 2); break; + case ZENITH: case NADIR: graphics_write_line (offset_vertex + 0, offset_vertex + 3 + site % 2); break; + case SOUTH: case NORTH: graphics_write_line (offset_vertex + 0, offset_vertex + 5 + site % 2); break; default: break; } - return 12; + return 7; }