forked from M-Labs/nalgebra
6c236af696
`./ci/test.sh` now passes locally. Refactoring done via the following sed commands: ```bash export RELEVANT_SOURCEFILES="$(find src -name '*.rs') $(find examples -name '*.rs')" for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Arbitrary\)/N\1: Scalar + Copy + \2/' $f; done for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Serialize\)/N\1: Scalar + Copy + \2/' $f; done for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Deserialize\)/N\1: Scalar + Copy + \2/' $f; do export RELEVANT_SOURCEFILES="$(find nalgebra-glm -name '*.rs')" for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar,/N\1: Scalar + Copy,/' $f; done for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar>/N\1: Scalar + Copy>/' $f; done for f in algebra-glm/src/traits.rs; do sed -i 's/Scalar + Ring/Scalar + Copy + Ring>/' $f; done # Number trait definition ```
174 lines
4.5 KiB
Rust
174 lines
4.5 KiB
Rust
#![cfg_attr(rustfmt, rustfmt_skip)]
|
|
|
|
use na::{Scalar, RealField, U2, U3, U4};
|
|
use crate::aliases::{TMat, Qua, TVec1, TVec2, TVec3, TVec4, TMat2, TMat2x3, TMat2x4, TMat3, TMat3x2, TMat3x4,
|
|
TMat4, TMat4x2, TMat4x3};
|
|
|
|
|
|
/// Creates a new 1D vector.
|
|
///
|
|
/// # Examples:
|
|
///
|
|
/// Construct a vector of `bool`s:
|
|
///
|
|
/// ```
|
|
/// # use nalgebra_glm as glm;
|
|
/// let v = glm::vec1(true);
|
|
/// ```
|
|
pub fn vec1<N: Scalar + Copy>(x: N) -> TVec1<N> {
|
|
TVec1::new(x)
|
|
}
|
|
|
|
/// Creates a new 2D vector.
|
|
pub fn vec2<N: Scalar + Copy>(x: N, y: N) -> TVec2<N> {
|
|
TVec2::new(x, y)
|
|
}
|
|
|
|
/// Creates a new 3D vector.
|
|
pub fn vec3<N: Scalar + Copy>(x: N, y: N, z: N) -> TVec3<N> {
|
|
TVec3::new(x, y, z)
|
|
}
|
|
|
|
/// Creates a new 4D vector.
|
|
pub fn vec4<N: Scalar + Copy>(x: N, y: N, z: N, w: N) -> TVec4<N> {
|
|
TVec4::new(x, y, z, w)
|
|
}
|
|
|
|
|
|
/// Create a new 2x2 matrix.
|
|
pub fn mat2<N: Scalar + Copy>(m11: N, m12: N,
|
|
m21: N, m22: N) -> TMat2<N> {
|
|
TMat::<N, U2, U2>::new(
|
|
m11, m12,
|
|
m21, m22,
|
|
)
|
|
}
|
|
|
|
/// Create a new 2x2 matrix.
|
|
pub fn mat2x2<N: Scalar + Copy>(m11: N, m12: N,
|
|
m21: N, m22: N) -> TMat2<N> {
|
|
TMat::<N, U2, U2>::new(
|
|
m11, m12,
|
|
m21, m22,
|
|
)
|
|
}
|
|
|
|
/// Create a new 2x3 matrix.
|
|
pub fn mat2x3<N: Scalar + Copy>(m11: N, m12: N, m13: N,
|
|
m21: N, m22: N, m23: N) -> TMat2x3<N> {
|
|
TMat::<N, U2, U3>::new(
|
|
m11, m12, m13,
|
|
m21, m22, m23,
|
|
)
|
|
}
|
|
|
|
/// Create a new 2x4 matrix.
|
|
pub fn mat2x4<N: Scalar + Copy>(m11: N, m12: N, m13: N, m14: N,
|
|
m21: N, m22: N, m23: N, m24: N) -> TMat2x4<N> {
|
|
TMat::<N, U2, U4>::new(
|
|
m11, m12, m13, m14,
|
|
m21, m22, m23, m24,
|
|
)
|
|
}
|
|
|
|
/// Create a new 3x3 matrix.
|
|
pub fn mat3<N: Scalar + Copy>(m11: N, m12: N, m13: N,
|
|
m21: N, m22: N, m23: N,
|
|
m31: N, m32: N, m33: N) -> TMat3<N> {
|
|
TMat::<N, U3, U3>::new(
|
|
m11, m12, m13,
|
|
m21, m22, m23,
|
|
m31, m32, m33,
|
|
)
|
|
}
|
|
|
|
/// Create a new 3x2 matrix.
|
|
pub fn mat3x2<N: Scalar + Copy>(m11: N, m12: N,
|
|
m21: N, m22: N,
|
|
m31: N, m32: N) -> TMat3x2<N> {
|
|
TMat::<N, U3, U2>::new(
|
|
m11, m12,
|
|
m21, m22,
|
|
m31, m32,
|
|
)
|
|
}
|
|
|
|
/// Create a new 3x3 matrix.
|
|
pub fn mat3x3<N: Scalar + Copy>(m11: N, m12: N, m13: N,
|
|
m21: N, m22: N, m23: N,
|
|
m31: N, m32: N, m33: N) -> TMat3<N> {
|
|
TMat::<N, U3, U3>::new(
|
|
m11, m12, m13,
|
|
m31, m32, m33,
|
|
m21, m22, m23,
|
|
)
|
|
}
|
|
|
|
/// Create a new 3x4 matrix.
|
|
pub fn mat3x4<N: Scalar + Copy>(m11: N, m12: N, m13: N, m14: N,
|
|
m21: N, m22: N, m23: N, m24: N,
|
|
m31: N, m32: N, m33: N, m34: N) -> TMat3x4<N> {
|
|
TMat::<N, U3, U4>::new(
|
|
m11, m12, m13, m14,
|
|
m21, m22, m23, m24,
|
|
m31, m32, m33, m34,
|
|
)
|
|
}
|
|
|
|
/// Create a new 4x2 matrix.
|
|
pub fn mat4x2<N: Scalar + Copy>(m11: N, m12: N,
|
|
m21: N, m22: N,
|
|
m31: N, m32: N,
|
|
m41: N, m42: N) -> TMat4x2<N> {
|
|
TMat::<N, U4, U2>::new(
|
|
m11, m12,
|
|
m21, m22,
|
|
m31, m32,
|
|
m41, m42,
|
|
)
|
|
}
|
|
|
|
/// Create a new 4x3 matrix.
|
|
pub fn mat4x3<N: Scalar + Copy>(m11: N, m12: N, m13: N,
|
|
m21: N, m22: N, m23: N,
|
|
m31: N, m32: N, m33: N,
|
|
m41: N, m42: N, m43: N) -> TMat4x3<N> {
|
|
TMat::<N, U4, U3>::new(
|
|
m11, m12, m13,
|
|
m21, m22, m23,
|
|
m31, m32, m33,
|
|
m41, m42, m43,
|
|
)
|
|
}
|
|
|
|
/// Create a new 4x4 matrix.
|
|
pub fn mat4x4<N: Scalar + Copy>(m11: N, m12: N, m13: N, m14: N,
|
|
m21: N, m22: N, m23: N, m24: N,
|
|
m31: N, m32: N, m33: N, m34: N,
|
|
m41: N, m42: N, m43: N, m44: N) -> TMat4<N> {
|
|
TMat::<N, U4, U4>::new(
|
|
m11, m12, m13, m14,
|
|
m21, m22, m23, m24,
|
|
m31, m32, m33, m34,
|
|
m41, m42, m43, m44,
|
|
)
|
|
}
|
|
|
|
/// Create a new 4x4 matrix.
|
|
pub fn mat4<N: Scalar + Copy>(m11: N, m12: N, m13: N, m14: N,
|
|
m21: N, m22: N, m23: N, m24: N,
|
|
m31: N, m32: N, m33: N, m34: N,
|
|
m41: N, m42: N, m43: N, m44: N) -> TMat4<N> {
|
|
TMat::<N, U4, U4>::new(
|
|
m11, m12, m13, m14,
|
|
m21, m22, m23, m24,
|
|
m31, m32, m33, m34,
|
|
m41, m42, m43, m44,
|
|
)
|
|
}
|
|
|
|
/// Creates a new quaternion.
|
|
pub fn quat<N: RealField>(x: N, y: N, z: N, w: N) -> Qua<N> {
|
|
Qua::new(w, x, y, z)
|
|
}
|