소스 검색

WebGLRenderer.setupVertexAttributes: Simplified ANGLE_instanced_arrays check.

Mr.doob 6 년 전
부모
커밋
06e83ff583
1개의 변경된 파일2개의 추가작업 그리고 18개의 파일을 삭제
  1. 2 18
      src/renderers/WebGLRenderer.js

+ 2 - 18
src/renderers/WebGLRenderer.js

@@ -891,25 +891,9 @@ function WebGLRenderer( parameters ) {
 
 	function setupVertexAttributes( object, geometry, material, program ) {
 
-		if ( object.isInstancedMesh ) {
-
-			if ( extensions.get( 'ANGLE_instanced_arrays' ) === null ) {
-
-				console.error( 'THREE.WebGLRenderer.setupVertexAttributes: using THREE.InstancedBufferGeometry but hardware does not support extension ANGLE_instanced_arrays.' );
-				return;
-
-			}
+		if ( capabilities.isWebGL2 === false && ( object.isInstancedMesh || geometry.isInstancedBufferGeometry ) ) {
 
-		} else if ( geometry && geometry.isInstancedBufferGeometry && ! capabilities.isWebGL2 ) {
-
-			// TODO Remove
-
-			if ( extensions.get( 'ANGLE_instanced_arrays' ) === null ) {
-
-				console.error( 'THREE.WebGLRenderer.setupVertexAttributes: using THREE.InstancedBufferGeometry but hardware does not support extension ANGLE_instanced_arrays.' );
-				return;
-
-			}
+			if ( extensions.get( 'ANGLE_instanced_arrays' ) === null ) return;
 
 		}