aboutsummaryrefslogtreecommitdiff
path: root/src/f32/sse2/mat2.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/f32/sse2/mat2.rs')
-rw-r--r--src/f32/sse2/mat2.rs45
1 files changed, 10 insertions, 35 deletions
diff --git a/src/f32/sse2/mat2.rs b/src/f32/sse2/mat2.rs
index ab63731..0222bdd 100644
--- a/src/f32/sse2/mat2.rs
+++ b/src/f32/sse2/mat2.rs
@@ -1,6 +1,6 @@
// Generated from mat.rs.tera template. Edit the template, not the generated file.
-use crate::{f32::math, swizzles::*, DMat2, Mat3, Mat3A, Vec2};
+use crate::{swizzles::*, DMat2, Mat3, Mat3A, Vec2};
#[cfg(not(target_arch = "spirv"))]
use core::fmt;
use core::iter::{Product, Sum};
@@ -11,24 +11,22 @@ use core::arch::x86::*;
#[cfg(target_arch = "x86_64")]
use core::arch::x86_64::*;
-#[repr(C)]
+#[cfg(feature = "libm")]
+#[allow(unused_imports)]
+use num_traits::Float;
+
union UnionCast {
a: [f32; 4],
v: Mat2,
}
-/// Creates a 2x2 matrix from two column vectors.
+/// Creates a 2x2 matrix from column vectors.
#[inline(always)]
-#[must_use]
pub const fn mat2(x_axis: Vec2, y_axis: Vec2) -> Mat2 {
Mat2::from_cols(x_axis, y_axis)
}
/// A 2x2 column major matrix.
-///
-/// SIMD vector types are used for storage on supported platforms.
-///
-/// This type is 16 byte aligned.
#[derive(Clone, Copy)]
#[repr(transparent)]
pub struct Mat2(pub(crate) __m128);
@@ -45,7 +43,6 @@ impl Mat2 {
#[allow(clippy::too_many_arguments)]
#[inline(always)]
- #[must_use]
const fn new(m00: f32, m01: f32, m10: f32, m11: f32) -> Self {
unsafe {
UnionCast {
@@ -57,7 +54,6 @@ impl Mat2 {
/// Creates a 2x2 matrix from two column vectors.
#[inline(always)]
- #[must_use]
pub const fn from_cols(x_axis: Vec2, y_axis: Vec2) -> Self {
unsafe {
UnionCast {
@@ -71,7 +67,6 @@ impl Mat2 {
/// If your data is stored in row major you will need to `transpose` the returned
/// matrix.
#[inline]
- #[must_use]
pub const fn from_cols_array(m: &[f32; 4]) -> Self {
Self::new(m[0], m[1], m[2], m[3])
}
@@ -79,7 +74,6 @@ impl Mat2 {
/// Creates a `[f32; 4]` array storing data in column major order.
/// If you require data in row major order `transpose` the matrix first.
#[inline]
- #[must_use]
pub const fn to_cols_array(&self) -> [f32; 4] {
unsafe { *(self as *const Self as *const [f32; 4]) }
}
@@ -88,7 +82,6 @@ impl Mat2 {
/// If your data is in row major order you will need to `transpose` the returned
/// matrix.
#[inline]
- #[must_use]
pub const fn from_cols_array_2d(m: &[[f32; 2]; 2]) -> Self {
Self::from_cols(Vec2::from_array(m[0]), Vec2::from_array(m[1]))
}
@@ -96,7 +89,6 @@ impl Mat2 {
/// Creates a `[[f32; 2]; 2]` 2D array storing data in column major order.
/// If you require data in row major order `transpose` the matrix first.
#[inline]
- #[must_use]
pub const fn to_cols_array_2d(&self) -> [[f32; 2]; 2] {
unsafe { *(self as *const Self as *const [[f32; 2]; 2]) }
}
@@ -104,7 +96,6 @@ impl Mat2 {
/// Creates a 2x2 matrix with its diagonal set to `diagonal` and all other entries set to 0.
#[doc(alias = "scale")]
#[inline]
- #[must_use]
pub const fn from_diagonal(diagonal: Vec2) -> Self {
Self::new(diagonal.x, 0.0, 0.0, diagonal.y)
}
@@ -112,30 +103,26 @@ impl Mat2 {
/// Creates a 2x2 matrix containing the combining non-uniform `scale` and rotation of
/// `angle` (in radians).
#[inline]
- #[must_use]
pub fn from_scale_angle(scale: Vec2, angle: f32) -> Self {
- let (sin, cos) = math::sin_cos(angle);
+ let (sin, cos) = angle.sin_cos();
Self::new(cos * scale.x, sin * scale.x, -sin * scale.y, cos * scale.y)
}
/// Creates a 2x2 matrix containing a rotation of `angle` (in radians).
#[inline]
- #[must_use]
pub fn from_angle(angle: f32) -> Self {
- let (sin, cos) = math::sin_cos(angle);
+ let (sin, cos) = angle.sin_cos();
Self::new(cos, sin, -sin, cos)
}
/// Creates a 2x2 matrix from a 3x3 matrix, discarding the 2nd row and column.
#[inline]
- #[must_use]
pub fn from_mat3(m: Mat3) -> Self {
Self::from_cols(m.x_axis.xy(), m.y_axis.xy())
}
/// Creates a 2x2 matrix from a 3x3 matrix, discarding the 2nd row and column.
#[inline]
- #[must_use]
pub fn from_mat3a(m: Mat3A) -> Self {
Self::from_cols(m.x_axis.xy(), m.y_axis.xy())
}
@@ -146,7 +133,6 @@ impl Mat2 {
///
/// Panics if `slice` is less than 4 elements long.
#[inline]
- #[must_use]
pub const fn from_cols_slice(slice: &[f32]) -> Self {
Self::new(slice[0], slice[1], slice[2], slice[3])
}
@@ -170,7 +156,6 @@ impl Mat2 {
///
/// Panics if `index` is greater than 1.
#[inline]
- #[must_use]
pub fn col(&self, index: usize) -> Vec2 {
match index {
0 => self.x_axis,
@@ -199,7 +184,6 @@ impl Mat2 {
///
/// Panics if `index` is greater than 1.
#[inline]
- #[must_use]
pub fn row(&self, index: usize) -> Vec2 {
match index {
0 => Vec2::new(self.x_axis.x, self.y_axis.x),
@@ -211,28 +195,25 @@ impl Mat2 {
/// Returns `true` if, and only if, all elements are finite.
/// If any element is either `NaN`, positive or negative infinity, this will return `false`.
#[inline]
- #[must_use]
pub fn is_finite(&self) -> bool {
self.x_axis.is_finite() && self.y_axis.is_finite()
}
/// Returns `true` if any elements are `NaN`.
#[inline]
- #[must_use]
pub fn is_nan(&self) -> bool {
self.x_axis.is_nan() || self.y_axis.is_nan()
}
/// Returns the transpose of `self`.
- #[inline]
#[must_use]
+ #[inline]
pub fn transpose(&self) -> Self {
Self(unsafe { _mm_shuffle_ps(self.0, self.0, 0b11_01_10_00) })
}
/// Returns the determinant of `self`.
#[inline]
- #[must_use]
pub fn determinant(&self) -> f32 {
unsafe {
let abcd = self.0;
@@ -250,8 +231,8 @@ impl Mat2 {
/// # Panics
///
/// Will panic if the determinant of `self` is zero when `glam_assert` is enabled.
- #[inline]
#[must_use]
+ #[inline]
pub fn inverse(&self) -> Self {
unsafe {
const SIGN: __m128 = crate::sse2::m128_from_f32x4([1.0, -1.0, -1.0, 1.0]);
@@ -269,7 +250,6 @@ impl Mat2 {
/// Transforms a 2D vector.
#[inline]
- #[must_use]
pub fn mul_vec2(&self, rhs: Vec2) -> Vec2 {
unsafe {
use crate::Align16;
@@ -287,7 +267,6 @@ impl Mat2 {
/// Multiplies two 2x2 matrices.
#[inline]
- #[must_use]
pub fn mul_mat2(&self, rhs: &Self) -> Self {
unsafe {
let abcd = self.0;
@@ -306,21 +285,18 @@ impl Mat2 {
/// Adds two 2x2 matrices.
#[inline]
- #[must_use]
pub fn add_mat2(&self, rhs: &Self) -> Self {
Self(unsafe { _mm_add_ps(self.0, rhs.0) })
}
/// Subtracts two 2x2 matrices.
#[inline]
- #[must_use]
pub fn sub_mat2(&self, rhs: &Self) -> Self {
Self(unsafe { _mm_sub_ps(self.0, rhs.0) })
}
/// Multiplies a 2x2 matrix by a scalar.
#[inline]
- #[must_use]
pub fn mul_scalar(&self, rhs: f32) -> Self {
Self(unsafe { _mm_mul_ps(self.0, _mm_set_ps1(rhs)) })
}
@@ -335,7 +311,6 @@ impl Mat2 {
/// For more see
/// [comparing floating point numbers](https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/).
#[inline]
- #[must_use]
pub fn abs_diff_eq(&self, rhs: Self, max_abs_diff: f32) -> bool {
self.x_axis.abs_diff_eq(rhs.x_axis, max_abs_diff)
&& self.y_axis.abs_diff_eq(rhs.y_axis, max_abs_diff)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 23:34:09 +0000