Pārlūkot izejas kodu

CanvasRenderer: Seems like Firefox will never implement globalCompositeOperation = 'darker'. Removing the hack for textures + lighting.

Mr.doob 13 gadi atpakaļ
vecāks
revīzija
91fedbd8ca
1 mainītis faili ar 1 papildinājumiem un 20 dzēšanām
  1. 1 20
      src/renderers/CanvasRenderer.js

+ 1 - 20
src/renderers/CanvasRenderer.js

@@ -529,7 +529,7 @@ THREE.CanvasRenderer = function ( parameters ) {
 
 			if ( material instanceof THREE.MeshBasicMaterial ) {
 
-				if ( material.map/* && !material.wireframe*/ ) {
+				if ( material.map ) {
 
 					if ( material.map.mapping instanceof THREE.UVMapping ) {
 
@@ -574,19 +574,6 @@ THREE.CanvasRenderer = function ( parameters ) {
 
 			} else if ( material instanceof THREE.MeshLambertMaterial ) {
 
-				if ( material.map && !material.wireframe ) {
-
-					if ( material.map.mapping instanceof THREE.UVMapping ) {
-
-						_uvs = element.uvs[ 0 ];
-						patternPath( _v1x, _v1y, _v2x, _v2y, _v3x, _v3y, _uvs[ uv1 ].u, _uvs[ uv1 ].v, _uvs[ uv2 ].u, _uvs[ uv2 ].v, _uvs[ uv3 ].u, _uvs[ uv3 ].v, material.map );
-
-					}
-
-					setBlending( THREE.SubtractiveBlending );
-
-				}
-
 				if ( _enableLighting ) {
 
 					if ( !material.wireframe && material.shading == THREE.SmoothShading && element.vertexNormalsWorld.length == 3 ) {
@@ -1068,12 +1055,6 @@ THREE.CanvasRenderer = function ( parameters ) {
 
 					break;
 
-				case THREE.SubtractiveBlending:
-
-					_context.globalCompositeOperation = 'darker';
-
-					break;
-
 			}
 
 			_contextGlobalCompositeOperation = value;