Skip to content

Commit f7c0862

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

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

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
@@ -1593,6 +1593,8 @@ class WebGLRenderer {
15931593
object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
15941594
object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
15951595

1596+
material.onBeforeRender( _this, scene, camera, geometry, object, group );
1597+
15961598
if ( material.transparent === true && material.side === DoubleSide && material.forceSinglePass === false ) {
15971599

15981600
material.side = BackSide;
@@ -1667,6 +1669,8 @@ class WebGLRenderer {
16671669

16681670
parameters.uniforms = programCache.getUniforms( material );
16691671

1672+
material.onBuild( object, parameters, _this );
1673+
16701674
material.onBeforeCompile( parameters, _this );
16711675

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

src/renderers/common/Renderer.js

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

14261426
object.onBeforeRender( this, scene, camera, geometry, material, group );
14271427

1428+
material.onBeforeRender( this, scene, camera, geometry, material, group );
1429+
14281430
//
14291431

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

0 commit comments

Comments
 (0)