Skip to content

Commit 8e8e2e2

Browse files
ericberberichmrdoob
ericberberich
authored and
mrdoob
committed
remove usages of deprecated functions size/center of Box2/3 (mrdoob#9740)
issue mrdoob#9739
1 parent 38caaf8 commit 8e8e2e2

File tree

4 files changed

+36
-34
lines changed

4 files changed

+36
-34
lines changed

‎src/extras/helpers/BoundingBoxHelper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BoundingBoxHelper.prototype.update = function () {
2828

2929
this.box.setFromObject( this.object );
3030

31-
this.box.size( this.scale );
31+
this.box.getSize( this.scale );
3232

3333
this.box.getCenter( this.position );
3434

‎src/math/Box3.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ Box3.prototype = {
396396

397397
this.getCenter( result.center );
398398

399-
result.radius = this.size( v1 ).length() * 0.5;
399+
result.radius = this.getSize( v1 ).length() * 0.5;
400400

401401
return result;
402402

‎test/unit/math/Box2.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,59 +66,60 @@ test( "empty/makeEmpty", function() {
6666
ok( a.isEmpty(), "Passed!" );
6767
});
6868

69-
test( "center", function() {
69+
test( "getCenter", function() {
7070
var a = new THREE.Box2( zero2.clone(), zero2.clone() );
7171

72-
ok( a.center().equals( zero2 ), "Passed!" );
72+
ok( a.getCenter().equals( zero2 ), "Passed!" );
7373

7474
a = new THREE.Box2( zero2, one2 );
7575
var midpoint = one2.clone().multiplyScalar( 0.5 );
76-
ok( a.center().equals( midpoint ), "Passed!" );
76+
ok( a.getCenter().equals( midpoint ), "Passed!" );
7777
});
7878

79-
test( "size", function() {
79+
test( "getSize", function() {
8080
var a = new THREE.Box2( zero2.clone(), zero2.clone() );
8181

82-
ok( a.size().equals( zero2 ), "Passed!" );
82+
ok( a.getSize().equals( zero2 ), "Passed!" );
8383

8484
a = new THREE.Box2( zero2.clone(), one2.clone() );
85-
ok( a.size().equals( one2 ), "Passed!" );
85+
ok( a.getSize().equals( one2 ), "Passed!" );
8686
});
8787

88+
8889
test( "expandByPoint", function() {
8990
var a = new THREE.Box2( zero2.clone(), zero2.clone() );
9091

9192
a.expandByPoint( zero2 );
92-
ok( a.size().equals( zero2 ), "Passed!" );
93+
ok( a.getSize().equals( zero2 ), "Passed!" );
9394

9495
a.expandByPoint( one2 );
95-
ok( a.size().equals( one2 ), "Passed!" );
96+
ok( a.getSize().equals( one2 ), "Passed!" );
9697

9798
a.expandByPoint( one2.clone().negate() );
98-
ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
99-
ok( a.center().equals( zero2 ), "Passed!" );
99+
ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
100+
ok( a.getCenter().equals( zero2 ), "Passed!" );
100101
});
101102

102103
test( "expandByVector", function() {
103104
var a = new THREE.Box2( zero2.clone(), zero2.clone() );
104105

105106
a.expandByVector( zero2 );
106-
ok( a.size().equals( zero2 ), "Passed!" );
107+
ok( a.getSize().equals( zero2 ), "Passed!" );
107108

108109
a.expandByVector( one2 );
109-
ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
110-
ok( a.center().equals( zero2 ), "Passed!" );
110+
ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
111+
ok( a.getCenter().equals( zero2 ), "Passed!" );
111112
});
112113

113114
test( "expandByScalar", function() {
114115
var a = new THREE.Box2( zero2.clone(), zero2.clone() );
115116

116117
a.expandByScalar( 0 );
117-
ok( a.size().equals( zero2 ), "Passed!" );
118+
ok( a.getSize().equals( zero2 ), "Passed!" );
118119

119120
a.expandByScalar( 1 );
120-
ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
121-
ok( a.center().equals( zero2 ), "Passed!" );
121+
ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
122+
ok( a.getCenter().equals( zero2 ), "Passed!" );
122123
});
123124

124125
test( "containsPoint", function() {

‎test/unit/math/Box3.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,59 +66,60 @@ test( "empty/makeEmpty", function() {
6666
ok( a.isEmpty(), "Passed!" );
6767
});
6868

69-
test( "center", function() {
69+
test( "getCenter", function() {
7070
var a = new THREE.Box3( zero3.clone(), zero3.clone() );
7171

72-
ok( a.center().equals( zero3 ), "Passed!" );
72+
ok( a.getCenter().equals( zero3 ), "Passed!" );
7373

7474
a = new THREE.Box3( zero3.clone(), one3.clone() );
7575
var midpoint = one3.clone().multiplyScalar( 0.5 );
76-
ok( a.center().equals( midpoint ), "Passed!" );
76+
ok( a.getCenter().equals( midpoint ), "Passed!" );
7777
});
7878

79-
test( "size", function() {
79+
test( "getSize", function() {
8080
var a = new THREE.Box3( zero3.clone(), zero3.clone() );
8181

82-
ok( a.size().equals( zero3 ), "Passed!" );
82+
ok( a.getSize().equals( zero3 ), "Passed!" );
8383

8484
a = new THREE.Box3( zero3.clone(), one3.clone() );
85-
ok( a.size().equals( one3 ), "Passed!" );
85+
ok( a.getSize().equals( one3 ), "Passed!" );
8686
});
8787

88+
8889
test( "expandByPoint", function() {
8990
var a = new THREE.Box3( zero3.clone(), zero3.clone() );
9091

9192
a.expandByPoint( zero3 );
92-
ok( a.size().equals( zero3 ), "Passed!" );
93+
ok( a.getSize().equals( zero3 ), "Passed!" );
9394

9495
a.expandByPoint( one3 );
95-
ok( a.size().equals( one3 ), "Passed!" );
96+
ok( a.getSize().equals( one3 ), "Passed!" );
9697

9798
a.expandByPoint( one3.clone().negate() );
98-
ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
99-
ok( a.center().equals( zero3 ), "Passed!" );
99+
ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
100+
ok( a.getCenter().equals( zero3 ), "Passed!" );
100101
});
101102

102103
test( "expandByVector", function() {
103104
var a = new THREE.Box3( zero3.clone(), zero3.clone() );
104105

105106
a.expandByVector( zero3 );
106-
ok( a.size().equals( zero3 ), "Passed!" );
107+
ok( a.getSize().equals( zero3 ), "Passed!" );
107108

108109
a.expandByVector( one3 );
109-
ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
110-
ok( a.center().equals( zero3 ), "Passed!" );
110+
ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
111+
ok( a.getCenter().equals( zero3 ), "Passed!" );
111112
});
112113

113114
test( "expandByScalar", function() {
114115
var a = new THREE.Box3( zero3.clone(), zero3.clone() );
115116

116117
a.expandByScalar( 0 );
117-
ok( a.size().equals( zero3 ), "Passed!" );
118+
ok( a.getSize().equals( zero3 ), "Passed!" );
118119

119120
a.expandByScalar( 1 );
120-
ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
121-
ok( a.center().equals( zero3 ), "Passed!" );
121+
ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
122+
ok( a.getCenter().equals( zero3 ), "Passed!" );
122123
});
123124

124125
test( "containsPoint", function() {

0 commit comments

Comments
 (0)