Skip to content

Commit 3f78179

Browse files
mrdoobabernier
mrdoob
authored and
abernier
committed
WebGLMaterials: Clean up. (mrdoob#23713)
1 parent 307cdbc commit 3f78179

File tree

1 file changed

+31
-181
lines changed

1 file changed

+31
-181
lines changed

‎src/renderers/webgl/WebGLMaterials.js‎

Lines changed: 31 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ function WebGLMaterials( renderer, properties ) {
2828
} else if ( material.isMeshLambertMaterial ) {
2929

3030
refreshUniformsCommon( uniforms, material );
31-
refreshUniformsLambert( uniforms, material );
3231

3332
} else if ( material.isMeshToonMaterial ) {
3433

@@ -43,15 +42,12 @@ function WebGLMaterials( renderer, properties ) {
4342
} else if ( material.isMeshStandardMaterial ) {
4443

4544
refreshUniformsCommon( uniforms, material );
45+
refreshUniformsStandard( uniforms, material );
4646

4747
if ( material.isMeshPhysicalMaterial ) {
4848

4949
refreshUniformsPhysical( uniforms, material, transmissionRenderTarget );
5050

51-
} else {
52-
53-
refreshUniformsStandard( uniforms, material );
54-
5551
}
5652

5753
} else if ( material.isMeshMatcapMaterial ) {
@@ -62,7 +58,6 @@ function WebGLMaterials( renderer, properties ) {
6258
} else if ( material.isMeshDepthMaterial ) {
6359

6460
refreshUniformsCommon( uniforms, material );
65-
refreshUniformsDepth( uniforms, material );
6661

6762
} else if ( material.isMeshDistanceMaterial ) {
6863

@@ -72,7 +67,6 @@ function WebGLMaterials( renderer, properties ) {
7267
} else if ( material.isMeshNormalMaterial ) {
7368

7469
refreshUniformsCommon( uniforms, material );
75-
refreshUniformsNormal( uniforms, material );
7670

7771
} else if ( material.isLineBasicMaterial ) {
7872

@@ -133,6 +127,36 @@ function WebGLMaterials( renderer, properties ) {
133127

134128
}
135129

130+
if ( material.bumpMap ) {
131+
132+
uniforms.bumpMap.value = material.bumpMap;
133+
uniforms.bumpScale.value = material.bumpScale;
134+
if ( material.side === BackSide ) uniforms.bumpScale.value *= - 1;
135+
136+
}
137+
138+
if ( material.displacementMap ) {
139+
140+
uniforms.displacementMap.value = material.displacementMap;
141+
uniforms.displacementScale.value = material.displacementScale;
142+
uniforms.displacementBias.value = material.displacementBias;
143+
144+
}
145+
146+
if ( material.emissiveMap ) {
147+
148+
uniforms.emissiveMap.value = material.emissiveMap;
149+
150+
}
151+
152+
if ( material.normalMap ) {
153+
154+
uniforms.normalMap.value = material.normalMap;
155+
uniforms.normalScale.value.copy( material.normalScale );
156+
if ( material.side === BackSide ) uniforms.normalScale.value.negate();
157+
158+
}
159+
136160
if ( material.specularMap ) {
137161

138162
uniforms.specularMap.value = material.specularMap;
@@ -451,51 +475,11 @@ function WebGLMaterials( renderer, properties ) {
451475

452476
}
453477

454-
function refreshUniformsLambert( uniforms, material ) {
455-
456-
if ( material.emissiveMap ) {
457-
458-
uniforms.emissiveMap.value = material.emissiveMap;
459-
460-
}
461-
462-
}
463-
464478
function refreshUniformsPhong( uniforms, material ) {
465479

466480
uniforms.specular.value.copy( material.specular );
467481
uniforms.shininess.value = Math.max( material.shininess, 1e-4 ); // to prevent pow( 0.0, 0.0 )
468482

469-
if ( material.emissiveMap ) {
470-
471-
uniforms.emissiveMap.value = material.emissiveMap;
472-
473-
}
474-
475-
if ( material.bumpMap ) {
476-
477-
uniforms.bumpMap.value = material.bumpMap;
478-
uniforms.bumpScale.value = material.bumpScale;
479-
if ( material.side === BackSide ) uniforms.bumpScale.value *= - 1;
480-
481-
}
482-
483-
if ( material.normalMap ) {
484-
485-
uniforms.normalMap.value = material.normalMap;
486-
uniforms.normalScale.value.copy( material.normalScale );
487-
if ( material.side === BackSide ) uniforms.normalScale.value.negate();
488-
489-
}
490-
491-
if ( material.displacementMap ) {
492-
493-
uniforms.displacementMap.value = material.displacementMap;
494-
uniforms.displacementScale.value = material.displacementScale;
495-
uniforms.displacementBias.value = material.displacementBias;
496-
497-
}
498-
499483
}
500484

501485
function refreshUniformsToon( uniforms, material ) {
@@ -506,36 +490,6 @@ function WebGLMaterials( renderer, properties ) {
506490

507491
}
508492

509-
if ( material.emissiveMap ) {
510-
511-
uniforms.emissiveMap.value = material.emissiveMap;
512-
513-
}
514-
515-
if ( material.bumpMap ) {
516-
517-
uniforms.bumpMap.value = material.bumpMap;
518-
uniforms.bumpScale.value = material.bumpScale;
519-
if ( material.side === BackSide ) uniforms.bumpScale.value *= - 1;
520-
521-
}
522-
523-
if ( material.normalMap ) {
524-
525-
uniforms.normalMap.value = material.normalMap;
526-
uniforms.normalScale.value.copy( material.normalScale );
527-
if ( material.side === BackSide ) uniforms.normalScale.value.negate();
528-
529-
}
530-
531-
if ( material.displacementMap ) {
532-
533-
uniforms.displacementMap.value = material.displacementMap;
534-
uniforms.displacementScale.value = material.displacementScale;
535-
uniforms.displacementBias.value = material.displacementBias;
536-
537-
}
538-
539493
}
540494

541495
function refreshUniformsStandard( uniforms, material ) {
@@ -555,36 +509,6 @@ function WebGLMaterials( renderer, properties ) {
555509

556510
}
557511

558-
if ( material.emissiveMap ) {
559-
560-
uniforms.emissiveMap.value = material.emissiveMap;
561-
562-
}
563-
564-
if ( material.bumpMap ) {
565-
566-
uniforms.bumpMap.value = material.bumpMap;
567-
uniforms.bumpScale.value = material.bumpScale;
568-
if ( material.side === BackSide ) uniforms.bumpScale.value *= - 1;
569-
570-
}
571-
572-
if ( material.normalMap ) {
573-
574-
uniforms.normalMap.value = material.normalMap;
575-
uniforms.normalScale.value.copy( material.normalScale );
576-
if ( material.side === BackSide ) uniforms.normalScale.value.negate();
577-
578-
}
579-
580-
if ( material.displacementMap ) {
581-
582-
uniforms.displacementMap.value = material.displacementMap;
583-
uniforms.displacementScale.value = material.displacementScale;
584-
uniforms.displacementBias.value = material.displacementBias;
585-
586-
}
587-
588512
const envMap = properties.get( material ).envMap;
589513

590514
if ( envMap ) {
@@ -598,8 +522,6 @@ function WebGLMaterials( renderer, properties ) {
598522

599523
function refreshUniformsPhysical( uniforms, material, transmissionRenderTarget ) {
600524

601-
refreshUniformsStandard( uniforms, material );
602-
603525
uniforms.ior.value = material.ior; // also part of uniforms common
604526

605527
if ( material.sheen > 0 ) {
@@ -704,88 +626,16 @@ function WebGLMaterials( renderer, properties ) {
704626

705627
}
706628

707-
if ( material.bumpMap ) {
708-
709-
uniforms.bumpMap.value = material.bumpMap;
710-
uniforms.bumpScale.value = material.bumpScale;
711-
if ( material.side === BackSide ) uniforms.bumpScale.value *= - 1;
712-
713-
}
714-
715-
if ( material.normalMap ) {
716-
717-
uniforms.normalMap.value = material.normalMap;
718-
uniforms.normalScale.value.copy( material.normalScale );
719-
if ( material.side === BackSide ) uniforms.normalScale.value.negate();
720-
721-
}
722-
723-
if ( material.displacementMap ) {
724-
725-
uniforms.displacementMap.value = material.displacementMap;
726-
uniforms.displacementScale.value = material.displacementScale;
727-
uniforms.displacementBias.value = material.displacementBias;
728-
729-
}
730-
731-
}
732-
733-
function refreshUniformsDepth( uniforms, material ) {
734-
735-
if ( material.displacementMap ) {
736-
737-
uniforms.displacementMap.value = material.displacementMap;
738-
uniforms.displacementScale.value = material.displacementScale;
739-
uniforms.displacementBias.value = material.displacementBias;
740-
741-
}
742-
743629
}
744630

745631
function refreshUniformsDistance( uniforms, material ) {
746632

747-
if ( material.displacementMap ) {
748-
749-
uniforms.displacementMap.value = material.displacementMap;
750-
uniforms.displacementScale.value = material.displacementScale;
751-
uniforms.displacementBias.value = material.displacementBias;
752-
753-
}
754-
755633
uniforms.referencePosition.value.copy( material.referencePosition );
756634
uniforms.nearDistance.value = material.nearDistance;
757635
uniforms.farDistance.value = material.farDistance;
758636

759637
}
760638

761-
function refreshUniformsNormal( uniforms, material ) {
762-
763-
if ( material.bumpMap ) {
764-
765-
uniforms.bumpMap.value = material.bumpMap;
766-
uniforms.bumpScale.value = material.bumpScale;
767-
if ( material.side === BackSide ) uniforms.bumpScale.value *= - 1;
768-
769-
}
770-
771-
if ( material.normalMap ) {
772-
773-
uniforms.normalMap.value = material.normalMap;
774-
uniforms.normalScale.value.copy( material.normalScale );
775-
if ( material.side === BackSide ) uniforms.normalScale.value.negate();
776-
777-
}
778-
779-
if ( material.displacementMap ) {
780-
781-
uniforms.displacementMap.value = material.displacementMap;
782-
uniforms.displacementScale.value = material.displacementScale;
783-
uniforms.displacementBias.value = material.displacementBias;
784-
785-
}
786-
787-
}
788-
789639
return {
790640
refreshFogUniforms: refreshFogUniforms,
791641
refreshMaterialUniforms: refreshMaterialUniforms

0 commit comments

Comments
 (0)