Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow BaseMaterial3D height/dither fade to work with Compatibility rendering #89528

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Allow BaseMaterial3D height/dither fade to work with Compatibility rendering #89528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions scene/resources/material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ void fragment() {)";
}

// Heightmapping isn't supported at the same time as triplanar mapping.
if (!RenderingServer::get_singleton()->is_low_end() && features[FEATURE_HEIGHT_MAPPING] && !flags[FLAG_UV1_USE_TRIPLANAR]) {
if (features[FEATURE_HEIGHT_MAPPING] && !flags[FLAG_UV1_USE_TRIPLANAR]) {
// Binormal is negative due to mikktspace. Flipping it "unflips" it.
code += R"(
{
Expand Down Expand Up @@ -1637,21 +1637,20 @@ void fragment() {)";
// Use the slightly more expensive circular fade (distance to the object) instead of linear
// (Z distance), so that the fade is always the same regardless of the camera angle.
if ((distance_fade == DISTANCE_FADE_OBJECT_DITHER || distance_fade == DISTANCE_FADE_PIXEL_DITHER)) {
if (!RenderingServer::get_singleton()->is_low_end()) {
code += "\n {";
code += "\n {";

if (distance_fade == DISTANCE_FADE_OBJECT_DITHER) {
code += R"(
if (distance_fade == DISTANCE_FADE_OBJECT_DITHER) {
code += R"(
// Distance Fade: Object Dither
float fade_distance = length((VIEW_MATRIX * MODEL_MATRIX[3]));
)";
} else {
code += R"(
} else {
code += R"(
// Distance Fade: Pixel Dither
float fade_distance = length(VERTEX);
)";
}
code += R"(
}
code += R"(
// Use interleaved gradient noise, which is fast but still looks good.
const vec3 magic = vec3(0.06711056, 0.00583715, 52.9829189);
float fade = clamp(smoothstep(distance_fade_min, distance_fade_max, fade_distance), 0.0, 1.0);
Expand All @@ -1661,7 +1660,6 @@ void fragment() {)";
}
}
)";
}
} else {
code += R"(
// Distance Fade: Pixel Alpha
Expand Down
Loading