2
0
Эх сурвалжийг харах

Material: Remove obsolete callbacks. (#28702)

Michael Herzog 1 жил өмнө
parent
commit
5557d53b23

+ 0 - 2
examples/jsm/renderers/common/Renderer.js

@@ -1382,8 +1382,6 @@ class Renderer {
 
 
 		object.onBeforeRender( this, scene, camera, geometry, material, group );
 		object.onBeforeRender( this, scene, camera, geometry, material, group );
 
 
-		material.onBeforeRender( this, scene, camera, geometry, material, group );
-
 		//
 		//
 
 
 		if ( scene.overrideMaterial !== null ) {
 		if ( scene.overrideMaterial !== null ) {

+ 13 - 4
src/materials/Material.js

@@ -100,10 +100,6 @@ class Material extends EventDispatcher {
 
 
 	}
 	}
 
 
-	onBuild( /* shaderobject, renderer */ ) {}
-
-	onBeforeRender( /* renderer, scene, camera, geometry, object, group */ ) {}
-
 	onBeforeCompile( /* shaderobject, renderer */ ) {}
 	onBeforeCompile( /* shaderobject, renderer */ ) {}
 
 
 	customProgramCacheKey() {
 	customProgramCacheKey() {
@@ -520,6 +516,19 @@ 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 };
 export { Material };

+ 0 - 4
src/renderers/WebGLRenderer.js

@@ -1599,8 +1599,6 @@ class WebGLRenderer {
 			object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
 			object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
 			object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
 			object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
 
 
-			material.onBeforeRender( _this, scene, camera, geometry, object, group );
-
 			if ( material.transparent === true && material.side === DoubleSide && material.forceSinglePass === false ) {
 			if ( material.transparent === true && material.side === DoubleSide && material.forceSinglePass === false ) {
 
 
 				material.side = BackSide;
 				material.side = BackSide;
@@ -1675,8 +1673,6 @@ class WebGLRenderer {
 
 
 				parameters.uniforms = programCache.getUniforms( material );
 				parameters.uniforms = programCache.getUniforms( material );
 
 
-				material.onBuild( object, parameters, _this );
-
 				material.onBeforeCompile( parameters, _this );
 				material.onBeforeCompile( parameters, _this );
 
 
 				program = programCache.acquireProgram( parameters, programCacheKey );
 				program = programCache.acquireProgram( parameters, programCacheKey );