-
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add runtime shader implementation for progressive blur
- Loading branch information
1 parent
f713b1a
commit 208f144
Showing
31 changed files
with
598 additions
and
335 deletions.
There are no files selected for viewing
This file contains 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.37 MB
haze/screenshots/android/HazeScreenshotTest.creditCard_childTint[32]_magenta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.37 MB
haze/screenshots/android/HazeScreenshotTest.creditCard_childTint[32]_red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.37 MB
haze/screenshots/android/HazeScreenshotTest.creditCard_childTint[32]_yellow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.37 MB
...screenshots/android/HazeScreenshotTest.creditCard_compositionLocalStyle[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.51 MB
...screenshots/android/HazeScreenshotTest.creditCard_conditional[32]_0_initial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+883 KB
...creenshots/android/HazeScreenshotTest.creditCard_conditional[32]_1_disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.51 MB
...reenshots/android/HazeScreenshotTest.creditCard_conditional[32]_2_reenabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.58 MB
haze/screenshots/android/HazeScreenshotTest.creditCard_progressive_horiz[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.52 MB
.../screenshots/android/HazeScreenshotTest.creditCard_progressive_vertical[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.51 MB
...reenshots/android/HazeScreenshotTest.creditCard_roundedCorner_bottomEnd[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.51 MB
...enshots/android/HazeScreenshotTest.creditCard_roundedCorner_bottomStart[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.51 MB
.../screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_topEnd[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.51 MB
...creenshots/android/HazeScreenshotTest.creditCard_roundedCorner_topStart[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.53 MB
haze/screenshots/android/HazeScreenshotTest.creditCard_transparentTint[32].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
128 changes: 128 additions & 0 deletions
128
haze/src/androidMain/kotlin/dev/chrisbanes/haze/HazeChildNode.android.kt
This file contains 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,128 @@ | ||
// Copyright 2024, Christopher Banes and the Haze project contributors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package dev.chrisbanes.haze | ||
|
||
import android.os.Build | ||
import androidx.annotation.RequiresApi | ||
import androidx.compose.ui.graphics.Brush | ||
import androidx.compose.ui.graphics.Color | ||
import androidx.compose.ui.graphics.drawscope.DrawScope | ||
import androidx.compose.ui.graphics.layer.GraphicsLayer | ||
import androidx.compose.ui.graphics.layer.drawLayer | ||
import androidx.compose.ui.node.currentValueOf | ||
import androidx.compose.ui.platform.LocalGraphicsContext | ||
import androidx.compose.ui.unit.dp | ||
import androidx.compose.ui.unit.takeOrElse | ||
import dev.chrisbanes.haze.HazeChildNode.Companion.TAG | ||
import kotlin.math.ceil | ||
import kotlin.math.max | ||
import kotlin.math.min | ||
|
||
@RequiresApi(31) | ||
internal actual fun HazeChildNode.drawLinearGradientProgressiveEffect( | ||
drawScope: DrawScope, | ||
progressive: HazeProgressive.LinearGradient, | ||
contentLayer: GraphicsLayer, | ||
) { | ||
if (Build.VERSION.SDK_INT >= 33) { | ||
with(drawScope) { | ||
contentLayer.renderEffect = createRenderEffect( | ||
blurRadiusPx = resolveBlurRadius().takeOrElse { 0.dp }.toPx(), | ||
noiseFactor = resolveNoiseFactor(), | ||
tints = resolveTints(), | ||
contentSize = size, | ||
contentOffset = contentOffset, | ||
layerSize = layerSize, | ||
mask = mask, | ||
progressive = progressive.asBrush(), | ||
) | ||
contentLayer.alpha = alpha | ||
|
||
// Finally draw the layer | ||
drawLayer(contentLayer) | ||
} | ||
} else { | ||
drawLinearGradientProgressiveEffectUsingLayers( | ||
drawScope = drawScope, | ||
progressive = progressive, | ||
contentLayer = contentLayer, | ||
) | ||
} | ||
} | ||
|
||
private fun HazeChildNode.drawLinearGradientProgressiveEffectUsingLayers( | ||
drawScope: DrawScope, | ||
progressive: HazeProgressive.LinearGradient, | ||
contentLayer: GraphicsLayer, | ||
) = with(drawScope) { | ||
require(progressive.startIntensity in 0f..1f) | ||
require(progressive.endIntensity in 0f..1f) | ||
|
||
// Here we're going to calculate an appropriate amount of steps for the length. | ||
// We use a calculation of 60dp per step, which is a good balance between | ||
// quality vs performance | ||
val stepHeightPx = with(drawContext.density) { 60.dp.toPx() } | ||
val length = calculateLength(progressive.start, progressive.end, size) | ||
val steps = ceil(length / stepHeightPx).toInt().coerceAtLeast(2) | ||
|
||
val graphicsContext = currentValueOf(LocalGraphicsContext) | ||
|
||
val seq = when { | ||
progressive.endIntensity >= progressive.startIntensity -> 0..steps | ||
else -> steps downTo 0 | ||
} | ||
|
||
val tints = resolveTints() | ||
val noiseFactor = resolveNoiseFactor() | ||
val blurRadiusPx = resolveBlurRadius().takeOrElse { 0.dp }.toPx() | ||
|
||
for (i in seq) { | ||
val fraction = i / steps.toFloat() | ||
val intensity = lerp( | ||
progressive.startIntensity, | ||
progressive.endIntensity, | ||
progressive.easing.transform(fraction), | ||
) | ||
|
||
val layer = graphicsContext.createGraphicsLayer() | ||
layer.record(contentLayer.size) { | ||
drawLayer(contentLayer) | ||
} | ||
|
||
log(TAG) { | ||
"drawProgressiveEffect. " + | ||
"step=$i, " + | ||
"fraction=$fraction, " + | ||
"intensity=$intensity" | ||
} | ||
|
||
val min = min(progressive.startIntensity, progressive.endIntensity) | ||
val max = max(progressive.startIntensity, progressive.endIntensity) | ||
|
||
layer.renderEffect = createRenderEffect( | ||
blurRadiusPx = intensity * blurRadiusPx, | ||
noiseFactor = noiseFactor, | ||
tints = tints, | ||
tintAlphaModulate = intensity, | ||
contentSize = size, | ||
contentOffset = contentOffset, | ||
layerSize = layerSize, | ||
mask = Brush.linearGradient( | ||
lerp(min, max, (i - 2f) / steps) to Color.Transparent, | ||
lerp(min, max, (i - 1f) / steps) to Color.Black, | ||
lerp(min, max, (i + 0f) / steps) to Color.Black, | ||
lerp(min, max, (i + 1f) / steps) to Color.Transparent, | ||
start = progressive.start, | ||
end = progressive.end, | ||
), | ||
) | ||
layer.alpha = alpha | ||
|
||
// Since we included a border around the content, we need to translate so that | ||
// we don't see it (but it still affects the RenderEffect) | ||
drawLayer(layer) | ||
|
||
graphicsContext.releaseGraphicsLayer(layer) | ||
} | ||
} |
Oops, something went wrong.