LightmapGI: Save directional lightmaps as ldr textures

Author: BlueCube3310

doc/classes/LightmapGIData.xml

@@ -54,6 +54,9 @@
 		</method>
 	</methods>
 	<members>
+		<member name="directional_textures" type="TextureLayered[]" setter="set_directional_textures" getter="get_directional_textures" default="[]">
+			The directional atlas textures generated by the lightmapper.
+		</member>
 		<member name="light_texture" type="TextureLayered" setter="set_light_texture" getter="get_light_texture" deprecated="The lightmap atlas can now contain multiple textures. See [member lightmap_textures].">
 			The lightmap atlas texture generated by the lightmapper.
 		</member>

drivers/gles3/rasterizer_scene_gles3.cpp

@@ -2758,14 +2758,14 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 				glBlitFramebuffer(0, 0, size.x, size.y,
 						0, 0, size.x, size.y,
 						GL_COLOR_BUFFER_BIT, GL_NEAREST);
-				glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 6);
+				glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 7);
 				glBindTexture(GL_TEXTURE_2D, backbuffer);
 			}
 			if (scene_state.used_depth_texture) {
 				glBlitFramebuffer(0, 0, size.x, size.y,
 						0, 0, size.x, size.y,
 						GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT, GL_NEAREST);
-				glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 7);
+				glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 8);
 				glBindTexture(GL_TEXTURE_2D, backbuffer_depth);
 			}
 		}
@@ -3562,6 +3562,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 								material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::LIGHTMAP_TEXTURE_SIZE, light_texture_size, shader->version, instance_variant, spec_constants);
 							}
 
+							// Shadowmasks
 							material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::LIGHTMAP_SHADOWMASK_MODE, (uint32_t)lm->shadowmask_mode, shader->version, instance_variant, spec_constants);
 
 							if (lm->shadow_texture.is_valid()) {
@@ -3594,6 +3595,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 						GLES3::LightmapInstance *li = GLES3::LightStorage::get_singleton()->get_lightmap_instance(inst->lightmap_instance);
 						GLES3::Lightmap *lm = GLES3::LightStorage::get_singleton()->get_lightmap(li->lightmap);
 
+						// Base lightmap
 						GLuint tex = GLES3::TextureStorage::get_singleton()->texture_get_texid(lm->light_texture);
 						glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 4);
 						glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
@@ -3616,6 +3618,16 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 						material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::LIGHTMAP_EXPOSURE_NORMALIZATION, exposure_normalization, shader->version, instance_variant, spec_constants);
 
 						if (lm->uses_spherical_harmonics) {
+							// Directional
+							if (lm->directional_texture.is_valid()) {
+								tex = GLES3::TextureStorage::get_singleton()->texture_get_texid(lm->directional_texture);
+							} else {
+								tex = GLES3::TextureStorage::get_singleton()->texture_get_texid(GLES3::TextureStorage::get_singleton()->texture_gl_get_default(GLES3::DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE));
+							}
+
+							glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 6);
+							glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
+
 							Basis to_lm = li->transform.basis.inverse() * p_render_data->cam_transform.basis;
 							to_lm = to_lm.inverse().transposed();
 							GLfloat matrix[9] = {
@@ -3664,7 +3676,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 						material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::REFPROBE1_LOCAL_MATRIX, inst->reflection_probes_local_transform_cache[0], shader->version, instance_variant, spec_constants);
 						material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::REFPROBE1_BLEND_DISTANCE, probe->blend_distance, shader->version, instance_variant, spec_constants);
 
-						glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 8);
+						glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 9);
 						glBindTexture(GL_TEXTURE_CUBE_MAP, light_storage->reflection_probe_instance_get_texture(inst->reflection_probe_rid_cache[0]));
 					}
 
@@ -3683,7 +3695,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 						material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::REFPROBE2_LOCAL_MATRIX, inst->reflection_probes_local_transform_cache[1], shader->version, instance_variant, spec_constants);
 						material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::REFPROBE2_BLEND_DISTANCE, probe->blend_distance, shader->version, instance_variant, spec_constants);
 
