feat(core): update three 0.140

nartc · May 4, 2022 · 25d6a51 · 25d6a51
1 parent 397843e
commit 25d6a51
Show file tree

Hide file tree

Showing 17 changed files with 107 additions and 118 deletions.
diff --git a/libs/core/materials/src/lib/mesh-basic-material/mesh-basic-material.ts b/libs/core/materials/src/lib/mesh-basic-material/mesh-basic-material.ts
@@ -40,9 +40,7 @@ export class NgtMeshBasicMaterial extends NgtCommonMaterial<
   }
 
   @Input() set lightMapIntensity(lightMapIntensity: NumberInput) {
-    this.set({
-      lightMapIntensity: coerceNumberProperty(lightMapIntensity),
-    });
+    this.set({ lightMapIntensity: coerceNumberProperty(lightMapIntensity) });
   }
 
   @Input() set aoMap(aoMap: THREE.Texture | null) {
@@ -61,6 +59,10 @@ export class NgtMeshBasicMaterial extends NgtCommonMaterial<
     this.set({ alphaMap });
   }
 
+  @Input() set fog(fog: BooleanInput) {
+    this.set({ fog: coerceBooleanProperty(fog) });
+  }
+
   @Input() set envMap(envMap: THREE.Texture | null) {
     this.set({ envMap });
   }
@@ -82,9 +84,7 @@ export class NgtMeshBasicMaterial extends NgtCommonMaterial<
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
   }
 
   @Input() set wireframeLinecap(wireframeLinecap: string) {
@@ -111,6 +111,7 @@ export class NgtMeshBasicMaterial extends NgtCommonMaterial<
       aoMapIntensity: true,
       specularMap: true,
       alphaMap: true,
+      fog: true,
       envMap: true,
       combine: true,
       reflectivity: true,

diff --git a/libs/core/materials/src/lib/mesh-depth-material/mesh-depth-material.ts b/libs/core/materials/src/lib/mesh-depth-material/mesh-depth-material.ts
@@ -40,9 +40,7 @@ export class NgtMeshDepthMaterial extends NgtCommonMaterial<
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {
@@ -54,9 +52,7 @@ export class NgtMeshDepthMaterial extends NgtCommonMaterial<
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
   }
 
   get materialType(): AnyConstructor<THREE.MeshDepthMaterial> {

diff --git a/libs/core/materials/src/lib/mesh-distance-material/mesh-distance-material.ts b/libs/core/materials/src/lib/mesh-distance-material/mesh-distance-material.ts
@@ -34,9 +34,7 @@ export class NgtMeshDistanceMaterial extends NgtCommonMaterial<
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {

diff --git a/libs/core/materials/src/lib/mesh-lambert-material/mesh-lambert-material.ts b/libs/core/materials/src/lib/mesh-lambert-material/mesh-lambert-material.ts
@@ -32,9 +32,7 @@ export class NgtMeshLambertMaterial extends NgtCommonMaterial<
   }
 
   @Input() set emissiveIntensity(emissiveIntensity: NumberInput) {
-    this.set({
-      emissiveIntensity: coerceNumberProperty(emissiveIntensity),
-    });
+    this.set({ emissiveIntensity: coerceNumberProperty(emissiveIntensity) });
   }
 
   @Input() set emissiveMap(emissiveMap: THREE.Texture | null) {
@@ -50,9 +48,7 @@ export class NgtMeshLambertMaterial extends NgtCommonMaterial<
   }
 
   @Input() set lightMapIntensity(lightMapIntensity: NumberInput) {
-    this.set({
-      lightMapIntensity: coerceNumberProperty(lightMapIntensity),
-    });
+    this.set({ lightMapIntensity: coerceNumberProperty(lightMapIntensity) });
   }
 
   @Input() set aoMap(aoMap: THREE.Texture | null) {
@@ -92,9 +88,7 @@ export class NgtMeshLambertMaterial extends NgtCommonMaterial<
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
   }
 
   @Input() set wireframeLinecap(wireframeLinecap: string) {
@@ -105,6 +99,10 @@ export class NgtMeshLambertMaterial extends NgtCommonMaterial<
     this.set({ wireframeLinejoin });
   }
 
+  @Input() set fog(fog: BooleanInput) {
+    this.set({ fog: coerceBooleanProperty(fog) });
+  }
+
   get materialType(): AnyConstructor<THREE.MeshLambertMaterial> {
     return THREE.MeshLambertMaterial;
   }
@@ -131,6 +129,7 @@ export class NgtMeshLambertMaterial extends NgtCommonMaterial<
       wireframeLinewidth: true,
       wireframeLinecap: true,
       wireframeLinejoin: true,
+      fog: true,
     };
   }
 }

