Browse Source

Updated builds.

Mr.doob 4 years ago
parent
commit
5146e24910
4 changed files with 40 additions and 65 deletions
  1. 18 26
      build/three.js
  2. 0 0
      build/three.min.js
  3. 20 37
      build/three.module.js
  4. 2 2
      src/math/Quaternion.js

+ 18 - 26
build/three.js

@@ -785,7 +785,7 @@
 		Function("r", "regeneratorRuntime = r")(runtime);
 		Function("r", "regeneratorRuntime = r")(runtime);
 	}
 	}
 
 
-	var REVISION = '125';
+	var REVISION = '126dev';
 	var MOUSE = {
 	var MOUSE = {
 		LEFT: 0,
 		LEFT: 0,
 		MIDDLE: 1,
 		MIDDLE: 1,
@@ -2924,6 +2924,22 @@
 					z1 = src1[srcOffset1 + 2],
 					z1 = src1[srcOffset1 + 2],
 					w1 = src1[srcOffset1 + 3];
 					w1 = src1[srcOffset1 + 3];
 
 
+			if (t === 0) {
+				dst[dstOffset + 0] = x0;
+				dst[dstOffset + 1] = y0;
+				dst[dstOffset + 2] = z0;
+				dst[dstOffset + 3] = w0;
+				return;
+			}
+
+			if (t === 1) {
+				dst[dstOffset + 0] = x1;
+				dst[dstOffset + 1] = y1;
+				dst[dstOffset + 2] = z1;
+				dst[dstOffset + 3] = w1;
+				return;
+			}
+
 			if (w0 !== w1 || x0 !== x1 || y0 !== y1 || z0 !== z1) {
 			if (w0 !== w1 || x0 !== x1 || y0 !== y1 || z0 !== z1) {
 				var s = 1 - t;
 				var s = 1 - t;
 				var cos = x0 * x1 + y0 * y1 + z0 * z1 + w0 * w1,
 				var cos = x0 * x1 + y0 * y1 + z0 * z1 + w0 * w1,
@@ -20143,10 +20159,6 @@
 	var _matrix$1 = new Matrix4();
 	var _matrix$1 = new Matrix4();
 
 
 	function SkinnedMesh(geometry, material) {
 	function SkinnedMesh(geometry, material) {
-		if (geometry && geometry.isGeometry) {
-			console.error('THREE.SkinnedMesh no longer supports THREE.Geometry. Use THREE.BufferGeometry instead.');
-		}
-
 		Mesh.call(this, geometry, material);
 		Mesh.call(this, geometry, material);
 		this.type = 'SkinnedMesh';
 		this.type = 'SkinnedMesh';
 		this.bindMode = 'attached';
 		this.bindMode = 'attached';
@@ -36751,27 +36763,8 @@
 	CubeCamera.prototype.clear = function (renderer, color, depth, stencil) {
 	CubeCamera.prototype.clear = function (renderer, color, depth, stencil) {
 		console.warn('THREE.CubeCamera: .clear() is now .renderTarget.clear().');
 		console.warn('THREE.CubeCamera: .clear() is now .renderTarget.clear().');
 		return this.renderTarget.clear(renderer, color, depth, stencil);
 		return this.renderTarget.clear(renderer, color, depth, stencil);
-	}; //
-
-
-	var GeometryUtils = {
-		merge: function merge(geometry1, geometry2, materialIndexOffset) {
-			console.warn('THREE.GeometryUtils: .merge() has been moved to Geometry. Use geometry.merge( geometry2, matrix, materialIndexOffset ) instead.');
-			var matrix;
-
-			if (geometry2.isMesh) {
-				geometry2.matrixAutoUpdate && geometry2.updateMatrix();
-				matrix = geometry2.matrix;
-				geometry2 = geometry2.geometry;
-			}
-
-			geometry1.merge(geometry2, matrix, materialIndexOffset);
-		},
-		center: function center(geometry) {
-			console.warn('THREE.GeometryUtils: .center() has been moved to Geometry. Use geometry.center() instead.');
-			return geometry.center();
-		}
 	};
 	};
+
 	ImageUtils.crossOrigin = undefined;
 	ImageUtils.crossOrigin = undefined;
 
 
 	ImageUtils.loadTexture = function (url, mapping, onLoad, onError) {
 	ImageUtils.loadTexture = function (url, mapping, onLoad, onError) {
@@ -36984,7 +36977,6 @@
 	exports.GLSL1 = GLSL1;
 	exports.GLSL1 = GLSL1;
 	exports.GLSL3 = GLSL3;
 	exports.GLSL3 = GLSL3;
 	exports.GammaEncoding = GammaEncoding;
 	exports.GammaEncoding = GammaEncoding;
-	exports.GeometryUtils = GeometryUtils;
 	exports.GreaterDepth = GreaterDepth;
 	exports.GreaterDepth = GreaterDepth;
 	exports.GreaterEqualDepth = GreaterEqualDepth;
 	exports.GreaterEqualDepth = GreaterEqualDepth;
 	exports.GreaterEqualStencilFunc = GreaterEqualStencilFunc;
 	exports.GreaterEqualStencilFunc = GreaterEqualStencilFunc;

File diff suppressed because it is too large
+ 0 - 0
build/three.min.js


File diff suppressed because it is too large
+ 20 - 37
build/three.module.js


+ 2 - 2
src/math/Quaternion.js

@@ -35,7 +35,7 @@ class Quaternion {
 
 
 		if ( t === 0 ) {
 		if ( t === 0 ) {
 
 
-			dst[ dstOffset ] = x0;
+			dst[ dstOffset + 0 ] = x0;
 			dst[ dstOffset + 1 ] = y0;
 			dst[ dstOffset + 1 ] = y0;
 			dst[ dstOffset + 2 ] = z0;
 			dst[ dstOffset + 2 ] = z0;
 			dst[ dstOffset + 3 ] = w0;
 			dst[ dstOffset + 3 ] = w0;
@@ -45,7 +45,7 @@ class Quaternion {
 
 
 		if ( t === 1 ) {
 		if ( t === 1 ) {
 
 
-			dst[ dstOffset ] = x1;
+			dst[ dstOffset + 0 ] = x1;
 			dst[ dstOffset + 1 ] = y1;
 			dst[ dstOffset + 1 ] = y1;
 			dst[ dstOffset + 2 ] = z1;
 			dst[ dstOffset + 2 ] = z1;
 			dst[ dstOffset + 3 ] = w1;
 			dst[ dstOffset + 3 ] = w1;

Some files were not shown because too many files changed in this diff