From a1005c60bfad39e6a2908d5f72e1ccefcc6ce429 Mon Sep 17 00:00:00 2001 From: Valentin Stark Date: Fri, 19 Aug 2022 22:36:36 +0200 Subject: [PATCH] correspondance entre la map 2d et l'affichage 3d --- ui/map/map.gd | 4 ++-- world/game.gd | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/map/map.gd b/ui/map/map.gd index 4c72cb4..4e76e7c 100644 --- a/ui/map/map.gd +++ b/ui/map/map.gd @@ -10,9 +10,9 @@ func heightmap(): colors.add_point(0.999, Color("#9e0142")) # red colors.add_point(0.5, Color("#dc865d")) # orange colors.add_point(0.25, Color("#fbf8b0")) # yellow - colors.add_point(0, Color("#89cfa5")) # green + colors.add_point(0.0, Color("#89cfa5")) # green colors.add_point(-0.999, Color("#5e4fa2")) # blue - var color = colors.interpolate(min(triangle.get_elevation(), 0.999)) + var color = colors.interpolate(min(triangle.get_elevation()+0.001, 0.999)) if triangle.get_data("ocean"): var factor = pow((triangle.get_elevation()+1), 10) / 5.0 color = Color("#5e4fa2") + Color(factor, factor, factor, 0.0) diff --git a/world/game.gd b/world/game.gd index 4fd0c80..e4830c9 100644 --- a/world/game.gd +++ b/world/game.gd @@ -64,7 +64,6 @@ func init_data(): # triangle.set_data("elevation", triangle_find_elevation(triangle)) triangle.set_data("water", triangle_is_water(triangle)) triangle.set_data("ocean", false) - # TODO #1 : Get triangles around point for point in triangle.points(): if point.get_data("ocean"): triangle.set_data("ocean", true)