From 1ac803de1c0d9d44972a80872aeb13b6b8e9aac6 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@relintai.net>
Date: Fri, 4 Apr 2025 17:45:11 +0200
Subject: [PATCH] Make use of the VertexLights3DServer in
 TerrainChunkDefault::_bake_lights() if enabled.

---
 .../world/default/terrain_chunk_default.cpp   | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/modules/terraman/world/default/terrain_chunk_default.cpp b/modules/terraman/world/default/terrain_chunk_default.cpp
index f1f477770..d7242e639 100644
--- a/modules/terraman/world/default/terrain_chunk_default.cpp
+++ b/modules/terraman/world/default/terrain_chunk_default.cpp
@@ -49,6 +49,10 @@
 #include "../jobs/terrain_terrain_job.h"
 #include "scene/resources/world_3d.h"
 
+#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
+#include "modules/vertex_lights_3d/vertex_lights_3d_server.h"
+#endif
+
 const String TerrainChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 
 _FORCE_INLINE_ int TerrainChunkDefault::get_build_flags() const {
@@ -752,9 +756,63 @@ void TerrainChunkDefault::_world_transform_changed() {
 void TerrainChunkDefault::_bake_lights() {
 	clear_baked_lights();
 
+#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
+	TerrainWorld *world = get_voxel_world();
+
+	if (world && world->get_use_vertex_lights_3d()) {
+		VertexLights3DServer *vls = VertexLights3DServer::get_singleton();
+		RID map = world->get_world_3d()->get_vertex_lights_3d_map();
+
+		uint8_t *channel_isolevel = channel_get(TerrainChunkDefault::DEFAULT_CHANNEL_ISOLEVEL);
+
+		if (!channel_isolevel) {
+			return;
+		}
+
+		uint8_t *channel_color_r = channel_get(TerrainChunkDefault::DEFAULT_CHANNEL_LIGHT_COLOR_R);
+		uint8_t *channel_color_g = channel_get(TerrainChunkDefault::DEFAULT_CHANNEL_LIGHT_COLOR_G);
+		uint8_t *channel_color_b = channel_get(TerrainChunkDefault::DEFAULT_CHANNEL_LIGHT_COLOR_B);
+
+		ERR_FAIL_COND(channel_color_r == NULL || channel_color_g == NULL || channel_color_b == NULL);
+
+		int64_t dsx = static_cast<int64_t>(_data_size_x);
+		int64_t dsz = static_cast<int64_t>(_data_size_z);
+		Vector2i chunk_world_data_position = Vector2i(_position_x * _size_x, _position_z * _size_z);
+
+		for (int x = 0; x < dsx; ++x) {
+			for (int z = 0; z < dsz; ++z) {
+				int index = get_data_index(x, z);
+
+				Vector2i world_data_pos = Vector2i(
+						chunk_world_data_position.x + x, // - _margin_start  Shouldn't this be required?
+						chunk_world_data_position.y + z); // - _margin_start
+
+				Vector3 current_world_position = world->world_data_position_to_world_position(world_data_pos);
+
+				current_world_position.y = (float)channel_isolevel[index] / 255.0 * _world_height * _voxel_scale;
+
+				Color color = vls->sample_light_value(map, current_world_position);
+
+				int r = color.r * 255.0;
+				int g = color.g * 255.0;
+				int b = color.b * 255.0;
+
+				channel_color_r[index] = r;
+				channel_color_g[index] = g;
+				channel_color_b[index] = b;
+			}
+		}
+
+	} else {
+		for (int i = 0; i < _lights.size(); ++i) {
+			bake_light(_lights.get(i));
+		}
+	}
+#else
 	for (int i = 0; i < _lights.size(); ++i) {
 		bake_light(_lights.get(i));
 	}
+#endif
 }
 void TerrainChunkDefault::_bake_light(Ref<TerrainLight> light) {
 	ERR_FAIL_COND(!light.is_valid());