Revert "Material: Remove obsolete callbacks. (mrdoob#28702)"

DOPPLE: Re-restore onBeforeRender on materials, to fix probes. This reverts commit 5557d53.
Curiosity-Machines · Jul 31, 2024 · ebce4ba · ebce4ba
1 parent 589bffc
commit ebce4ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/materials/Material.js b/src/materials/Material.js
@@ -100,6 +100,10 @@ class Material extends EventDispatcher {
 
 	}
 
+	onBuild( /* shaderobject, renderer */ ) {}
+
+	onBeforeRender( /* renderer, scene, camera, geometry, object, group */ ) {}
+
 	onBeforeCompile( /* shaderobject, renderer */ ) {}
 
 	customProgramCacheKey() {
@@ -516,19 +520,6 @@ class Material extends EventDispatcher {
 
 	}
 
-	onBuild( /* shaderobject, renderer */ ) {
-
-		console.warn( 'Material: onBuild() has been removed.' ); // @deprecated, r166
-
-	}
-
-	onBeforeRender( /* renderer, scene, camera, geometry, object, group */ ) {
-
-		console.warn( 'Material: onBeforeRender() has been removed.' ); // @deprecated, r166
-
-	}
-
-
 }
 
 export { Material };
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -1593,6 +1593,8 @@ class WebGLRenderer {
 			object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
 			object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
 
+			material.onBeforeRender( _this, scene, camera, geometry, object, group );
+
 			if ( material.transparent === true && material.side === DoubleSide && material.forceSinglePass === false ) {
 
 				material.side = BackSide;
@@ -1667,6 +1669,8 @@ class WebGLRenderer {
 
 				parameters.uniforms = programCache.getUniforms( material );
 
+				material.onBuild( object, parameters, _this );
+
 				material.onBeforeCompile( parameters, _this );
 
 				program = programCache.acquireProgram( parameters, programCacheKey );

diff --git a/src/renderers/common/Renderer.js b/src/renderers/common/Renderer.js
@@ -1425,6 +1425,8 @@ class Renderer {
 
 		object.onBeforeRender( this, scene, camera, geometry, material, group );
 
+		material.onBeforeRender( this, scene, camera, geometry, material, group );
+
 		//
 
 		if ( scene.overrideMaterial !== null ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1425,6 +1425,8 @@ class Renderer { @@
     		object.onBeforeRender( this, scene, camera, geometry, material, group );
+    		material.onBeforeRender( this, scene, camera, geometry, material, group );
     		//
     		if ( scene.overrideMaterial !== null ) {
@@ Expand Down @@