[3.2] Lightness of dynamic objects from Energy BakedLightmapData

[dedm0zaj]

Added the effect of Energy BakedLightmapData on dynamic objects.

On the GIF: cubes are dynamic objects.

Works well in a running game.
In the editor, for the changes to the Energy parameter to take effect, you need to turn off and on the visibility of BakedLightmap.

Bugsquad edit: Closes godotengine/godot-proposals#1952.

[clayjohn]

Looks reasonable to me. But I am unfamiliar with this code. Will need to wait for @JFonS to approve.

[JFonS]

With this approach we need to make sure _update_instance_lightmap_captures is called whenever the energy is changed. Otherwise we can have instances that don't update properly.

I think a better alternative is to multiply the lightmap energy directly in the shader. That would be in:

godot/drivers/gles3/shaders/scene.glsl

Lines 1856 to 1861 in cddff04

	if (lightmap_capture_sky) {
	ambient_light = mix(ambient_light, captured.rgb, captured.a);
	} else {
	ambient_light = captured.rgb;
	}
	}

and for GLES2:

godot/drivers/gles3/shaders/scene.glsl

Lines 1856 to 1861 in cddff04

	if (lightmap_capture_sky) {
	ambient_light = mix(ambient_light, captured.rgb, captured.a);
	} else {
	ambient_light = captured.rgb;
	}
	}

The lightmap_energy uniform is already available, so there should be no update issues.

[dedm0zaj]

@JFonS
I tried to do through shaders, but i am having problems:

1. In scene.glsl, the lightmap_energy variable refers to the #ifdef USE_LIGHTMAP section.
   And it must be applied in the #ifdef USE_LIGHTMAP_CAPTURE section.
   I didn't understand how to do it.
2. I created my capture_energy variable for the #ifdef USE_LIGHTMAP_CAPTURE section. And I tried to convey its meaning here:
   

   godot/drivers/gles3/rasterizer_scene_gles3.cpp

   Lines 1941 to 1945 in cddff04

   	} else if (!e->instance->lightmap_capture_data.empty()) {
   	glUniform4fv(state.scene_shader.get_uniform_location(SceneShaderGLES3::LIGHTMAP_CAPTURES), 12, (const GLfloat *)e->instance->lightmap_capture_data.ptr());
   	state.scene_shader.set_uniform(SceneShaderGLES3::LIGHTMAP_CAPTURE_SKY, false);

   
   For this, I added a few lines:

RasterizerStorageGLES3::LightmapCapture *capture = storage->lightmap_capture_data_owner.getornull(e->instance->lightmap_capture->base);
state.scene_shader.set_uniform(SceneShaderGLES3::CAPTURE_ENERGY, capture->energy);

but e->instance->lightmap_capture is NULL

I still haven't found a way to do it through the shader.

[JFonS]

ah right, my bad. I haven't looked deeply into it, but it seems like it won't be easy to get the capture energy when setting up the shader uniforms. So we're back to your implementation :)

I say we merge this PR and, if we find any case where capture is not updated after changing the energy, we can look into it.

[dedm0zaj]

@JFonS
There is an update problem in the editor. To update, you need to turn off and on the visibility of BakedLightmap.
I mentioned this in the topic.

If the change is done in the shader, then this problem will not occur.

[dedm0zaj]

@JFonS oops! I accidentally pressed "Re-request review". I don't know much about github and its functions yet. Sorry

[JFonS]

@dedm0zaj No worries :)

[akien-mga]

Thanks!