fix(materials): adjust how sub materials classes instantiate new mate…

…rial
nartc · Apr 16, 2021 · 80d32d0 · 80d32d0
1 parent 69dbdda
commit 80d32d0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/packages/core/geometries/src/lib/abstracts/geometry.abstract.ts b/packages/core/geometries/src/lib/abstracts/geometry.abstract.ts
diff --git a/packages/core/geometries/src/lib/box-buffer-geometry/index.ts b/packages/core/geometries/src/lib/box-buffer-geometry/index.ts
diff --git a/packages/core/geometries/src/lib/cylinder-buffer-geometry/index.ts b/packages/core/geometries/src/lib/cylinder-buffer-geometry/index.ts
diff --git a/packages/core/materials/src/lib/abstracts/material.abstract.ts b/packages/core/materials/src/lib/abstracts/material.abstract.ts
@@ -6,7 +6,8 @@ import { Color, Material, MaterialParameters } from 'three';
 @Directive()
 export abstract class ThreeMaterial<
   TMaterial extends Material = Material,
-  TMaterialParameters extends MaterialParameters = MaterialParameters
+  TMaterialParameters extends MaterialParameters = MaterialParameters,
+  TMaterialConstructor extends typeof Material = typeof Material
 > {
   @Input() ngtId?: string;
 
@@ -30,12 +31,14 @@ export abstract class ThreeMaterial<
     @SkipSelf() protected readonly canvasStore: CanvasStore
   ) {}
 
-  abstract init(): TMaterial;
+  abstract materialType: TMaterialConstructor;
 
   private _material?: TMaterial;
   get material(): TMaterial {
     if (this._material == null) {
-      this._material = this.init();
+      this._material = new ((this.materialType as unknown) as new (
+        params?: TMaterialParameters
+      ) => TMaterial)(this.parameters);
       this.instancesStore.saveMaterial({
         id: this.ngtId,
         material: this._material,

diff --git a/packages/core/materials/src/lib/mesh-lambert-material/mesh-lambert-material.directive.ts b/packages/core/materials/src/lib/mesh-lambert-material/mesh-lambert-material.directive.ts
@@ -11,13 +11,12 @@ import { ThreeMaterial } from '../abstracts';
 })
 export class MeshLambertMaterialDirective extends ThreeMaterial<
   MeshLambertMaterial,
-  MeshLambertMaterialParameters
+  MeshLambertMaterialParameters,
+  typeof MeshLambertMaterial
 > {
   static ngAcceptInputType_parameters:
     | MeshLambertMaterialParameters
     | undefined;
 
-  init(): MeshLambertMaterial {
-    return new MeshLambertMaterial(this.parameters);
-  }
+  materialType = MeshLambertMaterial;
 }
diff --git a/packages/core/materials/src/lib/mesh-normal-material/mesh-normal-material.directive.ts b/packages/core/materials/src/lib/mesh-normal-material/mesh-normal-material.directive.ts
@@ -11,11 +11,10 @@ import { ThreeMaterial } from '../abstracts';
 })
 export class MeshNormalMaterialDirective extends ThreeMaterial<
   MeshNormalMaterial,
-  MeshNormalMaterialParameters
+  MeshNormalMaterialParameters,
+  typeof MeshNormalMaterial
 > {
   static ngAcceptInputType_parameters: MeshNormalMaterialParameters;
 
-  init(): MeshNormalMaterial {
-    return new MeshNormalMaterial(this.parameters);
-  }
+  materialType = MeshNormalMaterial;
 }
diff --git a/packages/core/materials/src/lib/mesh-phong-material/mesh-phong-material.directive.ts b/packages/core/materials/src/lib/mesh-phong-material/mesh-phong-material.directive.ts
@@ -11,11 +11,10 @@ import { ThreeMaterial } from '../abstracts';
 })
 export class MeshPhongMaterialDirective extends ThreeMaterial<
   MeshPhongMaterial,
-  MeshPhongMaterialParameters
+  MeshPhongMaterialParameters,
+  typeof MeshPhongMaterial
 > {
   static ngAcceptInputType_parameters: MeshPhongMaterialParameters;
 
-  init(): MeshPhongMaterial {
-    return new MeshPhongMaterial(this.parameters);
-  }
+  materialType = MeshPhongMaterial;
 }
diff --git a/packages/core/materials/src/lib/mesh-standard-material/mesh-standard-material.directive.ts b/packages/core/materials/src/lib/mesh-standard-material/mesh-standard-material.directive.ts
@@ -11,11 +11,10 @@ import { ThreeMaterial } from '../abstracts';
 })
 export class MeshStandardMaterialDirective extends ThreeMaterial<
   MeshStandardMaterial,
-  MeshStandardMaterialParameters
+  MeshStandardMaterialParameters,
+  typeof MeshStandardMaterial
 > {
   static ngAcceptInputType_parameters: MeshStandardMaterialParameters;
 
-  init(): MeshStandardMaterial {
-    return new MeshStandardMaterial(this.parameters);
-  }
+  materialType = MeshStandardMaterial;
 }