mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-21 00:35:25 +02:00
Code Releases Activity

refactor(frontend): refactor blur.glsl

Browse Source
This commit is contained in:
syuilo
2026-03-11 10:35:59 +09:00
parent 1eefd8d3f0
commit bbffa563d9
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/frontend/src/utility/image-compositor-functions/blur.glsl
View File

@@ -10,6 +10,10 @@ const float PI = 3.141592653589793;
const float TWO_PI = 6.283185307179586; const float TWO_PI = 6.283185307179586;
const float HALF_PI = 1.5707963267948966; const float HALF_PI = 1.5707963267948966;
const float goldenAngle = 2.39996323;
const int sampleCount = 256;
const float sampleCountF = float(sampleCount);
in vec2 in_uv; in vec2 in_uv;
uniform sampler2D in_texture; uniform sampler2D in_texture;
uniform vec2 in_resolution; uniform vec2 in_resolution;
@@ -18,7 +22,6 @@ uniform vec2 u_scale;
uniform bool u_ellipse; uniform bool u_ellipse;
uniform float u_angle; uniform float u_angle;
uniform float u_radius; uniform float u_radius;
uniform int u_samples;
out vec4 out_color; out vec4 out_color;
float rand(vec2 value) { float rand(vec2 value) {
@@ -51,17 +54,7 @@ void main() {
vec4 result = vec4(0.0); vec4 result = vec4(0.0);
float totalSamples = 0.0; float totalSamples = 0.0;
float jitter = rand(in_uv);
// Make blur radius resolution-independent by using a percentage of image size
float referenceSize = min(in_resolution.x, in_resolution.y);
float normalizedRadius = u_radius / 100.0;
float radiusPx = normalizedRadius * referenceSize;
vec2 texelSize = 1.0 / in_resolution;
int sampleCount = max(u_samples, 1);
float sampleCountF = float(sampleCount);
float jitter = rand(in_uv * in_resolution);
float goldenAngle = 2.39996323;
// Sample in a circular pattern to avoid axis-aligned artifacts // Sample in a circular pattern to avoid axis-aligned artifacts
for (int i = 0; i < sampleCount; i++) { for (int i = 0; i < sampleCount; i++) {
@@ -69,15 +62,11 @@ void main() {
float radius = sqrt((fi + 0.5) / sampleCountF); float radius = sqrt((fi + 0.5) / sampleCountF);
float theta = (fi + jitter) * goldenAngle; float theta = (fi + jitter) * goldenAngle;
vec2 direction = vec2(cos(theta), sin(theta)); vec2 direction = vec2(cos(theta), sin(theta));
vec2 offset = direction * (radiusPx * radius) * texelSize; vec2 offset = direction * (u_radius * radius);
vec2 sampleUV = in_uv + offset; float weight = exp(-radius * radius * 4.0);
result += texture(in_texture, in_uv + offset) * weight;
if (sampleUV.x >= 0.0 && sampleUV.x <= 1.0 && sampleUV.y >= 0.0 && sampleUV.y <= 1.0) { totalSamples += weight;
float weight = exp(-radius * radius * 4.0);
result += texture(in_texture, sampleUV) * weight;
totalSamples += weight;
}
} }
out_color = totalSamples > 0.0 ? result / totalSamples : texture(in_texture, in_uv); out_color = result / totalSamples;
} }

7
packages/frontend/src/utility/image-compositor-functions/blur.ts
View File

@@ -24,7 +24,6 @@ export const fn = defineImageCompositorFunction<{
gl.uniform1i(u.ellipse, params.ellipse ? 1 : 0); gl.uniform1i(u.ellipse, params.ellipse ? 1 : 0);
gl.uniform1f(u.angle, params.angle / 2); gl.uniform1f(u.angle, params.angle / 2);
gl.uniform1f(u.radius, params.radius); gl.uniform1f(u.radius, params.radius);
gl.uniform1i(u.samples, 256);
}, },
}); });
@@ -84,10 +83,10 @@ export const uiDefinition = {
radius: { radius: {
label: i18n.ts._imageEffector._fxProps.strength, label: i18n.ts._imageEffector._fxProps.strength,
type: 'number', type: 'number',
default: 10.0, default: 0.15,
min: 0.0, min: 0.0,
max: 20.0, max: 0.3,
step: 0.5, step: 0.01,
}, },
}, },
} satisfies ImageEffectorUiDefinition<typeof fn>; } satisfies ImageEffectorUiDefinition<typeof fn>;