usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update ImageEffector.ts

This commit is contained in:
syuilo 2025-05-30 15:51:53 +09:00
parent 0e37048e1e
commit 1c985987e8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/frontend/src/utility/image-effector/ImageEffector.ts
View File

@ -52,6 +52,10 @@ export type ImageEffectorLayer = {
params: Record<string, any>; params: Record<string, any>;
}; };
function getValue<T extends keyof ParamTypeToPrimitive>(params: Record<string, any>, k: string): ParamTypeToPrimitive[T] {
return params[k];
}
export class ImageEffector { export class ImageEffector {
private gl: WebGL2RenderingContext; private gl: WebGL2RenderingContext;
private canvas: HTMLCanvasElement | null = null; private canvas: HTMLCanvasElement | null = null;
@ -230,16 +234,16 @@ export class ImageEffector {
Object.entries(fx.params).map(([key, param]) => { Object.entries(fx.params).map(([key, param]) => {
return [key, layer.params[key] ?? param.default]; return [key, layer.params[key] ?? param.default];
}), }),
) as any, ),
u: Object.fromEntries(fx.uniforms.map(u => [u, gl.getUniformLocation(shaderProgram, 'u_' + u)!])), u: Object.fromEntries(fx.uniforms.map(u => [u, gl.getUniformLocation(shaderProgram, 'u_' + u)!])),
width: this.renderWidth, width: this.renderWidth,
height: this.renderHeight, height: this.renderHeight,
textures: Object.fromEntries( textures: Object.fromEntries(
Object.entries(fx.params).map(([k, v]) => { Object.entries(fx.params).map(([k, v]) => {
if (v.type !== 'texture') return [k, null]; if (v.type !== 'texture') return [k, null];
const param = layer.params[k]; const param = getValue<typeof v.type>(layer.params, k);
if (param == null) return [k, null]; if (param == null) return [k, null];
const texture = this.paramTextures.get(this.getTextureKeyForParam(param)); const texture = this.paramTextures.get(this.getTextureKeyForParam(param)) ?? null;
return [k, texture]; return [k, texture];
})), })),
}); });
@ -315,10 +319,11 @@ export class ImageEffector {
const fx = this.fxs.find(fx => fx.id === layer.fxId); const fx = this.fxs.find(fx => fx.id === layer.fxId);
if (fx == null) continue; if (fx == null) continue;
for (const [k, v] of Object.entries(layer.params)) { for (const k of Object.keys(layer.params)) {
const paramDef = fx.params[k]; const paramDef = fx.params[k];
if (paramDef == null) continue; if (paramDef == null) continue;
if (paramDef.type !== 'texture') continue; if (paramDef.type !== 'texture') continue;
const v = getValue<typeof paramDef.type>(layer.params, k);
if (v == null) continue; if (v == null) continue;
const textureKey = this.getTextureKeyForParam(v); const textureKey = this.getTextureKeyForParam(v);