kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-shade-styles] Revise filtering in GradientBase

Browse Source
This commit is contained in:
Edwin Jakobs
2025-03-06 21:19:28 +01:00
parent a93b3074c5
commit aab49b846a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
orx-shade-styles/src/commonMain/kotlin/fills/gradients/GradientBase.kt
View File

@@ -34,8 +34,6 @@ open class GradientBase<C>(
var spreadMethod: Int by Parameter() var spreadMethod: Int by Parameter()
var fillUnits: Int by Parameter() var fillUnits: Int by Parameter()
var fillFit: Int by Parameter() var fillFit: Int by Parameter()
var filterWindow: Int by Parameter("filterWindow", 2)
var filterSpread: Double by Parameter("filterSpread", 0.5)
init { init {
this.quantization = 0 this.quantization = 0
@@ -93,8 +91,11 @@ open class GradientBase<C>(
vec2 dx = p_filterSpread * dFdx(coord) / (float(p_filterWindow) + 1.0); vec2 dx = p_filterSpread * dFdx(coord) / (float(p_filterWindow) + 1.0);
vec2 dy = p_filterSpread * dFdy(coord) / (float(p_filterWindow) + 1.0); vec2 dy = p_filterSpread * dFdy(coord) / (float(p_filterWindow) + 1.0);
for (int u = -p_filterWindow; u <= p_filterWindow; u++) { for (int u = 0; u < p_filterWindow; u++) {
for (int v = -p_filterWindow; v <= p_filterWindow; v++) { for (int v = 0; v < p_filterWindow; v++) {
float fv = float(v) / (float(p_filterWindow) - 1.0) - 0.5;
float fu = float(u) / (float(p_filterWindow) - 1.0) - 0.5;
vec2 scoord = coord + dx * float(u) + dy * float(v); vec2 scoord = coord + dx * float(u) + dy * float(v);
vec2 wcoord = domainWarp(scoord); vec2 wcoord = domainWarp(scoord);
@@ -135,7 +136,7 @@ open class GradientBase<C>(
gradient += m; gradient += m;
} }
} }
gradient /= (float(p_filterWindow) * 2.0 + 1.0) * (float(p_filterWindow) * 2.0 + 1.0); gradient /= float(p_filterWindow) * float(p_filterWindow);
if (gradient.a > 0.0) { if (gradient.a > 0.0) {
gradient.rgb /= gradient.a; gradient.rgb /= gradient.a;
} }

2
orx-shade-styles/src/commonMain/kotlin/fills/gradients/GradientBuilder.kt
View File

@@ -19,6 +19,8 @@ class GradientBuilder<C>(val colorType: KClass<C>): StyleParameters
override var parameterValues: MutableMap<String, Any> = mutableMapOf() override var parameterValues: MutableMap<String, Any> = mutableMapOf()
override var textureBaseIndex: Int = 2 override var textureBaseIndex: Int = 2
var filterWindow: Int by Parameter("filterWindow", 3)
var filterSpread: Double by Parameter("filterSpread", 0.5)
var stops = mutableMapOf<Double, C>() var stops = mutableMapOf<Double, C>()
var fillUnits = FillUnits.BOUNDS var fillUnits = FillUnits.BOUNDS