Use macro for generating wrapper impls
This commit is contained in:
Brendan Zabarauskas
parent
69615bee12
commit
e5879db08c
216
src/mat.rs
216
src/mat.rs
|
|
@ -665,51 +665,47 @@ impl<T:Copy + Float + FuzzyEq<T>> FuzzyEq<T> for Mat2<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! mat2_type(
|
||||||
|
($name:ident <$T:ty, $V:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(c0r0: $T, c0r1: $T, c1r0: $T, c1r1: $T)
|
||||||
|
-> $name { Matrix2::new(c0r0, c0r1, c1r0, c1r1) }
|
||||||
|
#[inline(always)] fn from_cols(c0: $V, c1: $V)
|
||||||
|
-> $name { Matrix2::from_cols(c0, c1) }
|
||||||
|
#[inline(always)] fn from_value(v: $T) -> $name { Matrix::from_value(v) }
|
||||||
|
|
||||||
|
#[inline(always)] fn identity() -> $name { Matrix::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { Matrix::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn from_angle(radians: $T) -> $name { Matrix2::from_angle(radians) }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 2 }
|
||||||
|
#[inline(always)] fn rows() -> uint { 2 }
|
||||||
|
#[inline(always)] fn cols() -> uint { 2 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
// GLSL-style type aliases, corresponding to Section 4.1.6 of the [GLSL 4.30.6 specification]
|
// GLSL-style type aliases, corresponding to Section 4.1.6 of the [GLSL 4.30.6 specification]
|
||||||
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
||||||
|
|
||||||
/// a 2×2 single-precision floating-point matrix
|
// a 2×2 single-precision floating-point matrix
|
||||||
pub type mat2 = Mat2<f32>;
|
pub type mat2 = Mat2<f32>;
|
||||||
/// a 2×2 double-precision floating-point matrix
|
// a 2×2 double-precision floating-point matrix
|
||||||
pub type dmat2 = Mat2<f64>;
|
pub type dmat2 = Mat2<f64>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
mat2_type!(mat2<f32,vec2>)
|
||||||
|
mat2_type!(dmat2<f64,dvec2>)
|
||||||
|
|
||||||
pub impl mat2 {
|
// Rust-style type aliases
|
||||||
#[inline(always)] fn new(c0r0: f32, c0r1: f32, c1r0: f32, c1r1: f32)
|
pub type Mat2f = Mat2<float>;
|
||||||
-> mat2 { Matrix2::new(c0r0, c0r1, c1r0, c1r1) }
|
pub type Mat2f32 = Mat2<f32>;
|
||||||
#[inline(always)] fn from_cols(c0: vec2, c1: vec2)
|
pub type Mat2f64 = Mat2<f64>;
|
||||||
-> mat2 { Matrix2::from_cols(c0, c1) }
|
|
||||||
#[inline(always)] fn from_value(v: f32) -> mat2 { Matrix::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn identity() -> mat2 { Matrix::identity() }
|
mat2_type!(Mat2f<float,Vec2f>)
|
||||||
#[inline(always)] fn zero() -> mat2 { Matrix::zero() }
|
mat2_type!(Mat2f32<f32,Vec2f32>)
|
||||||
|
mat2_type!(Mat2f64<f64,Vec2f64>)
|
||||||
#[inline(always)] fn from_angle(radians: f32) -> mat2 { Matrix2::from_angle(radians) }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn rows() -> uint { 2 }
|
|
||||||
#[inline(always)] fn cols() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<mat2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl dmat2 {
|
|
||||||
#[inline(always)] fn new(c0r0: f64, c0r1: f64, c1r0: f64, c1r1: f64)
|
|
||||||
-> dmat2 { Matrix2::new(c0r0, c0r1, c1r0, c1r1) }
|
|
||||||
#[inline(always)] fn from_cols(c0: dvec2, c1: dvec2)
|
|
||||||
-> dmat2 { Matrix2::from_cols(c0, c1) }
|
|
||||||
#[inline(always)] fn from_value(v: f64) -> dmat2 { Matrix::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn identity() -> dmat2 { Matrix::identity() }
|
|
||||||
#[inline(always)] fn zero() -> dmat2 { Matrix::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn from_angle(radians: f64) -> dmat2 { Matrix2::from_angle(radians) }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn rows() -> uint { 2 }
|
|
||||||
#[inline(always)] fn cols() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<dmat2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A 3 x 3 column major matrix
|
* A 3 x 3 column major matrix
|
||||||
|
|
@ -1256,56 +1252,50 @@ impl<T:Copy + Float + FuzzyEq<T> + Add<T,T> + Sub<T,T> + Mul<T,T> + Div<T,T> + N
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GLSL-style type aliases, corresponding to Section 4.1.6 of the [GLSL 4.30.6 specification]
|
macro_rules! mat3_type(
|
||||||
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
($name:ident <$T:ty, $V:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(c0r0: $T, c0r1: $T, c0r2: $T, c1r0: $T, c1r1: $T, c1r2: $T, c2r0: $T, c2r1: $T, c2r2: $T)
|
||||||
|
-> $name { Matrix3::new(c0r0, c0r1, c0r2, c1r0, c1r1, c1r2, c2r0, c2r1, c2r2) }
|
||||||
|
#[inline(always)] fn from_cols(c0: $V, c1: $V, c2: $V)
|
||||||
|
-> $name { Matrix3::from_cols(c0, c1, c2) }
|
||||||
|
#[inline(always)] fn from_value(v: $T) -> $name { Matrix::from_value(v) }
|
||||||
|
|
||||||
/// a 3×3 single-precision floating-point matrix
|
#[inline(always)] fn identity() -> $name { Matrix::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { Matrix::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn from_angle_x(radians: $T) -> $name { Matrix3::from_angle_x(radians) }
|
||||||
|
#[inline(always)] fn from_angle_y(radians: $T) -> $name { Matrix3::from_angle_y(radians) }
|
||||||
|
#[inline(always)] fn from_angle_z(radians: $T) -> $name { Matrix3::from_angle_z(radians) }
|
||||||
|
#[inline(always)] fn from_angle_xyz(radians_x: $T, radians_y: $T, radians_z: $T) -> $name { Matrix3::from_angle_xyz(radians_x, radians_y, radians_z) }
|
||||||
|
#[inline(always)] fn from_angle_axis(radians: $T, axis: &$V) -> $name { Matrix3::from_angle_axis(radians, axis) }
|
||||||
|
#[inline(always)] fn from_axes(x: $V, y: $V, z: $V) -> $name { Matrix3::from_axes(x, y, z) }
|
||||||
|
#[inline(always)] fn look_at(dir: &$V, up: &$V) -> $name { Matrix3::look_at(dir, up) }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 3 }
|
||||||
|
#[inline(always)] fn rows() -> uint { 3 }
|
||||||
|
#[inline(always)] fn cols() -> uint { 3 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
// a 3×3 single-precision floating-point matrix
|
||||||
pub type mat3 = Mat3<f32>;
|
pub type mat3 = Mat3<f32>;
|
||||||
/// a 3×3 double-precision floating-point matrix
|
// a 3×3 double-precision floating-point matrix
|
||||||
pub type dmat3 = Mat3<f64>;
|
pub type dmat3 = Mat3<f64>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
mat3_type!(mat3<f32,vec3>)
|
||||||
|
mat3_type!(dmat3<f64,dvec3>)
|
||||||
|
|
||||||
pub impl mat3 {
|
// Rust-style type aliases
|
||||||
#[inline(always)] fn new(c0r0: f32, c0r1: f32, c0r2: f32, c1r0: f32, c1r1: f32, c1r2: f32, c2r0: f32, c2r1: f32, c2r2: f32)
|
pub type Mat3f = Mat3<float>;
|
||||||
-> mat3 { Matrix3::new(c0r0, c0r1, c0r2, c1r0, c1r1, c1r2, c2r0, c2r1, c2r2) }
|
pub type Mat3f32 = Mat3<f32>;
|
||||||
#[inline(always)] fn from_cols(c0: vec3, c1: vec3, c2: vec3)
|
pub type Mat3f64 = Mat3<f64>;
|
||||||
-> mat3 { Matrix3::from_cols(c0, c1, c2) }
|
|
||||||
#[inline(always)] fn from_value(v: f32) -> mat3 { Matrix::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn identity() -> mat3 { Matrix::identity() }
|
mat3_type!(Mat3f<float,Vec3f>)
|
||||||
#[inline(always)] fn zero() -> mat3 { Matrix::zero() }
|
mat3_type!(Mat3f32<f32,Vec3f32>)
|
||||||
|
mat3_type!(Mat3f64<f64,Vec3f64>)
|
||||||
#[inline(always)] fn from_angle_x(radians: f32) -> mat3 { Matrix3::from_angle_x(radians) }
|
|
||||||
#[inline(always)] fn from_angle_y(radians: f32) -> mat3 { Matrix3::from_angle_y(radians) }
|
|
||||||
#[inline(always)] fn from_angle_z(radians: f32) -> mat3 { Matrix3::from_angle_z(radians) }
|
|
||||||
#[inline(always)] fn from_angle_xyz(radians_x: f32, radians_y: f32, radians_z: f32) -> mat3 { Matrix3::from_angle_xyz(radians_x, radians_y, radians_z) }
|
|
||||||
#[inline(always)] fn from_angle_axis(radians: f32, axis: &vec3) -> mat3 { Matrix3::from_angle_axis(radians, axis) }
|
|
||||||
#[inline(always)] fn from_axes(x: vec3, y: vec3, z: vec3) -> mat3 { Matrix3::from_axes(x, y, z) }
|
|
||||||
#[inline(always)] fn look_at(dir: &vec3, up: &vec3) -> mat3 { Matrix3::look_at(dir, up) }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
|
||||||
#[inline(always)] fn rows() -> uint { 3 }
|
|
||||||
#[inline(always)] fn cols() -> uint { 3 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<mat3>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
pub impl dmat3 {
|
|
||||||
#[inline(always)] fn new(c0r0: f64, c0r1: f64, c0r2: f64, c1r0: f64, c1r1: f64, c1r2: f64, c2r0: f64, c2r1: f64, c2r2: f64)
|
|
||||||
-> dmat3 { Matrix3::new(c0r0, c0r1, c0r2, c1r0, c1r1, c1r2, c2r0, c2r1, c2r2) }
|
|
||||||
#[inline(always)] fn from_cols(c0: dvec3, c1: dvec3, c2: dvec3)
|
|
||||||
-> dmat3 { Matrix3::from_cols(c0, c1, c2) }
|
|
||||||
#[inline(always)] fn from_value(v: f64) -> dmat3 { Matrix::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn identity() -> dmat3 { Matrix::identity() }
|
|
||||||
#[inline(always)] fn zero() -> dmat3 { Matrix::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
|
||||||
#[inline(always)] fn rows() -> uint { 3 }
|
|
||||||
#[inline(always)] fn cols() -> uint { 3 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<dmat3>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A 4 x 4 column major matrix
|
* A 4 x 4 column major matrix
|
||||||
|
|
@ -1793,44 +1783,42 @@ impl<T:Copy + Float + FuzzyEq<T>> FuzzyEq<T> for Mat4<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! mat4_type(
|
||||||
|
($name:ident <$T:ty, $V:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(c0r0: $T, c0r1: $T, c0r2: $T, c0r3: $T, c1r0: $T, c1r1: $T, c1r2: $T, c1r3: $T, c2r0: $T, c2r1: $T, c2r2: $T, c2r3: $T, c3r0: $T, c3r1: $T, c3r2: $T, c3r3: $T)
|
||||||
|
-> $name { Matrix4::new(c0r0, c0r1, c0r2, c0r3, c1r0, c1r1, c1r2, c1r3, c2r0, c2r1, c2r2, c2r3, c3r0, c3r1, c3r2, c3r3) }
|
||||||
|
#[inline(always)] fn from_cols(c0: $V, c1: $V, c2: $V, c3: $V)
|
||||||
|
-> $name { Matrix4::from_cols(c0, c1, c2, c3) }
|
||||||
|
#[inline(always)] fn from_value(v: $T) -> $name { Matrix::from_value(v) }
|
||||||
|
|
||||||
|
#[inline(always)] fn identity() -> $name { Matrix::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { Matrix::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 4 }
|
||||||
|
#[inline(always)] fn rows() -> uint { 4 }
|
||||||
|
#[inline(always)] fn cols() -> uint { 4 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
// GLSL-style type aliases, corresponding to Section 4.1.6 of the [GLSL 4.30.6 specification]
|
// GLSL-style type aliases, corresponding to Section 4.1.6 of the [GLSL 4.30.6 specification]
|
||||||
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
||||||
|
|
||||||
/// a 4×4 single-precision floating-point matrix
|
// a 4×4 single-precision floating-point matrix
|
||||||
pub type mat4 = Mat4<f32>;
|
pub type mat4 = Mat4<f32>;
|
||||||
/// a 4×4 double-precision floating-point matrix
|
// a 4×4 double-precision floating-point matrix
|
||||||
pub type dmat4 = Mat4<f64>;
|
pub type dmat4 = Mat4<f64>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
mat4_type!(mat4<f32,vec4>)
|
||||||
|
mat4_type!(dmat4<f64,dvec4>)
|
||||||
|
|
||||||
pub impl mat4 {
|
// Rust-style type aliases
|
||||||
#[inline(always)] fn new(c0r0: f32, c0r1: f32, c0r2: f32, c0r3: f32, c1r0: f32, c1r1: f32, c1r2: f32, c1r3: f32, c2r0: f32, c2r1: f32, c2r2: f32, c2r3: f32, c3r0: f32, c3r1: f32, c3r2: f32, c3r3: f32)
|
pub type Mat4f = Mat4<float>;
|
||||||
-> mat4 { Matrix4::new(c0r0, c0r1, c0r2, c0r3, c1r0, c1r1, c1r2, c1r3, c2r0, c2r1, c2r2, c2r3, c3r0, c3r1, c3r2, c3r3) }
|
pub type Mat4f32 = Mat4<f32>;
|
||||||
#[inline(always)] fn from_cols(c0: vec4, c1: vec4, c2: vec4, c3: vec4)
|
pub type Mat4f64 = Mat4<f64>;
|
||||||
-> mat4 { Matrix4::from_cols(c0, c1, c2, c3) }
|
|
||||||
#[inline(always)] fn from_value(v: f32) -> mat4 { Matrix::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn identity() -> mat4 { Matrix::identity() }
|
mat4_type!(Mat4f<float,Vec4f>)
|
||||||
#[inline(always)] fn zero() -> mat4 { Matrix::zero() }
|
mat4_type!(Mat4f32<f32,Vec4f32>)
|
||||||
|
mat4_type!(Mat4f64<f64,Vec4f64>)
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
|
||||||
#[inline(always)] fn rows() -> uint { 4 }
|
|
||||||
#[inline(always)] fn cols() -> uint { 4 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<mat4>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl dmat4 {
|
|
||||||
#[inline(always)] fn new(c0r0: f64, c0r1: f64, c0r2: f64, c0r3: f64, c1r0: f64, c1r1: f64, c1r2: f64, c1r3: f64, c2r0: f64, c2r1: f64, c2r2: f64, c2r3: f64, c3r0: f64, c3r1: f64, c3r2: f64, c3r3: f64)
|
|
||||||
-> dmat4 { Matrix4::new(c0r0, c0r1, c0r2, c0r3, c1r0, c1r1, c1r2, c1r3, c2r0, c2r1, c2r2, c2r3, c3r0, c3r1, c3r2, c3r3) }
|
|
||||||
#[inline(always)] fn from_cols(c0: dvec4, c1: dvec4, c2: dvec4, c3: dvec4)
|
|
||||||
-> dmat4 { Matrix4::from_cols(c0, c1, c2, c3) }
|
|
||||||
#[inline(always)] fn from_value(v: f64) -> dmat4 { Matrix::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn identity() -> dmat4 { Matrix::identity() }
|
|
||||||
#[inline(always)] fn zero() -> dmat4 { Matrix::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
|
||||||
#[inline(always)] fn rows() -> uint { 4 }
|
|
||||||
#[inline(always)] fn cols() -> uint { 4 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<dmat4>() }
|
|
||||||
}
|
|
||||||
85
src/quat.rs
85
src/quat.rs
|
|
@ -12,20 +12,10 @@ use numeric::*;
|
||||||
use numeric::number::Number;
|
use numeric::number::Number;
|
||||||
use numeric::number::Number::{zero,one};
|
use numeric::number::Number::{zero,one};
|
||||||
|
|
||||||
use mat::{
|
use mat::{Mat3, Matrix3};
|
||||||
Mat3,
|
use vec::{Vec3, Vector3, EuclideanVector};
|
||||||
Matrix3
|
use vec::{NumericVector, NumericVector3};
|
||||||
};
|
use vec::{vec3, dvec3, Vec3f, Vec3f32, Vec3f64};
|
||||||
|
|
||||||
use vec::{
|
|
||||||
Vec3,
|
|
||||||
Vector3,
|
|
||||||
EuclideanVector,
|
|
||||||
NumericVector,
|
|
||||||
NumericVector3,
|
|
||||||
vec3,
|
|
||||||
dvec3,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A quaternion in scalar/vector form
|
* A quaternion in scalar/vector form
|
||||||
|
|
@ -409,44 +399,45 @@ impl<T:Copy + Float + FuzzyEq<T>> FuzzyEq<T> for Quat<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! quat_type(
|
||||||
|
($name:ident <$T:ty, $V:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(w: $T, xi: $T, yj: $T, zk: $T) -> $name { Quat::new(w, xi, yj, zk) }
|
||||||
|
#[inline(always)] fn from_sv(s: $T, v: $V) -> $name { Quat::from_sv(s, v) }
|
||||||
|
#[inline(always)] fn identity() -> $name { Quat::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { Quat::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn from_angle_x(radians: $T) -> $name { Quat::from_angle_x(radians) }
|
||||||
|
#[inline(always)] fn from_angle_y(radians: $T) -> $name { Quat::from_angle_y(radians) }
|
||||||
|
#[inline(always)] fn from_angle_z(radians: $T) -> $name { Quat::from_angle_z(radians) }
|
||||||
|
#[inline(always)] fn from_angle_xyz(radians_x: $T, radians_y: $T, radians_z: $T)
|
||||||
|
-> $name { Quat::from_angle_xyz(radians_x, radians_y, radians_z) }
|
||||||
|
#[inline(always)] fn from_angle_axis(radians: $T, axis: &$V) -> $name { Quat::from_angle_axis(radians, axis) }
|
||||||
|
#[inline(always)] fn from_axes(x: $V, y: $V, z: $V) -> $name { Quat::from_axes(x, y, z) }
|
||||||
|
#[inline(always)] fn look_at(dir: &$V, up: &$V) -> $name { Quat::look_at(dir, up) }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 4 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
)
|
||||||
|
|
||||||
// GLSL-style type aliases for quaternions. These are not present in the GLSL
|
// GLSL-style type aliases for quaternions. These are not present in the GLSL
|
||||||
// specification, but they roughly follow the same nomenclature.
|
// specification, but they roughly follow the same nomenclature.
|
||||||
|
|
||||||
/// a single-precision floating-point quaternion
|
/// a single-precision floating-point quaternion
|
||||||
pub type quat = Quat<f32>;
|
type quat = Quat<f32>;
|
||||||
/// a double-precision floating-point quaternion
|
/// a double-precision floating-point quaternion
|
||||||
pub type dquat = Quat<f64>;
|
type dquat = Quat<f64>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
quat_type!(quat<f32,vec3>)
|
||||||
|
quat_type!(dquat<f64,dvec3>)
|
||||||
|
|
||||||
pub impl quat {
|
// Rust-style type aliases
|
||||||
#[inline(always)] fn new(w: f32, xi: f32, yj: f32, zk: f32) -> quat { Quat::new(w, xi, yj, zk) }
|
type Quatf = Quat<float>;
|
||||||
#[inline(always)] fn from_sv(s: f32, v: vec3) -> quat { Quat::from_sv(s, v) }
|
type Quatf32 = Quat<f32>;
|
||||||
#[inline(always)] fn identity() -> quat { Quat::identity() }
|
type Quatf64 = Quat<f64>;
|
||||||
#[inline(always)] fn zero() -> quat { Quat::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn from_angle_x(radians: f32) -> quat { Quat::from_angle_x(radians) }
|
quat_type!(Quatf<float,Vec3f>)
|
||||||
#[inline(always)] fn from_angle_y(radians: f32) -> quat { Quat::from_angle_y(radians) }
|
quat_type!(Quatf32<f32,Vec3f32>)
|
||||||
#[inline(always)] fn from_angle_z(radians: f32) -> quat { Quat::from_angle_z(radians) }
|
quat_type!(Quatf64<f64,Vec3f64>)
|
||||||
#[inline(always)] fn from_angle_xyz(radians_x: f32, radians_y: f32, radians_z: f32)
|
|
||||||
-> quat { Quat::from_angle_xyz(radians_x, radians_y, radians_z) }
|
|
||||||
#[inline(always)] fn from_angle_axis(radians: f32, axis: &vec3) -> quat { Quat::from_angle_axis(radians, axis) }
|
|
||||||
#[inline(always)] fn from_axes(x: vec3, y: vec3, z: vec3) -> quat { Quat::from_axes(x, y, z) }
|
|
||||||
#[inline(always)] fn look_at(dir: &vec3, up: &vec3) -> quat { Quat::look_at(dir, up) }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl dquat {
|
|
||||||
#[inline(always)] fn new(w: f64, xi: f64, yj: f64, zk: f64) -> dquat { Quat::new(w, xi, yj, zk) }
|
|
||||||
#[inline(always)] fn from_sv(s: f64, v: dvec3) -> dquat { Quat::from_sv(s, v) }
|
|
||||||
#[inline(always)] fn identity() -> dquat { Quat::identity() }
|
|
||||||
#[inline(always)] fn zero() -> dquat { Quat::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn from_angle_x(radians: f64) -> dquat { Quat::from_angle_x(radians) }
|
|
||||||
#[inline(always)] fn from_angle_y(radians: f64) -> dquat { Quat::from_angle_y(radians) }
|
|
||||||
#[inline(always)] fn from_angle_z(radians: f64) -> dquat { Quat::from_angle_z(radians) }
|
|
||||||
#[inline(always)] fn from_angle_xyz(radians_x: f64, radians_y: f64, radians_z: f64)
|
|
||||||
-> dquat { Quat::from_angle_xyz(radians_x, radians_y, radians_z) }
|
|
||||||
#[inline(always)] fn from_angle_axis(radians: f64, axis: &dvec3) -> dquat { Quat::from_angle_axis(radians, axis) }
|
|
||||||
#[inline(always)] fn from_axes(x: dvec3, y: dvec3, z: dvec3) -> dquat { Quat::from_axes(x, y, z) }
|
|
||||||
#[inline(always)] fn look_at(dir: &dvec3, up: &dvec3) -> dquat { Quat::look_at(dir, up) }
|
|
||||||
}
|
|
||||||
389
src/vec.rs
389
src/vec.rs
|
|
@ -772,84 +772,53 @@ impl BooleanVector for Vec2<bool> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! vec2_type(
|
||||||
|
($name:ident <bool>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(x: bool, y: bool) -> $name { Vector2::new(x, y) }
|
||||||
|
#[inline(always)] fn from_value(v: bool) -> $name { Vector::from_value(v) }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 2 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
($name:ident <$T:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(x: $T, y: $T) -> $name { Vector2::new(x, y) }
|
||||||
|
#[inline(always)] fn from_value(v: $T) -> $name { Vector::from_value(v) }
|
||||||
|
#[inline(always)] fn identity() -> $name { NumericVector::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { NumericVector::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn unit_x() -> $name { NumericVector2::unit_x() }
|
||||||
|
#[inline(always)] fn unit_y() -> $name { NumericVector2::unit_y() }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 2 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
)
|
||||||
|
|
||||||
// GLSL-style type aliases, corresponding to Section 4.1.5 of the [GLSL 4.30.6 specification]
|
// GLSL-style type aliases, corresponding to Section 4.1.5 of the [GLSL 4.30.6 specification]
|
||||||
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
||||||
|
|
||||||
/// a two-component single-precision floating-point vector
|
// a two-component single-precision floating-point vector
|
||||||
pub type vec2 = Vec2<f32>;
|
pub type vec2 = Vec2<f32>;
|
||||||
/// a two-component double-precision floating-point vector
|
// a two-component double-precision floating-point vector
|
||||||
pub type dvec2 = Vec2<f64>;
|
pub type dvec2 = Vec2<f64>;
|
||||||
/// a two-component Boolean vector
|
// a two-component Boolean vector
|
||||||
pub type bvec2 = Vec2<bool>;
|
pub type bvec2 = Vec2<bool>;
|
||||||
/// a two-component signed integer vector
|
// a two-component signed integer vector
|
||||||
pub type ivec2 = Vec2<i32>;
|
pub type ivec2 = Vec2<i32>;
|
||||||
/// a two-component unsigned integer vector
|
// a two-component unsigned integer vector
|
||||||
pub type uvec2 = Vec2<u32>;
|
pub type uvec2 = Vec2<u32>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
vec2_type!(vec2<f32>)
|
||||||
|
vec2_type!(dvec2<f64>)
|
||||||
pub impl vec2 {
|
vec2_type!(bvec2<bool>)
|
||||||
#[inline(always)] fn new(x: f32, y: f32) -> vec2 { Vector2::new(x, y) }
|
vec2_type!(ivec2<i32>)
|
||||||
#[inline(always)] fn from_value(v: f32) -> vec2 { Vector::from_value(v) }
|
vec2_type!(uvec2<u32>)
|
||||||
#[inline(always)] fn identity() -> vec2 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> vec2 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> vec2 { NumericVector2::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> vec2 { NumericVector2::unit_y() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<vec2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl dvec2 {
|
|
||||||
#[inline(always)] fn new(x: f64, y: f64) -> dvec2 { Vector2::new(x, y) }
|
|
||||||
#[inline(always)] fn from_value(v: f64) -> dvec2 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> dvec2 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> dvec2 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> dvec2 { NumericVector2::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> dvec2 { NumericVector2::unit_y() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<dvec2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl bvec2 {
|
|
||||||
#[inline(always)] fn new(x: bool, y: bool) -> bvec2 { Vector2::new(x, y) }
|
|
||||||
#[inline(always)] fn from_value(v: bool) -> bvec2 { Vector::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<bvec2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl ivec2 {
|
|
||||||
#[inline(always)] fn new(x: i32, y: i32) -> ivec2 { Vector2::new(x, y) }
|
|
||||||
#[inline(always)] fn from_value(v: i32) -> ivec2 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> ivec2 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> ivec2 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> ivec2 { NumericVector2::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> ivec2 { NumericVector2::unit_y() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<ivec2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl uvec2 {
|
|
||||||
#[inline(always)] fn new(x: u32, y: u32) -> uvec2 { Vector2::new(x, y) }
|
|
||||||
#[inline(always)] fn from_value(v: u32) -> uvec2 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> uvec2 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> uvec2 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> uvec2 { NumericVector2::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> uvec2 { NumericVector2::unit_y() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 2 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<uvec2>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Type aliases named in a more 'Rustic' style
|
|
||||||
|
|
||||||
|
// Rust-style type aliases
|
||||||
pub type Vec2f = Vec2<float>;
|
pub type Vec2f = Vec2<float>;
|
||||||
pub type Vec2f32 = Vec2<f32>;
|
pub type Vec2f32 = Vec2<f32>;
|
||||||
pub type Vec2f64 = Vec2<f64>;
|
pub type Vec2f64 = Vec2<f64>;
|
||||||
|
|
@ -858,8 +827,28 @@ pub type Vec2i8 = Vec2<i8>;
|
||||||
pub type Vec2i16 = Vec2<i16>;
|
pub type Vec2i16 = Vec2<i16>;
|
||||||
pub type Vec2i32 = Vec2<i32>;
|
pub type Vec2i32 = Vec2<i32>;
|
||||||
pub type Vec2i64 = Vec2<i64>;
|
pub type Vec2i64 = Vec2<i64>;
|
||||||
|
pub type Vec2u = Vec2<uint>;
|
||||||
|
pub type Vec2u8 = Vec2<u8>;
|
||||||
|
pub type Vec2u16 = Vec2<u16>;
|
||||||
|
pub type Vec2u32 = Vec2<u32>;
|
||||||
|
pub type Vec2u64 = Vec2<u64>;
|
||||||
pub type Vec2b = Vec2<bool>;
|
pub type Vec2b = Vec2<bool>;
|
||||||
|
|
||||||
|
vec2_type!(Vec2f<float>)
|
||||||
|
vec2_type!(Vec2f32<f32>)
|
||||||
|
vec2_type!(Vec2f64<f64>)
|
||||||
|
vec2_type!(Vec2i<int>)
|
||||||
|
vec2_type!(Vec2i8<i8>)
|
||||||
|
vec2_type!(Vec2i16<i16>)
|
||||||
|
vec2_type!(Vec2i32<i32>)
|
||||||
|
vec2_type!(Vec2i64<i64>)
|
||||||
|
vec2_type!(Vec2u<uint>)
|
||||||
|
vec2_type!(Vec2u8<u8>)
|
||||||
|
vec2_type!(Vec2u16<u16>)
|
||||||
|
vec2_type!(Vec2u32<u32>)
|
||||||
|
vec2_type!(Vec2u64<u64>)
|
||||||
|
vec2_type!(Vec2b<bool>)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A 3-dimensional vector
|
* A 3-dimensional vector
|
||||||
*
|
*
|
||||||
|
|
@ -1214,85 +1203,83 @@ impl BooleanVector for Vec3<bool> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! vec3_type(
|
||||||
|
($name:ident <bool>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(x: bool, y: bool, z: bool) -> $name { Vector3::new(x, y, z) }
|
||||||
|
#[inline(always)] fn from_value(v: bool) -> $name { Vector::from_value(v) }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 3 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
($name:ident <$T:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(x: $T, y: $T, z: $T) -> $name { Vector3::new(x, y, z) }
|
||||||
|
#[inline(always)] fn from_value(v: $T) -> $name { Vector::from_value(v) }
|
||||||
|
#[inline(always)] fn identity() -> $name { NumericVector::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { NumericVector::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn unit_x() -> $name { NumericVector3::unit_x() }
|
||||||
|
#[inline(always)] fn unit_y() -> $name { NumericVector3::unit_y() }
|
||||||
|
#[inline(always)] fn unit_z() -> $name { NumericVector3::unit_z() }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 3 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
)
|
||||||
|
|
||||||
// GLSL-style type aliases, corresponding to Section 4.1.5 of the [GLSL 4.30.6 specification]
|
// GLSL-style type aliases, corresponding to Section 4.1.5 of the [GLSL 4.30.6 specification]
|
||||||
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
||||||
|
|
||||||
/// a three-component single-precision floating-point vector
|
// a three-component single-precision floating-point vector
|
||||||
pub type vec3 = Vec3<f32>;
|
pub type vec3 = Vec3<f32>;
|
||||||
/// a three-component double-precision floating-point vector
|
// a three-component double-precision floating-point vector
|
||||||
pub type dvec3 = Vec3<f64>;
|
pub type dvec3 = Vec3<f64>;
|
||||||
/// a three-component Boolean vector
|
// a three-component Boolean vector
|
||||||
pub type bvec3 = Vec3<bool>;
|
pub type bvec3 = Vec3<bool>;
|
||||||
/// a three-component signed integer vector
|
// a three-component signed integer vector
|
||||||
pub type ivec3 = Vec3<i32>;
|
pub type ivec3 = Vec3<i32>;
|
||||||
/// a three-component unsigned integer vector
|
// a three-component unsigned integer vector
|
||||||
pub type uvec3 = Vec3<u32>;
|
pub type uvec3 = Vec3<u32>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
vec3_type!(vec3<f32>)
|
||||||
|
vec3_type!(dvec3<f64>)
|
||||||
|
vec3_type!(bvec3<bool>)
|
||||||
|
vec3_type!(ivec3<i32>)
|
||||||
|
vec3_type!(uvec3<u32>)
|
||||||
|
|
||||||
pub impl vec3 {
|
// Rust-style type aliases
|
||||||
#[inline(always)] fn new(x: f32, y: f32, z: f32) -> vec3 { Vector3::new(x, y, z) }
|
pub type Vec3f = Vec3<float>;
|
||||||
#[inline(always)] fn from_value(v: f32) -> vec3 { Vector::from_value(v) }
|
pub type Vec3f32 = Vec3<f32>;
|
||||||
#[inline(always)] fn identity() -> vec3 { NumericVector::identity() }
|
pub type Vec3f64 = Vec3<f64>;
|
||||||
#[inline(always)] fn zero() -> vec3 { NumericVector::zero() }
|
pub type Vec3i = Vec3<int>;
|
||||||
|
pub type Vec3i8 = Vec3<i8>;
|
||||||
|
pub type Vec3i16 = Vec3<i16>;
|
||||||
|
pub type Vec3i32 = Vec3<i32>;
|
||||||
|
pub type Vec3i64 = Vec3<i64>;
|
||||||
|
pub type Vec3u = Vec3<uint>;
|
||||||
|
pub type Vec3u8 = Vec3<u8>;
|
||||||
|
pub type Vec3u16 = Vec3<u16>;
|
||||||
|
pub type Vec3u32 = Vec3<u32>;
|
||||||
|
pub type Vec3u64 = Vec3<u64>;
|
||||||
|
pub type Vec3b = Vec3<bool>;
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> vec3 { NumericVector3::unit_x() }
|
vec3_type!(Vec3f<float>)
|
||||||
#[inline(always)] fn unit_y() -> vec3 { NumericVector3::unit_y() }
|
vec3_type!(Vec3f32<f32>)
|
||||||
#[inline(always)] fn unit_z() -> vec3 { NumericVector3::unit_z() }
|
vec3_type!(Vec3f64<f64>)
|
||||||
|
vec3_type!(Vec3i<int>)
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
vec3_type!(Vec3i8<i8>)
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<vec3>() }
|
vec3_type!(Vec3i16<i16>)
|
||||||
}
|
vec3_type!(Vec3i32<i32>)
|
||||||
|
vec3_type!(Vec3i64<i64>)
|
||||||
pub impl dvec3 {
|
vec3_type!(Vec3u<uint>)
|
||||||
#[inline(always)] fn new(x: f64, y: f64, z: f64) -> dvec3 { Vector3::new(x, y, z) }
|
vec3_type!(Vec3u8<u8>)
|
||||||
#[inline(always)] fn from_value(v: f64) -> dvec3 { Vector::from_value(v) }
|
vec3_type!(Vec3u16<u16>)
|
||||||
#[inline(always)] fn identity() -> dvec3 { NumericVector::identity() }
|
vec3_type!(Vec3u32<u32>)
|
||||||
#[inline(always)] fn zero() -> dvec3 { NumericVector::zero() }
|
vec3_type!(Vec3u64<u64>)
|
||||||
|
vec3_type!(Vec3b<bool>)
|
||||||
#[inline(always)] fn unit_x() -> dvec3 { NumericVector3::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> dvec3 { NumericVector3::unit_y() }
|
|
||||||
#[inline(always)] fn unit_z() -> dvec3 { NumericVector3::unit_z() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<dvec3>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl bvec3 {
|
|
||||||
#[inline(always)] fn new(x: bool, y: bool, z: bool) -> bvec3 { Vector3::new(x, y, z) }
|
|
||||||
#[inline(always)] fn from_value(v: bool) -> bvec3 { Vector::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<bvec3>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl ivec3 {
|
|
||||||
#[inline(always)] fn new(x: i32, y: i32, z: i32) -> ivec3 { Vector3::new(x, y, z) }
|
|
||||||
#[inline(always)] fn from_value(v: i32) -> ivec3 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> ivec3 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> ivec3 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> ivec3 { NumericVector3::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> ivec3 { NumericVector3::unit_y() }
|
|
||||||
#[inline(always)] fn unit_z() -> ivec3 { NumericVector3::unit_z() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<ivec3>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl uvec3 {
|
|
||||||
#[inline(always)] fn new(x: u32, y: u32, z: u32) -> uvec3 { Vector3::new(x, y, z) }
|
|
||||||
#[inline(always)] fn from_value(v: u32) -> uvec3 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> uvec3 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> uvec3 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> uvec3 { NumericVector3::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> uvec3 { NumericVector3::unit_y() }
|
|
||||||
#[inline(always)] fn unit_z() -> uvec3 { NumericVector3::unit_z() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 3 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<uvec3>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A 4-dimensional vector
|
* A 4-dimensional vector
|
||||||
|
|
@ -1658,6 +1645,34 @@ impl BooleanVector for Vec4<bool> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! vec4_type(
|
||||||
|
($name:ident <bool>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(x: bool, y: bool, z: bool, w: bool) -> $name { Vector4::new(x, y, z, w) }
|
||||||
|
#[inline(always)] fn from_value(v: bool) -> $name { Vector::from_value(v) }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 4 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
($name:ident <$T:ty>) => (
|
||||||
|
pub impl $name {
|
||||||
|
#[inline(always)] fn new(x: $T, y: $T, z: $T, w: $T) -> $name { Vector4::new(x, y, z, w) }
|
||||||
|
#[inline(always)] fn from_value(v: $T) -> $name { Vector::from_value(v) }
|
||||||
|
#[inline(always)] fn identity() -> $name { NumericVector::identity() }
|
||||||
|
#[inline(always)] fn zero() -> $name { NumericVector::zero() }
|
||||||
|
|
||||||
|
#[inline(always)] fn unit_x() -> $name { NumericVector4::unit_x() }
|
||||||
|
#[inline(always)] fn unit_y() -> $name { NumericVector4::unit_y() }
|
||||||
|
#[inline(always)] fn unit_z() -> $name { NumericVector4::unit_z() }
|
||||||
|
#[inline(always)] fn unit_w() -> $name { NumericVector4::unit_w() }
|
||||||
|
|
||||||
|
#[inline(always)] fn dim() -> uint { 4 }
|
||||||
|
#[inline(always)] fn size_of() -> uint { sys::size_of::<$name>() }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
)
|
||||||
|
|
||||||
// GLSL-style type aliases, corresponding to Section 4.1.5 of the [GLSL 4.30.6 specification]
|
// GLSL-style type aliases, corresponding to Section 4.1.5 of the [GLSL 4.30.6 specification]
|
||||||
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
// (http://www.opengl.org/registry/doc/GLSLangSpec.4.30.6.pdf).
|
||||||
|
|
||||||
|
|
@ -1672,73 +1687,39 @@ pub type ivec4 = Vec4<i32>;
|
||||||
// a four-component unsigned integer vector
|
// a four-component unsigned integer vector
|
||||||
pub type uvec4 = Vec4<u32>;
|
pub type uvec4 = Vec4<u32>;
|
||||||
|
|
||||||
// Static method wrappers for GLSL-style types
|
vec4_type!(vec4<f32>)
|
||||||
|
vec4_type!(dvec4<f64>)
|
||||||
|
vec4_type!(bvec4<bool>)
|
||||||
|
vec4_type!(ivec4<i32>)
|
||||||
|
vec4_type!(uvec4<u32>)
|
||||||
|
|
||||||
pub impl vec4 {
|
// Rust-style type aliases
|
||||||
#[inline(always)] fn new(x: f32, y: f32, z: f32, w: f32) -> vec4 { Vector4::new(x, y, z, w) }
|
pub type Vec4f = Vec4<float>;
|
||||||
#[inline(always)] fn from_value(v: f32) -> vec4 { Vector::from_value(v) }
|
pub type Vec4f32 = Vec4<f32>;
|
||||||
#[inline(always)] fn identity() -> vec4 { NumericVector::identity() }
|
pub type Vec4f64 = Vec4<f64>;
|
||||||
#[inline(always)] fn zero() -> vec4 { NumericVector::zero() }
|
pub type Vec4i = Vec4<int>;
|
||||||
|
pub type Vec4i8 = Vec4<i8>;
|
||||||
|
pub type Vec4i16 = Vec4<i16>;
|
||||||
|
pub type Vec4i32 = Vec4<i32>;
|
||||||
|
pub type Vec4i64 = Vec4<i64>;
|
||||||
|
pub type Vec4u = Vec4<uint>;
|
||||||
|
pub type Vec4u8 = Vec4<u8>;
|
||||||
|
pub type Vec4u16 = Vec4<u16>;
|
||||||
|
pub type Vec4u32 = Vec4<u32>;
|
||||||
|
pub type Vec4u64 = Vec4<u64>;
|
||||||
|
pub type Vec4b = Vec4<bool>;
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> vec4 { NumericVector4::unit_x() }
|
vec4_type!(Vec4f<float>)
|
||||||
#[inline(always)] fn unit_y() -> vec4 { NumericVector4::unit_y() }
|
vec4_type!(Vec4f32<f32>)
|
||||||
#[inline(always)] fn unit_z() -> vec4 { NumericVector4::unit_z() }
|
vec4_type!(Vec4f64<f64>)
|
||||||
#[inline(always)] fn unit_w() -> vec4 { NumericVector4::unit_w() }
|
vec4_type!(Vec4i<int>)
|
||||||
|
vec4_type!(Vec4i8<i8>)
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
vec4_type!(Vec4i16<i16>)
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<vec4>() }
|
vec4_type!(Vec4i32<i32>)
|
||||||
}
|
vec4_type!(Vec4i64<i64>)
|
||||||
|
vec4_type!(Vec4u<uint>)
|
||||||
pub impl dvec4 {
|
vec4_type!(Vec4u8<u8>)
|
||||||
#[inline(always)] fn new(x: f64, y: f64, z: f64, w: f64) -> dvec4 { Vector4::new(x, y, z, w) }
|
vec4_type!(Vec4u16<u16>)
|
||||||
#[inline(always)] fn from_value(v: f64) -> dvec4 { Vector::from_value(v) }
|
vec4_type!(Vec4u32<u32>)
|
||||||
#[inline(always)] fn identity() -> dvec4 { NumericVector::identity() }
|
vec4_type!(Vec4u64<u64>)
|
||||||
#[inline(always)] fn zero() -> dvec4 { NumericVector::zero() }
|
vec4_type!(Vec4b<bool>)
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> dvec4 { NumericVector4::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> dvec4 { NumericVector4::unit_y() }
|
|
||||||
#[inline(always)] fn unit_z() -> dvec4 { NumericVector4::unit_z() }
|
|
||||||
#[inline(always)] fn unit_w() -> dvec4 { NumericVector4::unit_w() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<dvec4>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
pub impl bvec4 {
|
|
||||||
#[inline(always)] fn new(x: bool, y: bool, z: bool, w: bool) -> bvec4 { Vector4::new(x, y, z, w) }
|
|
||||||
#[inline(always)] fn from_value(v: bool) -> bvec4 { Vector::from_value(v) }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<bvec4>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl ivec4 {
|
|
||||||
#[inline(always)] fn new(x: i32, y: i32, z: i32, w: i32) -> ivec4 { Vector4::new(x, y, z, w) }
|
|
||||||
#[inline(always)] fn from_value(v: i32) -> ivec4 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> ivec4 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> ivec4 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> ivec4 { NumericVector4::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> ivec4 { NumericVector4::unit_y() }
|
|
||||||
#[inline(always)] fn unit_z() -> ivec4 { NumericVector4::unit_z() }
|
|
||||||
#[inline(always)] fn unit_w() -> ivec4 { NumericVector4::unit_w() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<ivec4>() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub impl uvec4 {
|
|
||||||
#[inline(always)] fn new(x: u32, y: u32, z: u32, w: u32) -> uvec4 { Vector4::new(x, y, z, w) }
|
|
||||||
#[inline(always)] fn from_value(v: u32) -> uvec4 { Vector::from_value(v) }
|
|
||||||
#[inline(always)] fn identity() -> uvec4 { NumericVector::identity() }
|
|
||||||
#[inline(always)] fn zero() -> uvec4 { NumericVector::zero() }
|
|
||||||
|
|
||||||
#[inline(always)] fn unit_x() -> uvec4 { NumericVector4::unit_x() }
|
|
||||||
#[inline(always)] fn unit_y() -> uvec4 { NumericVector4::unit_y() }
|
|
||||||
#[inline(always)] fn unit_z() -> uvec4 { NumericVector4::unit_z() }
|
|
||||||
#[inline(always)] fn unit_w() -> uvec4 { NumericVector4::unit_w() }
|
|
||||||
|
|
||||||
#[inline(always)] fn dim() -> uint { 4 }
|
|
||||||
#[inline(always)] fn size_of() -> uint { sys::size_of::<uvec4>() }
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue