From e77a0d93ef38eabfa04b1072ad3250e2c4d5cfb7 Mon Sep 17 00:00:00 2001 From: valorcurse Date: Tue, 4 Oct 2016 19:09:59 +0200 Subject: [PATCH] Update THREE.js definitions to r81 (#11679) * Update THREE.js definitions to r81 * Update test_unit_maths.ts to r81 * Update version in header to r81 --- threejs/tests/math/test_unit_math.ts | 56 ++++++++++++++-------------- threejs/three.d.ts | 16 ++++---- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/threejs/tests/math/test_unit_math.ts b/threejs/tests/math/test_unit_math.ts index 5d095315dc..226ebbb709 100644 --- a/threejs/tests/math/test_unit_math.ts +++ b/threejs/tests/math/test_unit_math.ts @@ -92,56 +92,56 @@ test( "center", function() { var a = new THREE.Box2( zero2.clone(), zero2.clone() ); - ok( a.center().equals( zero2 ), "Passed!" ); + ok( a.getCenter().equals( zero2 ), "Passed!" ); a = new THREE.Box2( zero2, one2 ); var midpoint = one2.clone().multiplyScalar( 0.5 ); - ok( a.center().equals( midpoint ), "Passed!" ); + ok( a.getCenter().equals( midpoint ), "Passed!" ); }); test( "size", function() { var a = new THREE.Box2( zero2.clone(), zero2.clone() ); - ok( a.size().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( zero2 ), "Passed!" ); a = new THREE.Box2( zero2.clone(), one2.clone() ); - ok( a.size().equals( one2 ), "Passed!" ); + ok( a.getSize().equals( one2 ), "Passed!" ); }); test( "expandByPoint", function() { var a = new THREE.Box2( zero2.clone(), zero2.clone() ); a.expandByPoint( zero2 ); - ok( a.size().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( zero2 ), "Passed!" ); a.expandByPoint( one2 ); - ok( a.size().equals( one2 ), "Passed!" ); + ok( a.getSize().equals( one2 ), "Passed!" ); a.expandByPoint( one2.clone().negate() ); - ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" ); - ok( a.center().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" ); + ok( a.getCenter().equals( zero2 ), "Passed!" ); }); test( "expandByVector", function() { var a = new THREE.Box2( zero2.clone(), zero2.clone() ); a.expandByVector( zero2 ); - ok( a.size().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( zero2 ), "Passed!" ); a.expandByVector( one2 ); - ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" ); - ok( a.center().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" ); + ok( a.getCenter().equals( zero2 ), "Passed!" ); }); test( "expandByScalar", function() { var a = new THREE.Box2( zero2.clone(), zero2.clone() ); a.expandByScalar( 0 ); - ok( a.size().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( zero2 ), "Passed!" ); a.expandByScalar( 1 ); - ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" ); - ok( a.center().equals( zero2 ), "Passed!" ); + ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" ); + ok( a.getCenter().equals( zero2 ), "Passed!" ); }); test( "containsPoint", function() { @@ -333,56 +333,56 @@ test( "center", function() { var a = new THREE.Box3( zero3.clone(), zero3.clone() ); - ok( a.center().equals( zero3 ), "Passed!" ); + ok( a.getCenter().equals( zero3 ), "Passed!" ); a = new THREE.Box3( zero3.clone(), one3.clone() ); var midpoint = one3.clone().multiplyScalar( 0.5 ); - ok( a.center().equals( midpoint ), "Passed!" ); + ok( a.getCenter().equals( midpoint ), "Passed!" ); }); test( "size", function() { var a = new THREE.Box3( zero3.clone(), zero3.clone() ); - ok( a.size().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( zero3 ), "Passed!" ); a = new THREE.Box3( zero3.clone(), one3.clone() ); - ok( a.size().equals( one3 ), "Passed!" ); + ok( a.getSize().equals( one3 ), "Passed!" ); }); test( "expandByPoint", function() { var a = new THREE.Box3( zero3.clone(), zero3.clone() ); a.expandByPoint( zero3 ); - ok( a.size().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( zero3 ), "Passed!" ); a.expandByPoint( one3 ); - ok( a.size().equals( one3 ), "Passed!" ); + ok( a.getSize().equals( one3 ), "Passed!" ); a.expandByPoint( one3.clone().negate() ); - ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" ); - ok( a.center().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" ); + ok( a.getCenter().equals( zero3 ), "Passed!" ); }); test( "expandByVector", function() { var a = new THREE.Box3( zero3.clone(), zero3.clone() ); a.expandByVector( zero3 ); - ok( a.size().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( zero3 ), "Passed!" ); a.expandByVector( one3 ); - ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" ); - ok( a.center().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" ); + ok( a.getCenter().equals( zero3 ), "Passed!" ); }); test( "expandByScalar", function() { var a = new THREE.Box3( zero3.clone(), zero3.clone() ); a.expandByScalar( 0 ); - ok( a.size().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( zero3 ), "Passed!" ); a.expandByScalar( 1 ); - ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" ); - ok( a.center().equals( zero3 ), "Passed!" ); + ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" ); + ok( a.getCenter().equals( zero3 ), "Passed!" ); }); test( "containsPoint", function() { diff --git a/threejs/three.d.ts b/threejs/three.d.ts index 830edbf864..05b903bce6 100644 --- a/threejs/three.d.ts +++ b/threejs/three.d.ts @@ -1,4 +1,4 @@ -// Type definitions for three.js r80 +// Type definitions for three.js r81 // Project: http://mrdoob.github.com/three.js/ // Definitions by: Kon , Satoru Kimura , Florent Poujol , SereznoKot // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -2778,8 +2778,8 @@ declare namespace THREE { copy(box: this): this; makeEmpty(): Box2; isEmpty(): boolean; - center(optionalTarget?: Vector2): Vector2; - size(optionalTarget?: Vector2): Vector2; + getCenter(optionalTarget?: Vector2): Vector2; + getSize(optionalTarget?: Vector2): Vector2; expandByPoint(point: Vector2): Box2; expandByVector(vector: Vector2): Box2; expandByScalar(scalar: number): Box2; @@ -2813,8 +2813,8 @@ declare namespace THREE { copy(box: this): this; makeEmpty(): Box3; isEmpty(): boolean; - center(optionalTarget?: Vector3): Vector3; - size(optionalTarget?: Vector3): Vector3; + getCenter(optionalTarget?: Vector3): Vector3; + getSize(optionalTarget?: Vector3): Vector3; expandByPoint(point: Vector3): Box3; expandByVector(vector: Vector3): Box3; expandByScalar(scalar: number): Box3; @@ -3175,7 +3175,7 @@ declare namespace THREE { set(start?: Vector3, end?: Vector3): Line3; clone(): this; copy(line: this): this; - center(optionalTarget?: Vector3): Vector3; + getCenter(optionalTarget?: Vector3): Vector3; delta(optionalTarget?: Vector3): Vector3; distanceSq(): number; distance(): number; @@ -3330,7 +3330,7 @@ declare namespace THREE { * Transposes this matrix into the supplied array r, and returns itself. */ transposeIntoArray(r: number[]): number[]; - fromArray(array: number[]): Matrix3; + fromArray(array: number[], offset?: number): Matrix3; toArray(): number[]; // deprecated @@ -3513,7 +3513,7 @@ declare namespace THREE { */ makeOrthographic(left: number, right: number, top: number, bottom: number, near: number, far: number): Matrix4; equals( matrix: Matrix4 ): boolean; - fromArray(array: number[]): Matrix4; + fromArray(array: number[], offset?: number): Matrix4; toArray(): number[]; // deprecated