From c9b6f6a2b9596258c40e64ccf3c82e83d0777b03 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 6 Nov 2024 13:37:03 -0800 Subject: [PATCH] Adjusted for comments --- .../pixi/core/containers/cached-container.d.mts | 12 +++++++----- .../pixi/layers/effects/darkness-effects.d.mts | 2 -- .../pixi/layers/effects/illumination-effects.d.mts | 14 ++++++++------ .../client/pixi/layers/effects/visibility.d.mts | 2 +- .../pixi/layers/effects/weather-effects.d.mts | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/foundry/client/pixi/core/containers/cached-container.d.mts b/src/foundry/client/pixi/core/containers/cached-container.d.mts index 6ad68bac1..b7e5d0a37 100644 --- a/src/foundry/client/pixi/core/containers/cached-container.d.mts +++ b/src/foundry/client/pixi/core/containers/cached-container.d.mts @@ -1,3 +1,5 @@ +import type { NullishProps } from "../../../../../types/utils.d.mts"; + export {}; declare global { @@ -16,11 +18,11 @@ declare global { * The texture configuration to use for this cached container * @remarks Foundry marked as abstract */ - static textureConfiguration: { - multisample?: PIXI.MSAA_QUALITY; - scaleMode?: PIXI.SCALE_MODES; - format?: PIXI.FORMATS; - }; + static textureConfiguration: NullishProps<{ + multisample: PIXI.MSAA_QUALITY; + scaleMode: PIXI.SCALE_MODES; + format: PIXI.FORMATS; + }>; /** * A map of render textures, linked to their render function and an optional RGBA clear color. diff --git a/src/foundry/client/pixi/layers/effects/darkness-effects.d.mts b/src/foundry/client/pixi/layers/effects/darkness-effects.d.mts index d038535c2..d231ddad9 100644 --- a/src/foundry/client/pixi/layers/effects/darkness-effects.d.mts +++ b/src/foundry/client/pixi/layers/effects/darkness-effects.d.mts @@ -1,7 +1,5 @@ import type { AnyObject } from "../../../../../types/utils.d.mts"; -export {}; - declare global { /** * A layer of background alteration effects which change the appearance of the primary group render texture. diff --git a/src/foundry/client/pixi/layers/effects/illumination-effects.d.mts b/src/foundry/client/pixi/layers/effects/illumination-effects.d.mts index 8b079994c..2af564378 100644 --- a/src/foundry/client/pixi/layers/effects/illumination-effects.d.mts +++ b/src/foundry/client/pixi/layers/effects/illumination-effects.d.mts @@ -1,3 +1,5 @@ +import type { NullishProps } from "../../../../../types/utils.d.mts"; + export {}; declare global { @@ -114,12 +116,12 @@ declare global { * } * ``` */ - static override textureConfiguration: { - multisample?: PIXI.MSAA_QUALITY; - scaleMode?: PIXI.SCALE_MODES; - format?: PIXI.FORMATS; - mipmap?: PIXI.MIPMAP_MODES; - }; + static override textureConfiguration: NullishProps<{ + multisample: PIXI.MSAA_QUALITY; + scaleMode: PIXI.SCALE_MODES; + format: PIXI.FORMATS; + mipmap: PIXI.MIPMAP_MODES; + }>; /** @privateRemarks Including to protect duck typing due to overall similarities b/w DarknessLevelContainer and CachedContainer */ #onChildChange(): void; diff --git a/src/foundry/client/pixi/layers/effects/visibility.d.mts b/src/foundry/client/pixi/layers/effects/visibility.d.mts index 4b9844c93..06730ad70 100644 --- a/src/foundry/client/pixi/layers/effects/visibility.d.mts +++ b/src/foundry/client/pixi/layers/effects/visibility.d.mts @@ -34,7 +34,7 @@ declare global { */ visionModeData: { source: foundry.canvas.sources.PointVisionSource.Any | null; - activeLightingOptions: Record; + activeLightingOptions: VisionMode["_source"]["lighting"]; }; /** diff --git a/src/foundry/client/pixi/layers/effects/weather-effects.d.mts b/src/foundry/client/pixi/layers/effects/weather-effects.d.mts index 8f62b005d..78850c667 100644 --- a/src/foundry/client/pixi/layers/effects/weather-effects.d.mts +++ b/src/foundry/client/pixi/layers/effects/weather-effects.d.mts @@ -155,7 +155,7 @@ declare global { * If the mask should be reversed. * @defaultValue `false` */ - reverse?: boolean; + reverse?: boolean | undefined; /** * A texture which defines the mask region.