Mr.doob 8 år sedan
förälder
incheckning
74114053bc

+ 15 - 13
examples/js/loaders/ctm/CTMLoader.js

@@ -19,7 +19,7 @@ THREE.CTMLoader.prototype.constructor = THREE.CTMLoader;
 
 // Load multiple CTM parts defined in JSON
 
-THREE.CTMLoader.prototype.loadParts = function( url, callback, parameters ) {
+THREE.CTMLoader.prototype.loadParts = function ( url, callback, parameters ) {
 
 	parameters = parameters || {};
 
@@ -29,7 +29,7 @@ THREE.CTMLoader.prototype.loadParts = function( url, callback, parameters ) {
 
 	var basePath = parameters.basePath ? parameters.basePath : this.extractUrlBase( url );
 
-	xhr.onreadystatechange = function() {
+	xhr.onreadystatechange = function () {
 
 		if ( xhr.readyState === 4 ) {
 
@@ -65,7 +65,7 @@ THREE.CTMLoader.prototype.loadParts = function( url, callback, parameters ) {
 				// load joined CTM file
 
 				var partUrl = basePath + jsonObject.data;
-				var parametersPart = { useWorker: parameters.useWorker, worker:parameters.worker, offsets: jsonObject.offsets };
+				var parametersPart = { useWorker: parameters.useWorker, worker: parameters.worker, offsets: jsonObject.offsets };
 				scope.load( partUrl, callbackFinal, parametersPart );
 
 			}
@@ -85,7 +85,7 @@ THREE.CTMLoader.prototype.loadParts = function( url, callback, parameters ) {
 //		- url (required)
 //		- callback (required)
 
-THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
+THREE.CTMLoader.prototype.load = function ( url, callback, parameters ) {
 
 	parameters = parameters || {};
 
@@ -98,21 +98,21 @@ THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
 
 	var length = 0;
 
-	xhr.onreadystatechange = function() {
+	xhr.onreadystatechange = function () {
 
 		if ( xhr.readyState === 4 ) {
 
 			if ( xhr.status === 200 || xhr.status === 0 ) {
 
-				var binaryData = new Uint8Array(xhr.response);
+				var binaryData = new Uint8Array( xhr.response );
 
 				var s = Date.now();
 
 				if ( parameters.useWorker ) {
 
-					var worker = parameters.worker || new Worker( "js/loaders/ctm/CTMWorker.js" );
+					var worker = parameters.worker || new Worker( 'js/loaders/ctm/CTMWorker.js' );
 
-					worker.onmessage = function( event ) {
+					worker.onmessage = function ( event ) {
 
 						var files = event.data;
 
@@ -126,14 +126,14 @@ THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
 							scope.createModel( ctmFile, callback );
 
 							var e = Date.now();
-							console.log( "model load time [worker]: " + (e - e1) + " ms, total: " + (e - s));
+							console.log( "model load time [worker]: " + ( e - e1 ) + " ms, total: " + ( e - s ) );
 
 						}
 
 
 					};
 
-					worker.postMessage( { "data": binaryData, "offsets": offsets }, [binaryData.buffer] );
+					worker.postMessage( { "data": binaryData, "offsets": offsets }, [ binaryData.buffer ] );
 
 				} else {
 
@@ -197,9 +197,9 @@ THREE.CTMLoader.prototype.createModel = function ( file, callback ) {
 
 		this.materials = [];
 
-		var indices = file.body.indices,
-		positions = file.body.vertices,
-		normals = file.body.normals;
+		var indices = file.body.indices;
+		var positions = file.body.vertices;
+		var normals = file.body.normals;
 
 		var uvs, colors;
 
@@ -249,7 +249,9 @@ THREE.CTMLoader.prototype.createModel = function ( file, callback ) {
 
 	// compute vertex normals if not present in the CTM model
 	if ( geometry.attributes.normal === undefined ) {
+
 		geometry.computeVertexNormals();
+
 	}
 
 	callback( geometry );

+ 2 - 2
examples/js/loaders/ctm/CTMWorker.js

@@ -1,6 +1,6 @@
 importScripts( "lzma.js", "ctm.js" );
 
-self.onmessage = function( event ) {
+self.onmessage = function ( event ) {
 
 	var files = [];
 
@@ -9,7 +9,7 @@ self.onmessage = function( event ) {
 		var stream = new CTM.Stream( event.data.data );
 		stream.offset = event.data.offsets[ i ];
 
-		files[ i ] = new CTM.File( stream, [event.data.data.buffer] );
+		files[ i ] = new CTM.File( stream, [ event.data.data.buffer ] );
 
 	}
 

+ 10 - 12
examples/js/pmrem/PMREMCubeUVPacker.js

@@ -31,9 +31,11 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 		encoding: ( sourceTexture.encoding === THREE.RGBEEncoding ) ? THREE.RGBM16Encoding : sourceTexture.encoding
 	};
 
-	if( params.encoding === THREE.RGBM16Encoding ) {
+	if ( params.encoding === THREE.RGBM16Encoding ) {
+
 		params.magFilter = THREE.LinearFilter;
 		params.minFilter = THREE.LinearFilter;
+
 	}
 
 	this.CubeUVRenderTarget = new THREE.WebGLRenderTarget( size, size, params );
@@ -45,7 +47,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 	this.scene.add( this.camera );
 
 	this.objects = [];
-	var xOffset = 0;
+
 	var faceOffsets = [];
 	faceOffsets.push( new THREE.Vector2( 0, 0 ) );
 	faceOffsets.push( new THREE.Vector2( 1, 0 ) );
@@ -53,7 +55,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 	faceOffsets.push( new THREE.Vector2( 0, 1 ) );
 	faceOffsets.push( new THREE.Vector2( 1, 1 ) );
 	faceOffsets.push( new THREE.Vector2( 2, 1 ) );
-	var yOffset = 0;
+
 	var textureResolution = size;
 	size = cubeTextureLods[ 0 ].width;
 
@@ -63,8 +65,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 	for ( var i = 0; i < this.numLods; i ++ ) {
 
 		var offset1 = ( textureResolution - textureResolution / c ) * 0.5;
-		if ( size > 16 )
-		c *= 2;
+		if ( size > 16 ) c *= 2;
 		var nMips = size > 16 ? 6 : 1;
 		var mipOffsetX = 0;
 		var mipOffsetY = 0;
@@ -81,8 +82,6 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 				material.envMap = this.cubeLods[ i ].texture;
 				material.uniforms[ 'faceIndex' ].value = k;
 				material.uniforms[ 'mapSize' ].value = mipSize;
-				var color = material.uniforms[ 'testColor' ].value;
-				//color.copy(testColor[j]);
 				var planeMesh = new THREE.Mesh(
 				new THREE.PlaneGeometry( mipSize, mipSize, 0 ),
 				material );
@@ -99,8 +98,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 
 		}
 		offset2 += 2 * size;
-		if ( size > 16 )
-		size /= 2;
+		if ( size > 16 ) size /= 2;
 
 	}
 
@@ -108,9 +106,9 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
 
 THREE.PMREMCubeUVPacker.prototype = {
 
-	constructor : THREE.PMREMCubeUVPacker,
+	constructor: THREE.PMREMCubeUVPacker,
 
-	update: function( renderer ) {
+	update: function ( renderer ) {
 
 		var gammaInput = renderer.gammaInput;
 		var gammaOutput = renderer.gammaOutput;
@@ -129,7 +127,7 @@ THREE.PMREMCubeUVPacker.prototype = {
 
 	},
 
-	getShader: function() {
+	getShader: function () {
 
 		var shaderMaterial = new THREE.ShaderMaterial( {