godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00
Code Releases Wiki Activity

Merge pull request #62600 from Calinou/decal-fade-no-negative-values

Browse Source
This commit is contained in:
Rémi Verschelde
2022-07-01 20:26:06 +02:00
committed by GitHub
parent d8fe9ad864 e7315fcc45
commit 8c51b8246f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/Decal.xml
View File

@@ -79,7 +79,7 @@
Sets the size of the [AABB] used by the decal. The AABB goes from [code]-extents[/code] to [code]extents[/code]. Sets the size of the [AABB] used by the decal. The AABB goes from [code]-extents[/code] to [code]extents[/code].
</member> </member>
<member name="lower_fade" type="float" setter="set_lower_fade" getter="get_lower_fade" default="0.3"> <member name="lower_fade" type="float" setter="set_lower_fade" getter="get_lower_fade" default="0.3">
Sets the curve over which the decal will fade as the surface gets further from the center of the [AABB]. Sets the curve over which the decal will fade as the surface gets further from the center of the [AABB]. Only positive values are valid (negative values will be clamped to [code]0.0[/code]).
</member> </member>
<member name="modulate" type="Color" setter="set_modulate" getter="get_modulate" default="Color(1, 1, 1, 1)"> <member name="modulate" type="Color" setter="set_modulate" getter="get_modulate" default="Color(1, 1, 1, 1)">
Changes the [Color] of the Decal by multiplying it with this value. Changes the [Color] of the Decal by multiplying it with this value.
@@ -100,7 +100,7 @@
[Texture2D] storing ambient occlusion, roughness, and metallic for the decal. Use this to add extra detail to decals. [Texture2D] storing ambient occlusion, roughness, and metallic for the decal. Use this to add extra detail to decals.
</member> </member>
<member name="upper_fade" type="float" setter="set_upper_fade" getter="get_upper_fade" default="0.3"> <member name="upper_fade" type="float" setter="set_upper_fade" getter="get_upper_fade" default="0.3">
Sets the curve over which the decal will fade as the surface gets further from the center of the [AABB]. Sets the curve over which the decal will fade as the surface gets further from the center of the [AABB]. Only positive values are valid (negative values will be clamped to [code]0.0[/code]).
</member> </member>
</members> </members>
<constants> <constants>

4
scene/3d/decal.cpp
View File

@@ -72,7 +72,7 @@ real_t Decal::get_albedo_mix() const {
} }
void Decal::set_upper_fade(real_t p_fade) { void Decal::set_upper_fade(real_t p_fade) {
upper_fade = p_fade; upper_fade = MAX(p_fade, 0.0);
RS::get_singleton()->decal_set_fade(decal, upper_fade, lower_fade); RS::get_singleton()->decal_set_fade(decal, upper_fade, lower_fade);
} }
@@ -81,7 +81,7 @@ real_t Decal::get_upper_fade() const {
} }
void Decal::set_lower_fade(real_t p_fade) { void Decal::set_lower_fade(real_t p_fade) {
lower_fade = p_fade; lower_fade = MAX(p_fade, 0.0);
RS::get_singleton()->decal_set_fade(decal, upper_fade, lower_fade); RS::get_singleton()->decal_set_fade(decal, upper_fade, lower_fade);
} }