diff --git a/src/color.c b/src/color.c index c75c3cf..90c6be9 100644 --- a/src/color.c +++ b/src/color.c @@ -59,9 +59,9 @@ t_color choose_color(t_line *line, t_swap *s, t_FDF *FDF) void first_color(t_pnt *pnt, float z, t_map *map) { - if (z == map->z_min) + if (z == 0) pnt->color = int_to_color(COLOR1); - if (z == map->z_max) + if (z == map->z_max - map->z_min) pnt->color = int_to_color(COLOR2); else pnt->color = color_lerp( diff --git a/src/pnt_init.c b/src/pnt_init.c index 37648db..f779249 100644 --- a/src/pnt_init.c +++ b/src/pnt_init.c @@ -2,27 +2,26 @@ void pnt_init(t_map *map) { - t_pnt **arr_pnt; t_list *lst_map; int i; int j; float z; + lst_map = map->lst_map; - arr_pnt = malloc(sizeof(t_pnt *) * (map->y_max + 1)); + map->arr_pnt = malloc(sizeof(t_pnt *) * (map->y_max + 1)); i = 0; - while (i <= map->y_max) + while (i <= map->y_max && lst_map) { + map->arr_pnt[i] = malloc(sizeof(t_pnt) * (map->x_max + 1)); j = 0; - arr_pnt[i] = malloc(sizeof(t_pnt) * (map->x_max + 1)); while (j <= map->x_max) { - z = ((t_vec *)(lst_map->content))->z; - arr_pnt[i][j].z = z; - first_color(&arr_pnt[i][j], z, map); + z = ((t_vec *)(lst_map->content))->z - map->z_min; + map->arr_pnt[i][j].z = z; + first_color(&map->arr_pnt[i][j], z, map); lst_map = lst_map->next; j++; } i++; } - map->arr_pnt = arr_pnt; } diff --git a/src/render.c b/src/render.c index 09bd15b..dfa237d 100644 --- a/src/render.c +++ b/src/render.c @@ -167,7 +167,7 @@ void render(t_FDF *FDF) mat4_x_rot(rot_x, 30); mat4_z_rot(rot_z, -45); mat4_y_rot(rot_y, -20); - mat4_scale(scale, 0.9, 0.9, 0.1); + mat4_scale(scale, 0.9, 0.9, 0.4); mat4_translate( translate, (((double)FDF->map->x_max) / 2.0f), diff --git a/tests/pylone.fdf b/tests/pylone.fdf index b09ecd0..6520cf2 100644 --- a/tests/pylone.fdf +++ b/tests/pylone.fdf @@ -17,7 +17,7 @@ 0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -1 -1 -1 -1 -1 -2 -2 -2 -2 -2 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -3 -3 -3 -3 -3 -3 -3 -3 -3 -3 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0 -0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -3 -4 -4 -4 -4 -4 -4 -4 -4 -3 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 +0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -3 -4 -4 -4 -4 -4 -4 -4 -4 -3 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -3 -4 -5 -5 -5 -5 -5 -5 -4 -3 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -3 -4 -5 -6 -6 -6 -6 -5 -4 -3 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 6 5 4 3 2 1 -1 -2 -3 -4 -5 -6 -7 -7 -6 -5 -4 -3 -2 -1 1 2 3 4 5 6 7 6 5 4 3 2 1 0 0 0 0