diff --git a/packages/material_ui/lib/src/shaders/ink_sparkle.frag b/packages/material_ui/lib/shaders/ink_sparkle.frag similarity index 100% rename from packages/material_ui/lib/src/shaders/ink_sparkle.frag rename to packages/material_ui/lib/shaders/ink_sparkle.frag diff --git a/packages/material_ui/lib/src/ink_sparkle.dart b/packages/material_ui/lib/src/ink_sparkle.dart index 1a6d007e460a..e9608b980ca0 100644 --- a/packages/material_ui/lib/src/ink_sparkle.dart +++ b/packages/material_ui/lib/src/ink_sparkle.dart @@ -424,7 +424,9 @@ class _InkSparkleFactory extends InteractiveInkFeatureFactory { static void initializeShader() { if (!_initCalled) { - ui.FragmentProgram.fromAsset('shaders/ink_sparkle.frag').then((ui.FragmentProgram program) { + ui.FragmentProgram.fromAsset('packages/material_ui/shaders/ink_sparkle.frag').then(( + ui.FragmentProgram program, + ) { _program = program; }); _initCalled = true; diff --git a/packages/material_ui/lib/src/shaders/stretch_effect.frag b/packages/material_ui/lib/src/shaders/stretch_effect.frag deleted file mode 100644 index dbcca2e91e60..000000000000 --- a/packages/material_ui/lib/src/shaders/stretch_effect.frag +++ /dev/null @@ -1,159 +0,0 @@ -#version 320 es -// Copyright 2013 The Flutter Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This shader was created based on or with reference to the implementation found at: -// https://cs.android.com/android/platform/superproject/main/+/512046e84bcc51cc241bc6599f83ab345e93ab12:frameworks/base/libs/hwui/effects/StretchEffect.cpp - -#include - -uniform vec2 u_size; -uniform sampler2D u_texture; - -// Multiplier to apply to scale effect. -uniform float u_max_stretch_intensity; - -// Normalized overscroll amount in the horizontal direction. -uniform float u_overscroll_x; - -// Normalized overscroll amount in the vertical direction. -uniform float u_overscroll_y; - -// u_interpolation_strength is the intensity of the interpolation. -uniform float u_interpolation_strength; - -float ease_in(float t, float d) { - return t * d; -} - -float compute_overscroll_start( - float in_pos, - float overscroll, - float u_stretch_affected_dist, - float u_inverse_stretch_affected_dist, - float distance_stretched, - float interpolation_strength -) { - float offset_pos = u_stretch_affected_dist - in_pos; - float pos_based_variation = mix( - 1.0, - ease_in(offset_pos, u_inverse_stretch_affected_dist), - interpolation_strength - ); - float stretch_intensity = overscroll * pos_based_variation; - return distance_stretched - (offset_pos / (1.0 + stretch_intensity)); -} - -float compute_overscroll_end( - float in_pos, - float overscroll, - float reverse_stretch_dist, - float u_stretch_affected_dist, - float u_inverse_stretch_affected_dist, - float distance_stretched, - float interpolation_strength, - float viewport_dimension -) { - float offset_pos = in_pos - reverse_stretch_dist; - float pos_based_variation = mix( - 1.0, - ease_in(offset_pos, u_inverse_stretch_affected_dist), - interpolation_strength - ); - float stretch_intensity = (-overscroll) * pos_based_variation; - return viewport_dimension - (distance_stretched - (offset_pos / (1.0 + stretch_intensity))); -} - -float compute_streched_effect( - float in_pos, - float overscroll, - float u_stretch_affected_dist, - float u_inverse_stretch_affected_dist, - float distance_stretched, - float distance_diff, - float interpolation_strength, - float viewport_dimension -) { - if (overscroll > 0.0) { - if (in_pos <= u_stretch_affected_dist) { - return compute_overscroll_start( - in_pos, overscroll, u_stretch_affected_dist, - u_inverse_stretch_affected_dist, distance_stretched, - interpolation_strength - ); - } else { - return distance_diff + in_pos; - } - } else if (overscroll < 0.0) { - float stretch_affected_dist_calc = viewport_dimension - u_stretch_affected_dist; - if (in_pos >= stretch_affected_dist_calc) { - return compute_overscroll_end( - in_pos, - overscroll, - stretch_affected_dist_calc, - u_stretch_affected_dist, - u_inverse_stretch_affected_dist, - distance_stretched, - interpolation_strength, - viewport_dimension - ); - } else { - return -distance_diff + in_pos; - } - } else { - return in_pos; - } -} - -out vec4 frag_color; - -void main() { - vec2 uv = FlutterFragCoord().xy / u_size; - float in_u_norm = uv.x; - float in_v_norm = uv.y; - - float out_u_norm; - float out_v_norm; - - bool isVertical = u_overscroll_y != 0; - float overscroll = isVertical ? u_overscroll_y : u_overscroll_x; - - float norm_distance_stretched = 1.0 / (1.0 + abs(overscroll)); - float norm_dist_diff = norm_distance_stretched - 1.0; - - const float norm_viewport = 1.0; - const float norm_stretch_affected_dist = 1.0; - const float norm_inverse_stretch_affected_dist = 1.0; - - out_u_norm = isVertical ? in_u_norm : compute_streched_effect( - in_u_norm, - overscroll, - norm_stretch_affected_dist, - norm_inverse_stretch_affected_dist, - norm_distance_stretched, - norm_dist_diff, - u_interpolation_strength, - norm_viewport - ); - - out_v_norm = isVertical ? compute_streched_effect( - in_v_norm, - overscroll, - norm_stretch_affected_dist, - norm_inverse_stretch_affected_dist, - norm_distance_stretched, - norm_dist_diff, - u_interpolation_strength, - norm_viewport - ) : in_v_norm; - - uv.x = out_u_norm; - #ifdef IMPELLER_TARGET_OPENGLES - uv.y = 1.0 - out_v_norm; - #else - uv.y = out_v_norm; - #endif - - frag_color = texture(u_texture, uv); -} diff --git a/packages/material_ui/pending_changelogs/change_2026_08_10_1786383609407.yaml b/packages/material_ui/pending_changelogs/change_2026_08_10_1786383609407.yaml new file mode 100644 index 000000000000..23ce90738a69 --- /dev/null +++ b/packages/material_ui/pending_changelogs/change_2026_08_10_1786383609407.yaml @@ -0,0 +1,3 @@ +changelog: | + - Exposes ink_sparkle shader asset in pubspec.yaml and removes stretch_effect shader. +version: minor diff --git a/packages/material_ui/pubspec.yaml b/packages/material_ui/pubspec.yaml index d2ed5cee3293..fd671dbdddb1 100644 --- a/packages/material_ui/pubspec.yaml +++ b/packages/material_ui/pubspec.yaml @@ -36,3 +36,7 @@ topics: - ui - widgets - material + +flutter: + shaders: + - packages/material_ui/shaders/ink_sparkle.frag