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 #58601 from Calinou/material-triplanar-sharpness-clamp-3.x

Browse Source
This commit is contained in:
Rémi Verschelde
2022-08-22 22:21:59 +02:00
committed by GitHub
parent cdced052f0 967821f719
commit 812caa5f44
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/resources/material.cpp
View File

@@ -1534,8 +1534,9 @@ Vector3 SpatialMaterial::get_uv1_offset() const {
}
void SpatialMaterial::set_uv1_triplanar_blend_sharpness(float p_sharpness) {
uv1_triplanar_sharpness = p_sharpness;
VS::get_singleton()->material_set_param(_get_material(), shader_names->uv1_blend_sharpness, p_sharpness);
// Negative values or values higher than 150 can result in NaNs, leading to broken rendering.
uv1_triplanar_sharpness = CLAMP(p_sharpness, 0.0, 150.0);
VS::get_singleton()->material_set_param(_get_material(), shader_names->uv1_blend_sharpness, uv1_triplanar_sharpness);
}
float SpatialMaterial::get_uv1_triplanar_blend_sharpness() const {
@@ -1561,8 +1562,9 @@ Vector3 SpatialMaterial::get_uv2_offset() const {
}
void SpatialMaterial::set_uv2_triplanar_blend_sharpness(float p_sharpness) {
uv2_triplanar_sharpness = p_sharpness;
VS::get_singleton()->material_set_param(_get_material(), shader_names->uv2_blend_sharpness, p_sharpness);
// Negative values or values higher than 150 can result in NaNs, leading to broken rendering.
uv2_triplanar_sharpness = CLAMP(p_sharpness, 0.0, 150.0);
VS::get_singleton()->material_set_param(_get_material(), shader_names->uv2_blend_sharpness, uv2_triplanar_sharpness);
}
float SpatialMaterial::get_uv2_triplanar_blend_sharpness() const {