-
Notifications
You must be signed in to change notification settings - Fork 1
update nuget perf and fixes #1
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,135 @@ | ||||||||||||||||||||
| uniform float4 iMouse; // Mouse drag pos=.xy Click pos=.zw (pixels) | ||||||||||||||||||||
| uniform float iTime; // Shader playback time (s) | ||||||||||||||||||||
| uniform float2 iResolution; // Viewport resolution (pixels) | ||||||||||||||||||||
| uniform float2 iImageResolution; // iImage1 resolution (pixels) | ||||||||||||||||||||
| uniform shader iImage1; // Texture | ||||||||||||||||||||
| uniform shader iImage2; // Texture for reflection | ||||||||||||||||||||
| uniform float2 iOffset; // Top-left corner of DrawingRect | ||||||||||||||||||||
| uniform float2 iOrigin; // Mouse drag started here | ||||||||||||||||||||
|
|
||||||||||||||||||||
| uniform float2 origins[10]; // Array for multiple mouse positions | ||||||||||||||||||||
| uniform float progresses[10]; // Array for multiple animation progresses (0.0 -> 1.0) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /* | ||||||||||||||||||||
| This shader is ported from the original Apple shader presented at WWDC 2024. | ||||||||||||||||||||
| For more details, see the session here: https://developer.apple.com/videos/play/wwdc2024/10151/ | ||||||||||||||||||||
| Credit to Apple for the original implementation. | ||||||||||||||||||||
| Credits to Raouf Rahiche for the GLSL single ripple version that was used to create this SKSL. | ||||||||||||||||||||
| SKSL port + multi-ripples + reflection by Nick Kovalsky | ||||||||||||||||||||
| */ | ||||||||||||||||||||
|
|
||||||||||||||||||||
|
|
||||||||||||||||||||
| const float duration = 5.0; // This is the solved animation duration at speed 1 | ||||||||||||||||||||
| const float amplitude = 0.015; // Default amplitude of the ripple | ||||||||||||||||||||
| const float frequency = 15.0; // Default frequency of the ripple | ||||||||||||||||||||
| const float decay = 2.0; // Default decay rate of the ripple | ||||||||||||||||||||
| const float speed = 0.8; // Default speed of the ripple | ||||||||||||||||||||
| const float rippleIntensity = 0.05; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| const float reflectionIntensity = 0.15; | ||||||||||||||||||||
| const float minReflectionIntensity = 1.5; // minimum reflection visible | ||||||||||||||||||||
|
|
||||||||||||||||||||
| const vec3 waterTint = vec3(0.1, 0.2, 0.5); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Define separate reflection angles to simulate 3D viewing perspective | ||||||||||||||||||||
| const float reflectionAngleX = 5.0; // viewing perspective on X axis | ||||||||||||||||||||
| const float reflectionAngleY = 5.0; // viewing perspective on Y axis | ||||||||||||||||||||
| const float reflectionAngleZ = 1.0; // viewing perspective on Z axis | ||||||||||||||||||||
|
|
||||||||||||||||||||
| half4 main(float2 fragCoord) | ||||||||||||||||||||
| { | ||||||||||||||||||||
| // Precompute the scale factor | ||||||||||||||||||||
| float2 renderingScale = iImageResolution.xy / iResolution.xy; | ||||||||||||||||||||
| float2 inputCoord = (fragCoord - iOffset) * renderingScale; | ||||||||||||||||||||
| vec2 uv = (fragCoord - iOffset) / iResolution.xy; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Sample the base color | ||||||||||||||||||||
| half4 baseColor = iImage1.eval(inputCoord); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Initialize the combined displacement vector | ||||||||||||||||||||
| vec2 combinedDisplacement = vec2(0.0, 0.0); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Loop through the ripples | ||||||||||||||||||||
| for (int i = 0; i < 10; i++) | ||||||||||||||||||||
| { | ||||||||||||||||||||
| float progress = progresses[i]; | ||||||||||||||||||||
| vec2 mouse = origins[i]; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| if (progress >= 0.0 && progress <= 1.0) | ||||||||||||||||||||
| { | ||||||||||||||||||||
| // Get the cursor position and normalize it | ||||||||||||||||||||
| vec2 origin = mouse / iResolution.xy; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Calculate the distance and direction from the origin | ||||||||||||||||||||
| vec2 direction = uv - origin; | ||||||||||||||||||||
| float distance = length(direction); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Calculate the delay based on the distance | ||||||||||||||||||||
| float delay = distance / speed; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Adapt the time for the delay and clamp to 0 | ||||||||||||||||||||
| float time = max(0.0, progress * duration - delay); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Calculate the ripple amount | ||||||||||||||||||||
| float rippleAmount = amplitude * sin(frequency * time) * exp(-decay * time); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Normalize the direction vector | ||||||||||||||||||||
| vec2 n = direction / distance; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Accumulate the displacement caused by this ripple | ||||||||||||||||||||
| combinedDisplacement += rippleAmount * n; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Calculate the final position by applying the combined displacement | ||||||||||||||||||||
| vec2 finalPosition = uv + combinedDisplacement; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Sample the texture at the new combined position | ||||||||||||||||||||
| vec3 finalColor = iImage1.eval(finalPosition * iResolution.xy * renderingScale).rgb; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Define viewing direction using reflection angles | ||||||||||||||||||||
| vec2 viewingDirection = normalize(vec2(reflectionAngleX, reflectionAngleY)); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Calculate Fresnel effect | ||||||||||||||||||||
| float fresnelEffect = pow(1.0 - dot(normalize(combinedDisplacement), viewingDirection), 3.0); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Adapt reflection intensity with Fresnel effect | ||||||||||||||||||||
| float reflectionFactor = fresnelEffect * clamp(length(combinedDisplacement) / amplitude, 0.0, 1.0); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Ensure minimum reflection intensity | ||||||||||||||||||||
| reflectionFactor = max(reflectionFactor, minReflectionIntensity); | ||||||||||||||||||||
|
|
||||||||||||||||||||
|
Comment on lines
+97
to
+101
|
||||||||||||||||||||
| // Calculate dynamic perturbation factor based on combined displacement | ||||||||||||||||||||
| float dynamicPerturbationFactor = length(combinedDisplacement) * 10000.0; // Adapt factor based on ripple strength | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // Calculate perturbation | ||||||||||||||||||||
| vec2 perturbation = vec2(sin(finalPosition.x * dynamicPerturbationFactor), cos(finalPosition.y * dynamicPerturbationFactor)) * 0.05; | ||||||||||||||||||||
|
Comment on lines
+103
to
+106
|
||||||||||||||||||||
| float dynamicPerturbationFactor = length(combinedDisplacement) * 10000.0; // Adapt factor based on ripple strength | |
| // Calculate perturbation | |
| vec2 perturbation = vec2(sin(finalPosition.x * dynamicPerturbationFactor), cos(finalPosition.y * dynamicPerturbationFactor)) * 0.05; | |
| float rippleStrength = length(combinedDisplacement); | |
| float dynamicPerturbationFactor = rippleStrength * 10000.0; // Adapt factor based on ripple strength | |
| // Calculate perturbation, scaled by ripple strength so it vanishes when there is no displacement | |
| vec2 perturbation = vec2(sin(finalPosition.x * dynamicPerturbationFactor), cos(finalPosition.y * dynamicPerturbationFactor)) * 0.05 * rippleStrength; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -65,7 +65,7 @@ static void InitializeAvailableShaders() | |||
| } | ||||
|
|
||||
| private SkiaShaderEffect _shader; | ||||
|
|
||||
| private SkiaShaderEffect _shaderGlobal; | ||||
|
||||
| private SkiaShaderEffect _shaderGlobal; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,3 +1,6 @@ | ||||||
| using AppoMobi.Maui.Gestures; | ||||||
| using System.Collections.Concurrent; | ||||||
|
|
||||||
|
Comment on lines
+1
to
+3
|
||||||
| using AppoMobi.Maui.Gestures; | |
| using System.Collections.Concurrent; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vec2 n = direction / distance;will divide by zero whendistance == 0(e.g., fragment exactly at the ripple origin), producing NaNs that can corrupt the entire shader output. Add a small epsilon check (skip or clamp whendistanceis ~0).