diff --git a/libs/core/materials/src/lib/mesh-matcap-material/mesh-matcap-material.ts b/libs/core/materials/src/lib/mesh-matcap-material/mesh-matcap-material.ts
@@ -60,9 +60,7 @@ export class NgtMeshMatcapMaterial extends NgtCommonMaterial<
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {
@@ -73,6 +71,10 @@ export class NgtMeshMatcapMaterial extends NgtCommonMaterial<
     this.set({ alphaMap });
   }
 
+  @Input() set fog(fog: BooleanInput) {
+    this.set({ fog: coerceBooleanProperty(fog) });
+  }
+
   @Input() set flatShading(flatShading: BooleanInput) {
     this.set({ flatShading: coerceBooleanProperty(flatShading) });
   }
@@ -96,6 +98,7 @@ export class NgtMeshMatcapMaterial extends NgtCommonMaterial<
       displacementScale: true,
       displacementBias: true,
       alphaMap: true,
+      fog: true,
       flatShading: true,
     };
   }

diff --git a/libs/core/materials/src/lib/mesh-normal-material/mesh-normal-material.ts b/libs/core/materials/src/lib/mesh-normal-material/mesh-normal-material.ts
@@ -48,9 +48,7 @@ export class NgtMeshNormalMaterial extends NgtCommonMaterial<
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {
@@ -62,9 +60,7 @@ export class NgtMeshNormalMaterial extends NgtCommonMaterial<
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
   }
 
   @Input() set flatShading(flatShading: BooleanInput) {

diff --git a/libs/core/materials/src/lib/mesh-phong-material/mesh-phong-material.ts b/libs/core/materials/src/lib/mesh-phong-material/mesh-phong-material.ts
@@ -48,9 +48,7 @@ export class NgtMeshPhongMaterial extends NgtCommonMaterial<
   }
 
   @Input() set lightMapIntensity(lightMapIntensity: NumberInput) {
-    this.set({
-      lightMapIntensity: coerceNumberProperty(lightMapIntensity),
-    });
+    this.set({ lightMapIntensity: coerceNumberProperty(lightMapIntensity) });
   }
 
   @Input() set aoMap(aoMap: THREE.Texture | null) {
@@ -66,9 +64,7 @@ export class NgtMeshPhongMaterial extends NgtCommonMaterial<
   }
 
   @Input() set emissiveIntensity(emissiveIntensity: NumberInput) {
-    this.set({
-      emissiveIntensity: coerceNumberProperty(emissiveIntensity),
-    });
+    this.set({ emissiveIntensity: coerceNumberProperty(emissiveIntensity) });
   }
 
   @Input() set emissiveMap(emissiveMap: THREE.Texture | null) {
@@ -100,9 +96,7 @@ export class NgtMeshPhongMaterial extends NgtCommonMaterial<
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {
@@ -138,9 +132,7 @@ export class NgtMeshPhongMaterial extends NgtCommonMaterial<
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
   }
 
   @Input() set wireframeLinecap(wireframeLinecap: string) {
@@ -151,6 +143,10 @@ export class NgtMeshPhongMaterial extends NgtCommonMaterial<
     this.set({ wireframeLinejoin });
   }
 
+  @Input() set fog(fog: BooleanInput) {
+    this.set({ fog: coerceBooleanProperty(fog) });
+  }
+
   @Input() set flatShading(flatShading: BooleanInput) {
     this.set({ flatShading: coerceBooleanProperty(flatShading) });
   }
@@ -192,6 +188,7 @@ export class NgtMeshPhongMaterial extends NgtCommonMaterial<
       wireframeLinewidth: true,
       wireframeLinecap: true,
       wireframeLinejoin: true,
+      fog: true,
       flatShading: true,
     };
   }

