Clean up.

mrdoob · Aug 19, 2020 · 6268611 · 6268611
1 parent a21b664
commit 6268611
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 40 deletions.
diff --git a/examples/jsm/lines/LineMaterial.js b/examples/jsm/lines/LineMaterial.js
@@ -262,6 +262,8 @@ class LineMaterial extends ShaderMaterial {
 
 		this.dashed = false;
 
+		Object.defineProperty( this, 'isLineMaterial', { value: true } );
+
 		Object.defineProperties( this, {
 
 			color: {
@@ -398,6 +400,4 @@ class LineMaterial extends ShaderMaterial {
 
 }
 
-LineMaterial.prototype.isLineMaterial = true;
-
 export { LineMaterial };
diff --git a/examples/jsm/nodes/materials/NodeMaterial.js b/examples/jsm/nodes/materials/NodeMaterial.js
@@ -17,6 +17,8 @@ class NodeMaterial extends ShaderMaterial {
 
 		super();
 
+		Object.defineProperty( this, 'isNodeMaterial', { value: true } );
+
 		this.vertex = vertex || new RawNode( new PositionNode( PositionNode.PROJECTION ) );
 		this.fragment = fragment || new RawNode( new ColorNode( 0xFF0000 ) );
 
@@ -214,6 +216,4 @@ class NodeMaterial extends ShaderMaterial {
 
 }
 
-NodeMaterial.prototype.isNodeMaterial = true;
-
 export { NodeMaterial };
diff --git a/src/materials/LineBasicMaterial.js b/src/materials/LineBasicMaterial.js
@@ -17,6 +17,9 @@ class LineBasicMaterial extends Material {
 	constructor( parameters ) {
 
 		super();
+
+		Object.defineProperty( this, 'isLineBasicMaterial', { value: true } );
+
 		this.type = 'LineBasicMaterial';
 
 		this.color = new Color( 0xffffff );
@@ -50,6 +53,4 @@ class LineBasicMaterial extends Material {
 
 }
 
-LineBasicMaterial.prototype.isLineBasicMaterial = true;
-
 export { LineBasicMaterial };
diff --git a/src/materials/LineDashedMaterial.js b/src/materials/LineDashedMaterial.js
@@ -19,6 +19,8 @@ class LineDashedMaterial extends LineBasicMaterial {
 
 		super();
 
+		Object.defineProperty( this, 'isLineDashedMaterial', { value: true } );
+
 		this.type = 'LineDashedMaterial';
 
 		this.scale = 1;
@@ -43,6 +45,4 @@ class LineDashedMaterial extends LineBasicMaterial {
 
 }
 
-LineDashedMaterial.prototype.isLineDashedMaterial = true;
-
 export { LineDashedMaterial };
diff --git a/src/materials/Material.js b/src/materials/Material.js
@@ -10,6 +10,8 @@ class Material extends EventDispatcher {
 
 		super();
 
+		Object.defineProperty( this, 'isMaterial', { value: true } );
+
 		Object.defineProperty( this, 'id', { value: materialId ++ } );
 
 		this.uuid = MathUtils.generateUUID();
@@ -440,6 +442,4 @@ class Material extends EventDispatcher {
 
 }
 
-Material.prototype.isMaterial = true;
-
 export { Material };
diff --git a/src/materials/MeshBasicMaterial.js b/src/materials/MeshBasicMaterial.js
@@ -40,6 +40,8 @@ class MeshBasicMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshBasicMaterial', { value: true } );
+
 		this.type = 'MeshBasicMaterial';
 
 		this.color = new Color( 0xffffff ); // emissive
@@ -110,6 +112,4 @@ class MeshBasicMaterial extends Material {
 
 }
 
-MeshBasicMaterial.prototype.isMeshBasicMaterial = true;
-
 export { MeshBasicMaterial };
diff --git a/src/materials/MeshDepthMaterial.js b/src/materials/MeshDepthMaterial.js
@@ -25,6 +25,8 @@ class MeshDepthMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshDepthMaterial', { value: true } );
+
 		this.type = 'MeshDepthMaterial';
 
 		this.depthPacking = BasicDepthPacking;
@@ -75,6 +77,4 @@ class MeshDepthMaterial extends Material {
 
 }
 
-MeshDepthMaterial.prototype.isMeshDepthMaterial = true;
-
 export { MeshDepthMaterial };
diff --git a/src/materials/MeshDistanceMaterial.js b/src/materials/MeshDistanceMaterial.js
@@ -28,6 +28,8 @@ class MeshDistanceMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshDistanceMaterial', { value: true } );
+
 		this.type = 'MeshDistanceMaterial';
 
 		this.referencePosition = new Vector3();
@@ -76,6 +78,4 @@ class MeshDistanceMaterial extends Material {
 
 }
 
-MeshDistanceMaterial.prototype.isMeshDistanceMaterial = true;
-
 export { MeshDistanceMaterial };
diff --git a/src/materials/MeshLambertMaterial.js b/src/materials/MeshLambertMaterial.js
@@ -43,6 +43,8 @@ class MeshLambertMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshLambertMaterial', { value: true } );
+
 		this.type = 'MeshLambertMaterial';
 
 		this.color = new Color( 0xffffff ); // diffuse
@@ -123,6 +125,4 @@ class MeshLambertMaterial extends Material {
 
 }
 
-MeshLambertMaterial.prototype.isMeshLambertMaterial = true;
-
 export { MeshLambertMaterial };
diff --git a/src/materials/MeshMatcapMaterial.js b/src/materials/MeshMatcapMaterial.js
@@ -37,6 +37,8 @@ class MeshMatcapMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshMatcapMaterial', { value: true } );
+
 		this.defines = { 'MATCAP': '' };
 
 		this.type = 'MeshMatcapMaterial';
@@ -104,6 +106,4 @@ class MeshMatcapMaterial extends Material {
 
 }
 
-MeshMatcapMaterial.prototype.isMeshMatcapMaterial = true;
-
 export { MeshMatcapMaterial };
diff --git a/src/materials/MeshNormalMaterial.js b/src/materials/MeshNormalMaterial.js
@@ -32,6 +32,8 @@ class MeshNormalMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshNormalMaterial', { value: true } );
+
 		this.type = 'MeshNormalMaterial';
 
 		this.bumpMap = null;
@@ -86,6 +88,4 @@ class MeshNormalMaterial extends Material {
 
 }
 
-MeshNormalMaterial.prototype.isMeshNormalMaterial = true;
-
 export { MeshNormalMaterial };
diff --git a/src/materials/MeshPhongMaterial.js b/src/materials/MeshPhongMaterial.js
@@ -57,6 +57,8 @@ class MeshPhongMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshPhongMaterial', { value: true } );
+
 		this.type = 'MeshPhongMaterial';
 
 		this.color = new Color( 0xffffff ); // diffuse
@@ -163,6 +165,4 @@ class MeshPhongMaterial extends Material {
 
 }
 
-MeshPhongMaterial.prototype.isMeshPhongMaterial = true;
-
 export { MeshPhongMaterial };
diff --git a/src/materials/MeshPhysicalMaterial.js b/src/materials/MeshPhysicalMaterial.js
@@ -26,6 +26,8 @@ class MeshPhysicalMaterial extends MeshStandardMaterial {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshPhysicalMaterial', { value: true } );
+
 		this.defines = {
 
 			'STANDARD': '',
@@ -92,6 +94,4 @@ class MeshPhysicalMaterial extends MeshStandardMaterial {
 
 }
 
-MeshPhysicalMaterial.prototype.isMeshPhysicalMaterial = true;
-
 export { MeshPhysicalMaterial };
diff --git a/src/materials/MeshStandardMaterial.js b/src/materials/MeshStandardMaterial.js
@@ -59,6 +59,8 @@ class MeshStandardMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshStandardMaterial', { value: true } );
+
 		this.defines = { 'STANDARD': '' };
 
 		this.type = 'MeshStandardMaterial';
@@ -177,6 +179,4 @@ class MeshStandardMaterial extends Material {
 
 }
 
-MeshStandardMaterial.prototype.isMeshStandardMaterial = true;
-
 export { MeshStandardMaterial };
diff --git a/src/materials/MeshToonMaterial.js b/src/materials/MeshToonMaterial.js
@@ -48,6 +48,8 @@ class MeshToonMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isMeshToonMaterial', { value: true } );
+
 		this.defines = { 'TOON': '' };
 
 		this.type = 'MeshToonMaterial';
@@ -140,6 +142,4 @@ class MeshToonMaterial extends Material {
 
 }
 
-MeshToonMaterial.prototype.isMeshToonMaterial = true;
-
 export { MeshToonMaterial };
diff --git a/src/materials/PointsMaterial.js b/src/materials/PointsMaterial.js
@@ -21,6 +21,8 @@ class PointsMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isPointsMaterial', { value: true } );
+
 		this.type = 'PointsMaterial';
 
 		this.color = new Color( 0xffffff );
@@ -59,6 +61,4 @@ class PointsMaterial extends Material {
 
 }
 
-PointsMaterial.prototype.isPointsMaterial = true;
-
 export { PointsMaterial };
diff --git a/src/materials/RawShaderMaterial.js b/src/materials/RawShaderMaterial.js
@@ -6,12 +6,12 @@ class RawShaderMaterial extends ShaderMaterial {
 
 		super( parameters );
 
+		Object.defineProperty( this, 'isRawShaderMaterial', { value: true } );
+
 		this.type = 'RawShaderMaterial';
 
 	}
 
 }
 
-RawShaderMaterial.prototype.isRawShaderMaterial = true;
-
 export { RawShaderMaterial };
diff --git a/src/materials/ShaderMaterial.js b/src/materials/ShaderMaterial.js
@@ -29,6 +29,8 @@ class ShaderMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isShaderMaterial', { value: true } );
+
 		this.type = 'ShaderMaterial';
 
 		this.defines = {};
@@ -212,6 +214,4 @@ class ShaderMaterial extends Material {
 
 }
 
-ShaderMaterial.prototype.isShaderMaterial = true;
-
 export { ShaderMaterial };
diff --git a/src/materials/ShadowMaterial.js b/src/materials/ShadowMaterial.js
@@ -13,6 +13,8 @@ class ShadowMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isShadowMaterial', { value: true } );
+
 		this.type = 'ShadowMaterial';
 
 		this.color = new Color( 0x000000 );
@@ -34,6 +36,4 @@ class ShadowMaterial extends Material {
 
 }
 
-ShadowMaterial.prototype.isShadowMaterial = true;
-
 export { ShadowMaterial };
diff --git a/src/materials/SpriteMaterial.js b/src/materials/SpriteMaterial.js
@@ -17,6 +17,8 @@ class SpriteMaterial extends Material {
 
 		super();
 
+		Object.defineProperty( this, 'isSpriteMaterial', { value: true } );
+
 		this.type = 'SpriteMaterial';
 
 		this.color = new Color( 0xffffff );
@@ -55,6 +57,4 @@ class SpriteMaterial extends Material {
 
 }
 
-SpriteMaterial.prototype.isSpriteMaterial = true;
-
 export { SpriteMaterial };