godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #103853 from aaronfranke/gltf-fix-light-color-space

Browse Source 
GLTF: Fix wrong color space for GLTFLight on export
This commit is contained in:
Rémi Verschelde
2025-03-28 17:30:09 +01:00
parent e8bc75f056 6249306c15
commit ddae331c79
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Light3D.xml
View File

@@ -64,7 +64,7 @@
[b]Note:[/b] Meshes' global illumination mode will also affect the global illumination rendering. See [member GeometryInstance3D.gi_mode]. [b]Note:[/b] Meshes' global illumination mode will also affect the global illumination rendering. See [member GeometryInstance3D.gi_mode].
</member> </member>
<member name="light_color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)"> <member name="light_color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)">
The light's color. An [i]overbright[/i] color can be used to achieve a result equivalent to increasing the light's [member light_energy]. The light's color in the nonlinear sRGB color space. An [i]overbright[/i] color can be used to achieve a result equivalent to increasing the light's [member light_energy].
</member> </member>
<member name="light_cull_mask" type="int" setter="set_cull_mask" getter="get_cull_mask" default="4294967295"> <member name="light_cull_mask" type="int" setter="set_cull_mask" getter="get_cull_mask" default="4294967295">
The light will affect objects in the selected layers. The light will affect objects in the selected layers.

3
modules/gltf/doc_classes/GLTFLight.xml
View File

@@ -53,7 +53,8 @@
</methods> </methods>
<members> <members>
<member name="color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)" keywords="colour"> <member name="color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)" keywords="colour">
The [Color] of the light. Defaults to white. A black color causes the light to have no effect. The [Color] of the light in linear space. Defaults to white. A black color causes the light to have no effect.
This value is linear to match glTF, but will be converted to nonlinear sRGB when creating a Godot [Light3D] node upon import, or converted to linear when exporting a Godot [Light3D] to glTF.
</member> </member>
<member name="inner_cone_angle" type="float" setter="set_inner_cone_angle" getter="get_inner_cone_angle" default="0.0"> <member name="inner_cone_angle" type="float" setter="set_inner_cone_angle" getter="get_inner_cone_angle" default="0.0">
The inner angle of the cone in a spotlight. Must be less than or equal to the outer cone angle. The inner angle of the cone in a spotlight. Must be less than or equal to the outer cone angle.

46
modules/gltf/extensions/gltf_light.cpp
View File

@@ -130,7 +130,7 @@ Ref<GLTFLight> GLTFLight::from_node(const Light3D *p_light) {
Ref<GLTFLight> l; Ref<GLTFLight> l;
l.instantiate(); l.instantiate();
ERR_FAIL_NULL_V_MSG(p_light, l, "Tried to create a GLTFLight from a Light3D node, but the given node was null."); ERR_FAIL_NULL_V_MSG(p_light, l, "Tried to create a GLTFLight from a Light3D node, but the given node was null.");
l->color = p_light->get_color(); l->color = p_light->get_color().srgb_to_linear();
if (cast_to<DirectionalLight3D>(p_light)) { if (cast_to<DirectionalLight3D>(p_light)) {
l->light_type = "directional"; l->light_type = "directional";
const DirectionalLight3D *light = cast_to<const DirectionalLight3D>(p_light); const DirectionalLight3D *light = cast_to<const DirectionalLight3D>(p_light);
@@ -156,33 +156,33 @@ Ref<GLTFLight> GLTFLight::from_node(const Light3D *p_light) {
} }
Light3D *GLTFLight::to_node() const { Light3D *GLTFLight::to_node() const {
Light3D *light = nullptr;
if (light_type == "directional") { if (light_type == "directional") {
DirectionalLight3D *light = memnew(DirectionalLight3D); DirectionalLight3D *dir_light = memnew(DirectionalLight3D);
light->set_param(Light3D::PARAM_ENERGY, intensity); dir_light->set_param(Light3D::PARAM_ENERGY, intensity);
light->set_color(color); light = dir_light;
return light; } else if (light_type == "point") {
} OmniLight3D *omni_light = memnew(OmniLight3D);
if (light_type == "point") { omni_light->set_param(OmniLight3D::PARAM_ENERGY, intensity);
OmniLight3D *light = memnew(OmniLight3D); omni_light->set_param(OmniLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
light->set_param(OmniLight3D::PARAM_ENERGY, intensity); light = omni_light;
light->set_param(OmniLight3D::PARAM_RANGE, CLAMP(range, 0, 4096)); } else if (light_type == "spot") {
light->set_color(color); SpotLight3D *spot_light = memnew(SpotLight3D);
return light; spot_light->set_param(SpotLight3D::PARAM_ENERGY, intensity);
} spot_light->set_param(SpotLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
if (light_type == "spot") { spot_light->set_param(SpotLight3D::PARAM_SPOT_ANGLE, Math::rad_to_deg(outer_cone_angle));
SpotLight3D *light = memnew(SpotLight3D);
light->set_param(SpotLight3D::PARAM_ENERGY, intensity);
light->set_param(SpotLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
light->set_param(SpotLight3D::PARAM_SPOT_ANGLE, Math::rad_to_deg(outer_cone_angle));
light->set_color(color);
// Line of best fit derived from guessing, see https://www.desmos.com/calculator/biiflubp8b // Line of best fit derived from guessing, see https://www.desmos.com/calculator/biiflubp8b
// The points in desmos are not exact, except for (1, infinity). // The points in desmos are not exact, except for (1, infinity).
float angle_ratio = inner_cone_angle / outer_cone_angle; float angle_ratio = inner_cone_angle / outer_cone_angle;
float angle_attenuation = 0.2 / (1 - angle_ratio) - 0.1; float angle_attenuation = 0.2 / (1 - angle_ratio) - 0.1;
light->set_param(SpotLight3D::PARAM_SPOT_ATTENUATION, angle_attenuation); spot_light->set_param(SpotLight3D::PARAM_SPOT_ATTENUATION, angle_attenuation);
return light; light = spot_light;
} else {
ERR_PRINT("Failed to create a Light3D node from GLTFLight, unknown light type '" + light_type + "'.");
return nullptr;
} }
return memnew(Light3D); light->set_color(color.linear_to_srgb());
return light;
} }
Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary p_dictionary) { Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary p_dictionary) {
@@ -195,7 +195,7 @@ Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary p_dictionary) {
if (p_dictionary.has("color")) { if (p_dictionary.has("color")) {
const Array &arr = p_dictionary["color"]; const Array &arr = p_dictionary["color"];
if (arr.size() == 3) { if (arr.size() == 3) {
light->color = Color(arr[0], arr[1], arr[2]).linear_to_srgb(); light->color = Color(arr[0], arr[1], arr[2]);
} else { } else {
ERR_PRINT("Error parsing glTF light: The color must have exactly 3 numbers."); ERR_PRINT("Error parsing glTF light: The color must have exactly 3 numbers.");
} }