godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix VoxelGI CameraAttributes exposure normalization handling

This commit is contained in:
bitsawer 2023-08-28 13:19:07 +03:00
parent 713bfaf5ea
commit c73e1f0d22
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scene/3d/voxel_gi.cpp
View File

@ -270,6 +270,7 @@ VoxelGIData::~VoxelGIData() {
void VoxelGI::set_probe_data(const Ref<VoxelGIData> &p_data) { void VoxelGI::set_probe_data(const Ref<VoxelGIData> &p_data) {
if (p_data.is_valid()) { if (p_data.is_valid()) {
RS::get_singleton()->instance_set_base(get_instance(), p_data->get_rid()); RS::get_singleton()->instance_set_base(get_instance(), p_data->get_rid());
RS::get_singleton()->voxel_gi_set_baked_exposure_normalization(p_data->get_rid(), _get_camera_exposure_normalization());
} else { } else {
RS::get_singleton()->instance_set_base(get_instance(), RID()); RS::get_singleton()->instance_set_base(get_instance(), RID());
} }
@ -303,6 +304,10 @@ Vector3 VoxelGI::get_size() const {
void VoxelGI::set_camera_attributes(const Ref<CameraAttributes> &p_camera_attributes) { void VoxelGI::set_camera_attributes(const Ref<CameraAttributes> &p_camera_attributes) {
camera_attributes = p_camera_attributes; camera_attributes = p_camera_attributes;
if (probe_data.is_valid()) {
RS::get_singleton()->voxel_gi_set_baked_exposure_normalization(probe_data->get_rid(), _get_camera_exposure_normalization());
}
} }
Ref<CameraAttributes> VoxelGI::get_camera_attributes() const { Ref<CameraAttributes> VoxelGI::get_camera_attributes() const {
@ -398,13 +403,7 @@ void VoxelGI::bake(Node *p_from_node, bool p_create_visual_debug) {
p_from_node = p_from_node ? p_from_node : get_parent(); p_from_node = p_from_node ? p_from_node : get_parent();
ERR_FAIL_NULL(p_from_node); ERR_FAIL_NULL(p_from_node);
float exposure_normalization = 1.0; float exposure_normalization = _get_camera_exposure_normalization();
if (camera_attributes.is_valid()) {
exposure_normalization = camera_attributes->get_exposure_multiplier();
if (GLOBAL_GET("rendering/lights_and_shadows/use_physical_light_units")) {
exposure_normalization = camera_attributes->calculate_exposure_normalization();
}
}
Voxelizer baker; Voxelizer baker;
@ -485,6 +484,17 @@ void VoxelGI::_debug_bake() {
bake(nullptr, true); bake(nullptr, true);
} }
float VoxelGI::_get_camera_exposure_normalization() {
float exposure_normalization = 1.0;
if (camera_attributes.is_valid()) {
exposure_normalization = camera_attributes->get_exposure_multiplier();
if (GLOBAL_GET("rendering/lights_and_shadows/use_physical_light_units")) {
exposure_normalization = camera_attributes->calculate_exposure_normalization();
}
}
return exposure_normalization;
}
AABB VoxelGI::get_aabb() const { AABB VoxelGI::get_aabb() const {
return AABB(-size / 2, size); return AABB(-size / 2, size);
} }

2
scene/3d/voxel_gi.h
View File

@ -131,6 +131,8 @@ private:
void _find_meshes(Node *p_at_node, List<PlotMesh> &plot_meshes); void _find_meshes(Node *p_at_node, List<PlotMesh> &plot_meshes);
void _debug_bake(); void _debug_bake();
float _get_camera_exposure_normalization();
protected: protected:
static void _bind_methods(); static void _bind_methods();
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED