fix(postprocessing): use NumberInput

nartc · Apr 18, 2022 · c443bc9 · c443bc9
1 parent cd82c60
commit c443bc9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/libs/postprocessing/effects/src/lib/depth-of-field/depth-of-field.ts b/libs/postprocessing/effects/src/lib/depth-of-field/depth-of-field.ts
@@ -1,4 +1,10 @@
-import { AnyConstructor, NgtVector3, UnknownRecord } from '@angular-three/core';
+import {
+    AnyConstructor,
+    coerceNumberProperty,
+    NgtVector3,
+    NumberInput,
+    UnknownRecord,
+} from '@angular-three/core';
 import {
     NgtCommonEffect,
     provideCommonEffectRef,
@@ -39,8 +45,8 @@ export class NgtDepthOfField extends NgtCommonEffect<DepthOfFieldEffect> {
         this.set({ depthTexture });
     }
 
-    @Input() set blur(blur: number) {
-        this.set({ blur });
+    @Input() set blur(blur: NumberInput) {
+        this.set({ blur: coerceNumberProperty(blur) });
     }
 
     private readonly targetParams$ = this.select(

diff --git a/libs/postprocessing/src/lib/effect-composer.ts b/libs/postprocessing/src/lib/effect-composer.ts
@@ -2,13 +2,15 @@ import {
     AnyFunction,
     BooleanInput,
     coerceBooleanProperty,
+    coerceNumberProperty,
     NGT_INSTANCE_HOST_REF,
     NGT_INSTANCE_REF,
     NGT_IS_WEBGL_AVAILABLE,
     NgtInstance,
     NgtInstanceState,
     NgtRef,
     NgtStore,
+    NumberInput,
     provideInstanceRef,
     startWithUndefined,
     tapEffect,
@@ -84,20 +86,20 @@ export class NgtEffectComposer extends NgtInstance<
         this.set({ autoClear: coerceBooleanProperty(autoClear) });
     }
 
-    @Input() set resolutionScale(resolutionScale: number) {
-        this.set({ resolutionScale });
+    @Input() set resolutionScale(resolutionScale: NumberInput) {
+        this.set({ resolutionScale: coerceNumberProperty(resolutionScale) });
     }
 
-    @Input() set multisampling(multisampling: number) {
-        this.set({ multisampling });
+    @Input() set multisampling(multisampling: NumberInput) {
+        this.set({ multisampling: coerceNumberProperty(multisampling) });
     }
 
     @Input() set frameBufferType(frameBufferType: THREE.TextureDataType) {
         this.set({ frameBufferType });
     }
 
-    @Input() set renderPriority(renderPriority: number) {
-        this.set({ renderPriority });
+    @Input() set renderPriority(renderPriority: NumberInput) {
+        this.set({ renderPriority: coerceNumberProperty(renderPriority) });
     }
 
     @Input() set camera(camera: THREE.Camera) {

diff --git a/libs/postprocessing/src/lib/effect.ts b/libs/postprocessing/src/lib/effect.ts
@@ -1,12 +1,14 @@
 import {
     AnyConstructor,
     AnyFunction,
+    coerceNumberProperty,
     NGT_INSTANCE_HOST_REF,
     NGT_INSTANCE_REF,
     NgtInstance,
     NgtInstanceState,
     NgtRef,
     NgtStore,
+    NumberInput,
     provideInstanceRef,
     startWithUndefined,
     tapEffect,
@@ -54,8 +56,8 @@ export interface NgtCommonEffectState<TEffect extends Effect = Effect>
 export abstract class NgtCommonEffect<
     TEffect extends Effect = Effect
 > extends NgtInstance<TEffect, NgtCommonEffectState<TEffect>> {
-    @Input() set opacity(opacity: number) {
-        this.set({ opacity });
+    @Input() set opacity(opacity: NumberInput) {
+        this.set({ opacity: coerceNumberProperty(opacity) });
     }
 
     @Input() set blendFunction(blendFunction: BlendFunction) {