Skip to content

Commit 5637b32

Browse files
committed
Revert "Material: Remove obsolete callbacks. (mrdoob#28702)"
This reverts commit 5557d53.
1 parent f37eac2 commit 5637b32

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

examples/jsm/renderers/common/Renderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,6 +1384,8 @@ class Renderer {
13841384

13851385
object.onBeforeRender( this, scene, camera, geometry, material, group );
13861386

1387+
material.onBeforeRender( this, scene, camera, geometry, material, group );
1388+
13871389
//
13881390

13891391
if ( scene.overrideMaterial !== null ) {

src/materials/Material.js

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ class Material extends EventDispatcher {
100100

101101
}
102102

103+
onBuild( /* shaderobject, renderer */ ) {}
104+
105+
onBeforeRender( /* renderer, scene, camera, geometry, object, group */ ) {}
106+
103107
onBeforeCompile( /* shaderobject, renderer */ ) {}
104108

105109
customProgramCacheKey() {
@@ -516,19 +520,6 @@ class Material extends EventDispatcher {
516520

517521
}
518522

519-
onBuild( /* shaderobject, renderer */ ) {
520-
521-
console.warn( 'Material: onBuild() has been removed.' ); // @deprecated, r166
522-
523-
}
524-
525-
onBeforeRender( /* renderer, scene, camera, geometry, object, group */ ) {
526-
527-
console.warn( 'Material: onBeforeRender() has been removed.' ); // @deprecated, r166
528-
529-
}
530-
531-
532523
}
533524

534525
export { Material };

src/renderers/WebGLRenderer.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,8 @@ class WebGLRenderer {
15991599
object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
16001600
object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
16011601

1602+
material.onBeforeRender( _this, scene, camera, geometry, object, group );
1603+
16021604
if ( material.transparent === true && material.side === DoubleSide && material.forceSinglePass === false ) {
16031605

16041606
material.side = BackSide;
@@ -1673,6 +1675,8 @@ class WebGLRenderer {
16731675

16741676
parameters.uniforms = programCache.getUniforms( material );
16751677

1678+
material.onBuild( object, parameters, _this );
1679+
16761680
material.onBeforeCompile( parameters, _this );
16771681

16781682
program = programCache.acquireProgram( parameters, programCacheKey );

0 commit comments

Comments
 (0)