diff --git a/test/unit/src/extras/curves/CatmullRomCurve3.tests.js b/test/unit/src/extras/curves/CatmullRomCurve3.tests.js index 7990d83dc213b1ed5d86b330f3b9471aea877572..c43b43640568dae2f16f95a23a22fad8be6621b3 100644 --- a/test/unit/src/extras/curves/CatmullRomCurve3.tests.js +++ b/test/unit/src/extras/curves/CatmullRomCurve3.tests.js @@ -232,10 +232,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector3() ), + curve.getPointAt( 0.3, new Vector3() ), + curve.getPointAt( 0.5, new Vector3() ), + curve.getPointAt( 1, new Vector3() ) ]; assert.deepEqual( points, expectedPoints, "Correct points" ); @@ -256,11 +256,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.25 ), - curve.getTangent( 0.5 ), - curve.getTangent( 0.75 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector3() ), + curve.getTangent( 0.25, new Vector3() ), + curve.getTangent( 0.5, new Vector3() ), + curve.getTangent( 0.75, new Vector3() ), + curve.getTangent( 1, new Vector3() ) ]; expectedTangents.forEach( function ( exp, i ) { @@ -274,7 +274,7 @@ export default QUnit.module( 'Extras', () => { // - var expectedTangents = [ + expectedTangents = [ new Vector3( 0, 1, 0 ), new Vector3( - 0.10709018822205997, 0.9884651653817284, 0.10709018822205997 ), new Vector3( 0.6396363672964268, - 0.4262987629159402, - 0.6396363672964268 ), @@ -282,12 +282,12 @@ export default QUnit.module( 'Extras', () => { new Vector3( - 0.00019991333100812723, - 0.9999999600346592, 0.00019991333100812723 ) ]; - var tangents = [ - curve.getTangentAt( 0 ), - curve.getTangentAt( 0.25 ), - curve.getTangentAt( 0.5 ), - curve.getTangentAt( 0.75 ), - curve.getTangentAt( 1 ) + tangents = [ + curve.getTangentAt( 0, new Vector3() ), + curve.getTangentAt( 0.25, new Vector3() ), + curve.getTangentAt( 0.5, new Vector3() ), + curve.getTangentAt( 0.75, new Vector3() ), + curve.getTangentAt( 1, new Vector3() ) ]; expectedTangents.forEach( function ( exp, i ) { diff --git a/test/unit/src/extras/curves/CubicBezierCurve.tests.js b/test/unit/src/extras/curves/CubicBezierCurve.tests.js index 716b3f3cf3f3b0bd81b75dcd9b98e852f730b4bb..71ef5dd684dcdbbd5bff85754852256ddf401fe8 100644 --- a/test/unit/src/extras/curves/CubicBezierCurve.tests.js +++ b/test/unit/src/extras/curves/CubicBezierCurve.tests.js @@ -116,10 +116,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector2() ), + curve.getPointAt( 0.3, new Vector2() ), + curve.getPointAt( 0.5, new Vector2() ), + curve.getPointAt( 1, new Vector2() ) ]; assert.deepEqual( points, expectedPoints, "Correct points" ); @@ -137,11 +137,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.25 ), - curve.getTangent( 0.5 ), - curve.getTangent( 0.75 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector2() ), + curve.getTangent( 0.25, new Vector2() ), + curve.getTangent( 0.5, new Vector2() ), + curve.getTangent( 0.75, new Vector2() ), + curve.getTangent( 1, new Vector2() ) ]; expectedTangents.forEach( function ( exp, i ) { @@ -164,11 +164,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangentAt( 0 ), - curve.getTangentAt( 0.25 ), - curve.getTangentAt( 0.5 ), - curve.getTangentAt( 0.75 ), - curve.getTangentAt( 1 ) + curve.getTangentAt( 0, new Vector2() ), + curve.getTangentAt( 0.25, new Vector2() ), + curve.getTangentAt( 0.5, new Vector2() ), + curve.getTangentAt( 0.75, new Vector2() ), + curve.getTangentAt( 1, new Vector2() ) ]; expectedTangents.forEach( function ( exp, i ) { diff --git a/test/unit/src/extras/curves/CubicBezierCurve3.tests.js b/test/unit/src/extras/curves/CubicBezierCurve3.tests.js index 2a248e85eb8b742e638cbfa246d40c94fda9890f..5e3026645bfc024d78922751bcffc9ce322057ae 100644 --- a/test/unit/src/extras/curves/CubicBezierCurve3.tests.js +++ b/test/unit/src/extras/curves/CubicBezierCurve3.tests.js @@ -116,10 +116,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector3() ), + curve.getPointAt( 0.3, new Vector3() ), + curve.getPointAt( 0.5, new Vector3() ), + curve.getPointAt( 1, new Vector3() ) ]; assert.deepEqual( points, expectedPoints, "Correct points" ); @@ -137,11 +137,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.25 ), - curve.getTangent( 0.5 ), - curve.getTangent( 0.75 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector3() ), + curve.getTangent( 0.25, new Vector3() ), + curve.getTangent( 0.5, new Vector3() ), + curve.getTangent( 0.75, new Vector3() ), + curve.getTangent( 1, new Vector3() ) ]; expectedTangents.forEach( function ( exp, i ) { @@ -164,11 +164,11 @@ export default QUnit.module( 'Extras', () => { ]; tangents = [ - curve.getTangentAt( 0 ), - curve.getTangentAt( 0.25 ), - curve.getTangentAt( 0.5 ), - curve.getTangentAt( 0.75 ), - curve.getTangentAt( 1 ) + curve.getTangentAt( 0, new Vector3() ), + curve.getTangentAt( 0.25, new Vector3() ), + curve.getTangentAt( 0.5, new Vector3() ), + curve.getTangentAt( 0.75, new Vector3() ), + curve.getTangentAt( 1, new Vector3() ) ]; expectedTangents.forEach( function ( exp, i ) { diff --git a/test/unit/src/extras/curves/EllipseCurve.tests.js b/test/unit/src/extras/curves/EllipseCurve.tests.js index 69e38ed6e7fb34c294d4589f56147c5775e3e8a0..256a228f88f4fc528ee8e24a148d5d9731a69f61 100644 --- a/test/unit/src/extras/curves/EllipseCurve.tests.js +++ b/test/unit/src/extras/curves/EllipseCurve.tests.js @@ -107,13 +107,16 @@ export default QUnit.module( 'Extras', () => { var testValues = [ 0, 0.3, 0.5, 0.7, 1 ]; - testValues.forEach( function ( val, i ) { + var p = new Vector2(); + var a = new Vector2(); + + testValues.forEach( function ( val ) { var expectedX = Math.cos( val * Math.PI * 2 ) * 10; var expectedY = Math.sin( val * Math.PI * 2 ) * 10; - var p = curve.getPoint( val ); - var a = curve.getPointAt( val ); + curve.getPoint( val, p ); + curve.getPointAt( val, a ); assert.numEqual( p.x, expectedX, "getPoint(" + val + ").x correct" ); assert.numEqual( p.y, expectedY, "getPoint(" + val + ").y correct" ); @@ -136,11 +139,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.25 ), - curve.getTangent( 0.5 ), - curve.getTangent( 0.75 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector2() ), + curve.getTangent( 0.25, new Vector2() ), + curve.getTangent( 0.5, new Vector2() ), + curve.getTangent( 0.75, new Vector2() ), + curve.getTangent( 1, new Vector2() ) ]; expectedTangents.forEach( function ( exp, i ) { diff --git a/test/unit/src/extras/curves/LineCurve.tests.js b/test/unit/src/extras/curves/LineCurve.tests.js index 8cb9114ee9f0cfaee1afd2b4b79e5ce4cb863576..35777b5b1e62b403fcea1dec83ab03bef96e855b 100644 --- a/test/unit/src/extras/curves/LineCurve.tests.js +++ b/test/unit/src/extras/curves/LineCurve.tests.js @@ -66,10 +66,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector2() ), + curve.getPointAt( 0.3, new Vector2() ), + curve.getPointAt( 0.5, new Vector2() ), + curve.getPointAt( 1, new Vector2() ) ]; assert.deepEqual( points, expectedPoints, "Correct points" ); @@ -79,8 +79,9 @@ export default QUnit.module( 'Extras', () => { QUnit.test( "getTangent", ( assert ) => { var curve = _curve; + var tangent = new Vector2(); - var tangent = curve.getTangent( 0 ); + curve.getTangent( 0, tangent ); var expectedTangent = Math.sqrt( 0.5 ); assert.numEqual( tangent.x, expectedTangent, "tangent.x correct" ); diff --git a/test/unit/src/extras/curves/LineCurve3.tests.js b/test/unit/src/extras/curves/LineCurve3.tests.js index e223cdd62a80dede72805bf080ec9e2009104be5..62c56effbd4a96b1e3b7cc4e532b8d77bfb86df2 100644 --- a/test/unit/src/extras/curves/LineCurve3.tests.js +++ b/test/unit/src/extras/curves/LineCurve3.tests.js @@ -66,10 +66,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector3() ), + curve.getPointAt( 0.3, new Vector3() ), + curve.getPointAt( 0.5, new Vector3() ), + curve.getPointAt( 1, new Vector3() ) ]; assert.deepEqual( points, expectedPoints, "Correct getPointAt points" ); @@ -145,8 +145,9 @@ export default QUnit.module( 'Extras', () => { QUnit.test( "getTangent/getTangentAt", ( assert ) => { var curve = _curve; + var tangent = new Vector3(); - var tangent = curve.getTangent( 0.5 ); + curve.getTangent( 0.5, tangent ); var expectedTangent = Math.sqrt( 1 / 3 ); assert.numEqual( tangent.x, expectedTangent, "tangent.x correct" ); diff --git a/test/unit/src/extras/curves/QuadraticBezierCurve.tests.js b/test/unit/src/extras/curves/QuadraticBezierCurve.tests.js index fa9b4795261f00dd32728ec34567ee399fe61bba..58a64b1d39ab8e9350a161cf58712c8a2eec1da7 100644 --- a/test/unit/src/extras/curves/QuadraticBezierCurve.tests.js +++ b/test/unit/src/extras/curves/QuadraticBezierCurve.tests.js @@ -120,10 +120,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector2() ), + curve.getPointAt( 0.3, new Vector2() ), + curve.getPointAt( 0.5, new Vector2() ), + curve.getPointAt( 1, new Vector2() ) ]; assert.deepEqual( points, expectedPoints, "Correct points" ); @@ -143,11 +143,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.25 ), - curve.getTangent( 0.5 ), - curve.getTangent( 0.75 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector2() ), + curve.getTangent( 0.25, new Vector2() ), + curve.getTangent( 0.5, new Vector2() ), + curve.getTangent( 0.75, new Vector2() ), + curve.getTangent( 1, new Vector2() ) ]; expectedTangents.forEach( function ( exp, i ) { @@ -170,11 +170,11 @@ export default QUnit.module( 'Extras', () => { ]; tangents = [ - curve.getTangentAt( 0 ), - curve.getTangentAt( 0.25 ), - curve.getTangentAt( 0.5 ), - curve.getTangentAt( 0.75 ), - curve.getTangentAt( 1 ) + curve.getTangentAt( 0, new Vector2() ), + curve.getTangentAt( 0.25, new Vector2() ), + curve.getTangentAt( 0.5, new Vector2() ), + curve.getTangentAt( 0.75, new Vector2() ), + curve.getTangentAt( 1, new Vector2() ) ]; expectedTangents.forEach( function ( exp, i ) { diff --git a/test/unit/src/extras/curves/QuadraticBezierCurve3.tests.js b/test/unit/src/extras/curves/QuadraticBezierCurve3.tests.js index 1f57a74bea3a7a4a7749aaaec8a202ffccec4997..80898026eccfccadb505aa46866d3905ae0ff396 100644 --- a/test/unit/src/extras/curves/QuadraticBezierCurve3.tests.js +++ b/test/unit/src/extras/curves/QuadraticBezierCurve3.tests.js @@ -120,10 +120,10 @@ export default QUnit.module( 'Extras', () => { ]; var points = [ - curve.getPointAt( 0 ), - curve.getPointAt( 0.3 ), - curve.getPointAt( 0.5 ), - curve.getPointAt( 1 ) + curve.getPointAt( 0, new Vector3() ), + curve.getPointAt( 0.3, new Vector3() ), + curve.getPointAt( 0.5, new Vector3() ), + curve.getPointAt( 1, new Vector3() ) ]; assert.deepEqual( points, expectedPoints, "Correct points" ); @@ -143,11 +143,11 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.25 ), - curve.getTangent( 0.5 ), - curve.getTangent( 0.75 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector3() ), + curve.getTangent( 0.25, new Vector3() ), + curve.getTangent( 0.5, new Vector3() ), + curve.getTangent( 0.75, new Vector3() ), + curve.getTangent( 1, new Vector3() ) ]; expectedTangents.forEach( function ( exp, i ) { @@ -170,11 +170,11 @@ export default QUnit.module( 'Extras', () => { ]; tangents = [ - curve.getTangentAt( 0 ), - curve.getTangentAt( 0.25 ), - curve.getTangentAt( 0.5 ), - curve.getTangentAt( 0.75 ), - curve.getTangentAt( 1 ) + curve.getTangentAt( 0, new Vector3() ), + curve.getTangentAt( 0.25, new Vector3() ), + curve.getTangentAt( 0.5, new Vector3() ), + curve.getTangentAt( 0.75, new Vector3() ), + curve.getTangentAt( 1, new Vector3() ) ]; expectedTangents.forEach( function ( exp, i ) { diff --git a/test/unit/src/extras/curves/SplineCurve.tests.js b/test/unit/src/extras/curves/SplineCurve.tests.js index 4a3a0818c56c103fb51dc4e001da20b4ea4234fe..c827cc8a588c284218b604790f29a6721a7f7920 100644 --- a/test/unit/src/extras/curves/SplineCurve.tests.js +++ b/test/unit/src/extras/curves/SplineCurve.tests.js @@ -111,13 +111,15 @@ export default QUnit.module( 'Extras', () => { QUnit.test( "getPointAt", ( assert ) => { var curve = _curve; + var point = new Vector2(); - assert.ok( curve.getPointAt( 0 ).equals( curve.points[ 0 ] ), "PointAt 0.0 correct" ); - assert.ok( curve.getPointAt( 1 ).equals( curve.points[ 4 ] ), "PointAt 1.0 correct" ); + assert.ok( curve.getPointAt( 0, point ).equals( curve.points[ 0 ] ), "PointAt 0.0 correct" ); + assert.ok( curve.getPointAt( 1, point ).equals( curve.points[ 4 ] ), "PointAt 1.0 correct" ); - var pointAt = curve.getPointAt( 0.5 ); - assert.numEqual( pointAt.x, 0.0, "PointAt 0.5 x correct" ); - assert.numEqual( pointAt.y, 0.0, "PointAt 0.5 y correct" ); + curve.getPointAt( 0.5, point ); + + assert.numEqual( point.x, 0.0, "PointAt 0.5 x correct" ); + assert.numEqual( point.y, 0.0, "PointAt 0.5 y correct" ); } ); @@ -132,9 +134,9 @@ export default QUnit.module( 'Extras', () => { ]; var tangents = [ - curve.getTangent( 0 ), - curve.getTangent( 0.5 ), - curve.getTangent( 1 ) + curve.getTangent( 0, new Vector2() ), + curve.getTangent( 0.5, new Vector2() ), + curve.getTangent( 1, new Vector2() ) ]; tangents.forEach( function ( tangent, i ) {