瀏覽代碼

#7245 coding style

Marius Kintel 9 年之前
父節點
當前提交
ccd108de69
共有 2 個文件被更改,包括 120 次插入43 次删除
  1. 102 27
      src/renderers/WebGLRenderTarget.js
  2. 18 16
      src/renderers/WebGLRenderer.js

+ 102 - 27
src/renderers/WebGLRenderTarget.js

@@ -12,12 +12,7 @@ THREE.WebGLRenderTarget = function ( width, height, options ) {
 
 	options = options || {};
 
-	this.texture = new THREE.Texture(undefined, undefined, 
-																	 options.wrapS, options.wrapT,
-																	 options.magFilter, 
-																	 options.minFilter !== undefined ? options.minFilter : THREE.LinearFilter,
-																	 options.format, options.type,
-																	 options.anisotropy);
+	this.texture = new THREE.Texture( undefined, undefined, options.wrapS, options.wrapT, options.magFilter, options.minFilter !== undefined ? options.minFilter : THREE.LinearFilter, options.format, options.type, options.anisotropy );
 
 	this.depthBuffer = options.depthBuffer !== undefined ? options.depthBuffer : true;
 	this.stencilBuffer = options.stencilBuffer !== undefined ? options.stencilBuffer : true;
@@ -70,27 +65,107 @@ THREE.WebGLRenderTarget.prototype = {
 		this.dispatchEvent( { type: 'dispose' } );
 
 	},
-	
-	get wrapS() { return this.texture.wrapS; },
-	set wrapS(wrapS) { this.texture.wrapS = wrapS; },
-	get wrapT() { return this.texture.wrapT; },
-	set wrapT(wrapT) { this.texture.wrapT = wrapT; },
-	get magFilter() { return this.texture.magFilter; },
-	set magFilter(magFilter) { this.texture.magFilter = magFilter; },
-	get minFilter() { return this.texture.minFilter; },
-	set minFilter(minFilter) { this.texture.minFilter = minFilter; },
-	get anisotropy() { return this.texture.anisotropy; },
-	set anisotropy(anisotropy) { this.texture.anisotropy = anisotropy; },
-	get offset() { return this.texture.offset; },
-	set offset(offset) { this.texture.offset = offset; },
-	get repeat() { return this.texture.repeat; },
-	set repeat(repeat) { this.texture.repeat = repeat; },
-	get format() { return this.texture.format; },
-	set format(format) { this.texture.format = format; },
-	get type() { return this.texture.type; },
-	set type(type) { this.texture.type = type; },
-	get generateMipmaps() { return this.texture.generateMipmaps; },
-	set generateMipmaps(generateMipmaps) { this.texture.generateMipmaps = generateMipmaps; }
+
+	get wrapS() {
+
+		return this.texture.wrapS;
+
+	},
+	set wrapS( wrapS ) {
+
+		this.texture.wrapS = wrapS;
+
+	},
+	get wrapT() {
+
+		return this.texture.wrapT;
+
+	},
+	set wrapT( wrapT ) {
+
+		this.texture.wrapT = wrapT;
+
+	},
+	get magFilter() {
+
+		return this.texture.magFilter;
+
+	},
+	set magFilter( magFilter ) {
+
+		this.texture.magFilter = magFilter;
+
+	},
+	get minFilter() {
+
+		return this.texture.minFilter;
+
+	},
+	set minFilter( minFilter ) {
+
+		this.texture.minFilter = minFilter;
+
+	},
+	get anisotropy() {
+
+		return this.texture.anisotropy;
+
+	},
+	set anisotropy( anisotropy ) {
+
+		this.texture.anisotropy = anisotropy;
+
+	},
+	get offset() {
+
+		return this.texture.offset;
+
+	},
+	set offset( offset ) {
+
+		this.texture.offset = offset;
+
+	},
+	get repeat() {
+
+		return this.texture.repeat;
+
+	},
+	set repeat( repeat ) {
+
+		this.texture.repeat = repeat;
+
+	},
+	get format() {
+
+		return this.texture.format;
+
+	},
+	set format( format ) {
+
+		this.texture.format = format;
+
+	},
+	get type() {
+
+		return this.texture.type;
+
+	},
+	set type( type ) {
+
+		this.texture.type = type;
+
+	},
+	get generateMipmaps() {
+
+		return this.texture.generateMipmaps;
+
+	},
+	set generateMipmaps( generateMipmaps ) {
+
+		this.texture.generateMipmaps = generateMipmaps;
+
+	}
 
 };
 

+ 18 - 16
src/renderers/WebGLRenderer.js

@@ -32,9 +32,9 @@ THREE.WebGLRenderer = function ( parameters ) {
 	var lights = [];
 
 	var opaqueObjects = [];
-	var opaqueObjectsLastIndex = -1;
+	var opaqueObjectsLastIndex = - 1;
 	var transparentObjects = [];
-	var transparentObjectsLastIndex = -1;
+	var transparentObjectsLastIndex = - 1;
 
 	var morphInfluences = new Float32Array( 8 );
 
@@ -603,6 +603,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 		if ( programInfo !== undefined ) {
 
 			programCache.releaseProgram( programInfo );
+
 		}
 
 	}
@@ -1093,8 +1094,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		lights.length = 0;
 
-		opaqueObjectsLastIndex = -1;
-		transparentObjectsLastIndex = -1;
+		opaqueObjectsLastIndex = - 1;
+		transparentObjectsLastIndex = - 1;
 
 		sprites.length = 0;
 		lensFlares.length = 0;
@@ -1158,16 +1159,17 @@ THREE.WebGLRenderer = function ( parameters ) {
 		lensFlarePlugin.render( scene, camera, _currentWidth, _currentHeight );
 
 		// Generate mipmap if we're using any kind of mipmap filtering
-	
+
 		if ( renderTarget ) {
+
 			var texture = renderTarget.texture;
 			var isTargetPowerOfTwo = THREE.Math.isPowerOfTwo( renderTarget.width ) && THREE.Math.isPowerOfTwo( renderTarget.height );
-			if ( texture.generateMipmaps && 
-					 isTargetPowerOfTwo &&
-					 texture.minFilter !== THREE.NearestFilter && 
-					 texture.minFilter !== THREE.LinearFilter ) {
+			if ( texture.generateMipmaps && isTargetPowerOfTwo && texture.minFilter !== THREE.NearestFilter && texture.minFilter !== THREE.LinearFilter ) {
+
 				 updateRenderTargetMipmap( renderTarget );
+
 			}
+
 		}
 
 		// Ensure depth buffer writing is enabled so it can be cleared on next render
@@ -1335,17 +1337,17 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 			if ( object instanceof THREE.ImmediateRenderObject ) {
 
-					setMaterial( material );
+				setMaterial( material );
 
-					var program = setProgram( camera, lights, fog, material, object );
+				var program = setProgram( camera, lights, fog, material, object );
 
-					_currentGeometryProgram = '';
+				_currentGeometryProgram = '';
 
-					object.render( function ( object ) {
+				object.render( function ( object ) {
 
-						_this.renderBufferImmediate( object, program, material );
+					_this.renderBufferImmediate( object, program, material );
 
-					} );
+				} );
 
 			} else {
 
@@ -1991,7 +1993,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 						uniforms.shadowDarkness.value[ j ] = - light.shadowDarkness;
 
 					} else {
-						
+
 						uniforms.shadowDarkness.value[ j ] = light.shadowDarkness;
 
 					}