Mr.doob преди 8 години
родител
ревизия
1b2b779055
променени са 3 файла, в които са добавени 317 реда и са изтрити 331 реда
  1. 7 14
      build/three.js
  2. 303 303
      build/three.min.js
  3. 7 14
      build/three.module.js

+ 7 - 14
build/three.js

@@ -6385,7 +6385,7 @@
 	 * @author alteredq / http://alteredqualia.com/
 	 */
 
-	function WebGLFlareRenderer( renderer, gl, state, capabilities ) {
+	function WebGLFlareRenderer( renderer, gl, state, textures, capabilities ) {
 
 		var vertexBuffer, elementBuffer;
 		var shader, program, attributes, uniforms;
@@ -6712,7 +6712,8 @@
 							gl.uniform3f( uniforms.color, sprite.color.r, sprite.color.g, sprite.color.b );
 
 							state.setBlending( sprite.blending, sprite.blendEquation, sprite.blendSrc, sprite.blendDst );
-							renderer.setTexture2D( sprite.texture, 1 );
+
+							textures.setTexture2D( sprite.texture, 1 );
 
 							gl.drawElements( gl.TRIANGLES, 6, gl.UNSIGNED_SHORT, 0 );
 
@@ -6780,7 +6781,7 @@
 	 * @author alteredq / http://alteredqualia.com/
 	 */
 
-	function WebGLSpriteRenderer( renderer, gl, state, capabilities ) {
+	function WebGLSpriteRenderer( renderer, gl, state, textures, capabilities ) {
 
 		var vertexBuffer, elementBuffer;
 		var program, attributes, uniforms;
@@ -6998,15 +6999,7 @@
 				state.buffers.depth.setTest( material.depthTest );
 				state.buffers.depth.setMask( material.depthWrite );
 
-				if ( material.map ) {
-
-					renderer.setTexture2D( material.map, 0 );
-
-				} else {
-
-					renderer.setTexture2D( texture, 0 );
-
-				}
+				textures.setTexture2D( material.map || texture, 0 );
 
 				gl.drawElements( gl.TRIANGLES, 6, gl.UNSIGNED_SHORT, 0 );
 
@@ -20911,8 +20904,8 @@
 			bufferRenderer = new WebGLBufferRenderer( _gl, extensions, _infoRender );
 			indexedBufferRenderer = new WebGLIndexedBufferRenderer( _gl, extensions, _infoRender );
 
-			flareRenderer = new WebGLFlareRenderer( _this, _gl, state, capabilities );
-			spriteRenderer = new WebGLSpriteRenderer( _this, _gl, state, capabilities );
+			flareRenderer = new WebGLFlareRenderer( _this, _gl, state, textures, capabilities );
+			spriteRenderer = new WebGLSpriteRenderer( _this, _gl, state, textures, capabilities );
 
 			_this.info.programs = programCache.programs;
 

Файловите разлики са ограничени, защото са твърде много
+ 303 - 303
build/three.min.js


+ 7 - 14
build/three.module.js

@@ -6379,7 +6379,7 @@ Object.assign( Box2.prototype, {
  * @author alteredq / http://alteredqualia.com/
  */
 
-function WebGLFlareRenderer( renderer, gl, state, capabilities ) {
+function WebGLFlareRenderer( renderer, gl, state, textures, capabilities ) {
 
 	var vertexBuffer, elementBuffer;
 	var shader, program, attributes, uniforms;
@@ -6706,7 +6706,8 @@ function WebGLFlareRenderer( renderer, gl, state, capabilities ) {
 						gl.uniform3f( uniforms.color, sprite.color.r, sprite.color.g, sprite.color.b );
 
 						state.setBlending( sprite.blending, sprite.blendEquation, sprite.blendSrc, sprite.blendDst );
-						renderer.setTexture2D( sprite.texture, 1 );
+
+						textures.setTexture2D( sprite.texture, 1 );
 
 						gl.drawElements( gl.TRIANGLES, 6, gl.UNSIGNED_SHORT, 0 );
 
@@ -6774,7 +6775,7 @@ CanvasTexture.prototype.constructor = CanvasTexture;
  * @author alteredq / http://alteredqualia.com/
  */
 
-function WebGLSpriteRenderer( renderer, gl, state, capabilities ) {
+function WebGLSpriteRenderer( renderer, gl, state, textures, capabilities ) {
 
 	var vertexBuffer, elementBuffer;
 	var program, attributes, uniforms;
@@ -6992,15 +6993,7 @@ function WebGLSpriteRenderer( renderer, gl, state, capabilities ) {
 			state.buffers.depth.setTest( material.depthTest );
 			state.buffers.depth.setMask( material.depthWrite );
 
-			if ( material.map ) {
-
-				renderer.setTexture2D( material.map, 0 );
-
-			} else {
-
-				renderer.setTexture2D( texture, 0 );
-
-			}
+			textures.setTexture2D( material.map || texture, 0 );
 
 			gl.drawElements( gl.TRIANGLES, 6, gl.UNSIGNED_SHORT, 0 );
 
@@ -20905,8 +20898,8 @@ function WebGLRenderer( parameters ) {
 		bufferRenderer = new WebGLBufferRenderer( _gl, extensions, _infoRender );
 		indexedBufferRenderer = new WebGLIndexedBufferRenderer( _gl, extensions, _infoRender );
 
-		flareRenderer = new WebGLFlareRenderer( _this, _gl, state, capabilities );
-		spriteRenderer = new WebGLSpriteRenderer( _this, _gl, state, capabilities );
+		flareRenderer = new WebGLFlareRenderer( _this, _gl, state, textures, capabilities );
+		spriteRenderer = new WebGLSpriteRenderer( _this, _gl, state, textures, capabilities );
 
 		_this.info.programs = programCache.programs;
 

Някои файлове не бяха показани, защото твърде много файлове са промени