-						glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 9);
+						glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 10);
 						glBindTexture(GL_TEXTURE_CUBE_MAP, light_storage->reflection_probe_instance_get_texture(inst->reflection_probe_rid_cache[1]));
 
 						spec_constants |= SceneShaderGLES3::SECOND_REFLECTION_PROBE;

drivers/gles3/shaders/scene.glsl

@@ -994,10 +994,11 @@ void main() {
 3-shadow
 4-lightmap textures
 5-shadowmask textures
-6-screen
-7-depth
-8-reflection probe 1
-9-reflection probe 2
+6-directional textures
+7-screen
+8-depth
+9-reflection probe 1
+10-reflection probe 2
 
 */
 
@@ -1085,7 +1086,7 @@ uniform float refprobe1_blend_distance;
 uniform int refprobe1_ambient_mode;
 uniform vec4 refprobe1_ambient_color;
 
-uniform samplerCube refprobe1_texture; // texunit:-8
+uniform samplerCube refprobe1_texture; // texunit:-9
 
 #ifdef SECOND_REFLECTION_PROBE
 
@@ -1099,7 +1100,7 @@ uniform float refprobe2_blend_distance;
 uniform int refprobe2_ambient_mode;
 uniform vec4 refprobe2_ambient_color;
 
-uniform samplerCube refprobe2_texture; // texunit:-9
+uniform samplerCube refprobe2_texture; // texunit:-10
 
 #endif // SECOND_REFLECTION_PROBE
 
@@ -1379,6 +1380,7 @@ float sample_shadow(highp sampler2DShadow shadow, float shadow_pixel_size, vec4
 #ifdef USE_LIGHTMAP
 uniform mediump sampler2DArray lightmap_textures; //texunit:-4
 uniform lowp sampler2DArray shadowmask_textures; //texunit:-5
+uniform mediump sampler2DArray directional_textures; //texunit:-6
 uniform lowp uint lightmap_slice;
 uniform highp vec4 lightmap_uv_scale;
 uniform float lightmap_exposure_normalization;
@@ -1404,17 +1406,17 @@ uniform mediump vec4[9] lightmap_captures;
 #endif // !DISABLE_LIGHTMAP
 
 #ifdef USE_MULTIVIEW
-uniform highp sampler2DArray depth_buffer; // texunit:-7
-uniform highp sampler2DArray color_buffer; // texunit:-6
+uniform highp sampler2DArray depth_buffer; // texunit:-8
+uniform highp sampler2DArray color_buffer; // texunit:-7
 vec3 multiview_uv(vec2 uv) {
 	return vec3(uv, ViewIndex);
 }
 ivec3 multiview_uv(ivec2 uv) {
 	return ivec3(uv, int(ViewIndex));
 }
 #else
-uniform highp sampler2D depth_buffer; // texunit:-7
-uniform highp sampler2D color_buffer; // texunit:-6
+uniform highp sampler2D depth_buffer; // texunit:-8
+uniform highp sampler2D color_buffer; // texunit:-7
 vec2 multiview_uv(vec2 uv) {
 	return uv;
 }
@@ -2296,23 +2298,19 @@ void main() {
 #else
 #ifdef USE_LIGHTMAP
 	{
-		vec3 uvw;
-		uvw.xy = uv2 * lightmap_uv_scale.zw + lightmap_uv_scale.xy;
-		uvw.z = float(lightmap_slice);
+		vec3 uvw = vec3(uv2 * lightmap_uv_scale.zw + lightmap_uv_scale.xy, float(lightmap_slice));
 
 #ifdef USE_SH_LIGHTMAP
-		uvw.z *= 4.0; // SH textures use 4 times more data.
-
 #ifdef LIGHTMAP_BICUBIC_FILTER
-		vec3 lm_light_l0 = textureArray_bicubic(lightmap_textures, uvw + vec3(0.0, 0.0, 0.0), lightmap_texture_size).rgb;
-		vec3 lm_light_l1n1 = (textureArray_bicubic(lightmap_textures, uvw + vec3(0.0, 0.0, 1.0), lightmap_texture_size).rgb - vec3(0.5)) * 2.0;
-		vec3 lm_light_l1_0 = (textureArray_bicubic(lightmap_textures, uvw + vec3(0.0, 0.0, 2.0), lightmap_texture_size).rgb - vec3(0.5)) * 2.0;
-		vec3 lm_light_l1p1 = (textureArray_bicubic(lightmap_textures, uvw + vec3(0.0, 0.0, 3.0), lightmap_texture_size).rgb - vec3(0.5)) * 2.0;
+		vec3 lm_light_l0 = textureArray_bicubic(lightmap_textures, uvw, lightmap_texture_size).rgb;
+		vec3 lm_light_l1n1 = (textureArray_bicubic(directional_textures, vec3(uvw.xy, uvw.z * 3 + 0.0), lightmap_texture_size).rgb - vec3(0.5)) * 2.0;
+		vec3 lm_light_l1_0 = (textureArray_bicubic(directional_textures, vec3(uvw.xy, uvw.z * 3 + 1.0), lightmap_texture_size).rgb - vec3(0.5)) * 2.0;
+		vec3 lm_light_l1p1 = (textureArray_bicubic(directional_textures, vec3(uvw.xy, uvw.z * 3 + 2.0), lightmap_texture_size).rgb - vec3(0.5)) * 2.0;
 #else
-		vec3 lm_light_l0 = textureLod(lightmap_textures, uvw + vec3(0.0, 0.0, 0.0), 0.0).rgb;
-		vec3 lm_light_l1n1 = (textureLod(lightmap_textures, uvw + vec3(0.0, 0.0, 1.0), 0.0).rgb - vec3(0.5)) * 2.0;
-		vec3 lm_light_l1_0 = (textureLod(lightmap_textures, uvw + vec3(0.0, 0.0, 2.0), 0.0).rgb - vec3(0.5)) * 2.0;
-		vec3 lm_light_l1p1 = (textureLod(lightmap_textures, uvw + vec3(0.0, 0.0, 3.0), 0.0).rgb - vec3(0.5)) * 2.0;
+		vec3 lm_light_l0 = textureLod(lightmap_textures, uvw, 0.0).rgb;
+		vec3 lm_light_l1n1 = (textureLod(directional_textures, vec3(uvw.xy, uvw.z * 3 + 0.0), 0.0).rgb - vec3(0.5)) * 2.0;
+		vec3 lm_light_l1_0 = (textureLod(directional_textures, vec3(uvw.xy, uvw.z * 3 + 1.0), 0.0).rgb - vec3(0.5)) * 2.0;
+		vec3 lm_light_l1p1 = (textureLod(directional_textures, vec3(uvw.xy, uvw.z * 3 + 2.0), 0.0).rgb - vec3(0.5)) * 2.0;
 #endif
 
 		vec3 n = normalize(lightmap_normal_xform * normal);

drivers/gles3/storage/light_storage.cpp

@@ -1247,6 +1247,20 @@ void LightStorage::lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMo
 	lightmap->shadowmask_mode = p_mode;
 }
 
+void LightStorage::lightmap_set_directional_textures(RID p_lightmap, RID p_directional) {
+	Lightmap *lightmap = lightmap_owner.get_or_null(p_lightmap);
+	ERR_FAIL_NULL(lightmap);
+	lightmap->directional_texture = p_directional;
+
+	GLuint tex = GLES3::TextureStorage::get_singleton()->texture_get_texid(lightmap->directional_texture);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, 0);
+}
+
 /* LIGHTMAP INSTANCE */
 
 RID LightStorage::lightmap_instance_create(RID p_lightmap) {

drivers/gles3/storage/light_storage.h

@@ -175,6 +175,7 @@ struct ReflectionProbeInstance {
 struct Lightmap {
 	RID light_texture;
 	RID shadow_texture;
+	RID directional_texture;
 	bool uses_spherical_harmonics = false;
 	bool interior = false;
 	AABB bounds = AABB(Vector3(), Vector3(1, 1, 1));
@@ -739,6 +740,8 @@ class LightStorage : public RendererLightStorage {
 	virtual RS::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override;
 	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) override;
 
+	virtual void lightmap_set_directional_textures(RID p_lightmap, RID p_directional) override;
+
 	/* LIGHTMAP INSTANCE */
 
 	LightmapInstance *get_lightmap_instance(RID p_rid) { return lightmap_instance_owner.get_or_null(p_rid); }

editor/scene/3d/lightmap_gi_editor_plugin.cpp

@@ -129,6 +129,21 @@ void LightmapGIEditorPlugin::_bake() {
 	_bake_select_file("");
 }
 
+void LightmapGIEditorPlugin::_upgrade() {
+	if (lightmap) {
+		Ref<LightmapGIData> gi_data = lightmap->get_light_data();
+		if (gi_data.is_valid() && gi_data->is_using_spherical_harmonics() && gi_data->_get_directional_version() < LightmapGIData::DIRECTIONAL_VERSION) {
+			gi_data->_upgrade_directional_version();
+			ResourceSaver::save(gi_data);
+
+			lightmap->set_light_data(gi_data);
+			lightmap->update_configuration_warnings();
+
+			upgrade->hide();
+		}
+	}
+}
+
 void LightmapGIEditorPlugin::edit(Object *p_object) {
 	LightmapGI *s = Object::cast_to<LightmapGI>(p_object);
 	if (!s) {
@@ -145,8 +160,16 @@ bool LightmapGIEditorPlugin::handles(Object *p_object) const {
 void LightmapGIEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		bake->show();
+
+		if (lightmap) {
+			Ref<LightmapGIData> gi_data = lightmap->get_light_data();
+			if (gi_data.is_valid() && gi_data->is_using_spherical_harmonics() && gi_data->_get_directional_version() < LightmapGIData::DIRECTIONAL_VERSION) {
+				upgrade->show();
+			}
+		}
 	} else {
 		bake->hide();
+		upgrade->hide();
 	}
 }
 
@@ -176,6 +199,7 @@ void LightmapGIEditorPlugin::bake_func_end(uint64_t p_time_started) {
 
 void LightmapGIEditorPlugin::_bind_methods() {
 	ClassDB::bind_method("_bake", &LightmapGIEditorPlugin::_bake);
+	ClassDB::bind_method("_upgrade", &LightmapGIEditorPlugin::_upgrade);
 }
 
 LightmapGIEditorPlugin::LightmapGIEditorPlugin() {
@@ -186,6 +210,10 @@ LightmapGIEditorPlugin::LightmapGIEditorPlugin() {
 	bake->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Bake"), EditorStringName(EditorIcons)));
 	bake->set_text(TTR("Bake Lightmaps"));
 
+	upgrade = memnew(Button);
+	upgrade->set_theme_type_variation(SceneStringName(FlatButton));
+	upgrade->set_text(TTR("Upgrade Lightmaps"));
+
 #ifdef MODULE_LIGHTMAPPER_RD_ENABLED
 	// Disable lightmap baking if not supported on the current GPU.
 	if (!DisplayServer::get_singleton()->can_create_rendering_device()) {
@@ -205,6 +233,11 @@ LightmapGIEditorPlugin::LightmapGIEditorPlugin() {
 	bake->hide();
 	bake->connect(SceneStringName(pressed), Callable(this, "_bake"));
 	add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, bake);
+
+	upgrade->hide();
+	upgrade->connect(SceneStringName(pressed), Callable(this, "_upgrade"));
+	add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, upgrade);
+
 	lightmap = nullptr;
 
 	file_dialog = memnew(EditorFileDialog);

editor/scene/3d/lightmap_gi_editor_plugin.h

@@ -43,6 +43,7 @@ class LightmapGIEditorPlugin : public EditorPlugin {
 	LightmapGI *lightmap = nullptr;
 
 	Button *bake = nullptr;
+	Button *upgrade = nullptr;
 
 	EditorFileDialog *file_dialog = nullptr;
 	static EditorProgress *tmp_progress;
@@ -51,6 +52,7 @@ class LightmapGIEditorPlugin : public EditorPlugin {
 
 	void _bake_select_file(const String &p_file);
 	void _bake();
+	void _upgrade();
 
 protected:
 	static void _bind_methods();

modules/lightmapper_rd/lightmapper_rd.cpp

@@ -1081,6 +1081,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 	}
 	lightmap_textures.clear();
 	shadowmask_textures.clear();
+	directional_textures.clear();
 	int grid_size = 128;
 
 	/* STEP 1: Fetch material textures and compute the bounds */
@@ -2312,14 +2313,16 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 		p_step_function(0.9, RTR("Retrieving textures"), p_bake_userdata, true);
 	}
 
-	for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
-		Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i);
+	// Retrieve lightmaps.
+	for (int i = 0; i < atlas_slices; i++) {
+		Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, p_bake_sh ? i * 4 : i);
 		Ref<Image> img = Image::create_from_data(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
-		img->convert(Image::FORMAT_RGBH); //remove alpha
+		img->convert(Image::FORMAT_RGBH); // Remove alpha.
 		lightmap_textures.push_back(img);
 	}
 
 	if (p_bake_shadowmask) {
+		// Retrieve shadowmasks.
 		for (int i = 0; i < atlas_slices; i++) {
 			Vector<uint8_t> s = rd->texture_get_data(shadowmask_tex, i);
 			Ref<Image> img = Image::create_from_data(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBA8, s);
@@ -2328,6 +2331,18 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 		}
 	}
 
+	if (p_bake_sh) {
+		// Retrieve directional.
+		for (int i = 0; i < atlas_slices; i++) {
+			for (int j = 1; j < 4; j++) {
+				Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i * 4 + j);
+				Ref<Image> img = Image::create_from_data(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+				img->convert(Image::FORMAT_RGB8);
+				directional_textures.push_back(img);
+			}
+		}
+	}
+
 	if (probe_positions.size() > 0) {
 		probe_values.resize(probe_positions.size() * 9);
 		Vector<uint8_t> probe_data = rd->buffer_get_data(light_probe_buffer);
@@ -2375,6 +2390,15 @@ Ref<Image> LightmapperRD::get_shadowmask_texture(int p_index) const {
 	return shadowmask_textures[p_index];
 }
 
+int LightmapperRD::get_directional_texture_count() const {
+	return directional_textures.size();
+}
+
+Ref<Image> LightmapperRD::get_directional_texture(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, directional_textures.size(), Ref<Image>());
+	return directional_textures[p_index];
+}
+
 int LightmapperRD::get_bake_mesh_count() const {
 	return mesh_instances.size();
 }

modules/lightmapper_rd/lightmapper_rd.h

@@ -266,6 +266,7 @@ class LightmapperRD : public Lightmapper {
 
 	Vector<Ref<Image>> lightmap_textures;
 	Vector<Ref<Image>> shadowmask_textures;
+	Vector<Ref<Image>> directional_textures;
 	Vector<Color> probe_values;
 
 	struct DilateParams {
@@ -309,6 +310,9 @@ class LightmapperRD : public Lightmapper {
 	Ref<Image> get_bake_texture(int p_index) const override;
 	int get_shadowmask_texture_count() const override;
 	Ref<Image> get_shadowmask_texture(int p_index) const override;
+	int get_directional_texture_count() const override;
+	Ref<Image> get_directional_texture(int p_index) const override;
+
 	int get_bake_mesh_count() const override;
 	Variant get_bake_mesh_userdata(int p_index) const override;
 	Rect2 get_bake_mesh_uv_scale(int p_index) const override;