Przeglądaj źródła

Updated builds.

Mr.doob 6 lat temu
rodzic
commit
e3136492ff
3 zmienionych plików z 73 dodań i 265 usunięć
  1. 29 13
      build/three.js
  2. 15 239
      build/three.min.js
  3. 29 13
      build/three.module.js

+ 29 - 13
build/three.js

@@ -23331,7 +23331,23 @@
 
 		// Rendering
 
-		this.render = function ( scene, camera, renderTarget, forceClear ) {
+		this.render = function ( scene, camera ) {
+
+			var renderTarget, forceClear;
+
+			if ( arguments[ 2 ] !== undefined ) {
+
+				console.warn( 'THREE.WebGLRenderer.render(): the renderTarget argument has been removed. Use .setRenderTarget() instead.' );
+				renderTarget = arguments[ 2 ];
+
+			}
+
+			if ( arguments[ 3 ] !== undefined ) {
+
+				console.warn( 'THREE.WebGLRenderer.render(): the forceClear argument has been removed. Use .clear() instead.' );
+				forceClear = arguments[ 3 ];
+
+			}
 
 			if ( ! ( camera && camera.isCamera ) ) {
 
@@ -23404,14 +23420,12 @@
 
 			if ( this.info.autoReset ) this.info.reset();
 
-			if ( renderTarget === undefined ) {
+			if ( renderTarget !== undefined ) {
 
-				renderTarget = null;
+				this.setRenderTarget( renderTarget );
 
 			}
 
-			this.setRenderTarget( renderTarget );
-
 			//
 
 			background.render( currentRenderList, scene, camera, forceClear );
@@ -39947,24 +39961,26 @@
 			renderTarget.texture.generateMipmaps = false;
 
 			renderTarget.activeCubeFace = 0;
-			renderer.render( scene, cameraPX, renderTarget );
+			renderer.setRenderTarget( renderTarget );
+
+			renderer.render( scene, cameraPX );
 
 			renderTarget.activeCubeFace = 1;
-			renderer.render( scene, cameraNX, renderTarget );
+			renderer.render( scene, cameraNX );
 
 			renderTarget.activeCubeFace = 2;
-			renderer.render( scene, cameraPY, renderTarget );
+			renderer.render( scene, cameraPY );
 
 			renderTarget.activeCubeFace = 3;
-			renderer.render( scene, cameraNY, renderTarget );
+			renderer.render( scene, cameraNY );
 
 			renderTarget.activeCubeFace = 4;
-			renderer.render( scene, cameraPZ, renderTarget );
+			renderer.render( scene, cameraPZ );
 
 			renderTarget.texture.generateMipmaps = generateMipmaps;
 
 			renderTarget.activeCubeFace = 5;
-			renderer.render( scene, cameraNZ, renderTarget );
+			renderer.render( scene, cameraNZ );
 
 			renderer.setRenderTarget( currentRenderTarget );
 
@@ -44999,8 +45015,8 @@
 	function PositionalAudioHelper( audio, range, divisionsInnerAngle, divisionsOuterAngle ) {
 
 		this.audio = audio;
-	 	this.range = range || 1;
-	 	this.divisionsInnerAngle = divisionsOuterAngle || 16;
+		this.range = range || 1;
+		this.divisionsInnerAngle = divisionsOuterAngle || 16;
 		this.divisionsOuterAngle = divisionsOuterAngle || 2;
 
 		var geometry = new BufferGeometry();

Plik diff jest za duży
+ 15 - 239
build/three.min.js


+ 29 - 13
build/three.module.js

@@ -23325,7 +23325,23 @@ function WebGLRenderer( parameters ) {
 
 	// Rendering
 
-	this.render = function ( scene, camera, renderTarget, forceClear ) {
+	this.render = function ( scene, camera ) {
+
+		var renderTarget, forceClear;
+
+		if ( arguments[ 2 ] !== undefined ) {
+
+			console.warn( 'THREE.WebGLRenderer.render(): the renderTarget argument has been removed. Use .setRenderTarget() instead.' );
+			renderTarget = arguments[ 2 ];
+
+		}
+
+		if ( arguments[ 3 ] !== undefined ) {
+
+			console.warn( 'THREE.WebGLRenderer.render(): the forceClear argument has been removed. Use .clear() instead.' );
+			forceClear = arguments[ 3 ];
+
+		}
 
 		if ( ! ( camera && camera.isCamera ) ) {
 
@@ -23398,14 +23414,12 @@ function WebGLRenderer( parameters ) {
 
 		if ( this.info.autoReset ) this.info.reset();
 
-		if ( renderTarget === undefined ) {
+		if ( renderTarget !== undefined ) {
 
-			renderTarget = null;
+			this.setRenderTarget( renderTarget );
 
 		}
 
-		this.setRenderTarget( renderTarget );
-
 		//
 
 		background.render( currentRenderList, scene, camera, forceClear );
@@ -39941,24 +39955,26 @@ function CubeCamera( near, far, cubeResolution, options ) {
 		renderTarget.texture.generateMipmaps = false;
 
 		renderTarget.activeCubeFace = 0;
-		renderer.render( scene, cameraPX, renderTarget );
+		renderer.setRenderTarget( renderTarget );
+
+		renderer.render( scene, cameraPX );
 
 		renderTarget.activeCubeFace = 1;
-		renderer.render( scene, cameraNX, renderTarget );
+		renderer.render( scene, cameraNX );
 
 		renderTarget.activeCubeFace = 2;
-		renderer.render( scene, cameraPY, renderTarget );
+		renderer.render( scene, cameraPY );
 
 		renderTarget.activeCubeFace = 3;
-		renderer.render( scene, cameraNY, renderTarget );
+		renderer.render( scene, cameraNY );
 
 		renderTarget.activeCubeFace = 4;
-		renderer.render( scene, cameraPZ, renderTarget );
+		renderer.render( scene, cameraPZ );
 
 		renderTarget.texture.generateMipmaps = generateMipmaps;
 
 		renderTarget.activeCubeFace = 5;
-		renderer.render( scene, cameraNZ, renderTarget );
+		renderer.render( scene, cameraNZ );
 
 		renderer.setRenderTarget( currentRenderTarget );
 
@@ -44993,8 +45009,8 @@ PolarGridHelper.prototype.constructor = PolarGridHelper;
 function PositionalAudioHelper( audio, range, divisionsInnerAngle, divisionsOuterAngle ) {
 
 	this.audio = audio;
- 	this.range = range || 1;
- 	this.divisionsInnerAngle = divisionsOuterAngle || 16;
+	this.range = range || 1;
+	this.divisionsInnerAngle = divisionsOuterAngle || 16;
 	this.divisionsOuterAngle = divisionsOuterAngle || 2;
 
 	var geometry = new BufferGeometry();

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików