Merge branch 'master' into null_safety
diff --git a/analysis_options.yaml b/analysis_options.yaml
index b75a5ae..e08c7c9 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -38,7 +38,6 @@
- missing_whitespace_between_adjacent_strings
- no_adjacent_strings_in_list
- no_runtimeType_toString
- #- non_constant_identifier_names
- only_throw_errors
- overridden_fields
- package_api_docs
diff --git a/lib/src/vector_math/vector2.dart b/lib/src/vector_math/vector2.dart
index 4f5dd6a..eb2aa21 100644
--- a/lib/src/vector_math/vector2.dart
+++ b/lib/src/vector_math/vector2.dart
@@ -168,7 +168,7 @@
/// Normalize this. Returns length of vector before normalization.
/// DEPRECATED: Use [normalize].
- @Deprecated('Use normalize instead.')
+ @Deprecated('Use normalize() insteaed.')
double normalizeLength() => normalize();
/// Normalized copy of this.
diff --git a/lib/src/vector_math/vector3.dart b/lib/src/vector_math/vector3.dart
index 65a6eae..6ed3d08 100644
--- a/lib/src/vector_math/vector3.dart
+++ b/lib/src/vector_math/vector3.dart
@@ -180,7 +180,7 @@
/// Normalize this. Returns length of vector before normalization.
/// DEPRCATED: Use [normalize].
- @Deprecated('Use normalize instead.')
+ @Deprecated('Use normalize() insteaed.')
double normalizeLength() => normalize();
/// Normalizes copy of this.
diff --git a/lib/src/vector_math/vector4.dart b/lib/src/vector_math/vector4.dart
index 77d12d6..e200d8d 100644
--- a/lib/src/vector_math/vector4.dart
+++ b/lib/src/vector_math/vector4.dart
@@ -204,7 +204,7 @@
/// Normalizes this. Returns length of vector before normalization.
/// DEPRCATED: Use [normalize].
- @Deprecated('Use normalize instead.')
+ @Deprecated('Use normalize() insteaed.')
double normalizeLength() => normalize();
/// Normalizes copy of this.
diff --git a/lib/src/vector_math_64/vector2.dart b/lib/src/vector_math_64/vector2.dart
index 760c1e7..0a6aebf 100644
--- a/lib/src/vector_math_64/vector2.dart
+++ b/lib/src/vector_math_64/vector2.dart
@@ -168,7 +168,7 @@
/// Normalize this. Returns length of vector before normalization.
/// DEPRECATED: Use [normalize].
- @Deprecated('Use normalize instead.')
+ @Deprecated('Use normalize() insteaed.')
double normalizeLength() => normalize();
/// Normalized copy of this.
diff --git a/lib/src/vector_math_64/vector3.dart b/lib/src/vector_math_64/vector3.dart
index b7353f3..127488f 100644
--- a/lib/src/vector_math_64/vector3.dart
+++ b/lib/src/vector_math_64/vector3.dart
@@ -180,7 +180,7 @@
/// Normalize this. Returns length of vector before normalization.
/// DEPRCATED: Use [normalize].
- @Deprecated('Use normalize instead.')
+ @Deprecated('Use normalize() insteaed.')
double normalizeLength() => normalize();
/// Normalizes copy of this.
diff --git a/lib/src/vector_math_64/vector4.dart b/lib/src/vector_math_64/vector4.dart
index 61105ec..cff83f8 100644
--- a/lib/src/vector_math_64/vector4.dart
+++ b/lib/src/vector_math_64/vector4.dart
@@ -204,7 +204,7 @@
/// Normalizes this. Returns length of vector before normalization.
/// DEPRCATED: Use [normalize].
- @Deprecated('Use normalize instead.')
+ @Deprecated('Use normalize() insteaed.')
double normalizeLength() => normalize();
/// Normalizes copy of this.
diff --git a/lib/src/vector_math_geometry/filters/color_filter.dart b/lib/src/vector_math_geometry/filters/color_filter.dart
index 68e86a2..60e81c2 100644
--- a/lib/src/vector_math_geometry/filters/color_filter.dart
+++ b/lib/src/vector_math_geometry/filters/color_filter.dart
@@ -19,7 +19,7 @@
if (mesh.getAttrib('COLOR') == null) {
final attributes = <VertexAttrib>[
...mesh.attribs,
- VertexAttrib('COLOR', 4, 'float')
+ VertexAttrib('COLOR', 4, 'float'),
];
output = MeshGeometry.resetAttribs(mesh, attributes);
} else {
diff --git a/test/matrix4_test.dart b/test/matrix4_test.dart
index 8ed5013..919f436 100644
--- a/test/matrix4_test.dart
+++ b/test/matrix4_test.dart
@@ -8,7 +8,6 @@
import 'dart:typed_data';
import 'package:test/test.dart';
-
import 'package:vector_math/vector_math.dart';
import 'test_utils.dart';
@@ -597,15 +596,7 @@
}
void testMatrix4InvertConstructor() {
- var exception = false;
- try {
- Matrix4.inverted(Matrix4.zero());
- expect(false, isTrue); // don't hit here.
- } catch (ArgumentError) {
- exception = true;
- }
- expect(exception, isTrue);
-
+ expect(() => Matrix4.inverted(Matrix4.zero()), throwsArgumentError);
expect(Matrix4.inverted(Matrix4.identity()), equals(Matrix4.identity()));
}
