diff options
author | clayjohn <claynjohn@gmail.com> | 2020-04-15 12:06:02 -0700 |
---|---|---|
committer | clayjohn <claynjohn@gmail.com> | 2020-04-15 12:06:02 -0700 |
commit | 61d86190e0737607c7268e57288fbf60a6762e83 (patch) | |
tree | d4242a8637e849149c9f777541d15ee43c9dba55 /scene/3d | |
parent | 5b4ea6529a4a6d4698238f566bb032d3710a365b (diff) |
Fix texture check in decal setup
Diffstat (limited to 'scene/3d')
-rw-r--r-- | scene/3d/decal.cpp | 12 | ||||
-rw-r--r-- | scene/3d/decal.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scene/3d/decal.cpp b/scene/3d/decal.cpp index 77210d8eb9..4c824aedc4 100644 --- a/scene/3d/decal.cpp +++ b/scene/3d/decal.cpp @@ -60,24 +60,24 @@ float Decal::get_emission_energy() const { return emission_energy; } -void Decal::set_albedo_mix(float p_energy) { - albedo_mix = p_energy; +void Decal::set_albedo_mix(float p_mix) { + albedo_mix = p_mix; RS::get_singleton()->decal_set_albedo_mix(decal, albedo_mix); } float Decal::get_albedo_mix() const { return albedo_mix; } -void Decal::set_upper_fade(float p_energy) { - upper_fade = p_energy; +void Decal::set_upper_fade(float p_fade) { + upper_fade = p_fade; RS::get_singleton()->decal_set_fade(decal, upper_fade, lower_fade); } float Decal::get_upper_fade() const { return upper_fade; } -void Decal::set_lower_fade(float p_energy) { - lower_fade = p_energy; +void Decal::set_lower_fade(float p_fade) { + lower_fade = p_fade; RS::get_singleton()->decal_set_fade(decal, upper_fade, lower_fade); } float Decal::get_lower_fade() const { diff --git a/scene/3d/decal.h b/scene/3d/decal.h index ca4d1843b4..665444829d 100644 --- a/scene/3d/decal.h +++ b/scene/3d/decal.h @@ -75,7 +75,7 @@ public: void set_emission_energy(float p_energy); float get_emission_energy() const; - void set_albedo_mix(float p_energy); + void set_albedo_mix(float p_mix); float get_albedo_mix() const; void set_modulate(Color p_modulate); @@ -84,10 +84,10 @@ public: void set_upper_fade(float p_energy); float get_upper_fade() const; - void set_lower_fade(float p_energy); + void set_lower_fade(float p_fade); float get_lower_fade() const; - void set_normal_fade(float p_energy); + void set_normal_fade(float p_fade); float get_normal_fade() const; void set_enable_distance_fade(bool p_enable); |