diff --git a/libs/core/materials/src/lib/mesh-physical-material/mesh-physical-material.ts b/libs/core/materials/src/lib/mesh-physical-material/mesh-physical-material.ts
@@ -31,9 +31,7 @@ export class NgtMeshPhysicalMaterial extends NgtMeshStandardMaterial<
   }
 
   @Input() set clearcoatRoughness(clearcoatRoughness: NumberInput) {
-    this.set({
-      clearcoatRoughness: coerceNumberProperty(clearcoatRoughness),
-    });
+    this.set({ clearcoatRoughness: coerceNumberProperty(clearcoatRoughness) });
   }
 
   @Input() set clearcoatRoughnessMap(clearcoatRoughnessMap: THREE.Texture | null) {
@@ -77,19 +75,15 @@ export class NgtMeshPhysicalMaterial extends NgtMeshStandardMaterial<
   }
 
   @Input() set attenuationDistance(attenuationDistance: NumberInput) {
-    this.set({
-      attenuationDistance: coerceNumberProperty(attenuationDistance),
-    });
+    this.set({ attenuationDistance: coerceNumberProperty(attenuationDistance) });
   }
 
   @Input() set attenuationColor(attenuationColor: THREE.Color) {
     this.set({ attenuationColor });
   }
 
   @Input() set specularIntensity(specularIntensity: NumberInput) {
-    this.set({
-      specularIntensity: coerceNumberProperty(specularIntensity),
-    });
+    this.set({ specularIntensity: coerceNumberProperty(specularIntensity) });
   }
 
   @Input() set specularColor(specularColor: THREE.Color) {

diff --git a/libs/core/materials/src/lib/mesh-standard-material/mesh-standard-material.ts b/libs/core/materials/src/lib/mesh-standard-material/mesh-standard-material.ts
@@ -44,9 +44,7 @@ export class NgtMeshStandardMaterial<
   }
 
   @Input() set lightMapIntensity(lightMapIntensity: NumberInput) {
-    this.set({
-      lightMapIntensity: coerceNumberProperty(lightMapIntensity),
-    });
+    this.set({ lightMapIntensity: coerceNumberProperty(lightMapIntensity) });
   }
 
   @Input() set aoMap(aoMap: THREE.Texture | null) {
@@ -62,9 +60,7 @@ export class NgtMeshStandardMaterial<
   }
 
   @Input() set emissiveIntensity(emissiveIntensity: NumberInput) {
-    this.set({
-      emissiveIntensity: coerceNumberProperty(emissiveIntensity),
-    });
+    this.set({ emissiveIntensity: coerceNumberProperty(emissiveIntensity) });
   }
 
   @Input() set emissiveMap(emissiveMap: THREE.Texture | null) {
@@ -96,9 +92,7 @@ export class NgtMeshStandardMaterial<
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {
@@ -130,9 +124,11 @@ export class NgtMeshStandardMaterial<
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
+  }
+
+  @Input() set fog(fog: BooleanInput) {
+    this.set({ fog: coerceBooleanProperty(fog) });
   }
 
   @Input() set flatShading(flatShading: BooleanInput) {
@@ -172,6 +168,7 @@ export class NgtMeshStandardMaterial<
       envMapIntensity: true,
       wireframe: true,
       wireframeLinewidth: true,
+      fog: true,
       flatShading: true,
     };
   }

diff --git a/libs/core/materials/src/lib/mesh-toon-material/mesh-toon-material.ts b/libs/core/materials/src/lib/mesh-toon-material/mesh-toon-material.ts
@@ -41,9 +41,7 @@ export class NgtMeshToonMaterial extends NgtCommonMaterial<THREE.MeshToonMateria
   }
 
   @Input() set lightMapIntensity(lightMapIntensity: NumberInput) {
-    this.set({
-      lightMapIntensity: coerceNumberProperty(lightMapIntensity),
-    });
+    this.set({ lightMapIntensity: coerceNumberProperty(lightMapIntensity) });
   }
 
   @Input() set aoMap(aoMap: THREE.Texture | null) {
@@ -59,9 +57,7 @@ export class NgtMeshToonMaterial extends NgtCommonMaterial<THREE.MeshToonMateria
   }
 
   @Input() set emissiveIntensity(emissiveIntensity: NumberInput) {
-    this.set({
-      emissiveIntensity: coerceNumberProperty(emissiveIntensity),
-    });
+    this.set({ emissiveIntensity: coerceNumberProperty(emissiveIntensity) });
   }
 
   @Input() set emissiveMap(emissiveMap: THREE.Texture | null) {
@@ -93,9 +89,7 @@ export class NgtMeshToonMaterial extends NgtCommonMaterial<THREE.MeshToonMateria
   }
 
   @Input() set displacementScale(displacementScale: NumberInput) {
-    this.set({
-      displacementScale: coerceNumberProperty(displacementScale),
-    });
+    this.set({ displacementScale: coerceNumberProperty(displacementScale) });
   }
 
   @Input() set displacementBias(displacementBias: NumberInput) {
@@ -111,9 +105,7 @@ export class NgtMeshToonMaterial extends NgtCommonMaterial<THREE.MeshToonMateria
   }
 
   @Input() set wireframeLinewidth(wireframeLinewidth: NumberInput) {
-    this.set({
-      wireframeLinewidth: coerceNumberProperty(wireframeLinewidth),
-    });
+    this.set({ wireframeLinewidth: coerceNumberProperty(wireframeLinewidth) });
   }
 
   @Input() set wireframeLinecap(wireframeLinecap: string) {
@@ -124,6 +116,10 @@ export class NgtMeshToonMaterial extends NgtCommonMaterial<THREE.MeshToonMateria
     this.set({ wireframeLinejoin });
   }
 
+  @Input() set fog(fog: BooleanInput) {
+    this.set({ fog: coerceBooleanProperty(fog) });
+  }
+
   get materialType(): AnyConstructor<THREE.MeshToonMaterial> {
     return THREE.MeshToonMaterial;
   }
@@ -155,6 +151,7 @@ export class NgtMeshToonMaterial extends NgtCommonMaterial<THREE.MeshToonMateria
       wireframeLinewidth: true,
       wireframeLinecap: true,
       wireframeLinejoin: true,
+      fog: true,
     };
   }
 }