فهرست منبع

Merge pull request #7866 from Mugen87/revert-7836-dev

Revert "add stencil properties to material"
Mr.doob 9 سال پیش
والد
کامیت
bee4e676cd
5فایلهای تغییر یافته به همراه1 افزوده شده و 16 حذف شده
  1. 0 2
      src/loaders/Loader.js
  2. 0 2
      src/loaders/MaterialLoader.js
  3. 0 6
      src/materials/Material.js
  4. 1 5
      src/renderers/WebGLRenderer.js
  5. 0 1
      src/renderers/webgl/WebGLState.js

+ 0 - 2
src/loaders/Loader.js

@@ -229,8 +229,6 @@ THREE.Loader.prototype = {
 						break;
 					case 'depthTest':
 					case 'depthWrite':
-					case 'stencilTest':
-					case 'stencilWrite':
 					case 'colorWrite':
 					case 'opacity':
 					case 'reflectivity':

+ 0 - 2
src/loaders/MaterialLoader.js

@@ -70,8 +70,6 @@ THREE.MaterialLoader.prototype = {
 		if ( json.alphaTest !== undefined ) material.alphaTest = json.alphaTest;
 		if ( json.depthTest !== undefined ) material.depthTest = json.depthTest;
 		if ( json.depthWrite !== undefined ) material.depthWrite = json.depthWrite;
-		if ( json.stencilTest !== undefined ) material.stencilTest = json.stencilTest;
-		if ( json.stencilWrite !== undefined ) material.stencilWrite = json.stencilWrite;
 		if ( json.colorWrite !== undefined ) material.colorWrite = json.colorWrite;
 		if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
 		if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;

+ 0 - 6
src/materials/Material.js

@@ -30,9 +30,6 @@ THREE.Material = function () {
 	this.depthTest = true;
 	this.depthWrite = true;
 
-	this.stencilTest = false;
-	this.stencilWrite = false;
-
 	this.colorWrite = true;
 
 	this.precision = null; // override the renderer's default precision for this material
@@ -260,9 +257,6 @@ THREE.Material.prototype = {
 		this.depthTest = source.depthTest;
 		this.depthWrite = source.depthWrite;
 
-		this.stencilTest = source.stencilTest;
-		this.stencilWrite = source.stencilWrite;
-
 		this.colorWrite = source.colorWrite;
 
 		this.precision = source.precision;

+ 1 - 5
src/renderers/WebGLRenderer.js

@@ -1189,12 +1189,10 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		}
 
-		// Ensure buffer writing is enabled so they can be cleared on next render
+		// Ensure depth buffer writing is enabled so it can be cleared on next render
 
 		state.setDepthTest( true );
 		state.setDepthWrite( true );
-		state.setStencilTest( true );
-		state.setStencilWrite( true );
 		state.setColorWrite( true );
 
 		// _gl.finish();
@@ -1557,8 +1555,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 		state.setDepthFunc( material.depthFunc );
 		state.setDepthTest( material.depthTest );
 		state.setDepthWrite( material.depthWrite );
-		state.setStencilTest( material.stencilTest );
-		state.setStencilWrite( material.stencilWrite );
 		state.setColorWrite( material.colorWrite );
 		state.setPolygonOffset( material.polygonOffset, material.polygonOffsetFactor, material.polygonOffsetUnits );
 

+ 0 - 1
src/renderers/webgl/WebGLState.js

@@ -643,7 +643,6 @@ THREE.WebGLState = function ( gl, extensions, paramThreeToGL ) {
 		currentBlending = null;
 
 		currentDepthWrite = null;
-		currentStencilWrite = null;
 		currentColorWrite = null;
 
 		currentFlipSided = null;