Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix VoxelGI CameraAttributes exposure normalization handling #81067

Merged
merged 1 commit into from Aug 29, 2023
Merged

Fix VoxelGI CameraAttributes exposure normalization handling #81067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 17 additions & 7 deletions scene/3d/voxel_gi.cpp
View file
Open in desktop
Expand Up @@ -270,6 +270,7 @@ VoxelGIData::~VoxelGIData() {
void VoxelGI::set_probe_data(const Ref<VoxelGIData> &p_data) {
if (p_data.is_valid()) {
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 {
RS::get_singleton()->instance_set_base(get_instance(), RID());
}
Expand Down Expand Up @@ -303,6 +304,10 @@ Vector3 VoxelGI::get_size() const {

void VoxelGI::set_camera_attributes(const Ref<CameraAttributes> &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 {
Expand Down Expand Up @@ -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();
ERR_FAIL_NULL(p_from_node);

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();
}
}
float exposure_normalization = _get_camera_exposure_normalization();

Voxelizer baker;

Expand Down Expand Up @@ -485,6 +484,17 @@ void VoxelGI::_debug_bake() {
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 {
return AABB(-size / 2, size);
}
Expand Down
2 changes: 2 additions & 0 deletions scene/3d/voxel_gi.h
View file
Open in desktop
Expand Up @@ -131,6 +131,8 @@ class VoxelGI : public VisualInstance3D {
void _find_meshes(Node *p_at_node, List<PlotMesh> &plot_meshes);
void _debug_bake();

float _get_camera_exposure_normalization();

protected:
static void _bind_methods();
#ifndef DISABLE_DEPRECATED
Expand Down