Merge branch 'dev32' of https://github.com/Mugen87/three.js into dev

# Conflicts:
#	examples/webgl_loader_ctm.html

editor/index.html

@@ -22,8 +22,6 @@
 		<script src="../examples/js/libs/chevrotain.min.js"></script> <!-- VRML -->
 		<script src="../examples/js/libs/jszip.min.js"></script>
 		<script src="../examples/js/libs/inflate.min.js"></script> <!-- FBX -->
-		<script src="../examples/js/libs/lzma.js"></script> <!-- CTM -->
-		<script src="../examples/js/libs/ctm.js"></script> <!-- CTM -->
 
 		<script src="../examples/js/loaders/AMFLoader.js"></script>
 		<script src="../examples/js/loaders/AWDLoader.js"></script>
@@ -45,7 +43,6 @@
 		<script src="../examples/js/loaders/TDSLoader.js"></script>
 		<script src="../examples/js/loaders/VRMLLoader.js"></script>
 		<script src="../examples/js/loaders/VTKLoader.js"></script>
-		<script src="../examples/js/loaders/ctm/CTMLoader.js"></script>
 
 		<script src="../examples/js/exporters/ColladaExporter.js"></script>
 		<script src="../examples/js/exporters/GLTFExporter.js"></script>

editor/js/Loader.js

