From 59afe1a3f074b35412d93871e8824b070aa41783 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 15 Jan 2013 21:51:42 +0100 Subject: [PATCH] Moved Vector3's __q1 to Vector3. Updated includes list. See #2920. --- src/math/Quaternion.js | 2 -- src/math/Vector3.js | 2 ++ utils/includes/canvas.json | 3 ++- utils/includes/common.json | 2 +- utils/includes/common2.json | 2 +- utils/includes/css3d.json | 2 +- utils/includes/math.json | 2 +- utils/includes/webgl.json | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/math/Quaternion.js b/src/math/Quaternion.js index f043667490..a6c68dc11f 100644 --- a/src/math/Quaternion.js +++ b/src/math/Quaternion.js @@ -346,5 +346,3 @@ THREE.Quaternion.slerp = function ( qa, qb, qm, t ) { return qm.copy( qa ).slerp( qb, t ); } - -THREE.Vector3.__q1 = new THREE.Quaternion(); // to be moved to Vector3.js diff --git a/src/math/Vector3.js b/src/math/Vector3.js index dce655a82e..26dc9d5828 100644 --- a/src/math/Vector3.js +++ b/src/math/Vector3.js @@ -714,3 +714,5 @@ THREE.Vector3.prototype = { } }; + +THREE.Vector3.__q1 = new THREE.Quaternion(); diff --git a/utils/includes/canvas.json b/utils/includes/canvas.json index aac7dffaa2..fb0661878c 100644 --- a/utils/includes/canvas.json +++ b/utils/includes/canvas.json @@ -1,11 +1,13 @@ [ "../src/Three.js", "../src/math/Color.js", + "../src/math/Quaternion.js", "../src/math/Vector2.js", "../src/math/Vector3.js", "../src/math/Vector4.js", "../src/math/Matrix3.js", "../src/math/Matrix4.js", + "../src/math/Ray.js", "../src/math/Box2.js", "../src/math/Box3.js", "../src/math/Sphere.js", @@ -13,7 +15,6 @@ "../src/math/Frustum.js", "../src/math/Math.js", "../src/math/Triangle.js", - "../src/math/Quaternion.js", "../src/math/Vertex.js", "../src/math/UV.js", "../src/core/EventDispatcher.js", diff --git a/utils/includes/common.json b/utils/includes/common.json index 9458dacf8b..012a527e3b 100644 --- a/utils/includes/common.json +++ b/utils/includes/common.json @@ -1,6 +1,7 @@ [ "../src/Three.js", "../src/math/Color.js", + "../src/math/Quaternion.js", "../src/math/Vector2.js", "../src/math/Vector3.js", "../src/math/Vector4.js", @@ -13,7 +14,6 @@ "../src/math/Frustum.js", "../src/math/Plane.js", "../src/math/Math.js", - "../src/math/Quaternion.js", "../src/math/Spline.js", "../src/math/Triangle.js", "../src/math/Vertex.js", diff --git a/utils/includes/common2.json b/utils/includes/common2.json index 0333be07ef..c6da0b9ced 100644 --- a/utils/includes/common2.json +++ b/utils/includes/common2.json @@ -1,6 +1,7 @@ [ "../src/Three.js", "../src/math/Color.js", + "../src/math/Quaternion.js", "../src/math/Vector2.js", "../src/math/Vector3.js", "../src/math/Vector4.js", @@ -13,7 +14,6 @@ "../src/math/Frustum.js", "../src/math/Plane.js", "../src/math/Math.js", - "../src/math/Quaternion.js", "../src/math/Spline.js", "../src/math/Triangle.js", "../src/math/Vertex.js", diff --git a/utils/includes/css3d.json b/utils/includes/css3d.json index 783871613e..75ca2abfc5 100644 --- a/utils/includes/css3d.json +++ b/utils/includes/css3d.json @@ -1,12 +1,12 @@ [ "../src/Three.js", + "../src/math/Quaternion.js", "../src/math/Vector2.js", "../src/math/Vector3.js", "../src/math/Vector4.js", "../src/math/Math.js", "../src/math/Matrix3.js", "../src/math/Matrix4.js", - "../src/math/Quaternion.js", "../src/math/Frustum.js", "../src/math/Sphere.js", "../src/math/Plane.js", diff --git a/utils/includes/math.json b/utils/includes/math.json index 6866da5a75..7c90be8002 100644 --- a/utils/includes/math.json +++ b/utils/includes/math.json @@ -1,6 +1,7 @@ [ "../src/Three.js", "../src/math/Color.js", + "../src/math/Quaternion.js", "../src/math/Vector2.js", "../src/math/Vector3.js", "../src/math/Vector4.js", @@ -13,7 +14,6 @@ "../src/math/Plane.js", "../src/math/Sphere.js", "../src/math/Math.js", - "../src/math/Quaternion.js", "../src/math/Spline.js", "../src/math/Triangle.js" ] diff --git a/utils/includes/webgl.json b/utils/includes/webgl.json index bfeec8f3e6..6bc1adbd95 100644 --- a/utils/includes/webgl.json +++ b/utils/includes/webgl.json @@ -1,6 +1,7 @@ [ "../src/Three.js", "../src/math/Color.js", + "../src/math/Quaternion.js", "../src/math/Vector2.js", "../src/math/Vector3.js", "../src/math/Vector4.js", @@ -8,7 +9,6 @@ "../src/math/Matrix4.js", "../src/math/Frustum.js", "../src/math/Math.js", - "../src/math/Quaternion.js", "../src/math/Vertex.js", "../src/math/UV.js", "../src/math/Spline.js", -- GitLab