Skip to content

Commit ee2d261

Browse files
Mugen87Mugen87
authored
Merge pull request mrdoob#17614 from Mugen87/dev38
Material: Clean up usage of .lights property.
2 parents a84f4c4 + c2d9cf8 commit ee2d261

16 files changed

+0
-26
lines changed

‎examples/js/loaders/GLTFLoader.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,7 +2116,6 @@ THREE.GLTFLoader = ( function () {
21162116
THREE.Material.prototype.copy.call( pointsMaterial, material );
21172117
pointsMaterial.color.copy( material.color );
21182118
pointsMaterial.map = material.map;
2119-
pointsMaterial.lights = false; // PointsMaterial doesn't support lights yet
21202119
pointsMaterial.sizeAttenuation = false; // glTF spec says points should be 1px
21212120

21222121
this.cache.add( cacheKey, pointsMaterial );
@@ -2136,7 +2135,6 @@ THREE.GLTFLoader = ( function () {
21362135
lineMaterial = new THREE.LineBasicMaterial();
21372136
THREE.Material.prototype.copy.call( lineMaterial, material );
21382137
lineMaterial.color.copy( material.color );
2139-
lineMaterial.lights = false; // LineBasicMaterial doesn't support lights yet
21402138

21412139
this.cache.add( cacheKey, lineMaterial );
21422140

‎examples/js/loaders/MMDLoader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,6 @@ THREE.MMDLoader = ( function () {
10321032

10331033
params.skinning = geometry.bones.length > 0 ? true : false;
10341034
params.morphTargets = geometry.morphTargets.length > 0 ? true : false;
1035-
params.lights = true;
10361035
params.fog = true;
10371036

10381037
// blend

‎examples/js/loaders/OBJLoader.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,6 @@ THREE.OBJLoader = ( function () {
682682
var materialLine = new THREE.LineBasicMaterial();
683683
THREE.Material.prototype.copy.call( materialLine, material );
684684
materialLine.color.copy( material.color );
685-
materialLine.lights = false;
686685
material = materialLine;
687686

688687
} else if ( isPoints && material && ! ( material instanceof THREE.PointsMaterial ) ) {
@@ -691,7 +690,6 @@ THREE.OBJLoader = ( function () {
691690
THREE.Material.prototype.copy.call( materialPoints, material );
692691
materialPoints.color.copy( material.color );
693692
materialPoints.map = material.map;
694-
materialPoints.lights = false;
695693
material = materialPoints;
696694

697695
}

‎examples/jsm/loaders/GLTFLoader.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,6 @@ var GLTFLoader = ( function () {
21802180
Material.prototype.copy.call( pointsMaterial, material );
21812181
pointsMaterial.color.copy( material.color );
21822182
pointsMaterial.map = material.map;
2183-
pointsMaterial.lights = false; // PointsMaterial doesn't support lights yet
21842183
pointsMaterial.sizeAttenuation = false; // glTF spec says points should be 1px
21852184

21862185
this.cache.add( cacheKey, pointsMaterial );
@@ -2200,7 +2199,6 @@ var GLTFLoader = ( function () {
22002199
lineMaterial = new LineBasicMaterial();
22012200
Material.prototype.copy.call( lineMaterial, material );
22022201
lineMaterial.color.copy( material.color );
2203-
lineMaterial.lights = false; // LineBasicMaterial doesn't support lights yet
22042202

22052203
this.cache.add( cacheKey, lineMaterial );
22062204

‎examples/jsm/loaders/MMDLoader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,6 @@ var MMDLoader = ( function () {
10681068

10691069
params.skinning = geometry.bones.length > 0 ? true : false;
10701070
params.morphTargets = geometry.morphTargets.length > 0 ? true : false;
1071-
params.lights = true;
10721071
params.fog = true;
10731072

10741073
// blend

‎examples/jsm/loaders/OBJLoader.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ var OBJLoader = ( function () {
699699
var materialLine = new LineBasicMaterial();
700700
Material.prototype.copy.call( materialLine, material );
701701
materialLine.color.copy( material.color );
702-
materialLine.lights = false;
703702
material = materialLine;
704703

705704
} else if ( isPoints && material && ! ( material instanceof PointsMaterial ) ) {
@@ -708,7 +707,6 @@ var OBJLoader = ( function () {
708707
Material.prototype.copy.call( materialPoints, material );
709708
materialPoints.color.copy( material.color );
710709
materialPoints.map = material.map;
711-
materialPoints.lights = false;
712710
material = materialPoints;
713711

714712
}

‎examples/webgl_loader_vrm.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
THREE.Material.prototype.copy.call( material, object.material[ i ] );
6363
material.color.copy( object.material[ i ].color );
6464
material.map = object.material[ i ].map;
65-
material.lights = false;
6665
material.skinning = object.material[ i ].skinning;
6766
material.morphTargets = object.material[ i ].morphTargets;
6867
material.morphNormals = object.material[ i ].morphNormals;
@@ -76,7 +75,6 @@
7675
THREE.Material.prototype.copy.call( material, object.material );
7776
material.color.copy( object.material.color );
7877
material.map = object.material.map;
79-
material.lights = false;
8078
material.skinning = object.material.skinning;
8179
material.morphTargets = object.material.morphTargets;
8280
material.morphNormals = object.material.morphNormals;

‎src/materials/LineBasicMaterial.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ function LineBasicMaterial( parameters ) {
2727
this.linecap = 'round';
2828
this.linejoin = 'round';
2929

30-
this.lights = false;
31-
3230
this.setValues( parameters );
3331

3432
}

‎src/materials/Material.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function Material() {
1919
this.type = 'Material';
2020

2121
this.fog = true;
22-
this.lights = true;
2322

2423
this.blending = NormalBlending;
2524
this.side = FrontSide;
@@ -343,7 +342,6 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
343342
this.name = source.name;
344343

345344
this.fog = source.fog;
346-
this.lights = source.lights;
347345

348346
this.blending = source.blending;
349347
this.side = source.side;

‎src/materials/MeshBasicMaterial.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ function MeshBasicMaterial( parameters ) {
7070
this.skinning = false;
7171
this.morphTargets = false;
7272

73-
this.lights = false;
74-
7573
this.setValues( parameters );
7674

7775
}

‎src/materials/MeshDepthMaterial.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ function MeshDepthMaterial( parameters ) {
4747
this.wireframeLinewidth = 1;
4848

4949
this.fog = false;
50-
this.lights = false;
5150

5251
this.setValues( parameters );
5352

‎src/materials/MeshDistanceMaterial.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ function MeshDistanceMaterial( parameters ) {
4646
this.displacementBias = 0;
4747

4848
this.fog = false;
49-
this.lights = false;
5049

5150
this.setValues( parameters );
5251

‎src/materials/MeshMatcapMaterial.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ function MeshMatcapMaterial( parameters ) {
6464
this.morphTargets = false;
6565
this.morphNormals = false;
6666

67-
this.lights = false;
68-
6967
this.setValues( parameters );
7068

7169
}

‎src/materials/MeshNormalMaterial.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ function MeshNormalMaterial( parameters ) {
5050
this.wireframeLinewidth = 1;
5151

5252
this.fog = false;
53-
this.lights = false;
5453

5554
this.skinning = false;
5655
this.morphTargets = false;

‎src/materials/PointsMaterial.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ function PointsMaterial( parameters ) {
3232

3333
this.morphTargets = false;
3434

35-
this.lights = false;
36-
3735
this.setValues( parameters );
3836

3937
}

‎src/materials/SpriteMaterial.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ function SpriteMaterial( parameters ) {
2525

2626
this.sizeAttenuation = true;
2727

28-
this.lights = false;
2928
this.transparent = true;
3029

3130
this.setValues( parameters );

0 commit comments

Comments
 (0)