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

Merge pull request #48798 from josefkaragoli/emission_fix

Browse Source 
Disable GIProbe emission when disabled on a material
This commit is contained in:
Rémi Verschelde 2021-05-18 08:22:18 +02:00 committed by GitHub
commit 530a999fb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scene/3d/voxel_light_baker.cpp
View File

@ -536,6 +536,8 @@ VoxelLightBaker::MaterialCache VoxelLightBaker::_get_material_cache(Ref<Material
MaterialCache mc; MaterialCache mc;
Ref<Image> empty;
if (mat.is_valid()) { if (mat.is_valid()) {
Ref<Texture> albedo_tex = mat->get_texture(SpatialMaterial::TEXTURE_ALBEDO); Ref<Texture> albedo_tex = mat->get_texture(SpatialMaterial::TEXTURE_ALBEDO);
@ -547,26 +549,28 @@ VoxelLightBaker::MaterialCache VoxelLightBaker::_get_material_cache(Ref<Material
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
} }
Ref<Texture> emission_tex = mat->get_texture(SpatialMaterial::TEXTURE_EMISSION); if (mat->get_feature(SpatialMaterial::FEATURE_EMISSION)) {
Ref<Texture> emission_tex = mat->get_texture(SpatialMaterial::TEXTURE_EMISSION);
Color emission_col = mat->get_emission(); Color emission_col = mat->get_emission();
float emission_energy = mat->get_emission_energy(); float emission_energy = mat->get_emission_energy();
Ref<Image> img_emission; Ref<Image> img_emission;
if (emission_tex.is_valid()) { if (emission_tex.is_valid()) {
img_emission = emission_tex->get_data(); img_emission = emission_tex->get_data();
} }
if (mat->get_emission_operator() == SpatialMaterial::EMISSION_OP_ADD) { if (mat->get_emission_operator() == SpatialMaterial::EMISSION_OP_ADD) {
mc.emission = _get_bake_texture(img_emission, Color(1, 1, 1) * emission_energy, emission_col * emission_energy); mc.emission = _get_bake_texture(img_emission, Color(1, 1, 1) * emission_energy, emission_col * emission_energy);
} else {
mc.emission = _get_bake_texture(img_emission, emission_col * emission_energy, Color(0, 0, 0));
}
} else { } else {
mc.emission = _get_bake_texture(img_emission, emission_col * emission_energy, Color(0, 0, 0)); mc.emission = _get_bake_texture(empty, Color(0, 0, 0), Color(0, 0, 0));
} }
} else { } else {
Ref<Image> empty;
mc.albedo = _get_bake_texture(empty, Color(0, 0, 0), Color(1, 1, 1)); mc.albedo = _get_bake_texture(empty, Color(0, 0, 0), Color(1, 1, 1));
mc.emission = _get_bake_texture(empty, Color(0, 0, 0), Color(0, 0, 0)); mc.emission = _get_bake_texture(empty, Color(0, 0, 0), Color(0, 0, 0));
} }