diff options
Diffstat (limited to 'scene/3d/decal.cpp')
| -rw-r--r-- | scene/3d/decal.cpp | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/scene/3d/decal.cpp b/scene/3d/decal.cpp index 320258b3a1..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 { @@ -204,11 +204,11 @@ void Decal::_bind_methods() {  	ADD_GROUP("Cull Mask", "");  	ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask"); -	BIND_CONSTANT(TEXTURE_ALBEDO); -	BIND_CONSTANT(TEXTURE_NORMAL); -	BIND_CONSTANT(TEXTURE_ORM); -	BIND_CONSTANT(TEXTURE_EMISSION); -	BIND_CONSTANT(TEXTURE_MAX); +	BIND_ENUM_CONSTANT(TEXTURE_ALBEDO); +	BIND_ENUM_CONSTANT(TEXTURE_NORMAL); +	BIND_ENUM_CONSTANT(TEXTURE_ORM); +	BIND_ENUM_CONSTANT(TEXTURE_EMISSION); +	BIND_ENUM_CONSTANT(TEXTURE_MAX);  }  Decal::Decal() {  |