Skip to content

Commit 236dbbf

Browse files
committed
fix typescript issues
1 parent aa92984 commit 236dbbf

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/core/renderers/webgl/WebGlCoreShader.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import { isWebGl2 } from './internal/WebGlUtils.js';
4242
* Shader's who's rendering depends on the dimensions of the Node being rendered
4343
* should extend this interface from their Prop interface type.
4444
*/
45-
export interface AutomaticShaderProps {
45+
export interface DimensionsShaderProps {
4646
/**
4747
* Dimensions of the Node being rendered (Auto-set by the renderer)
4848
*
@@ -51,6 +51,9 @@ export interface AutomaticShaderProps {
5151
* Any values set here will be ignored.
5252
*/
5353
$dimensions?: Dimensions;
54+
}
55+
56+
export interface AlphaShaderProps {
5457
/**
5558
* Alpha of the Node being rendered (Auto-set by the renderer)
5659
*

src/core/renderers/webgl/shaders/DynamicShader.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import type { ExtractProps } from '../../../CoreTextureManager.js';
2020
import type { WebGlCoreRenderer } from '../WebGlCoreRenderer.js';
2121
import {
2222
WebGlCoreShader,
23-
type AutomaticShaderProps,
23+
type DimensionsShaderProps,
24+
type AlphaShaderProps,
2425
} from '../WebGlCoreShader.js';
2526
import type { UniformInfo } from '../internal/ShaderUtils.js';
2627
import type { WebGlCoreCtxTexture } from '../WebGlCoreCtxTexture.js';
@@ -36,7 +37,9 @@ import { BorderLeftEffect } from './effects/BorderLeftEffect.js';
3637
import { GlitchEffect } from './effects/GlitchEffect.js';
3738
import { FadeOutEffect } from './effects/FadeOutEffect.js';
3839

39-
export interface DynamicShaderProps extends AutomaticShaderProps {
40+
export interface DynamicShaderProps
41+
extends DimensionsShaderProps,
42+
AlphaShaderProps {
4043
effects?: EffectDesc[];
4144
}
4245

@@ -314,7 +317,7 @@ export class DynamicShader extends WebGlCoreShader {
314317

315318
static override resolveDefaults(
316319
props: DynamicShaderProps,
317-
): Record<string, unknown> {
320+
): Required<DynamicShaderProps> {
318321
return {
319322
effects: (props.effects ?? []).map((effect) => ({
320323
type: effect.type,

src/core/renderers/webgl/shaders/RoundedRectangle.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import type { WebGlCoreRenderer } from '../WebGlCoreRenderer.js';
2121
import {
2222
WebGlCoreShader,
23-
type AutomaticShaderProps,
23+
type DimensionsShaderProps,
2424
} from '../WebGlCoreShader.js';
2525
import type { WebGlCoreCtxTexture } from '../WebGlCoreCtxTexture.js';
2626
import type { ShaderProgramSources } from '../internal/ShaderUtils.js';
2727

2828
/**
2929
* Properties of the {@link RoundedRectangle} shader
3030
*/
31-
export interface RoundedRectangleProps extends AutomaticShaderProps {
31+
export interface RoundedRectangleProps extends DimensionsShaderProps {
3232
/**
3333
* Corner radius, in pixels, to cut out of the corners
3434
*
@@ -65,7 +65,7 @@ export class RoundedRectangle extends WebGlCoreShader {
6565

6666
static override resolveDefaults(
6767
props: RoundedRectangleProps,
68-
): Record<string, unknown> {
68+
): Required<RoundedRectangleProps> {
6969
return {
7070
radius: props.radius || 10,
7171
$dimensions: {
@@ -81,7 +81,7 @@ export class RoundedRectangle extends WebGlCoreShader {
8181
gl.bindTexture(gl.TEXTURE_2D, textures[0]!.ctxTexture);
8282
}
8383

84-
protected override bindProps(props: RoundedRectangleProps): void {
84+
protected override bindProps(props: Required<RoundedRectangleProps>): void {
8585
this.setUniform('u_radius', props.radius);
8686
}
8787

0 commit comments

Comments
 (0)