asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix light intensity and attenuation import from GLTF

Browse source 
(cherry picked from commit aa7ab96e71)
This commit is contained in:
PZerua 2022-07-05 19:41:52 +02:00 committed by Rémi Verschelde
parent ee227b9d09
commit 7a35bf683a
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/gltf/gltf_document.cpp
View file

@ -5177,19 +5177,16 @@ Spatial *GLTFDocument::_generate_light(Ref<GLTFState> state, Node *scene_parent,
} }
const float range = CLAMP(l->range, 0, 4096); const float range = CLAMP(l->range, 0, 4096);
// Doubling the range will double the effective brightness, so we need double attenuation (half brightness).
// We want to have double intensity give double brightness, so we need half the attenuation.
const float attenuation = range / intensity;
if (l->type == "point") { if (l->type == "point") {
OmniLight *light = memnew(OmniLight); OmniLight *light = memnew(OmniLight);
light->set_param(OmniLight::PARAM_ATTENUATION, attenuation); light->set_param(OmniLight::PARAM_ENERGY, intensity);
light->set_param(OmniLight::PARAM_RANGE, range); light->set_param(OmniLight::PARAM_RANGE, range);
light->set_color(l->color); light->set_color(l->color);
return light; return light;
} }
if (l->type == "spot") { if (l->type == "spot") {
SpotLight *light = memnew(SpotLight); SpotLight *light = memnew(SpotLight);
light->set_param(SpotLight::PARAM_ATTENUATION, attenuation); light->set_param(SpotLight::PARAM_ENERGY, intensity);
light->set_param(SpotLight::PARAM_RANGE, range); light->set_param(SpotLight::PARAM_RANGE, range);
light->set_param(SpotLight::PARAM_SPOT_ANGLE, Math::rad2deg(l->outer_cone_angle)); light->set_param(SpotLight::PARAM_SPOT_ANGLE, Math::rad2deg(l->outer_cone_angle));
light->set_color(l->color); light->set_color(l->color);
@ -5258,14 +5255,12 @@ GLTFLightIndex GLTFDocument::_convert_light(Ref<GLTFState> state, Light *p_light
l->type = "point"; l->type = "point";
OmniLight *light = cast_to<OmniLight>(p_light); OmniLight *light = cast_to<OmniLight>(p_light);
l->range = light->get_param(OmniLight::PARAM_RANGE); l->range = light->get_param(OmniLight::PARAM_RANGE);
float attenuation = p_light->get_param(OmniLight::PARAM_ATTENUATION); l->intensity = light->get_param(OmniLight::PARAM_ENERGY);
l->intensity = l->range / attenuation;
} else if (cast_to<SpotLight>(p_light)) { } else if (cast_to<SpotLight>(p_light)) {
l->type = "spot"; l->type = "spot";
SpotLight *light = cast_to<SpotLight>(p_light); SpotLight *light = cast_to<SpotLight>(p_light);
l->range = light->get_param(SpotLight::PARAM_RANGE); l->range = light->get_param(SpotLight::PARAM_RANGE);
float attenuation = light->get_param(SpotLight::PARAM_ATTENUATION); l->intensity = light->get_param(SpotLight::PARAM_ENERGY);
l->intensity = l->range / attenuation;
l->outer_cone_angle = Math::deg2rad(light->get_param(SpotLight::PARAM_SPOT_ANGLE)); l->outer_cone_angle = Math::deg2rad(light->get_param(SpotLight::PARAM_SPOT_ANGLE));
// This equation is the inverse of the import equation (which has a desmos link). // This equation is the inverse of the import equation (which has a desmos link).