diff --git a/src/math/Quaternion.js b/src/math/Quaternion.js index f043667490facd9de9d17c251da59f86e495d304..a6c68dc11fe4a348168e27bc0f743d028a9f863c 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 dce655a82e4b8bdd28ecb3356ec6393670f558a4..26dc9d58282724b7cca21d0b3999c2502230144a 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 aac7dffaa217406deb191b1f7b1bfd1c70a86685..fb0661878c3ce9a346edf49851bb5864e9083f6e 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 9458dacf8bb46e89b71f07f88f6e94c02ce1dfd6..012a527e3b45c3cea55df3fffbab53a62569a51b 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 0333be07ef8019f15d07b6ec4f6de6703df20a7d..c6da0b9ced1a29b37b935c8fc1e1f742b3072558 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 783871613e6156b1235029f660a24a047a7f6863..75ca2abfc5eef05d7b96486301b66f32372680e1 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 6866da5a75bb7569f4dfa5db1f80f0cae5fb2e88..7c90be80028f20c5d7b76f3cc74a4b55e997596b 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 bfeec8f3e6071ef04be0016c2dc92b95531ee7cc..6bc1adbd955379c4129ebff344d4db586f185b32 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",