Rename AabbN.minmax constructor to AabbN.minMax to match the Dart style guide (and the style of the rest of the library)
For now the old name remains in the library, but it is marked as deprecated.
diff --git a/README.md b/README.md
index 20b82c5..315e5b8 100644
--- a/README.md
+++ b/README.md
@@ -128,9 +128,9 @@
void main() {
// Define the first box with a minimum and a maximum.
- Aabb2 aabbOne = new Aabb2.minmax(new Vector2.zero(), new Vector2(4.0, 4.0));
+ Aabb2 aabbOne = new Aabb2.minMax(new Vector2.zero(), new Vector2(4.0, 4.0));
// Define the second box
- Aabb2 aabbTwo = new Aabb2.minmax(new Vector2(5.0, 5.0), new Vector2(6.0, 6.0));
+ Aabb2 aabbTwo = new Aabb2.minMax(new Vector2(5.0, 5.0), new Vector2(6.0, 6.0));
// Extend the second box to contain a point
aabbTwo.hullPoint(new Vector2(3.0, 3.0));
// Check if the two boxes intersect, returns true in this case.
diff --git a/lib/src/vector_math/aabb2.dart b/lib/src/vector_math/aabb2.dart
index d6df1cf..a5a067c 100644
--- a/lib/src/vector_math/aabb2.dart
+++ b/lib/src/vector_math/aabb2.dart
@@ -41,10 +41,15 @@
_min = new Vector2.copy(other._min),
_max = new Vector2.copy(other._max) {}
+ @deprecated
Aabb2.minmax(Vector2 min_, Vector2 max_) :
_min = new Vector2.copy(min_),
_max = new Vector2.copy(max_) {}
+ Aabb2.minMax(Vector2 min_, Vector2 max_) :
+ _min = new Vector2.copy(min_),
+ _max = new Vector2.copy(max_) {}
+
void copyMinMax(Vector2 min_, Vector2 max_) {
max_.setFrom(_max);
min_.setFrom(_min);
diff --git a/lib/src/vector_math/aabb3.dart b/lib/src/vector_math/aabb3.dart
index e0918c7..f891461 100644
--- a/lib/src/vector_math/aabb3.dart
+++ b/lib/src/vector_math/aabb3.dart
@@ -41,10 +41,15 @@
_min = new Vector3.copy(other._min),
_max = new Vector3.copy(other._max) {}
+ @deprecated
Aabb3.minmax(Vector3 min_, Vector3 max_) :
_min = new Vector3.copy(min_),
_max = new Vector3.copy(max_) {}
+ Aabb3.minMax(Vector3 min_, Vector3 max_) :
+ _min = new Vector3.copy(min_),
+ _max = new Vector3.copy(max_) {}
+
void copyMinMax(Vector3 min_, Vector3 max_) {
max_.setFrom(_max);
min_.setFrom(_min);
@@ -150,7 +155,7 @@
/// Return if [this] contains [other].
bool containsSphere(Sphere other) {
final sphereExtends = new Vector3.zero().splat(other.radius);
- final sphereBox = new Aabb3.minmax(other.center.clone().sub(sphereExtends),
+ final sphereBox = new Aabb3.minMax(other.center.clone().sub(sphereExtends),
other.center.clone().add(sphereExtends));
return containsAabb3(sphereBox);
diff --git a/lib/src/vector_math_64/aabb2.dart b/lib/src/vector_math_64/aabb2.dart
index 6ac33c0..e85255c 100644
--- a/lib/src/vector_math_64/aabb2.dart
+++ b/lib/src/vector_math_64/aabb2.dart
@@ -41,10 +41,15 @@
_min = new Vector2.copy(other._min),
_max = new Vector2.copy(other._max) {}
+ @deprecated
Aabb2.minmax(Vector2 min_, Vector2 max_) :
_min = new Vector2.copy(min_),
_max = new Vector2.copy(max_) {}
+ Aabb2.minMax(Vector2 min_, Vector2 max_) :
+ _min = new Vector2.copy(min_),
+ _max = new Vector2.copy(max_) {}
+
void copyMinMax(Vector2 min_, Vector2 max_) {
max_.setFrom(_max);
min_.setFrom(_min);
diff --git a/lib/src/vector_math_64/aabb3.dart b/lib/src/vector_math_64/aabb3.dart
index ac30dcf..ef18e70 100644
--- a/lib/src/vector_math_64/aabb3.dart
+++ b/lib/src/vector_math_64/aabb3.dart
@@ -41,10 +41,15 @@
_min = new Vector3.copy(other._min),
_max = new Vector3.copy(other._max) {}
+ @deprecated
Aabb3.minmax(Vector3 min_, Vector3 max_) :
_min = new Vector3.copy(min_),
_max = new Vector3.copy(max_) {}
+ Aabb3.minMax(Vector3 min_, Vector3 max_) :
+ _min = new Vector3.copy(min_),
+ _max = new Vector3.copy(max_) {}
+
void copyMinMax(Vector3 min_, Vector3 max_) {
max_.setFrom(_max);
min_.setFrom(_min);
@@ -150,7 +155,7 @@
/// Return if [this] contains [other].
bool containsSphere(Sphere other) {
final sphereExtends = new Vector3.zero().splat(other.radius);
- final sphereBox = new Aabb3.minmax(other.center.clone().sub(sphereExtends),
+ final sphereBox = new Aabb3.minMax(other.center.clone().sub(sphereExtends),
other.center.clone().add(sphereExtends));
return containsAabb3(sphereBox);
diff --git a/test/test_aabb.dart b/test/test_aabb.dart
index 9e95d92..31eada3 100644
--- a/test/test_aabb.dart
+++ b/test/test_aabb.dart
@@ -3,7 +3,7 @@
class AabbTest extends BaseTest {
void testAabb2Center() {
- final Aabb2 aabb = new Aabb2.minmax(_v(1.0, 2.0), _v(8.0, 16.0));
+ final Aabb2 aabb = new Aabb2.minMax(_v(1.0, 2.0), _v(8.0, 16.0));
final Vector2 center = aabb.center;
expect(center.x, equals(4.5));
@@ -11,11 +11,11 @@
}
void testAabb2ContainsAabb2() {
- final Aabb2 parent = new Aabb2.minmax(_v(1.0, 1.0), _v(8.0, 8.0));
- final Aabb2 child = new Aabb2.minmax(_v(2.0, 2.0), _v(7.0, 7.0));
- final Aabb2 cutting = new Aabb2.minmax(_v(0.0, 0.0), _v(5.0, 5.0));
- final Aabb2 outside = new Aabb2.minmax(_v(10.0, 10.0), _v(20.0, 20.0));
- final Aabb2 grandParent = new Aabb2.minmax(_v(0.0, 0.0), _v(10.0, 10.0));
+ final Aabb2 parent = new Aabb2.minMax(_v(1.0, 1.0), _v(8.0, 8.0));
+ final Aabb2 child = new Aabb2.minMax(_v(2.0, 2.0), _v(7.0, 7.0));
+ final Aabb2 cutting = new Aabb2.minMax(_v(0.0, 0.0), _v(5.0, 5.0));
+ final Aabb2 outside = new Aabb2.minMax(_v(10.0, 10.0), _v(20.0, 20.0));
+ final Aabb2 grandParent = new Aabb2.minMax(_v(0.0, 0.0), _v(10.0, 10.0));
expect(parent.containsAabb2(child), isTrue);
expect(parent.containsAabb2(parent), isFalse);
@@ -25,7 +25,7 @@
}
void testAabb2ContainsVector2() {
- final Aabb2 parent = new Aabb2.minmax(_v(1.0,1.0), _v(8.0,8.0));
+ final Aabb2 parent = new Aabb2.minMax(_v(1.0,1.0), _v(8.0,8.0));
final Vector2 child = _v(2.0,2.0);
final Vector2 cutting = _v(1.0,8.0);
final Vector2 outside = _v(-1.0,0.0);
@@ -36,15 +36,15 @@
}
void testAabb2IntersectionAabb2() {
- final Aabb2 parent = new Aabb2.minmax(_v(1.0,1.0), _v(8.0,8.0));
- final Aabb2 child = new Aabb2.minmax(_v(2.0,2.0), _v(7.0,7.0));
- final Aabb2 cutting = new Aabb2.minmax(_v(0.0,0.0), _v(5.0,5.0));
- final Aabb2 outside = new Aabb2.minmax(_v(10.0,10.0), _v(20.0,20.0));
- final Aabb2 grandParent = new Aabb2.minmax(_v(0.0,0.0), _v(10.0,10.0));
+ final Aabb2 parent = new Aabb2.minMax(_v(1.0,1.0), _v(8.0,8.0));
+ final Aabb2 child = new Aabb2.minMax(_v(2.0,2.0), _v(7.0,7.0));
+ final Aabb2 cutting = new Aabb2.minMax(_v(0.0,0.0), _v(5.0,5.0));
+ final Aabb2 outside = new Aabb2.minMax(_v(10.0,10.0), _v(20.0,20.0));
+ final Aabb2 grandParent = new Aabb2.minMax(_v(0.0,0.0), _v(10.0,10.0));
- final Aabb2 siblingOne = new Aabb2.minmax(_v(0.0,0.0), _v(3.0,3.0));
- final Aabb2 siblingTwo = new Aabb2.minmax(_v(3.0,0.0), _v(6.0,3.0));
- final Aabb2 siblingThree = new Aabb2.minmax(_v(3.0,3.0), _v(6.0,6.0));
+ final Aabb2 siblingOne = new Aabb2.minMax(_v(0.0,0.0), _v(3.0,3.0));
+ final Aabb2 siblingTwo = new Aabb2.minMax(_v(3.0,0.0), _v(6.0,3.0));
+ final Aabb2 siblingThree = new Aabb2.minMax(_v(3.0,3.0), _v(6.0,6.0));
expect(parent.intersectsWithAabb2(child), isTrue);
@@ -68,7 +68,7 @@
}
void testAabb2IntersectionVector2() {
- final Aabb2 parent = new Aabb2.minmax(_v(1.0,1.0), _v(8.0,8.0));
+ final Aabb2 parent = new Aabb2.minMax(_v(1.0,1.0), _v(8.0,8.0));
final Vector2 child = _v(2.0,2.0);
final Vector2 cutting = _v(1.0,8.0);
final Vector2 outside = _v(-1.0,0.0);
@@ -79,8 +79,8 @@
}
void testAabb2Hull() {
- final Aabb2 a = new Aabb2.minmax(_v(1.0,1.0), _v(3.0,4.0));
- final Aabb2 b = new Aabb2.minmax(_v(3.0,2.0), _v(6.0,2.0));
+ final Aabb2 a = new Aabb2.minMax(_v(1.0,1.0), _v(3.0,4.0));
+ final Aabb2 b = new Aabb2.minMax(_v(3.0,2.0), _v(6.0,2.0));
a.hull(b);
@@ -91,7 +91,7 @@
}
void testAabb2HullPoint() {
- final Aabb2 a = new Aabb2.minmax(_v(1.0,1.0), _v(3.0,4.0));
+ final Aabb2 a = new Aabb2.minMax(_v(1.0,1.0), _v(3.0,4.0));
final Vector2 b = _v(6.0,2.0);
a.hullPoint(b);
@@ -113,7 +113,7 @@
void testAabb2Rotate() {
final Matrix3 rotation = new Matrix3.rotationZ(Math.PI/4);
- final Aabb2 input = new Aabb2.minmax(_v(1.0,1.0), _v(3.0,3.0));
+ final Aabb2 input = new Aabb2.minMax(_v(1.0,1.0), _v(3.0,3.0));
final Aabb2 result = input.rotate(rotation);
@@ -127,7 +127,7 @@
void testAabb2Transform() {
final Matrix3 rotation = new Matrix3.rotationZ(Math.PI/4);
- final Aabb2 input = new Aabb2.minmax(_v(1.0,1.0), _v(3.0,3.0));
+ final Aabb2 input = new Aabb2.minMax(_v(1.0,1.0), _v(3.0,3.0));
final Aabb2 result = input.transform(rotation);
final double newCenterY = Math.sqrt(8);
@@ -170,7 +170,7 @@
}
void testAabb3Center() {
- final Aabb3 aabb = new Aabb3.minmax(_v3(1.0,2.0, 4.0), _v3(8.0,16.0, 32.0));
+ final Aabb3 aabb = new Aabb3.minMax(_v3(1.0,2.0, 4.0), _v3(8.0,16.0, 32.0));
final Vector3 center = aabb.center;
expect(center.x, equals(4.5));
@@ -179,11 +179,11 @@
}
void testAabb3ContainsAabb3() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
- final Aabb3 child = new Aabb3.minmax(_v3(2.0,2.0,2.0), _v3(7.0,7.0,7.0));
- final Aabb3 cutting = new Aabb3.minmax(_v3(0.0,0.0,0.0), _v3(5.0,5.0,5.0));
- final Aabb3 outside = new Aabb3.minmax(_v3(10.0,10.0,10.0), _v3(20.0,20.0,20.0));
- final Aabb3 grandParent = new Aabb3.minmax(_v3(0.0,0.0,0.0), _v3(10.0,10.0,10.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 child = new Aabb3.minMax(_v3(2.0,2.0,2.0), _v3(7.0,7.0,7.0));
+ final Aabb3 cutting = new Aabb3.minMax(_v3(0.0,0.0,0.0), _v3(5.0,5.0,5.0));
+ final Aabb3 outside = new Aabb3.minMax(_v3(10.0,10.0,10.0), _v3(20.0,20.0,20.0));
+ final Aabb3 grandParent = new Aabb3.minMax(_v3(0.0,0.0,0.0), _v3(10.0,10.0,10.0));
expect(parent.containsAabb3(child), isTrue);
expect(parent.containsAabb3(parent), isFalse);
@@ -193,7 +193,7 @@
}
void testAabb3ContainsSphere() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
final Sphere child = new Sphere.centerRadius(_v3(3.0, 3.0, 3.0), 1.5);
final Sphere cutting = new Sphere.centerRadius(_v3(0.0,0.0,0.0), 6.0);
final Sphere outside = new Sphere.centerRadius(_v3(-10.0,-10.0,-10.0), 5.0);
@@ -204,7 +204,7 @@
}
void testAabb3ContainsVector3() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
final Vector3 child = _v3(7.0,7.0,7.0);
final Vector3 cutting = _v3(1.0,2.0,1.0);
final Vector3 outside = _v3(-10.0,10.0,10.0);
@@ -215,7 +215,7 @@
}
void testAabb3ContainsTriangle() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
final Triangle child = new Triangle.points(_v3(2.0,2.0,2.0), _v3(3.0,3.0,3.0), _v3(4.0,4.0,4.0));
final Triangle edge = new Triangle.points(_v3(1.0,1.0,1.0), _v3(3.0,3.0,3.0), _v3(4.0,4.0,4.0));
final Triangle cutting = new Triangle.points(_v3(2.0,2.0,2.0), _v3(3.0,3.0,3.0), _v3(14.0,14.0,14.0));
@@ -228,15 +228,15 @@
}
void testAabb3IntersectionAabb3() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
- final Aabb3 child = new Aabb3.minmax(_v3(2.0,2.0,2.0), _v3(7.0,7.0,7.0));
- final Aabb3 cutting = new Aabb3.minmax(_v3(0.0,0.0,0.0), _v3(5.0,5.0,5.0));
- final Aabb3 outside = new Aabb3.minmax(_v3(10.0,10.0,10.0), _v3(20.0,20.0,10.0));
- final Aabb3 grandParent = new Aabb3.minmax(_v3(0.0,0.0,0.0), _v3(10.0,10.0,10.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 child = new Aabb3.minMax(_v3(2.0,2.0,2.0), _v3(7.0,7.0,7.0));
+ final Aabb3 cutting = new Aabb3.minMax(_v3(0.0,0.0,0.0), _v3(5.0,5.0,5.0));
+ final Aabb3 outside = new Aabb3.minMax(_v3(10.0,10.0,10.0), _v3(20.0,20.0,10.0));
+ final Aabb3 grandParent = new Aabb3.minMax(_v3(0.0,0.0,0.0), _v3(10.0,10.0,10.0));
- final Aabb3 siblingOne = new Aabb3.minmax(_v3(0.0,0.0,0.0), _v3(3.0,3.0,3.0));
- final Aabb3 siblingTwo = new Aabb3.minmax(_v3(3.0,0.0,0.0), _v3(6.0,3.0,3.0));
- final Aabb3 siblingThree = new Aabb3.minmax(_v3(3.0,3.0,3.0), _v3(6.0,6.0,6.0));
+ final Aabb3 siblingOne = new Aabb3.minMax(_v3(0.0,0.0,0.0), _v3(3.0,3.0,3.0));
+ final Aabb3 siblingTwo = new Aabb3.minMax(_v3(3.0,0.0,0.0), _v3(6.0,3.0,3.0));
+ final Aabb3 siblingThree = new Aabb3.minMax(_v3(3.0,3.0,3.0), _v3(6.0,6.0,6.0));
expect(parent.intersectsWithAabb3(child), isTrue);
expect(child.intersectsWithAabb3(parent), isTrue);
@@ -259,7 +259,7 @@
}
void testAabb3IntersectionSphere() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
final Sphere child = new Sphere.centerRadius(_v3(3.0, 3.0, 3.0), 1.5);
final Sphere cutting = new Sphere.centerRadius(_v3(0.0,0.0,0.0), 6.0);
final Sphere outside = new Sphere.centerRadius(_v3(-10.0,-10.0,-10.0), 5.0);
@@ -270,7 +270,7 @@
}
void testAabb3IntersectionVector3() {
- final Aabb3 parent = new Aabb3.minmax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
+ final Aabb3 parent = new Aabb3.minMax(_v3(1.0,1.0,1.0), _v3(8.0,8.0,8.0));
final Vector3 child = _v3(7.0,7.0,7.0);
final Vector3 cutting = _v3(1.0,2.0,1.0);
final Vector3 outside = _v3(-10.0,10.0,10.0);
@@ -281,8 +281,8 @@
}
void testAabb3Hull() {
- final Aabb3 a = new Aabb3.minmax(_v3(1.0,1.0,4.0), _v3(3.0,4.0,10.0));
- final Aabb3 b = new Aabb3.minmax(_v3(3.0,2.0,3.0), _v3(6.0,2.0,8.0));
+ final Aabb3 a = new Aabb3.minMax(_v3(1.0,1.0,4.0), _v3(3.0,4.0,10.0));
+ final Aabb3 b = new Aabb3.minMax(_v3(3.0,2.0,3.0), _v3(6.0,2.0,8.0));
a.hull(b);
@@ -295,7 +295,7 @@
}
void testAabb3HullPoint() {
- final Aabb3 a = new Aabb3.minmax(_v3(1.0,1.0,4.0), _v3(3.0,4.0,10.0));
+ final Aabb3 a = new Aabb3.minMax(_v3(1.0,1.0,4.0), _v3(3.0,4.0,10.0));
final Vector3 b = _v3(6.0,2.0,8.0);
a.hullPoint(b);
diff --git a/test/test_ray.dart b/test/test_ray.dart
index 48d1ccf..c3695cf 100644
--- a/test/test_ray.dart
+++ b/test/test_ray.dart
@@ -74,11 +74,11 @@
void testRayIntersectionAabb3() {
final Ray parent = new Ray.originDirection(_v3(1.0, 1.0, 1.0), _v3(0.0, 1.0, 0.0));
- final Aabb3 hitting = new Aabb3.minmax(_v3(0.5, 3.5, -10.0), _v3(2.5, 5.5, 10.0));
- final Aabb3 cutting = new Aabb3.minmax(_v3(0.0, 2.0, 1.0), _v3(2.0, 3.0, 2.0));
- final Aabb3 outside = new Aabb3.minmax(_v3(2.0, 0.0, 0.0), _v3(6.0, 6.0, 6.0));
- final Aabb3 behind = new Aabb3.minmax(_v3(0.0, -2.0, 0.0), _v3(2.0, 0.0, 2.0));
- final Aabb3 inside = new Aabb3.minmax(_v3(0.0, 0.0, 0.0), _v3(2.0, 2.0, 2.0));
+ final Aabb3 hitting = new Aabb3.minMax(_v3(0.5, 3.5, -10.0), _v3(2.5, 5.5, 10.0));
+ final Aabb3 cutting = new Aabb3.minMax(_v3(0.0, 2.0, 1.0), _v3(2.0, 3.0, 2.0));
+ final Aabb3 outside = new Aabb3.minMax(_v3(2.0, 0.0, 0.0), _v3(6.0, 6.0, 6.0));
+ final Aabb3 behind = new Aabb3.minMax(_v3(0.0, -2.0, 0.0), _v3(2.0, 0.0, 2.0));
+ final Aabb3 inside = new Aabb3.minMax(_v3(0.0, 0.0, 0.0), _v3(2.0, 2.0, 2.0));
expect(parent.intersectsWithAabb3(hitting), equals(2.5));
expect(parent.intersectsWithAabb3(cutting), equals(1.0));
