From 8f2439c2d0c71113c8c57096dc1c038260b83520 Mon Sep 17 00:00:00 2001 From: WestLangley Date: Mon, 15 Oct 2018 23:13:21 -0400 Subject: [PATCH] Remove Material.overdraw property --- docs/api/en/materials/Material.html | 7 ------- docs/scenes/js/material.js | 1 - examples/misc_lights_test.html | 2 +- examples/misc_ubiquity_test2.html | 2 +- examples/software_geometry_earth.html | 4 ++-- examples/software_sandbox.html | 2 +- examples/webgl_effects_peppersghost.html | 2 +- src/Three.Legacy.js | 14 ++++++++++++++ src/materials/Material.js | 9 --------- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/docs/api/en/materials/Material.html b/docs/api/en/materials/Material.html index c7986300440974..272e32f526f284 100644 --- a/docs/api/en/materials/Material.html +++ b/docs/api/en/materials/Material.html @@ -175,13 +175,6 @@

[property:Float opacity]

Default is *1.0*.

-

[property:Float overdraw]

-

- Amount of triangle expansion at draw time. - This is a workaround for cases when gaps appear between triangles when using [page:CanvasRenderer]. - *0.5* tends to give good results across browsers. Default is *0*. -

-

[property:Boolean polygonOffset]

Whether to use polygon offset. Default is *false*. This corresponds to the *GL_POLYGON_OFFSET_FILL* WebGL feature. diff --git a/docs/scenes/js/material.js b/docs/scenes/js/material.js index 8529fc12b72aba..ccb4f593de4d75 100644 --- a/docs/scenes/js/material.js +++ b/docs/scenes/js/material.js @@ -302,7 +302,6 @@ function guiMaterial( gui, mesh, material, geometry ) { // folder.add( material, 'polygonOffsetFactor' ); // folder.add( material, 'polygonOffsetUnits' ); folder.add( material, 'alphaTest', 0, 1 ); - // folder.add( material, 'overdraw', 0, 5 ); folder.add( material, 'visible' ); folder.add( material, 'side', constants.side ).onChange( needsUpdate( material, geometry ) ); diff --git a/examples/misc_lights_test.html b/examples/misc_lights_test.html index 3fa14bb753515e..4391bba6a7494f 100644 --- a/examples/misc_lights_test.html +++ b/examples/misc_lights_test.html @@ -67,7 +67,7 @@ // Spheres geometry = new THREE.SphereBufferGeometry( 100, 16, 8 ); - material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, overdraw: 0.5, shininess: 0 } ); + material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, shininess: 0 } ); for ( var i = 0; i < 30; i ++ ) { diff --git a/examples/misc_ubiquity_test2.html b/examples/misc_ubiquity_test2.html index 235a42cb11f448..8694604685d5d7 100644 --- a/examples/misc_ubiquity_test2.html +++ b/examples/misc_ubiquity_test2.html @@ -56,7 +56,7 @@ texture.wrapT = THREE.RepeatWrapping; var geometry = new THREE.BoxBufferGeometry( 150, 150, 150, 4, 4, 4 ); - var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } ); + var material = new THREE.MeshBasicMaterial( { map: texture } ); mesh = new THREE.Mesh( geometry, material ); scene.add( mesh ); diff --git a/examples/software_geometry_earth.html b/examples/software_geometry_earth.html index 43d797cc48416c..5f7952f96b7a6c 100644 --- a/examples/software_geometry_earth.html +++ b/examples/software_geometry_earth.html @@ -73,7 +73,7 @@ var geometry = new THREE.SphereBufferGeometry( 200, 20, 20 ); - var material = new THREE.MeshLambertMaterial( { map: texture, overdraw: 0.5 } ); + var material = new THREE.MeshLambertMaterial( { map: texture } ); var mesh = new THREE.Mesh( geometry, material ); group.add( mesh ); @@ -103,7 +103,7 @@ var texture = new THREE.CanvasTexture( canvas ); var geometry = new THREE.PlaneBufferGeometry( 300, 300, 3, 3 ); - var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } ); + var material = new THREE.MeshBasicMaterial( { map: texture } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.y = - 250; diff --git a/examples/software_sandbox.html b/examples/software_sandbox.html index 6eb525e29510ac..280acc53610d69 100644 --- a/examples/software_sandbox.html +++ b/examples/software_sandbox.html @@ -82,7 +82,7 @@ // Cube with texture var loader = new THREE.TextureLoader(); var map = loader.load( 'textures/brick_diffuse.jpg' ); - texCube = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { map: map, overdraw: 0.5 } ) ); + texCube = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { map: map } ) ); texCube.position.set( - 300, 0, 0 ); scene.add( texCube ); diff --git a/examples/webgl_effects_peppersghost.html b/examples/webgl_effects_peppersghost.html index 222634dd62d5df..7d0586a7dbeeef 100644 --- a/examples/webgl_effects_peppersghost.html +++ b/examples/webgl_effects_peppersghost.html @@ -104,7 +104,7 @@ geometry.addAttribute( 'color', new THREE.Float32BufferAttribute( colors, 3 ) ); - var material = new THREE.MeshBasicMaterial( { vertexColors: THREE.VertexColors, overdraw: 0.5 } ); + var material = new THREE.MeshBasicMaterial( { vertexColors: THREE.VertexColors } ); for ( var i = 0; i < 10; i ++ ) { diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index 750d9c58a87dc0..1784cfaf1d7705 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -1288,6 +1288,20 @@ Object.defineProperties( Material.prototype, { } }, + + overdraw: { + get: function () { + + console.warn( 'THREE.Material: .overdraw has been removed.' ); + + }, + set: function () { + + console.warn( 'THREE.Material: .overdraw has been removed.' ); + + } + }, + wrapRGB: { get: function () { diff --git a/src/materials/Material.js b/src/materials/Material.js index 28a25cde84a2c6..b099f3753d4caa 100644 --- a/src/materials/Material.js +++ b/src/materials/Material.js @@ -59,8 +59,6 @@ function Material() { this.alphaTest = 0; this.premultipliedAlpha = false; - this.overdraw = 0; // Overdrawn pixels (typically between 0 and 1) for fixing antialiasing gaps in CanvasRenderer - this.visible = true; this.userData = {}; @@ -118,11 +116,6 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ), currentValue.copy( newValue ); - } else if ( key === 'overdraw' ) { - - // ensure overdraw is backwards-compatible with legacy boolean type - this[ key ] = Number( newValue ); - } else { this[ key ] = newValue; @@ -349,8 +342,6 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ), this.alphaTest = source.alphaTest; this.premultipliedAlpha = source.premultipliedAlpha; - this.overdraw = source.overdraw; - this.visible = source.visible; this.userData = JSON.parse( JSON.stringify( source.userData ) );