@@ -140,35 +140,6 @@ var Loader = function ( editor ) {
 
 				break;
 
-			case 'ctm':
-
-				reader.addEventListener( 'load', function ( event ) {
-
-					var data = new Uint8Array( event.target.result );
-
-					var stream = new CTM.Stream( data );
-					stream.offset = 0;
-
-					var loader = new THREE.CTMLoader();
-					loader.createModel( new CTM.File( stream ), function ( geometry ) {
-
-						geometry.sourceType = "ctm";
-						geometry.sourceFile = file.name;
-
-						var material = new THREE.MeshStandardMaterial();
-
-						var mesh = new THREE.Mesh( geometry, material );
-						mesh.name = filename;
-
-						editor.execute( new AddObjectCommand( editor, mesh ) );
-
-					} );
-
-				}, false );
-				reader.readAsArrayBuffer( file );
-
-				break;
-
 			case 'dae':
 
 				reader.addEventListener( 'load', function ( event ) {

editor/sw.js

@@ -13,8 +13,6 @@ const staticAssets = [
 	'../examples/js/libs/chevrotain.min.js',
 	'../examples/js/libs/jszip.min.js',
 	'../examples/js/libs/inflate.min.js',
-	'../examples/js/libs/lzma.js',
-	'../examples/js/libs/ctm.js',
 
 	'../examples/js/loaders/AMFLoader.js',
 	'../examples/js/loaders/AWDLoader.js',
@@ -36,7 +34,6 @@ const staticAssets = [
 	'../examples/js/loaders/TDSLoader.js',
 	'../examples/js/loaders/VRMLLoader.js',
 	'../examples/js/loaders/VTKLoader.js',
-	'../examples/js/loaders/ctm/CTMLoader.js',
 
 	'../examples/js/exporters/ColladaExporter.js',
 	'../examples/js/exporters/GLTFExporter.js',

examples/files.js

@@ -85,8 +85,6 @@ var files = {
 		"webgl_loader_collada",
 		"webgl_loader_collada_kinematics",
 		"webgl_loader_collada_skinning",
-		"webgl_loader_ctm",
-		"webgl_loader_ctm_materials",
 		"webgl_loader_draco",
 		"webgl_loader_fbx",
 		"webgl_loader_fbx_nurbs",

examples/js/libs/ctm.js

@@ -1,658 +0,0 @@
-/*
-Copyright (c) 2011 Juan Mellado
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-/*
-References:
-- "OpenCTM: The Open Compressed Triangle Mesh file format" by Marcus Geelnard
-  http://openctm.sourceforge.net/
-*/
-
-var CTM = CTM || {};
-
-// browserify support
-if ( typeof module === 'object' ) {
-
-	module.exports = CTM;
-
-}
-
-CTM.CompressionMethod = {
-  RAW: 0x00574152,
-  MG1: 0x0031474d,
-  MG2: 0x0032474d
-};
-
-CTM.Flags = {
-  NORMALS: 0x00000001
-};
-
-CTM.File = function(stream) {
-	this.load(stream);
-};
-
-CTM.File.prototype.load = function(stream) {
-	this.header = new CTM.FileHeader(stream);
-
-	this.body = new CTM.FileBody(this.header);
-
-	this.getReader().read(stream, this.body);
-};
-
-CTM.File.prototype.getReader = function() {
-	var reader;
-
-	switch (this.header.compressionMethod){
-		case CTM.CompressionMethod.RAW:
-			reader = new CTM.ReaderRAW();
-			break;
-		case CTM.CompressionMethod.MG1:
-			reader = new CTM.ReaderMG1();
-			break;
-		case CTM.CompressionMethod.MG2:
-			reader = new CTM.ReaderMG2();
-			break;
-	}
-
-	return reader;
-};
-
-CTM.FileHeader = function(stream) {
-	stream.readInt32(); //magic "OCTM"
-	this.fileFormat = stream.readInt32();
-	this.compressionMethod = stream.readInt32();
-	this.vertexCount = stream.readInt32();
-	this.triangleCount = stream.readInt32();
-	this.uvMapCount = stream.readInt32();
-	this.attrMapCount = stream.readInt32();
-	this.flags = stream.readInt32();
-	this.comment = stream.readString();
-};
-
-CTM.FileHeader.prototype.hasNormals = function() {
-	return this.flags & CTM.Flags.NORMALS;
-};
-
-CTM.FileBody = function(header) {
-	var i = header.triangleCount * 3,
-      v = header.vertexCount * 3,
-      n = header.hasNormals() ? header.vertexCount * 3 : 0,
-      u = header.vertexCount * 2,
-      a = header.vertexCount * 4,
-      j = 0;
-
-	var data = new ArrayBuffer(
-    (i + v + n + (u * header.uvMapCount) + (a * header.attrMapCount) ) * 4);
-
-	this.indices = new Uint32Array(data, 0, i);
-
-	this.vertices = new Float32Array(data, i * 4, v);
-
-	if ( header.hasNormals() ) {
-		this.normals = new Float32Array(data, (i + v) * 4, n);
-	}
-
-	if (header.uvMapCount) {
-		this.uvMaps = [];
-		for (j = 0; j < header.uvMapCount; ++ j) {
-			this.uvMaps[j] = { uv: new Float32Array(data,
-        (i + v + n + (j * u) ) * 4, u) };
-		}
-	}
-
-	if (header.attrMapCount) {
-		this.attrMaps = [];
-		for (j = 0; j < header.attrMapCount; ++ j) {
-			this.attrMaps[j] = { attr: new Float32Array(data,
-        (i + v + n + (u * header.uvMapCount) + (j * a) ) * 4, a) };
-		}
-	}
-};
-
-CTM.FileMG2Header = function(stream) {
-	stream.readInt32(); //magic "MG2H"
-	this.vertexPrecision = stream.readFloat32();
-	this.normalPrecision = stream.readFloat32();
-	this.lowerBoundx = stream.readFloat32();
-	this.lowerBoundy = stream.readFloat32();
-	this.lowerBoundz = stream.readFloat32();
-	this.higherBoundx = stream.readFloat32();
-	this.higherBoundy = stream.readFloat32();
-	this.higherBoundz = stream.readFloat32();
-	this.divx = stream.readInt32();
-	this.divy = stream.readInt32();
-	this.divz = stream.readInt32();
-
-	this.sizex = (this.higherBoundx - this.lowerBoundx) / this.divx;
-	this.sizey = (this.higherBoundy - this.lowerBoundy) / this.divy;
-	this.sizez = (this.higherBoundz - this.lowerBoundz) / this.divz;
-};
-
-CTM.ReaderRAW = function() {
-};
-
-CTM.ReaderRAW.prototype.read = function(stream, body) {
-	this.readIndices(stream, body.indices);
-	this.readVertices(stream, body.vertices);
-
-	if (body.normals) {
-		this.readNormals(stream, body.normals);
-	}
-	if (body.uvMaps) {
-		this.readUVMaps(stream, body.uvMaps);
-	}
-	if (body.attrMaps) {
-		this.readAttrMaps(stream, body.attrMaps);
-	}
-};
-
-CTM.ReaderRAW.prototype.readIndices = function(stream, indices) {
-	stream.readInt32(); //magic "INDX"
-	stream.readArrayInt32(indices);
-};
-
-CTM.ReaderRAW.prototype.readVertices = function(stream, vertices) {
-	stream.readInt32(); //magic "VERT"
-	stream.readArrayFloat32(vertices);
-};
-
-CTM.ReaderRAW.prototype.readNormals = function(stream, normals) {
-	stream.readInt32(); //magic "NORM"
-	stream.readArrayFloat32(normals);
-};
-
-CTM.ReaderRAW.prototype.readUVMaps = function(stream, uvMaps) {
-	var i = 0;
-	for (; i < uvMaps.length; ++ i) {
-		stream.readInt32(); //magic "TEXC"
-
-		uvMaps[i].name = stream.readString();
-		uvMaps[i].filename = stream.readString();
-		stream.readArrayFloat32(uvMaps[i].uv);
-	}
-};
-
-CTM.ReaderRAW.prototype.readAttrMaps = function(stream, attrMaps) {
-	var i = 0;
-	for (; i < attrMaps.length; ++ i) {
-		stream.readInt32(); //magic "ATTR"
-
-		attrMaps[i].name = stream.readString();
-		stream.readArrayFloat32(attrMaps[i].attr);
-	}
-};
-
-CTM.ReaderMG1 = function() {
-};
-
-CTM.ReaderMG1.prototype.read = function(stream, body) {
-	this.readIndices(stream, body.indices);
-	this.readVertices(stream, body.vertices);
-
-	if (body.normals) {
-		this.readNormals(stream, body.normals);
-	}
-	if (body.uvMaps) {
-		this.readUVMaps(stream, body.uvMaps);
-	}
-	if (body.attrMaps) {
-		this.readAttrMaps(stream, body.attrMaps);
-	}
-};
-
-CTM.ReaderMG1.prototype.readIndices = function(stream, indices) {
-	stream.readInt32(); //magic "INDX"
-	stream.readInt32(); //packed size
-
-	var interleaved = new CTM.InterleavedStream(indices, 3);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-	CTM.restoreIndices(indices, indices.length);
-};
-
-CTM.ReaderMG1.prototype.readVertices = function(stream, vertices) {
-	stream.readInt32(); //magic "VERT"
-	stream.readInt32(); //packed size
-
-	var interleaved = new CTM.InterleavedStream(vertices, 1);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-};
-
-CTM.ReaderMG1.prototype.readNormals = function(stream, normals) {
-	stream.readInt32(); //magic "NORM"
-	stream.readInt32(); //packed size
-
-	var interleaved = new CTM.InterleavedStream(normals, 3);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-};
-
-CTM.ReaderMG1.prototype.readUVMaps = function(stream, uvMaps) {
-	var i = 0;
-	for (; i < uvMaps.length; ++ i) {
-		stream.readInt32(); //magic "TEXC"
-
-		uvMaps[i].name = stream.readString();
-		uvMaps[i].filename = stream.readString();
-
-		stream.readInt32(); //packed size
-
-		var interleaved = new CTM.InterleavedStream(uvMaps[i].uv, 2);
-		LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-	}
-};
-
-CTM.ReaderMG1.prototype.readAttrMaps = function(stream, attrMaps) {
-	var i = 0;
-	for (; i < attrMaps.length; ++ i) {
-		stream.readInt32(); //magic "ATTR"
-
-		attrMaps[i].name = stream.readString();
-
-		stream.readInt32(); //packed size
-
-		var interleaved = new CTM.InterleavedStream(attrMaps[i].attr, 4);
-		LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-	}
-};
-
-CTM.ReaderMG2 = function() {
-};
-
-CTM.ReaderMG2.prototype.read = function(stream, body) {
-	this.MG2Header = new CTM.FileMG2Header(stream);
-
-	this.readVertices(stream, body.vertices);
-	this.readIndices(stream, body.indices);
-
-	if (body.normals) {
-		this.readNormals(stream, body);
-	}
-	if (body.uvMaps) {
-		this.readUVMaps(stream, body.uvMaps);
-	}
-	if (body.attrMaps) {
-		this.readAttrMaps(stream, body.attrMaps);
-	}
-};
-
-CTM.ReaderMG2.prototype.readVertices = function(stream, vertices) {
-	stream.readInt32(); //magic "VERT"
-	stream.readInt32(); //packed size
-
-	var interleaved = new CTM.InterleavedStream(vertices, 3);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-	var gridIndices = this.readGridIndices(stream, vertices);
-
-	CTM.restoreVertices(vertices, this.MG2Header, gridIndices, this.MG2Header.vertexPrecision);
-};
-
-CTM.ReaderMG2.prototype.readGridIndices = function(stream, vertices) {
-	stream.readInt32(); //magic "GIDX"
-	stream.readInt32(); //packed size
-
-	var gridIndices = new Uint32Array(vertices.length / 3);
-
-	var interleaved = new CTM.InterleavedStream(gridIndices, 1);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-	CTM.restoreGridIndices(gridIndices, gridIndices.length);
-
-	return gridIndices;
-};
-
-CTM.ReaderMG2.prototype.readIndices = function(stream, indices) {
-	stream.readInt32(); //magic "INDX"
-	stream.readInt32(); //packed size
-
-	var interleaved = new CTM.InterleavedStream(indices, 3);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-	CTM.restoreIndices(indices, indices.length);
-};
-
-CTM.ReaderMG2.prototype.readNormals = function(stream, body) {
-	stream.readInt32(); //magic "NORM"
-	stream.readInt32(); //packed size
-
-	var interleaved = new CTM.InterleavedStream(body.normals, 3);
-	LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-	var smooth = CTM.calcSmoothNormals(body.indices, body.vertices);
-
-	CTM.restoreNormals(body.normals, smooth, this.MG2Header.normalPrecision);
-};
-
-CTM.ReaderMG2.prototype.readUVMaps = function(stream, uvMaps) {
-	var i = 0;
-	for (; i < uvMaps.length; ++ i) {
-		stream.readInt32(); //magic "TEXC"
-
-		uvMaps[i].name = stream.readString();
-		uvMaps[i].filename = stream.readString();
-
-		var precision = stream.readFloat32();
-
-		stream.readInt32(); //packed size
-
-		var interleaved = new CTM.InterleavedStream(uvMaps[i].uv, 2);
-		LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-		CTM.restoreMap(uvMaps[i].uv, 2, precision);
-	}
-};
-
-CTM.ReaderMG2.prototype.readAttrMaps = function(stream, attrMaps) {
-	var i = 0;
-	for (; i < attrMaps.length; ++ i) {
-		stream.readInt32(); //magic "ATTR"
-
-		attrMaps[i].name = stream.readString();
-
-		var precision = stream.readFloat32();
-
-		stream.readInt32(); //packed size
-
-		var interleaved = new CTM.InterleavedStream(attrMaps[i].attr, 4);
-		LZMA.decompress(stream, stream, interleaved, interleaved.data.length);
-
-		CTM.restoreMap(attrMaps[i].attr, 4, precision);
-	}
-};
-
-CTM.restoreIndices = function(indices, len) {
-	var i = 3;
-	if (len > 0) {
-		indices[2] += indices[0];
-		indices[1] += indices[0];
-	}
-	for (; i < len; i += 3) {
-		indices[i] += indices[i - 3];
-
-		if (indices[i] === indices[i - 3]) {
-			indices[i + 1] += indices[i - 2];
-		}else {
-			indices[i + 1] += indices[i];
-		}
-
-		indices[i + 2] += indices[i];
-	}
-};
-
-CTM.restoreGridIndices = function(gridIndices, len) {
-	var i = 1;
-	for (; i < len; ++ i) {
-		gridIndices[i] += gridIndices[i - 1];
-	}
-};
-
-CTM.restoreVertices = function(vertices, grid, gridIndices, precision) {
-	var gridIdx, delta, x, y, z,
-      intVertices = new Uint32Array(vertices.buffer, vertices.byteOffset, vertices.length),
-      ydiv = grid.divx, zdiv = ydiv * grid.divy,
-      prevGridIdx = 0x7fffffff, prevDelta = 0,
-      i = 0, j = 0, len = gridIndices.length;
-
-	for (; i < len; j += 3) {
-		x = gridIdx = gridIndices[i ++];
-
-		z = ~~(x / zdiv);
-		x -= ~~(z * zdiv);
-		y = ~~(x / ydiv);
-		x -= ~~(y * ydiv);
-
-		delta = intVertices[j];
-		if (gridIdx === prevGridIdx) {
-			delta += prevDelta;
-		}
-
-		vertices[j]     = grid.lowerBoundx +
-      x * grid.sizex + precision * delta;
-		vertices[j + 1] = grid.lowerBoundy +
-      y * grid.sizey + precision * intVertices[j + 1];
-		vertices[j + 2] = grid.lowerBoundz +
-      z * grid.sizez + precision * intVertices[j + 2];
-
-		prevGridIdx = gridIdx;
-		prevDelta = delta;
-	}
-};
-
-CTM.restoreNormals = function(normals, smooth, precision) {
-	var ro, phi, theta, sinPhi,
-      nx, ny, nz, by, bz, len,
-      intNormals = new Uint32Array(normals.buffer, normals.byteOffset, normals.length),
-      i = 0, k = normals.length,
-      PI_DIV_2 = 3.141592653589793238462643 * 0.5;
-
-	for (; i < k; i += 3) {
-		ro = intNormals[i] * precision;
-		phi = intNormals[i + 1];
-
-		if (phi === 0) {
-			normals[i]     = smooth[i]     * ro;
-			normals[i + 1] = smooth[i + 1] * ro;
-			normals[i + 2] = smooth[i + 2] * ro;
-		}else {
-
-			if (phi <= 4) {
-				theta = (intNormals[i + 2] - 2) * PI_DIV_2;
-			}else {
-				theta = ( (intNormals[i + 2] * 4 / phi) - 2) * PI_DIV_2;
-			}
-
-			phi *= precision * PI_DIV_2;
-			sinPhi = ro * Math.sin(phi);
-
-			nx = sinPhi * Math.cos(theta);
-			ny = sinPhi * Math.sin(theta);
-			nz = ro * Math.cos(phi);
-
-			bz = smooth[i + 1];
-			by = smooth[i] - smooth[i + 2];
-
-			len = Math.sqrt(2 * bz * bz + by * by);
-			if (len > 1e-20) {
-				by /= len;
-				bz /= len;
-			}
-
-			normals[i] = smooth[i] * nz + (smooth[i + 1] * bz - smooth[i + 2] * by) * ny - bz * nx;
-			normals[i + 1] = smooth[i + 1] * nz - (smooth[i + 2] + smooth[i]) * bz  * ny + by * nx;
-			normals[i + 2] = smooth[i + 2] * nz + (smooth[i] * by + smooth[i + 1] * bz) * ny + bz * nx;
-		}
-	}
-};
-
-CTM.restoreMap = function(map, count, precision) {
-	var delta, value,
-      intMap = new Uint32Array(map.buffer, map.byteOffset, map.length),
-      i = 0, j, len = map.length;
-
-	for (; i < count; ++ i) {
-		delta = 0;
-
-		for (j = i; j < len; j += count) {
-			value = intMap[j];
-
-			delta += value & 1 ? -( (value + 1) >> 1) : value >> 1;
-
-			map[j] = delta * precision;
-		}
-	}
-};
-
-CTM.calcSmoothNormals = function(indices, vertices) {
-	var smooth = new Float32Array(vertices.length),
-      indx, indy, indz, nx, ny, nz,
-      v1x, v1y, v1z, v2x, v2y, v2z, len,
-      i, k;
-
-	for (i = 0, k = indices.length; i < k;) {
-		indx = indices[i ++] * 3;
-		indy = indices[i ++] * 3;
-		indz = indices[i ++] * 3;
-
-		v1x = vertices[indy]     - vertices[indx];
-		v2x = vertices[indz]     - vertices[indx];
-		v1y = vertices[indy + 1] - vertices[indx + 1];
-		v2y = vertices[indz + 1] - vertices[indx + 1];
-		v1z = vertices[indy + 2] - vertices[indx + 2];
-		v2z = vertices[indz + 2] - vertices[indx + 2];
-
-		nx = v1y * v2z - v1z * v2y;
-		ny = v1z * v2x - v1x * v2z;
-		nz = v1x * v2y - v1y * v2x;
-
-		len = Math.sqrt(nx * nx + ny * ny + nz * nz);
-		if (len > 1e-10) {
-			nx /= len;
-			ny /= len;
-			nz /= len;
-		}
-
-		smooth[indx]     += nx;
-		smooth[indx + 1] += ny;
-		smooth[indx + 2] += nz;
-		smooth[indy]     += nx;
-		smooth[indy + 1] += ny;
-		smooth[indy + 2] += nz;
-		smooth[indz]     += nx;
-		smooth[indz + 1] += ny;
-		smooth[indz + 2] += nz;
-	}
-
-	for (i = 0, k = smooth.length; i < k; i += 3) {
-		len = Math.sqrt(smooth[i] * smooth[i] +
-      smooth[i + 1] * smooth[i + 1] +
-      smooth[i + 2] * smooth[i + 2]);
-
-		if (len > 1e-10) {
-			smooth[i]     /= len;
-			smooth[i + 1] /= len;
-			smooth[i + 2] /= len;
-		}
-	}
-
-	return smooth;
-};
-
-CTM.isLittleEndian = (function() {
-	var buffer = new ArrayBuffer(2),
-      bytes = new Uint8Array(buffer),
-      ints = new Uint16Array(buffer);
-
-	bytes[0] = 1;
-
-	return ints[0] === 1;
-}());
-
-CTM.InterleavedStream = function(data, count) {
-	this.data = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-	this.offset = CTM.isLittleEndian ? 3 : 0;
-	this.count = count * 4;
-	this.len = this.data.length;
-};
-
-CTM.InterleavedStream.prototype.writeByte = function(value) {
-	this.data[this.offset] = value;
-
-	this.offset += this.count;
-	if (this.offset >= this.len) {
-
-		this.offset -= this.len - 4;
-		if (this.offset >= this.count) {
-
-			this.offset -= this.count + (CTM.isLittleEndian ? 1 : -1);
-		}
-	}
-};
-
-CTM.Stream = function(data) {
-	this.data = data;
-	this.offset = 0;
-};
-
-CTM.Stream.prototype.TWO_POW_MINUS23 = Math.pow(2, -23);
-
-CTM.Stream.prototype.TWO_POW_MINUS126 = Math.pow(2, -126);
-
-CTM.Stream.prototype.readByte = function() {
-	return this.data[this.offset ++] & 0xff;
-};
-
-CTM.Stream.prototype.readInt32 = function() {
-	var i = this.readByte();
-	i |= this.readByte() << 8;
-	i |= this.readByte() << 16;
-	return i | (this.readByte() << 24);
-};
-
-CTM.Stream.prototype.readFloat32 = function() {
-	var m = this.readByte();
-	m += this.readByte() << 8;
-
-	var b1 = this.readByte();
-	var b2 = this.readByte();
-
-	m += (b1 & 0x7f) << 16;
-	var e = ( (b2 & 0x7f) << 1) | ( (b1 & 0x80) >>> 7);
-	var s = b2 & 0x80 ? -1 : 1;
-
-	if (e === 255) {
-		return m !== 0 ? NaN : s * Infinity;
-	}
-	if (e > 0) {
-		return s * (1 + (m * this.TWO_POW_MINUS23) ) * Math.pow(2, e - 127);
-	}
-	if (m !== 0) {
-		return s * m * this.TWO_POW_MINUS126;
-	}
-	return s * 0;
-};
-
-CTM.Stream.prototype.readString = function() {
-	var len = this.readInt32();
-
-	this.offset += len;
-
-	return String.fromCharCode.apply(null, this.data.subarray(this.offset - len, this.offset));
-};
-
-CTM.Stream.prototype.readArrayInt32 = function(array) {
-	var i = 0, len = array.length;
-
-	while (i < len) {
-		array[i ++] = this.readInt32();
-	}
-
-	return array;
-};
-
-CTM.Stream.prototype.readArrayFloat32 = function(array) {
-	var i = 0, len = array.length;
-
-	while (i < len) {
-		array[i ++] = this.readFloat32();
-	}
-
-	return array;
-};

examples/js/libs/lzma.js

@@ -1,517 +0,0 @@
-
-var LZMA = LZMA || {};
-
-// browserify support
-if ( typeof module === 'object' ) {
-
-	module.exports = LZMA;
-
-}
-
-LZMA.OutWindow = function() {
-	this._windowSize = 0;
-};
-
-LZMA.OutWindow.prototype.create = function(windowSize) {
-	if ( (!this._buffer) || (this._windowSize !== windowSize) ) {
-		this._buffer = [];
-	}
-	this._windowSize = windowSize;
-	this._pos = 0;
-	this._streamPos = 0;
-};
-
-LZMA.OutWindow.prototype.flush = function() {
-	var size = this._pos - this._streamPos;
-	if (size !== 0) {
-		while (size --) {
-			this._stream.writeByte(this._buffer[this._streamPos ++]);
-		}
-		if (this._pos >= this._windowSize) {
-			this._pos = 0;
-		}
-		this._streamPos = this._pos;
-	}
-};
-
-LZMA.OutWindow.prototype.releaseStream = function() {
-	this.flush();
-	this._stream = null;
-};
-
-LZMA.OutWindow.prototype.setStream = function(stream) {
-	this.releaseStream();
-	this._stream = stream;
-};
-
-LZMA.OutWindow.prototype.init = function(solid) {
-	if (!solid) {
-		this._streamPos = 0;
-		this._pos = 0;
-	}
-};
-
-LZMA.OutWindow.prototype.copyBlock = function(distance, len) {
-	var pos = this._pos - distance - 1;
-	if (pos < 0) {
-		pos += this._windowSize;
-	}
-	while (len --) {
-		if (pos >= this._windowSize) {
-			pos = 0;
-		}
-		this._buffer[this._pos ++] = this._buffer[pos ++];
-		if (this._pos >= this._windowSize) {
-			this.flush();
-		}
-	}
-};
-
-LZMA.OutWindow.prototype.putByte = function(b) {
-	this._buffer[this._pos ++] = b;
-	if (this._pos >= this._windowSize) {
-		this.flush();
-	}
-};
-
-LZMA.OutWindow.prototype.getByte = function(distance) {
-	var pos = this._pos - distance - 1;
-	if (pos < 0) {
-		pos += this._windowSize;
-	}
-	return this._buffer[pos];
-};
-
-LZMA.RangeDecoder = function() {
-};
-
-LZMA.RangeDecoder.prototype.setStream = function(stream) {
-	this._stream = stream;
-};
-
-LZMA.RangeDecoder.prototype.releaseStream = function() {
-	this._stream = null;
-};
-
-LZMA.RangeDecoder.prototype.init = function() {
-	var i = 5;
-
-	this._code = 0;
-	this._range = -1;
-
-	while (i --) {
-		this._code = (this._code << 8) | this._stream.readByte();
-	}
-};
-
-LZMA.RangeDecoder.prototype.decodeDirectBits = function(numTotalBits) {
-	var result = 0, i = numTotalBits, t;
-
-	while (i --) {
-		this._range >>>= 1;
-		t = (this._code - this._range) >>> 31;
-		this._code -= this._range & (t - 1);
-		result = (result << 1) | (1 - t);
-
-		if ( (this._range & 0xff000000) === 0) {
-			this._code = (this._code << 8) | this._stream.readByte();
-			this._range <<= 8;
-		}
-	}
-
-	return result;
-};
-
-LZMA.RangeDecoder.prototype.decodeBit = function(probs, index) {
-	var prob = probs[index],
-      newBound = (this._range >>> 11) * prob;
-
-	if ( (this._code ^ 0x80000000) < (newBound ^ 0x80000000) ) {
-		this._range = newBound;
-		probs[index] += (2048 - prob) >>> 5;
-		if ( (this._range & 0xff000000) === 0) {
-			this._code = (this._code << 8) | this._stream.readByte();
-			this._range <<= 8;
-		}
-		return 0;
-	}
-
-	this._range -= newBound;
-	this._code -= newBound;
-	probs[index] -= prob >>> 5;
-	if ( (this._range & 0xff000000) === 0) {
-		this._code = (this._code << 8) | this._stream.readByte();
-		this._range <<= 8;
-	}
-	return 1;
-};
-
-LZMA.initBitModels = function(probs, len) {
-	while (len --) {
-		probs[len] = 1024;
-	}
-};
-
-LZMA.BitTreeDecoder = function(numBitLevels) {
-	this._models = [];
-	this._numBitLevels = numBitLevels;
-};
-
-LZMA.BitTreeDecoder.prototype.init = function() {
-	LZMA.initBitModels(this._models, 1 << this._numBitLevels);
-};
-
-LZMA.BitTreeDecoder.prototype.decode = function(rangeDecoder) {
-	var m = 1, i = this._numBitLevels;
-
-	while (i --) {
-		m = (m << 1) | rangeDecoder.decodeBit(this._models, m);
-	}
-	return m - (1 << this._numBitLevels);
-};
-
-LZMA.BitTreeDecoder.prototype.reverseDecode = function(rangeDecoder) {
-	var m = 1, symbol = 0, i = 0, bit;
-
-	for (; i < this._numBitLevels; ++ i) {
-		bit = rangeDecoder.decodeBit(this._models, m);
-		m = (m << 1) | bit;
-		symbol |= bit << i;
-	}
-	return symbol;
-};
-
-LZMA.reverseDecode2 = function(models, startIndex, rangeDecoder, numBitLevels) {
-	var m = 1, symbol = 0, i = 0, bit;
-
-	for (; i < numBitLevels; ++ i) {
-		bit = rangeDecoder.decodeBit(models, startIndex + m);
-		m = (m << 1) | bit;
-		symbol |= bit << i;
-	}
-	return symbol;
-};
-
-LZMA.LenDecoder = function() {
-	this._choice = [];
-	this._lowCoder = [];
-	this._midCoder = [];
-	this._highCoder = new LZMA.BitTreeDecoder(8);
-	this._numPosStates = 0;
-};
-
-LZMA.LenDecoder.prototype.create = function(numPosStates) {
-	for (; this._numPosStates < numPosStates; ++ this._numPosStates) {
-		this._lowCoder[this._numPosStates] = new LZMA.BitTreeDecoder(3);
-		this._midCoder[this._numPosStates] = new LZMA.BitTreeDecoder(3);
-	}
-};
-
-LZMA.LenDecoder.prototype.init = function() {
-	var i = this._numPosStates;
-	LZMA.initBitModels(this._choice, 2);
-	while (i --) {
-		this._lowCoder[i].init();
-		this._midCoder[i].init();
-	}
-	this._highCoder.init();
-};
-
-LZMA.LenDecoder.prototype.decode = function(rangeDecoder, posState) {
-	if (rangeDecoder.decodeBit(this._choice, 0) === 0) {
-		return this._lowCoder[posState].decode(rangeDecoder);
-	}
-	if (rangeDecoder.decodeBit(this._choice, 1) === 0) {
-		return 8 + this._midCoder[posState].decode(rangeDecoder);
-	}
-	return 16 + this._highCoder.decode(rangeDecoder);
-};
-
-LZMA.Decoder2 = function() {
-	this._decoders = [];
-};
-
-LZMA.Decoder2.prototype.init = function() {
-	LZMA.initBitModels(this._decoders, 0x300);
-};
-
-LZMA.Decoder2.prototype.decodeNormal = function(rangeDecoder) {
-	var symbol = 1;
-
-	do {
-		symbol = (symbol << 1) | rangeDecoder.decodeBit(this._decoders, symbol);
-	}while (symbol < 0x100);
-
-	return symbol & 0xff;
-};
-
-LZMA.Decoder2.prototype.decodeWithMatchByte = function(rangeDecoder, matchByte) {
-	var symbol = 1, matchBit, bit;
-
-	do {
-		matchBit = (matchByte >> 7) & 1;
-		matchByte <<= 1;
-		bit = rangeDecoder.decodeBit(this._decoders, ( (1 + matchBit) << 8) + symbol);
-		symbol = (symbol << 1) | bit;
-		if (matchBit !== bit) {
-			while (symbol < 0x100) {
-				symbol = (symbol << 1) | rangeDecoder.decodeBit(this._decoders, symbol);
-			}
-			break;
-		}
-	}while (symbol < 0x100);
-
-	return symbol & 0xff;
-};
-
-LZMA.LiteralDecoder = function() {
-};
-
-LZMA.LiteralDecoder.prototype.create = function(numPosBits, numPrevBits) {
-	var i;
-
-	if (this._coders
-    && (this._numPrevBits === numPrevBits)
-    && (this._numPosBits === numPosBits) ) {
-		return;
-	}
-	this._numPosBits = numPosBits;
-	this._posMask = (1 << numPosBits) - 1;
-	this._numPrevBits = numPrevBits;
-
-	this._coders = [];
-
-	i = 1 << (this._numPrevBits + this._numPosBits);
-	while (i --) {
-		this._coders[i] = new LZMA.Decoder2();
-	}
-};
-
-LZMA.LiteralDecoder.prototype.init = function() {
-	var i = 1 << (this._numPrevBits + this._numPosBits);
-	while (i --) {
-		this._coders[i].init();
-	}
-};
-
-LZMA.LiteralDecoder.prototype.getDecoder = function(pos, prevByte) {
-	return this._coders[( (pos & this._posMask) << this._numPrevBits)
-    + ( (prevByte & 0xff) >>> (8 - this._numPrevBits) )];
-};
-
-LZMA.Decoder = function() {
-	this._outWindow = new LZMA.OutWindow();
-	this._rangeDecoder = new LZMA.RangeDecoder();
-	this._isMatchDecoders = [];
-	this._isRepDecoders = [];
-	this._isRepG0Decoders = [];
-	this._isRepG1Decoders = [];
-	this._isRepG2Decoders = [];
-	this._isRep0LongDecoders = [];
-	this._posSlotDecoder = [];
-	this._posDecoders = [];
-	this._posAlignDecoder = new LZMA.BitTreeDecoder(4);
-	this._lenDecoder = new LZMA.LenDecoder();
-	this._repLenDecoder = new LZMA.LenDecoder();
-	this._literalDecoder = new LZMA.LiteralDecoder();
-	this._dictionarySize = -1;
-	this._dictionarySizeCheck = -1;
-
-	this._posSlotDecoder[0] = new LZMA.BitTreeDecoder(6);
-	this._posSlotDecoder[1] = new LZMA.BitTreeDecoder(6);
-	this._posSlotDecoder[2] = new LZMA.BitTreeDecoder(6);
-	this._posSlotDecoder[3] = new LZMA.BitTreeDecoder(6);
-};
-
-LZMA.Decoder.prototype.setDictionarySize = function(dictionarySize) {
-	if (dictionarySize < 0) {
-		return false;
-	}
-	if (this._dictionarySize !== dictionarySize) {
-		this._dictionarySize = dictionarySize;
-		this._dictionarySizeCheck = Math.max(this._dictionarySize, 1);
-		this._outWindow.create( Math.max(this._dictionarySizeCheck, 4096) );
-	}
-	return true;
-};
-
-LZMA.Decoder.prototype.setLcLpPb = function(lc, lp, pb) {
-	var numPosStates = 1 << pb;
-
-	if (lc > 8 || lp > 4 || pb > 4) {
-		return false;
-	}
-
-	this._literalDecoder.create(lp, lc);
-
-	this._lenDecoder.create(numPosStates);
-	this._repLenDecoder.create(numPosStates);
-	this._posStateMask = numPosStates - 1;
-
-	return true;
-};
-
-LZMA.Decoder.prototype.init = function() {
-	var i = 4;
-
-	this._outWindow.init(false);
-
-	LZMA.initBitModels(this._isMatchDecoders, 192);
-	LZMA.initBitModels(this._isRep0LongDecoders, 192);
-	LZMA.initBitModels(this._isRepDecoders, 12);
-	LZMA.initBitModels(this._isRepG0Decoders, 12);
-	LZMA.initBitModels(this._isRepG1Decoders, 12);
-	LZMA.initBitModels(this._isRepG2Decoders, 12);
-	LZMA.initBitModels(this._posDecoders, 114);
-
-	this._literalDecoder.init();
-
-	while (i --) {
-		this._posSlotDecoder[i].init();
-	}
-
-	this._lenDecoder.init();
-	this._repLenDecoder.init();
-	this._posAlignDecoder.init();
-	this._rangeDecoder.init();
-};
-
-LZMA.Decoder.prototype.decode = function(inStream, outStream, outSize) {
-	var state = 0, rep0 = 0, rep1 = 0, rep2 = 0, rep3 = 0, nowPos64 = 0, prevByte = 0,
-      posState, decoder2, len, distance, posSlot, numDirectBits;
-
-	this._rangeDecoder.setStream(inStream);
-	this._outWindow.setStream(outStream);
-
-	this.init();
-
-	while (outSize < 0 || nowPos64 < outSize) {
-		posState = nowPos64 & this._posStateMask;
-
-		if (this._rangeDecoder.decodeBit(this._isMatchDecoders, (state << 4) + posState) === 0) {
-			decoder2 = this._literalDecoder.getDecoder(nowPos64 ++, prevByte);
-
-			if (state >= 7) {
-				prevByte = decoder2.decodeWithMatchByte(this._rangeDecoder, this._outWindow.getByte(rep0) );
-			}else {
-				prevByte = decoder2.decodeNormal(this._rangeDecoder);
-			}
-			this._outWindow.putByte(prevByte);
-
-			state = state < 4 ? 0 : state - (state < 10 ? 3 : 6);
-
-		}else {
-
-			if (this._rangeDecoder.decodeBit(this._isRepDecoders, state) === 1) {
-				len = 0;
-				if (this._rangeDecoder.decodeBit(this._isRepG0Decoders, state) === 0) {
-					if (this._rangeDecoder.decodeBit(this._isRep0LongDecoders, (state << 4) + posState) === 0) {
-						state = state < 7 ? 9 : 11;
-						len = 1;
-					}
-				}else {
-					if (this._rangeDecoder.decodeBit(this._isRepG1Decoders, state) === 0) {
-						distance = rep1;
-					}else {
-						if (this._rangeDecoder.decodeBit(this._isRepG2Decoders, state) === 0) {
-							distance = rep2;
-						}else {
-							distance = rep3;
-							rep3 = rep2;
-						}
-						rep2 = rep1;
-					}
-					rep1 = rep0;
-					rep0 = distance;
-				}
-				if (len === 0) {
-					len = 2 + this._repLenDecoder.decode(this._rangeDecoder, posState);
-					state = state < 7 ? 8 : 11;
-				}
-			}else {
-				rep3 = rep2;
-				rep2 = rep1;
-				rep1 = rep0;
-
-				len = 2 + this._lenDecoder.decode(this._rangeDecoder, posState);
-				state = state < 7 ? 7 : 10;
-
-				posSlot = this._posSlotDecoder[len <= 5 ? len - 2 : 3].decode(this._rangeDecoder);
-				if (posSlot >= 4) {
-
-					numDirectBits = (posSlot >> 1) - 1;
-					rep0 = (2 | (posSlot & 1) ) << numDirectBits;
-
-					if (posSlot < 14) {
-						rep0 += LZMA.reverseDecode2(this._posDecoders,
-                rep0 - posSlot - 1, this._rangeDecoder, numDirectBits);
-					}else {
-						rep0 += this._rangeDecoder.decodeDirectBits(numDirectBits - 4) << 4;
-						rep0 += this._posAlignDecoder.reverseDecode(this._rangeDecoder);
-						if (rep0 < 0) {
-							if (rep0 === -1) {
-								break;
-							}
-							return false;
-						}
-					}
-				}else {
-					rep0 = posSlot;
-				}
-			}
-
-			if (rep0 >= nowPos64 || rep0 >= this._dictionarySizeCheck) {
-				return false;
-			}
-
-			this._outWindow.copyBlock(rep0, len);
-			nowPos64 += len;
-			prevByte = this._outWindow.getByte(0);
-		}
-	}
-
-	this._outWindow.flush();
-	this._outWindow.releaseStream();
-	this._rangeDecoder.releaseStream();
-
-	return true;
-};
-
-LZMA.Decoder.prototype.setDecoderProperties = function(properties) {
-	var value, lc, lp, pb, dictionarySize;
-
-	if (properties.size < 5) {
-		return false;
-	}
-
-	value = properties.readByte();
-	lc = value % 9;
-	value = ~~(value / 9);
-	lp = value % 5;
-	pb = ~~(value / 5);
-
-	if ( !this.setLcLpPb(lc, lp, pb) ) {
-		return false;
-	}
-
-	dictionarySize = properties.readByte();
-	dictionarySize |= properties.readByte() << 8;
-	dictionarySize |= properties.readByte() << 16;
-	dictionarySize += properties.readByte() * 16777216;
-
-	return this.setDictionarySize(dictionarySize);
-};
-
-LZMA.decompress = function(properties, inStream, outStream, outSize) {
-	var decoder = new LZMA.Decoder();
-
-	if ( !decoder.setDecoderProperties(properties) ) {
-		throw "Incorrect stream properties";
-	}
-
-	if ( !decoder.decode(inStream, outStream, outSize) ) {
-		throw "Error in data stream";
-	}
-
-	return true;
-};

examples/js/loaders/ctm/CTMLoader.js

@@ -1,279 +0,0 @@
-/**
- * Loader for CTM encoded models generated by OpenCTM tools:
- *	http://openctm.sourceforge.net/
- *
- * Uses js-openctm library by Juan Mellado
- *	http://code.google.com/p/js-openctm/
- *
- * @author alteredq / http://alteredqualia.com/
- *
- * OpenCTM LICENSE:
- *
- * Copyright (c) 2009-2010 Marcus Geelnard
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- *     1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- *
- *    2. Altered source versions must be plainly marked as such, and must not
- *    be misrepresented as being the original software.
- *
- *    3. This notice may not be removed or altered from any source
- *    distribution.
- *
- */
-
-/* global CTM */
-
-THREE.CTMLoader = function () {
-
-	this.workerPath = null;
-
-};
-
-THREE.CTMLoader.prototype.constructor = THREE.CTMLoader;
-
-THREE.CTMLoader.prototype.setWorkerPath = function ( workerPath ) {
-
-	this.workerPath = workerPath;
-
-};
-
-// Load multiple CTM parts defined in JSON
-
-THREE.CTMLoader.prototype.loadParts = function ( url, callback, parameters ) {
-
-	parameters = parameters || {};
-
-	var scope = this;
-
-	var xhr = new XMLHttpRequest();
-
-	var basePath = parameters.basePath ? parameters.basePath : THREE.LoaderUtils.extractUrlBase( url );
-
-	xhr.onreadystatechange = function () {
-
-		if ( xhr.readyState === 4 ) {
-
-			if ( xhr.status === 200 || xhr.status === 0 ) {
-
-				var jsonObject = JSON.parse( xhr.responseText );
-
-				var materials = [], geometries = [], counter = 0;
-
-				function callbackFinal( geometry ) {
-
-					counter += 1;
-
-					geometries.push( geometry );
-
-					if ( counter === jsonObject.offsets.length ) {
-
-						callback( geometries, materials );
-
-					}
-
-				}
-
-
-				// init materials
-
-				for ( var i = 0; i < jsonObject.materials.length; i ++ ) {
-
-					materials[ i ] = THREE.Loader.prototype.createMaterial( jsonObject.materials[ i ], basePath );
-
-				}
-
-				// load joined CTM file
-
-				var partUrl = basePath + jsonObject.data;
-				var parametersPart = { useWorker: parameters.useWorker, worker: parameters.worker, offsets: jsonObject.offsets };
-				scope.load( partUrl, callbackFinal, parametersPart );
-
-			}
-
-		}
-
-	};
-
-	xhr.open( "GET", url, true );
-	xhr.setRequestHeader( "Content-Type", "text/plain" );
-	xhr.send( null );
-
-};
-
-// Load CTMLoader compressed models
-//	- parameters
-//		- url (required)
-//		- callback (required)
-
-THREE.CTMLoader.prototype.load = function ( url, callback, parameters ) {
-
-	parameters = parameters || {};
-
-	var scope = this;
-
-	var offsets = parameters.offsets !== undefined ? parameters.offsets : [ 0 ];
-
-	var xhr = new XMLHttpRequest(),
-		callbackProgress = null;
-
-	var length = 0;
-
-	xhr.onreadystatechange = function () {
-
-		if ( xhr.readyState === 4 ) {
-
-			if ( xhr.status === 200 || xhr.status === 0 ) {
-
-				var binaryData = new Uint8Array( xhr.response );
-
-				var s = Date.now();
-
-				if ( parameters.useWorker ) {
-
-					var worker = parameters.worker || new Worker( scope.workerPath );
-
-					worker.onmessage = function ( event ) {
-
-						var files = event.data;
-
-						for ( var i = 0; i < files.length; i ++ ) {
-
-							var ctmFile = files[ i ];
-
-							var e1 = Date.now();
-							// console.log( "CTM data parse time [worker]: " + (e1-s) + " ms" );
-
-							scope._createGeometry( ctmFile, callback );
-
-							var e = Date.now();
-							console.log( "model load time [worker]: " + ( e - e1 ) + " ms, total: " + ( e - s ) );
-
-						}
-
-
-					};
-
-					worker.postMessage( { "data": binaryData, "offsets": offsets }, [ binaryData.buffer ] );
-
-				} else {
-
-					for ( var i = 0; i < offsets.length; i ++ ) {
-
-						var stream = new CTM.Stream( binaryData );
-						stream.offset = offsets[ i ];
-
-						var ctmFile = new CTM.File( stream );
-
-						scope._createGeometry( ctmFile, callback );
-
-					}
-
-					//var e = Date.now();
-					//console.log( "CTM data parse time [inline]: " + (e-s) + " ms" );
-
-				}
-
-			} else {
-
-				console.error( "Couldn't load [" + url + "] [" + xhr.status + "]" );
-
-			}
-
-		} else if ( xhr.readyState === 3 ) {
-
-			if ( callbackProgress ) {
-
-				if ( length === 0 ) {
-
-					length = xhr.getResponseHeader( "Content-Length" );
-
-				}
-
-				callbackProgress( { total: length, loaded: xhr.responseText.length } );
-
-			}
-
-		} else if ( xhr.readyState === 2 ) {
-
-			length = xhr.getResponseHeader( "Content-Length" );
-
-		}
-
-	};
-
-	xhr.open( "GET", url, true );
-	xhr.responseType = "arraybuffer";
-
-	xhr.send( null );
-
-};
-
-
-THREE.CTMLoader.prototype._createGeometry = function ( file, callback ) {
-
-	var geometry = new THREE.BufferGeometry();
-
-	var indices = file.body.indices;
-	var positions = file.body.vertices;
-	var normals = file.body.normals;
-
-	var uvs, colors;
-
-	var uvMaps = file.body.uvMaps;
-
-	if ( uvMaps !== undefined && uvMaps.length > 0 ) {
-
-		uvs = uvMaps[ 0 ].uv;
-
-	}
-
-	var attrMaps = file.body.attrMaps;
-
-	if ( attrMaps !== undefined && attrMaps.length > 0 && attrMaps[ 0 ].name === 'Color' ) {
-
-		colors = attrMaps[ 0 ].attr;
-
-	}
-
-	geometry.setIndex( new THREE.BufferAttribute( indices, 1 ) );
-	geometry.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );
-
-	if ( normals !== undefined ) {
-
-		geometry.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );
-
-	}
-
-	if ( uvs !== undefined ) {
-
-		geometry.addAttribute( 'uv', new THREE.BufferAttribute( uvs, 2 ) );
-
-	}
-
-	if ( colors !== undefined ) {
-
-		geometry.addAttribute( 'color', new THREE.BufferAttribute( colors, 4 ) );
-
-	}
-
-	// compute vertex normals if not present in the CTM model
-	if ( geometry.attributes.normal === undefined ) {
-
-		geometry.computeVertexNormals();
-
-	}
-
-	callback( geometry );
-
-};

examples/js/loaders/ctm/CTMWorker.js

@@ -1,19 +0,0 @@
-importScripts( "../../libs/lzma.js", "../../libs/ctm.js" );
-
-self.onmessage = function ( event ) {
-
-	var files = [];
-
-	for ( var i = 0; i < event.data.offsets.length; i ++ ) {
-
-		var stream = new CTM.Stream( event.data.data );
-		stream.offset = event.data.offsets[ i ];
-
-		files[ i ] = new CTM.File( stream, [ event.data.data.buffer ] );
-
-	}
-
-	self.postMessage( files );
-	self.close();
-
-};

examples/jsm/loaders/ctm/CTMLoader.d.ts

@@ -1,20 +0,0 @@
-import {
-  BufferGeometry,
-  Material
-} from '../../../../src/Three';
-
-export interface CTMLoaderParameters {
-  basePath?: string;
-  offsets?: number[];
-  useWorker?: boolean;
-  worker?: object;
-}
-
-export class CTMLoader {
-  constructor();
-  workerPath: string;
-
-  load(url: string, onLoad: (geometry: BufferGeometry) => void, parameters: CTMLoaderParameters): void;
-  loadParts(url: string, onLoad: (geometries: BufferGeometry[], materials: Material[]) => void, parameters: CTMLoaderParameters): void;
-  setWorkerPath(value: string): this;
-}

examples/jsm/loaders/ctm/CTMLoader.js

@@ -1,288 +0,0 @@
-/**
- * Loader for CTM encoded models generated by OpenCTM tools:
- *	http://openctm.sourceforge.net/
- *
- * Uses js-openctm library by Juan Mellado
- *	http://code.google.com/p/js-openctm/
- *
- * @author alteredq / http://alteredqualia.com/
- *
- * OpenCTM LICENSE:
- *
- * Copyright (c) 2009-2010 Marcus Geelnard
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- *     1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- *
- *    2. Altered source versions must be plainly marked as such, and must not
- *    be misrepresented as being the original software.
- *
- *    3. This notice may not be removed or altered from any source
- *    distribution.
- *
- */
-
-import {
-	BufferAttribute,
-	BufferGeometry,
-	Loader,
-	LoaderUtils
-} from "../../../../build/three.module.js";
-
-/* global CTM */
-
-var CTMLoader = function () {
-
-	this.workerPath = null;
-
-};
-
-CTMLoader.prototype.constructor = CTMLoader;
-
-CTMLoader.prototype.setWorkerPath = function ( workerPath ) {
-
-	this.workerPath = workerPath;
-
-};
-
-// Load multiple CTM parts defined in JSON
-
-CTMLoader.prototype.loadParts = function ( url, callback, parameters ) {
-
-	parameters = parameters || {};
-
-	var scope = this;
-
-	var xhr = new XMLHttpRequest();
-
-	var basePath = parameters.basePath ? parameters.basePath : LoaderUtils.extractUrlBase( url );
-
-	xhr.onreadystatechange = function () {
-
-		if ( xhr.readyState === 4 ) {
-
-			if ( xhr.status === 200 || xhr.status === 0 ) {
-
-				var jsonObject = JSON.parse( xhr.responseText );
-
-				var materials = [], geometries = [], counter = 0;
-
-				function callbackFinal( geometry ) {
-
-					counter += 1;
-
-					geometries.push( geometry );
-
-					if ( counter === jsonObject.offsets.length ) {
-
-						callback( geometries, materials );
-
-					}
-
-				}
-
-
-				// init materials
-
-				for ( var i = 0; i < jsonObject.materials.length; i ++ ) {
-
-					materials[ i ] = Loader.prototype.createMaterial( jsonObject.materials[ i ], basePath );
-
-				}
-
-				// load joined CTM file
-
-				var partUrl = basePath + jsonObject.data;
-				var parametersPart = { useWorker: parameters.useWorker, worker: parameters.worker, offsets: jsonObject.offsets };
-				scope.load( partUrl, callbackFinal, parametersPart );
-
-			}
-
-		}
-
-	};
-
-	xhr.open( "GET", url, true );
-	xhr.setRequestHeader( "Content-Type", "text/plain" );
-	xhr.send( null );
-
-};
-
-// Load CTMLoader compressed models
-//	- parameters
-//		- url (required)
-//		- callback (required)
-
-CTMLoader.prototype.load = function ( url, callback, parameters ) {
-
-	parameters = parameters || {};
-
-	var scope = this;
-
-	var offsets = parameters.offsets !== undefined ? parameters.offsets : [ 0 ];
-
-	var xhr = new XMLHttpRequest(),
-		callbackProgress = null;
-
-	var length = 0;
-
-	xhr.onreadystatechange = function () {
-
-		if ( xhr.readyState === 4 ) {
-
-			if ( xhr.status === 200 || xhr.status === 0 ) {
-
-				var binaryData = new Uint8Array( xhr.response );
-
-				var s = Date.now();
-
-				if ( parameters.useWorker ) {
-
-					var worker = parameters.worker || new Worker( scope.workerPath );
-
-					worker.onmessage = function ( event ) {
-
-						var files = event.data;
-
-						for ( var i = 0; i < files.length; i ++ ) {
-
-							var ctmFile = files[ i ];
-
-							var e1 = Date.now();
-							// console.log( "CTM data parse time [worker]: " + (e1-s) + " ms" );
-
-							scope._createGeometry( ctmFile, callback );
-
-							var e = Date.now();
-							console.log( "model load time [worker]: " + ( e - e1 ) + " ms, total: " + ( e - s ) );
-
-						}
-
-
-					};
-
-					worker.postMessage( { "data": binaryData, "offsets": offsets }, [ binaryData.buffer ] );
-
-				} else {
-
-					for ( var i = 0; i < offsets.length; i ++ ) {
-
-						var stream = new CTM.Stream( binaryData );
-						stream.offset = offsets[ i ];
-
-						var ctmFile = new CTM.File( stream );
-
-						scope._createGeometry( ctmFile, callback );
-
-					}
-
-					//var e = Date.now();
-					//console.log( "CTM data parse time [inline]: " + (e-s) + " ms" );
-
-				}
-
-			} else {
-
-				console.error( "Couldn't load [" + url + "] [" + xhr.status + "]" );
-
-			}
-
-		} else if ( xhr.readyState === 3 ) {
-
-			if ( callbackProgress ) {
-
-				if ( length === 0 ) {
-
-					length = xhr.getResponseHeader( "Content-Length" );
-
-				}
-
-				callbackProgress( { total: length, loaded: xhr.responseText.length } );
-
-			}
-
-		} else if ( xhr.readyState === 2 ) {
-
-			length = xhr.getResponseHeader( "Content-Length" );
-
-		}
-
-	};
-
-	xhr.open( "GET", url, true );
-	xhr.responseType = "arraybuffer";
-
-	xhr.send( null );
-
-};
-
-
-CTMLoader.prototype._createGeometry = function ( file, callback ) {
-
-	var geometry = new BufferGeometry();
-
-	var indices = file.body.indices;
-	var positions = file.body.vertices;
-	var normals = file.body.normals;
-
-	var uvs, colors;
-
-	var uvMaps = file.body.uvMaps;
-
-	if ( uvMaps !== undefined && uvMaps.length > 0 ) {
-
-		uvs = uvMaps[ 0 ].uv;
-
-	}
-
-	var attrMaps = file.body.attrMaps;
-
-	if ( attrMaps !== undefined && attrMaps.length > 0 && attrMaps[ 0 ].name === 'Color' ) {
-
-		colors = attrMaps[ 0 ].attr;
-
-	}
-
-	geometry.setIndex( new BufferAttribute( indices, 1 ) );
-	geometry.addAttribute( 'position', new BufferAttribute( positions, 3 ) );
-
-	if ( normals !== undefined ) {
-
-		geometry.addAttribute( 'normal', new BufferAttribute( normals, 3 ) );
-
-	}
-
-	if ( uvs !== undefined ) {
-
-		geometry.addAttribute( 'uv', new BufferAttribute( uvs, 2 ) );
-
-	}
-
-	if ( colors !== undefined ) {
-
-		geometry.addAttribute( 'color', new BufferAttribute( colors, 4 ) );
-
-	}
-
-	// compute vertex normals if not present in the CTM model
-	if ( geometry.attributes.normal === undefined ) {
-
-		geometry.computeVertexNormals();
-
-	}
-
-	callback( geometry );
-
-};
-
-export { CTMLoader };

examples/models/ctm/camaro/camaro.js

@@ -1,113 +0,0 @@
-{
-"data" : "camaro.ctm",
-
-"offsets": [ 0, 39262, 79223, 83542, 94677, 95890, 144902, 470461 ],
-
-"materials" :
-	[
-	{
-	"DbgColor" : 15658734,
-	"DbgIndex" : 0,
-	"DbgName" : "Body_car-ao",
-	"colorDiffuse" : [0.1816, 0.3264, 0.3704],
-	"colorSpecular" : [2.0, 2.0, 2.0],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 778.431373,
-	"opacity" : 1.0
-	},
-
-	{
-	"DbgColor" : 15597568,
-	"DbgIndex" : 1,
-	"DbgName" : "tire_car-ao",
-	"colorDiffuse" : [0.2168, 0.2168, 0.2104],
-	"colorSpecular" : [0.1, 0.1, 0.1],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 15.686275,
-	"opacity" : 1.0
-	},
-
-	{
-	"DbgColor" : 60928,
-	"DbgIndex" : 2,
-	"DbgName" : "black2_car-ao",
-	"colorDiffuse" : [0.0, 0.0, 0.0],
-	"colorSpecular" : [0.0, 0.0, 0.0],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 0.0,
-	"opacity" : 1.0
-	},
-
-	{
-	"DbgColor" : 238,
-	"DbgIndex" : 3,
-	"DbgName" : "tireling_car-ao",
-	"colorDiffuse" : [0.4, 0.4, 0.4],
-	"colorSpecular" : [0.2, 0.2, 0.2],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 15.686275,
-	"opacity" : 1.0
-	},
-
-	{
-	"DbgColor" : 15658496,
-	"DbgIndex" : 4,
-	"DbgName" : "glass_car-ao",
-	"colorDiffuse" : [0.16, 0.248, 0.2448],
-	"colorSpecular" : [2.0, 2.0, 2.0],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 778.431373,
-	"opacity" : 0.34
-	},
-
-	{
-	"DbgColor" : 61166,
-	"DbgIndex" : 5,
-	"DbgName" : "black_car-ao",
-	"colorDiffuse" : [0.0816, 0.0816, 0.0816],
-	"colorSpecular" : [0.2, 0.2, 0.2],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 3.921569,
-	"opacity" : 1.0
-	},
-
-	{
-	"DbgColor" : 15597806,
-	"DbgIndex" : 6,
-	"DbgName" : "mirror_car-ao",
-	"colorDiffuse" : [0.24, 0.24, 0.24],
-	"colorSpecular" : [2.0, 2.0, 2.0],
-	"illumination" : 2,
-	"mapDiffuse" : "car-ao.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 778.431373,
-	"opacity" : 1.0
-	},
-
-
-	{
-	"DbgColor" : 3744854,
-	"DbgIndex" : 8,
-	"DbgName" : "Material.001_plane-ao-256",
-	"colorDiffuse" : [0.798635, 0.776149, 0.8],
-	"colorSpecular" : [0.5, 0.5, 0.5],
-	"illumination" : 2,
-	"mapDiffuse" : "plane-ao-256.png",
-	"opticalDensity" : 1.0,
-	"specularCoef" : 96.078431,
-	"opacity" : 1.0
-	}
-	]
-}

examples/webgl_loader_ctm_materials.html

@@ -1,242 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>three.js webgl - CTM loader materials</title>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
-		<link type="text/css" rel="stylesheet" href="main.css">
-	</head>
-	<body>
-		<div id="info">
-			<a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> webgl -
-			using <a href="https://github.com/jcmellado/js-openctm"  target="_blank" rel="noopener">js-openctm</a><br/>
-			camaro by <a href="http://www.turbosquid.com/3d-models/blender-camaro/411348" target="_blank" rel="noopener">dskfnwn</a> -
-			skybox by <a href="http://ict.debevec.org/~debevec/" target="_blank" rel="noopener">Paul Debevec</a>
-		</div>
-
-		<script type="module">
-
-			import * as THREE from '../build/three.module.js';
-
-			import Stats from './jsm/libs/stats.module.js';
-
-			import { CTMLoader } from './jsm/loaders/ctm/CTMLoader.js';
-			import { OrbitControls } from './jsm/controls/OrbitControls.js';
-
-			var SCREEN_WIDTH = window.innerWidth;
-			var SCREEN_HEIGHT = window.innerHeight;
-
-			var container, stats;
-
-			var camera, scene, controls;
-			var renderer;
-
-			var textureCube;
-
-			init();
-			animate();
-
-			function init() {
-
-				container = document.createElement( 'div' );
-				document.body.appendChild( container );
-
-				// CAMERA
-
-				camera = new THREE.PerspectiveCamera( 30, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
-				camera.position.set( 185, 40, 170 );
-
-				// SCENE
-
-				var r = "textures/cube/pisa/";
-				var urls = [
-					r + "px.png", r + "nx.png",
-					r + "py.png", r + "ny.png",
-					r + "pz.png", r + "nz.png"
-				];
-
-				textureCube = new THREE.CubeTextureLoader().load( urls );
-
-				scene = new THREE.Scene();
-				scene.background = textureCube;
-
-				// LIGHTS
-
-				var light = new THREE.PointLight( 0xffffff, 1 );
-				light.position.set( 2, 5, 1 );
-				light.position.multiplyScalar( 30 );
-				scene.add( light );
-
-				var light = new THREE.PointLight( 0xffffff, 0.75 );
-				light.position.set( - 12, 4.6, 2.4 );
-				light.position.multiplyScalar( 30 );
-				scene.add( light );
-
-				scene.add( new THREE.AmbientLight( 0x050505 ) );
-
-				// RENDERER
-
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
-				renderer.setPixelRatio( window.devicePixelRatio );
-				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
-				renderer.gammaInput = true;
-				renderer.gammaOutput = true;
-				renderer.domElement.style.position = "relative";
-				container.appendChild( renderer.domElement );
-
-				controls = new OrbitControls( camera, renderer.domElement );
-				controls.maxPolarAngle = Math.PI / 2;
-				controls.minDistance = 150;
-				controls.maxDistance = 500;
-
-				// STATS
-
-				stats = new Stats();
-				container.appendChild( stats.dom );
-
-				// EVENTS
-
-				window.addEventListener( 'resize', onWindowResize, false );
-
-				// LOADER
-
-				var start = Date.now();
-
-				// new way via CTMLoader and separate parts
-
-				var position = new THREE.Vector3( - 105, - 78, - 30 );
-				var scale = new THREE.Vector3( 30, 30, 30 );
-
-				var loader = new CTMLoader();
-				loader.setWorkerPath( "js/loaders/ctm/CTMWorker.js" );
-
-				loader.loadParts( "models/ctm/camaro/camaro.js", function ( geometries, materials ) {
-
-					hackMaterials( materials );
-
-					for ( var i = 0; i < geometries.length; i ++ ) {
-
-						var mesh = new THREE.Mesh( geometries[ i ], materials[ i ] );
-						mesh.position.copy( position );
-						mesh.scale.copy( scale );
-						scene.add( mesh );
-
-					}
-
-					var end = Date.now();
-
-					console.log( "load time:", end - start, "ms" );
-
-				}, { useWorker: true } );
-
-			}
-
-			//
-
-			function hackMaterials( materials ) {
-
-				for ( var i = 0; i < materials.length; i ++ ) {
-
-					var m = materials[ i ];
-
-					if ( m.name.indexOf( "Body" ) !== - 1 ) {
-
-						var mm = new THREE.MeshStandardMaterial();
-
-						mm.color.setHex( 0x000000 );
-						mm.lightMap = m.map;
-						mm.envMap = textureCube;
-						mm.metalness = 0.5;
-						mm.roughness = 0.3;
-
-						materials[ i ] = mm;
-
-					} else if ( m.name.indexOf( "tire_car" ) !== - 1 ) {
-
-						var mm = new THREE.MeshStandardMaterial();
-
-						mm.color.setHex( 0x000000 );
-						mm.lightMap = m.map;
-						mm.metalness = 0.1;
-						mm.roughness = 0.9;
-
-						materials[ i ] = mm;
-
-					} else if ( m.name.indexOf( "mirror" ) !== - 1 ) {
-
-						var mm = new THREE.MeshStandardMaterial();
-
-						mm.color.setHex( 0x808080 );
-						mm.lightMap = m.map;
-						mm.envMap = textureCube;
-						mm.metalness = 0.9;
-						mm.roughness = 0.5;
-
-						materials[ i ] = mm;
-
-					} else if ( m.name.indexOf( "glass" ) !== - 1 ) {
-
-						var mm = new THREE.MeshStandardMaterial();
-
-						mm.color.copy( m.color );
-						mm.envMap = textureCube;
-						mm.metalness = 1;
-						mm.roughtness = 0.1;
-						mm.opacity = m.opacity;
-						mm.transparent = true;
-
-						materials[ i ] = mm;
-
-					} else if ( m.name.indexOf( "Material.001" ) !== - 1 ) {
-
-						var mm = new THREE.MeshPhongMaterial( { map: m.map } );
-
-						mm.specularMap = m.map;
-						mm.shininess = 30;
-						mm.color.setHex( 0x404040 );
-
-						materials[ i ] = mm;
-
-					}
-
-					materials[ i ].side = THREE.DoubleSide;
-
-				}
-
-			}
-
-			//
-
-			function onWindowResize() {
-
-				SCREEN_WIDTH = window.innerWidth;
-				SCREEN_HEIGHT = window.innerHeight;
-
-				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
-
-				camera.aspect = SCREEN_WIDTH / SCREEN_HEIGHT;
-				camera.updateProjectionMatrix();
-
-			}
-
-			//
-
-			function animate() {
-
-				requestAnimationFrame( animate );
-
-				render();
-				stats.update();
-
-			}
-
-			function render() {
-
-				renderer.render( scene, camera );
-
-			}
-
-		</script>
-
-	</body>
-</html>

utils/modularize.js

@@ -71,7 +71,6 @@ var files = [
 	{ path: 'lines/Wireframe.js', dependencies: [ { name: 'LineSegmentsGeometry', path: 'lines/LineSegmentsGeometry.js' }, { name: 'LineMaterial', path: 'lines/LineMaterial.js' } ], ignoreList: [] },
 	{ path: 'lines/WireframeGeometry2.js', dependencies: [ { name: 'LineSegmentsGeometry', path: 'lines/LineSegmentsGeometry.js' } ], ignoreList: [] },
 
-	{ path: 'loaders/ctm/CTMLoader.js', dependencies: [], ignoreList: [] },
 	{ path: 'loaders/deprecated/LegacyGLTFLoader.js', dependencies: [], ignoreList: [ 'AnimationMixer' ] },
 	{ path: 'loaders/deprecated/LegacyJSONLoader.js', dependencies: [], ignoreList: [ 'ObjectLoader' ] },
 	{ path: 'loaders/3MFLoader.js', dependencies: [], ignoreList: [] },