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

Merge pull request #73464 from clayjohn/VoxelGI-emission

Browse Source 
Only include emission when enabled in material during VoxelGI bake
This commit is contained in:
Rémi Verschelde
2023-02-17 00:42:30 +01:00
parent 6061d1bfd8 76093d6a03
commit c7aadab155
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/3d/voxelizer.cpp
View File

@ -346,7 +346,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material
} else { } else {
mc.albedo = _get_bake_texture(img_albedo, Color(1, 1, 1), mat->get_albedo()); // no albedo texture, color is additive mc.albedo = _get_bake_texture(img_albedo, Color(1, 1, 1), mat->get_albedo()); // no albedo texture, color is additive
} }
if (mat->get_feature(BaseMaterial3D::FEATURE_EMISSION)) {
Ref<Texture2D> emission_tex = mat->get_texture(BaseMaterial3D::TEXTURE_EMISSION); Ref<Texture2D> emission_tex = mat->get_texture(BaseMaterial3D::TEXTURE_EMISSION);
Color emission_col = mat->get_emission(); Color emission_col = mat->get_emission();
@ -366,6 +366,10 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material
} else { } else {
mc.emission = _get_bake_texture(img_emission, emission_col * emission_energy, Color(0, 0, 0)); mc.emission = _get_bake_texture(img_emission, emission_col * emission_energy, Color(0, 0, 0));
} }
} else {
Ref<Image> empty;
mc.emission = _get_bake_texture(empty, Color(0, 0, 0), Color(0, 0, 0));
}
} else { } else {
Ref<Image> empty; Ref<Image> empty;