Browse Source

remove usages of deprecated functions size/center of Box2/3 (#9740)

issue #9739
Eric Berberich 9 years ago
parent
commit
8e8e2e20ac
4 changed files with 36 additions and 34 deletions
  1. 1 1
      src/extras/helpers/BoundingBoxHelper.js
  2. 1 1
      src/math/Box3.js
  3. 17 16
      test/unit/math/Box2.js
  4. 17 16
      test/unit/math/Box3.js

+ 1 - 1
src/extras/helpers/BoundingBoxHelper.js

@@ -28,7 +28,7 @@ BoundingBoxHelper.prototype.update = function () {
 
 	this.box.setFromObject( this.object );
 
-	this.box.size( this.scale );
+	this.box.getSize( this.scale );
 
 	this.box.getCenter( this.position );
 

+ 1 - 1
src/math/Box3.js

@@ -396,7 +396,7 @@ Box3.prototype = {
 
 			this.getCenter( result.center );
 
-			result.radius = this.size( v1 ).length() * 0.5;
+			result.radius = this.getSize( v1 ).length() * 0.5;
 
 			return result;
 

+ 17 - 16
test/unit/math/Box2.js

@@ -66,59 +66,60 @@ test( "empty/makeEmpty", function() {
 	ok( a.isEmpty(), "Passed!" );
 });
 
-test( "center", function() {
+test( "getCenter", 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() {
+test( "getSize", 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() {

+ 17 - 16
test/unit/math/Box3.js

@@ -66,59 +66,60 @@ test( "empty/makeEmpty", function() {
 	ok( a.isEmpty(), "Passed!" );
 });
 
-test( "center", function() {
+test( "getCenter", 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() {
+test( "getSize", 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() {