mirror of
https://github.com/lisk77/comet.git
synced 2025-10-23 21:38:50 +00:00
refactor(math): moved the determinant implementation to the LinearTransformation trait
This commit is contained in:
parent
92055d62a5
commit
b290f98b11
1 changed files with 778 additions and 523 deletions
|
|
@ -1,5 +1,5 @@
|
|||
use std::ops::*;
|
||||
use crate::vector::{v2, v3, v4};
|
||||
use std::ops::*;
|
||||
|
||||
trait LinearTransformation {
|
||||
fn det(&self) -> f32;
|
||||
|
|
@ -19,37 +19,39 @@ pub struct m2 {
|
|||
}
|
||||
|
||||
impl m2 {
|
||||
|
||||
pub const ZERO: Self = Self {
|
||||
x00: 0.0, x01: 0.0,
|
||||
x10: 0.0, x11: 0.0
|
||||
x00: 0.0,
|
||||
x01: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 0.0,
|
||||
};
|
||||
|
||||
pub const IDENTITY: Self = Self {
|
||||
x00: 1.0, x01: 0.0,
|
||||
x10: 0.0, x11: 1.0
|
||||
x00: 1.0,
|
||||
x01: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 1.0,
|
||||
};
|
||||
pub fn new(
|
||||
x00: f32, x01: f32,
|
||||
x10: f32, x11: f32
|
||||
) -> Self {
|
||||
Self {
|
||||
x00, x01,
|
||||
x10, x11
|
||||
}
|
||||
|
||||
pub fn new(x00: f32, x01: f32, x10: f32, x11: f32) -> Self {
|
||||
Self { x00, x01, x10, x11 }
|
||||
}
|
||||
|
||||
pub fn from_cols(col1: v2, col2: v2) -> Self {
|
||||
Self {
|
||||
x00: col1.x(), x01: col1.y(),
|
||||
x10: col2.x(), x11: col2.y(),
|
||||
x00: col1.x(),
|
||||
x01: col1.y(),
|
||||
x10: col2.x(),
|
||||
x11: col2.y(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_rows(row1: v2, row2: v2) -> Self {
|
||||
Self {
|
||||
x00: row1.x(), x01: row2.x(),
|
||||
x10: row1.y(), x11: row2.y(),
|
||||
x00: row1.x(),
|
||||
x01: row2.x(),
|
||||
x10: row1.y(),
|
||||
x11: row2.y(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -59,7 +61,7 @@ impl m2 {
|
|||
(0, 1) => Some(self.x01),
|
||||
(1, 0) => Some(self.x10),
|
||||
(1, 1) => Some(self.x11),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +79,7 @@ impl m2 {
|
|||
match index {
|
||||
0 => Some(v2::new(self.x00, self.x01)),
|
||||
1 => Some(v2::new(self.x10, self.x11)),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -85,19 +87,23 @@ impl m2 {
|
|||
match index {
|
||||
0 => Some(v2::new(self.x00, self.x10)),
|
||||
1 => Some(v2::new(self.x01, self.x11)),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn transpose(&self) -> Self {
|
||||
Self {
|
||||
x00: self.x00, x01: self.x10,
|
||||
x10: self.x01, x11: self.x11,
|
||||
x00: self.x00,
|
||||
x01: self.x10,
|
||||
x10: self.x01,
|
||||
x11: self.x11,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn det(&self) -> f32 {
|
||||
self.x00 * self.x11 - self.x01 * self.x10
|
||||
pub fn to_homogeneous(&self) -> m3 {
|
||||
m3::new(
|
||||
self.x00, self.x01, 0.0, self.x10, self.x11, 0.0, 0.0, 0.0, 1.0,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -146,7 +152,7 @@ impl Mul<v2> for m2 {
|
|||
fn mul(self, rhs: v2) -> v2 {
|
||||
v2::new(
|
||||
self.x00 * rhs.x() + self.x01 * rhs.y(),
|
||||
self.x10 * rhs.x() + self.x11 * rhs.y()
|
||||
self.x10 * rhs.x() + self.x11 * rhs.y(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -177,12 +183,9 @@ impl Div<f32> for m2 {
|
|||
}
|
||||
}
|
||||
|
||||
impl Into<[[f32;2];2]> for m2 {
|
||||
fn into(self) -> [[f32;2];2] {
|
||||
[
|
||||
[self.x00, self.x01],
|
||||
[self.x10, self.x11],
|
||||
]
|
||||
impl Into<[[f32; 2]; 2]> for m2 {
|
||||
fn into(self) -> [[f32; 2]; 2] {
|
||||
[[self.x00, self.x01], [self.x10, self.x11]]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -193,49 +196,91 @@ impl Into<[[f32;2];2]> for m2 {
|
|||
#[repr(C)]
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct m3 {
|
||||
x00: f32, x01: f32, x02: f32,
|
||||
x10: f32, x11: f32, x12: f32,
|
||||
x20: f32, x21: f32, x22: f32,
|
||||
x00: f32,
|
||||
x01: f32,
|
||||
x02: f32,
|
||||
x10: f32,
|
||||
x11: f32,
|
||||
x12: f32,
|
||||
x20: f32,
|
||||
x21: f32,
|
||||
x22: f32,
|
||||
}
|
||||
|
||||
impl m3 {
|
||||
pub const ZERO: Self = Self {
|
||||
x00: 0.0, x01: 0.0, x02: 0.0,
|
||||
x10: 0.0, x11: 0.0, x12: 0.0,
|
||||
x20: 0.0, x21: 0.0, x22: 0.0
|
||||
x00: 0.0,
|
||||
x01: 0.0,
|
||||
x02: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 0.0,
|
||||
x12: 0.0,
|
||||
x20: 0.0,
|
||||
x21: 0.0,
|
||||
x22: 0.0,
|
||||
};
|
||||
|
||||
pub const IDENTITY: Self = Self {
|
||||
x00: 1.0, x01: 0.0, x02: 0.0,
|
||||
x10: 0.0, x11: 1.0, x12: 0.0,
|
||||
x20: 0.0, x21: 0.0, x22: 1.0
|
||||
x00: 1.0,
|
||||
x01: 0.0,
|
||||
x02: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 1.0,
|
||||
x12: 0.0,
|
||||
x20: 0.0,
|
||||
x21: 0.0,
|
||||
x22: 1.0,
|
||||
};
|
||||
|
||||
pub fn new(
|
||||
x00: f32, x01: f32, x02: f32,
|
||||
x10: f32, x11: f32, x12: f32,
|
||||
x20: f32, x21: f32, x22: f32
|
||||
x00: f32,
|
||||
x01: f32,
|
||||
x02: f32,
|
||||
x10: f32,
|
||||
x11: f32,
|
||||
x12: f32,
|
||||
x20: f32,
|
||||
x21: f32,
|
||||
x22: f32,
|
||||
) -> Self {
|
||||
Self {
|
||||
x00, x01, x02,
|
||||
x10, x11, x12,
|
||||
x20, x21, x22
|
||||
x00,
|
||||
x01,
|
||||
x02,
|
||||
x10,
|
||||
x11,
|
||||
x12,
|
||||
x20,
|
||||
x21,
|
||||
x22,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_cols(col1: v3, col2: v3, col3: v3) -> Self {
|
||||
Self {
|
||||
x00: col1.x(), x01: col1.y(), x02: col1.z(),
|
||||
x10: col2.x(), x11: col2.y(), x12: col2.z(),
|
||||
x20: col3.x(), x21: col3.y(), x22: col3.z(),
|
||||
x00: col1.x(),
|
||||
x01: col1.y(),
|
||||
x02: col1.z(),
|
||||
x10: col2.x(),
|
||||
x11: col2.y(),
|
||||
x12: col2.z(),
|
||||
x20: col3.x(),
|
||||
x21: col3.y(),
|
||||
x22: col3.z(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_rows(row1: v3, row2: v3, row3: v3) -> Self {
|
||||
Self {
|
||||
x00: row1.x(), x01: row2.x(), x02: row3.x(),
|
||||
x10: row1.y(), x11: row2.y(), x12: row3.y(),
|
||||
x20: row1.z(), x21: row2.z(), x22: row3.z(),
|
||||
x00: row1.x(),
|
||||
x01: row2.x(),
|
||||
x02: row3.x(),
|
||||
x10: row1.y(),
|
||||
x11: row2.y(),
|
||||
x12: row3.y(),
|
||||
x20: row1.z(),
|
||||
x21: row2.z(),
|
||||
x22: row3.z(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -250,7 +295,7 @@ impl m3 {
|
|||
(2, 0) => Some(self.x20),
|
||||
(2, 1) => Some(self.x21),
|
||||
(2, 2) => Some(self.x22),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -274,7 +319,7 @@ impl m3 {
|
|||
0 => Some(v3::new(self.x00, self.x01, self.x02)),
|
||||
1 => Some(v3::new(self.x10, self.x11, self.x12)),
|
||||
2 => Some(v3::new(self.x20, self.x21, self.x22)),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -283,22 +328,29 @@ impl m3 {
|
|||
0 => Some(v3::new(self.x00, self.x10, self.x20)),
|
||||
1 => Some(v3::new(self.x01, self.x11, self.x21)),
|
||||
2 => Some(v3::new(self.x02, self.x12, self.x22)),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn transpose(&self) -> Self {
|
||||
Self {
|
||||
x00: self.x00, x01: self.x10, x02: self.x20,
|
||||
x10: self.x01, x11: self.x11, x12: self.x21,
|
||||
x20: self.x02, x21: self.x12, x22: self.x22,
|
||||
x00: self.x00,
|
||||
x01: self.x10,
|
||||
x02: self.x20,
|
||||
x10: self.x01,
|
||||
x11: self.x11,
|
||||
x12: self.x21,
|
||||
x20: self.x02,
|
||||
x21: self.x12,
|
||||
x22: self.x22,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn det(&self) -> f32 {
|
||||
self.x00 * (self.x11 * self.x22 - self.x12 * self.x21)
|
||||
- self.x01 * (self.x10 * self.x22 - self.x12 * self.x20)
|
||||
+ self.x02 * (self.x10 * self.x21 - self.x11 * self.x20)
|
||||
pub fn to_homogeneous(&self) -> m4 {
|
||||
m4::new(
|
||||
self.x00, self.x01, self.x02, 0.0, self.x10, self.x11, self.x12, 0.0, self.x20,
|
||||
self.x21, self.x22, 0.0, 0.0, 0.0, 0.0, 1.0,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -307,9 +359,15 @@ impl Add for m3 {
|
|||
|
||||
fn add(self, rhs: Self) -> Self {
|
||||
Self {
|
||||
x00: self.x00 + rhs.x00, x01: self.x01 + rhs.x01, x02: self.x02 + rhs.x02,
|
||||
x10: self.x10 + rhs.x10, x11: self.x11 + rhs.x11, x12: self.x12 + rhs.x12,
|
||||
x20: self.x20 + rhs.x20, x21: self.x21 + rhs.x21, x22: self.x22 + rhs.x22,
|
||||
x00: self.x00 + rhs.x00,
|
||||
x01: self.x01 + rhs.x01,
|
||||
x02: self.x02 + rhs.x02,
|
||||
x10: self.x10 + rhs.x10,
|
||||
x11: self.x11 + rhs.x11,
|
||||
x12: self.x12 + rhs.x12,
|
||||
x20: self.x20 + rhs.x20,
|
||||
x21: self.x21 + rhs.x21,
|
||||
x22: self.x22 + rhs.x22,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -319,9 +377,15 @@ impl Sub for m3 {
|
|||
|
||||
fn sub(self, rhs: Self) -> Self {
|
||||
Self {
|
||||
x00: self.x00 - rhs.x00, x01: self.x01 - rhs.x01, x02: self.x02 - rhs.x02,
|
||||
x10: self.x10 - rhs.x10, x11: self.x11 - rhs.x11, x12: self.x12 - rhs.x12,
|
||||
x20: self.x20 - rhs.x20, x21: self.x21 - rhs.x21, x22: self.x22 - rhs.x22,
|
||||
x00: self.x00 - rhs.x00,
|
||||
x01: self.x01 - rhs.x01,
|
||||
x02: self.x02 - rhs.x02,
|
||||
x10: self.x10 - rhs.x10,
|
||||
x11: self.x11 - rhs.x11,
|
||||
x12: self.x12 - rhs.x12,
|
||||
x20: self.x20 - rhs.x20,
|
||||
x21: self.x21 - rhs.x21,
|
||||
x22: self.x22 - rhs.x22,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -331,9 +395,15 @@ impl Mul<f32> for m3 {
|
|||
|
||||
fn mul(self, rhs: f32) -> Self {
|
||||
Self {
|
||||
x00: self.x00 * rhs, x01: self.x01 * rhs, x02: self.x02 * rhs,
|
||||
x10: self.x10 * rhs, x11: self.x11 * rhs, x12: self.x12 * rhs,
|
||||
x20: self.x20 * rhs, x21: self.x21 * rhs, x22: self.x22 * rhs,
|
||||
x00: self.x00 * rhs,
|
||||
x01: self.x01 * rhs,
|
||||
x02: self.x02 * rhs,
|
||||
x10: self.x10 * rhs,
|
||||
x11: self.x11 * rhs,
|
||||
x12: self.x12 * rhs,
|
||||
x20: self.x20 * rhs,
|
||||
x21: self.x21 * rhs,
|
||||
x22: self.x22 * rhs,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -345,7 +415,7 @@ impl Mul<v3> for m3 {
|
|||
v3::new(
|
||||
self.x00 * rhs.x() + self.x01 * rhs.y() + self.x02 * rhs.z(),
|
||||
self.x10 * rhs.x() + self.x11 * rhs.y() + self.x12 * rhs.z(),
|
||||
self.x20 * rhs.x() + self.x21 * rhs.y() + self.x22 * rhs.z()
|
||||
self.x20 * rhs.x() + self.x21 * rhs.y() + self.x22 * rhs.z(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -373,15 +443,21 @@ impl Div<f32> for m3 {
|
|||
|
||||
fn div(self, rhs: f32) -> Self {
|
||||
Self {
|
||||
x00: self.x00 / rhs, x01: self.x01 / rhs, x02: self.x02 / rhs,
|
||||
x10: self.x10 / rhs, x11: self.x11 / rhs, x12: self.x12 / rhs,
|
||||
x20: self.x20 / rhs, x21: self.x21 / rhs, x22: self.x22 / rhs,
|
||||
x00: self.x00 / rhs,
|
||||
x01: self.x01 / rhs,
|
||||
x02: self.x02 / rhs,
|
||||
x10: self.x10 / rhs,
|
||||
x11: self.x11 / rhs,
|
||||
x12: self.x12 / rhs,
|
||||
x20: self.x20 / rhs,
|
||||
x21: self.x21 / rhs,
|
||||
x22: self.x22 / rhs,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Into<[[f32;3];3]> for m3 {
|
||||
fn into(self) -> [[f32;3];3] {
|
||||
impl Into<[[f32; 3]; 3]> for m3 {
|
||||
fn into(self) -> [[f32; 3]; 3] {
|
||||
[
|
||||
[self.x00, self.x01, self.x02],
|
||||
[self.x10, self.x11, self.x12],
|
||||
|
|
@ -397,63 +473,159 @@ impl Into<[[f32;3];3]> for m3 {
|
|||
#[repr(C)]
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct m4 {
|
||||
x00: f32, x01: f32, x02: f32, x03: f32,
|
||||
x10: f32, x11: f32, x12: f32, x13: f32,
|
||||
x20: f32, x21: f32, x22: f32, x23: f32,
|
||||
x30: f32, x31: f32, x32: f32, x33: f32,
|
||||
x00: f32,
|
||||
x01: f32,
|
||||
x02: f32,
|
||||
x03: f32,
|
||||
x10: f32,
|
||||
x11: f32,
|
||||
x12: f32,
|
||||
x13: f32,
|
||||
x20: f32,
|
||||
x21: f32,
|
||||
x22: f32,
|
||||
x23: f32,
|
||||
x30: f32,
|
||||
x31: f32,
|
||||
x32: f32,
|
||||
x33: f32,
|
||||
}
|
||||
|
||||
impl m4 {
|
||||
pub const ZERO: Self = Self {
|
||||
x00: 0.0, x01: 0.0, x02: 0.0, x03: 0.0,
|
||||
x10: 0.0, x11: 0.0, x12: 0.0, x13: 0.0,
|
||||
x20: 0.0, x21: 0.0, x22: 0.0, x23: 0.0,
|
||||
x30: 0.0, x31: 0.0, x32: 0.0, x33: 0.0
|
||||
x00: 0.0,
|
||||
x01: 0.0,
|
||||
x02: 0.0,
|
||||
x03: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 0.0,
|
||||
x12: 0.0,
|
||||
x13: 0.0,
|
||||
x20: 0.0,
|
||||
x21: 0.0,
|
||||
x22: 0.0,
|
||||
x23: 0.0,
|
||||
x30: 0.0,
|
||||
x31: 0.0,
|
||||
x32: 0.0,
|
||||
x33: 0.0,
|
||||
};
|
||||
|
||||
pub const IDENTITY: Self = Self {
|
||||
x00: 1.0, x01: 0.0, x02: 0.0, x03: 0.0,
|
||||
x10: 0.0, x11: 1.0, x12: 0.0, x13: 0.0,
|
||||
x20: 0.0, x21: 0.0, x22: 1.0, x23: 0.0,
|
||||
x30: 0.0, x31: 0.0, x32: 0.0, x33: 1.0
|
||||
x00: 1.0,
|
||||
x01: 0.0,
|
||||
x02: 0.0,
|
||||
x03: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 1.0,
|
||||
x12: 0.0,
|
||||
x13: 0.0,
|
||||
x20: 0.0,
|
||||
x21: 0.0,
|
||||
x22: 1.0,
|
||||
x23: 0.0,
|
||||
x30: 0.0,
|
||||
x31: 0.0,
|
||||
x32: 0.0,
|
||||
x33: 1.0,
|
||||
};
|
||||
|
||||
pub const OPENGL_CONV: Self = Self {
|
||||
x00: 1.0, x01: 0.0, x02: 0.0, x03: 0.0,
|
||||
x10: 0.0, x11: 1.0, x12: 0.0, x13: 0.0,
|
||||
x20: 0.0, x21: 0.0, x22: 0.5, x23: 0.5,
|
||||
x30: 0.0, x31: 0.0, x32: 0.0, x33: 1.0
|
||||
x00: 1.0,
|
||||
x01: 0.0,
|
||||
x02: 0.0,
|
||||
x03: 0.0,
|
||||
x10: 0.0,
|
||||
x11: 1.0,
|
||||
x12: 0.0,
|
||||
x13: 0.0,
|
||||
x20: 0.0,
|
||||
x21: 0.0,
|
||||
x22: 0.5,
|
||||
x23: 0.5,
|
||||
x30: 0.0,
|
||||
x31: 0.0,
|
||||
x32: 0.0,
|
||||
x33: 1.0,
|
||||
};
|
||||
|
||||
pub fn new(
|
||||
x00: f32, x01: f32, x02: f32, x03: f32,
|
||||
x10: f32, x11: f32, x12: f32, x13: f32,
|
||||
x20: f32, x21: f32, x22: f32, x23: f32,
|
||||
x30: f32, x31: f32, x32: f32, x33: f32
|
||||
x00: f32,
|
||||
x01: f32,
|
||||
x02: f32,
|
||||
x03: f32,
|
||||
x10: f32,
|
||||
x11: f32,
|
||||
x12: f32,
|
||||
x13: f32,
|
||||
x20: f32,
|
||||
x21: f32,
|
||||
x22: f32,
|
||||
x23: f32,
|
||||
x30: f32,
|
||||
x31: f32,
|
||||
x32: f32,
|
||||
x33: f32,
|
||||
) -> Self {
|
||||
Self {
|
||||
x00, x01, x02, x03,
|
||||
x10, x11, x12, x13,
|
||||
x20, x21, x22, x23,
|
||||
x30, x31, x32, x33
|
||||
x00,
|
||||
x01,
|
||||
x02,
|
||||
x03,
|
||||
x10,
|
||||
x11,
|
||||
x12,
|
||||
x13,
|
||||
x20,
|
||||
x21,
|
||||
x22,
|
||||
x23,
|
||||
x30,
|
||||
x31,
|
||||
x32,
|
||||
x33,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_cols(col1: v4, col2: v4, col3: v4, col4: v4) -> Self {
|
||||
Self {
|
||||
x00: col1.x(), x01: col1.y(), x02: col1.z(), x03: col1.w(),
|
||||
x10: col2.x(), x11: col2.y(), x12: col2.z(), x13: col2.w(),
|
||||
x20: col3.x(), x21: col3.y(), x22: col3.z(), x23: col3.w(),
|
||||
x30: col4.x(), x31: col4.y(), x32: col4.z(), x33: col4.w(),
|
||||
x00: col1.x(),
|
||||
x01: col1.y(),
|
||||
x02: col1.z(),
|
||||
x03: col1.w(),
|
||||
x10: col2.x(),
|
||||
x11: col2.y(),
|
||||
x12: col2.z(),
|
||||
x13: col2.w(),
|
||||
x20: col3.x(),
|
||||
x21: col3.y(),
|
||||
x22: col3.z(),
|
||||
x23: col3.w(),
|
||||
x30: col4.x(),
|
||||
x31: col4.y(),
|
||||
x32: col4.z(),
|
||||
x33: col4.w(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_rows(row1: v4, row2: v4, row3: v4, row4: v4) -> Self {
|
||||
Self {
|
||||
x00: row1.x(), x01: row2.x(), x02: row3.x(), x03: row4.x(),
|
||||
x10: row1.y(), x11: row2.y(), x12: row3.y(), x13: row4.y(),
|
||||
x20: row1.z(), x21: row2.z(), x22: row3.z(), x23: row4.z(),
|
||||
x30: row1.w(), x31: row2.w(), x32: row3.w(), x33: row4.w(),
|
||||
x00: row1.x(),
|
||||
x01: row2.x(),
|
||||
x02: row3.x(),
|
||||
x03: row4.x(),
|
||||
x10: row1.y(),
|
||||
x11: row2.y(),
|
||||
x12: row3.y(),
|
||||
x13: row4.y(),
|
||||
x20: row1.z(),
|
||||
x21: row2.z(),
|
||||
x22: row3.z(),
|
||||
x23: row4.z(),
|
||||
x30: row1.w(),
|
||||
x31: row2.w(),
|
||||
x32: row3.w(),
|
||||
x33: row4.w(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -475,7 +647,7 @@ impl m4 {
|
|||
(3, 1) => Some(self.x31),
|
||||
(3, 2) => Some(self.x32),
|
||||
(3, 3) => Some(self.x33),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -507,7 +679,7 @@ impl m4 {
|
|||
1 => Some(v4::new(self.x10, self.x11, self.x12, self.x13)),
|
||||
2 => Some(v4::new(self.x20, self.x21, self.x22, self.x23)),
|
||||
3 => Some(v4::new(self.x30, self.x31, self.x32, self.x33)),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -517,47 +689,39 @@ impl m4 {
|
|||
1 => Some(v4::new(self.x01, self.x11, self.x21, self.x31)),
|
||||
2 => Some(v4::new(self.x02, self.x12, self.x22, self.x32)),
|
||||
3 => Some(v4::new(self.x03, self.x13, self.x23, self.x33)),
|
||||
_ => None
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn transpose(&self) -> Self {
|
||||
Self {
|
||||
x00: self.x00, x01: self.x10, x02: self.x20, x03: self.x30,
|
||||
x10: self.x01, x11: self.x11, x12: self.x21, x13: self.x31,
|
||||
x20: self.x02, x21: self.x12, x22: self.x22, x23: self.x32,
|
||||
x30: self.x03, x31: self.x13, x32: self.x23, x33: self.x33,
|
||||
x00: self.x00,
|
||||
x01: self.x10,
|
||||
x02: self.x20,
|
||||
x03: self.x30,
|
||||
x10: self.x01,
|
||||
x11: self.x11,
|
||||
x12: self.x21,
|
||||
x13: self.x31,
|
||||
x20: self.x02,
|
||||
x21: self.x12,
|
||||
x22: self.x22,
|
||||
x23: self.x32,
|
||||
x30: self.x03,
|
||||
x31: self.x13,
|
||||
x32: self.x23,
|
||||
x33: self.x33,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn det(&self) -> f32 {
|
||||
self.x00 * self.x11 * self.x22 * self.x33
|
||||
+ self.x00 * self.x12 * self.x23 * self.x31
|
||||
+ self.x00 * self.x13 * self.x21 * self.x32
|
||||
+ self.x01 * self.x10 * self.x23 * self.x32
|
||||
+ self.x01 * self.x12 * self.x20 * self.x33
|
||||
+ self.x01 * self.x13 * self.x22 * self.x30
|
||||
+ self.x02 * self.x10 * self.x21 * self.x33
|
||||
+ self.x02 * self.x11 * self.x23 * self.x30
|
||||
+ self.x02 * self.x13 * self.x20 * self.x31
|
||||
+ self.x03 * self.x10 * self.x22 * self.x31
|
||||
+ self.x03 * self.x11 * self.x20 * self.x32
|
||||
+ self.x03 * self.x12 * self.x21 * self.x30
|
||||
- self.x00 * self.x11 * self.x23 * self.x32
|
||||
- self.x00 * self.x12 * self.x21 * self.x33
|
||||
- self.x00 * self.x13 * self.x22 * self.x31
|
||||
- self.x01 * self.x10 * self.x22 * self.x33
|
||||
- self.x01 * self.x12 * self.x23 * self.x30
|
||||
- self.x01 * self.x13 * self.x20 * self.x32
|
||||
- self.x02 * self.x10 * self.x23 * self.x31
|
||||
- self.x02 * self.x11 * self.x20 * self.x33
|
||||
- self.x02 * self.x13 * self.x21 * self.x30
|
||||
- self.x03 * self.x10 * self.x21 * self.x32
|
||||
- self.x03 * self.x11 * self.x22 * self.x30
|
||||
- self.x03 * self.x12 * self.x20 * self.x31
|
||||
}
|
||||
|
||||
pub fn orthographic_projection(left: f32, right: f32, bottom: f32, top: f32, near: f32, far: f32) -> Self {
|
||||
pub fn orthographic_projection(
|
||||
left: f32,
|
||||
right: f32,
|
||||
bottom: f32,
|
||||
top: f32,
|
||||
near: f32,
|
||||
far: f32,
|
||||
) -> Self {
|
||||
let mut m = Self::IDENTITY;
|
||||
|
||||
m.x00 = 2.0 / (right - left);
|
||||
|
|
@ -576,10 +740,22 @@ impl Add for m4 {
|
|||
|
||||
fn add(self, rhs: Self) -> Self {
|
||||
Self {
|
||||
x00: self.x00 + rhs.x00, x01: self.x01 + rhs.x01, x02: self.x02 + rhs.x02, x03: self.x03 + rhs.x03,
|
||||
x10: self.x10 + rhs.x10, x11: self.x11 + rhs.x11, x12: self.x12 + rhs.x12, x13: self.x13 + rhs.x13,
|
||||
x20: self.x20 + rhs.x20, x21: self.x21 + rhs.x21, x22: self.x22 + rhs.x22, x23: self.x23 + rhs.x23,
|
||||
x30: self.x30 + rhs.x30, x31: self.x31 + rhs.x31, x32: self.x32 + rhs.x32, x33: self.x33 + rhs.x33,
|
||||
x00: self.x00 + rhs.x00,
|
||||
x01: self.x01 + rhs.x01,
|
||||
x02: self.x02 + rhs.x02,
|
||||
x03: self.x03 + rhs.x03,
|
||||
x10: self.x10 + rhs.x10,
|
||||
x11: self.x11 + rhs.x11,
|
||||
x12: self.x12 + rhs.x12,
|
||||
x13: self.x13 + rhs.x13,
|
||||
x20: self.x20 + rhs.x20,
|
||||
x21: self.x21 + rhs.x21,
|
||||
x22: self.x22 + rhs.x22,
|
||||
x23: self.x23 + rhs.x23,
|
||||
x30: self.x30 + rhs.x30,
|
||||
x31: self.x31 + rhs.x31,
|
||||
x32: self.x32 + rhs.x32,
|
||||
x33: self.x33 + rhs.x33,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -589,10 +765,22 @@ impl Sub for m4 {
|
|||
|
||||
fn sub(self, rhs: Self) -> Self {
|
||||
Self {
|
||||
x00: self.x00 - rhs.x00, x01: self.x01 - rhs.x01, x02: self.x02 - rhs.x02, x03: self.x03 - rhs.x03,
|
||||
x10: self.x10 - rhs.x10, x11: self.x11 - rhs.x11, x12: self.x12 - rhs.x12, x13: self.x13 - rhs.x13,
|
||||
x20: self.x20 - rhs.x20, x21: self.x21 - rhs.x21, x22: self.x22 - rhs.x22, x23: self.x23 - rhs.x23,
|
||||
x30: self.x30 - rhs.x30, x31: self.x31 - rhs.x31, x32: self.x32 - rhs.x32, x33: self.x33 - rhs.x33,
|
||||
x00: self.x00 - rhs.x00,
|
||||
x01: self.x01 - rhs.x01,
|
||||
x02: self.x02 - rhs.x02,
|
||||
x03: self.x03 - rhs.x03,
|
||||
x10: self.x10 - rhs.x10,
|
||||
x11: self.x11 - rhs.x11,
|
||||
x12: self.x12 - rhs.x12,
|
||||
x13: self.x13 - rhs.x13,
|
||||
x20: self.x20 - rhs.x20,
|
||||
x21: self.x21 - rhs.x21,
|
||||
x22: self.x22 - rhs.x22,
|
||||
x23: self.x23 - rhs.x23,
|
||||
x30: self.x30 - rhs.x30,
|
||||
x31: self.x31 - rhs.x31,
|
||||
x32: self.x32 - rhs.x32,
|
||||
x33: self.x33 - rhs.x33,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -602,10 +790,22 @@ impl Mul<f32> for m4 {
|
|||
|
||||
fn mul(self, rhs: f32) -> Self {
|
||||
Self {
|
||||
x00: self.x00 * rhs, x01: self.x01 * rhs, x02: self.x02 * rhs, x03: self.x03 * rhs,
|
||||
x10: self.x10 * rhs, x11: self.x11 * rhs, x12: self.x12 * rhs, x13: self.x13 * rhs,
|
||||
x20: self.x20 * rhs, x21: self.x21 * rhs, x22: self.x22 * rhs, x23: self.x23 * rhs,
|
||||
x30: self.x30 * rhs, x31: self.x31 * rhs, x32: self.x32 * rhs, x33: self.x33 * rhs,
|
||||
x00: self.x00 * rhs,
|
||||
x01: self.x01 * rhs,
|
||||
x02: self.x02 * rhs,
|
||||
x03: self.x03 * rhs,
|
||||
x10: self.x10 * rhs,
|
||||
x11: self.x11 * rhs,
|
||||
x12: self.x12 * rhs,
|
||||
x13: self.x13 * rhs,
|
||||
x20: self.x20 * rhs,
|
||||
x21: self.x21 * rhs,
|
||||
x22: self.x22 * rhs,
|
||||
x23: self.x23 * rhs,
|
||||
x30: self.x30 * rhs,
|
||||
x31: self.x31 * rhs,
|
||||
x32: self.x32 * rhs,
|
||||
x33: self.x33 * rhs,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -618,7 +818,7 @@ impl Mul<v4> for m4 {
|
|||
self.x00 * rhs.x() + self.x01 * rhs.y() + self.x02 * rhs.z() + self.x03 * rhs.w(),
|
||||
self.x10 * rhs.x() + self.x11 * rhs.y() + self.x12 * rhs.z() + self.x13 * rhs.w(),
|
||||
self.x20 * rhs.x() + self.x21 * rhs.y() + self.x22 * rhs.z() + self.x23 * rhs.w(),
|
||||
self.x30 * rhs.x() + self.x31 * rhs.y() + self.x32 * rhs.z() + self.x33 * rhs.w()
|
||||
self.x30 * rhs.x() + self.x31 * rhs.y() + self.x32 * rhs.z() + self.x33 * rhs.w(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -653,16 +853,28 @@ impl Div<f32> for m4 {
|
|||
|
||||
fn div(self, rhs: f32) -> Self {
|
||||
Self {
|
||||
x00: self.x00 / rhs, x01: self.x01 / rhs, x02: self.x02 / rhs, x03: self.x03 / rhs,
|
||||
x10: self.x10 / rhs, x11: self.x11 / rhs, x12: self.x12 / rhs, x13: self.x13 / rhs,
|
||||
x20: self.x20 / rhs, x21: self.x21 / rhs, x22: self.x22 / rhs, x23: self.x23 / rhs,
|
||||
x30: self.x30 / rhs, x31: self.x31 / rhs, x32: self.x32 / rhs, x33: self.x33 / rhs,
|
||||
x00: self.x00 / rhs,
|
||||
x01: self.x01 / rhs,
|
||||
x02: self.x02 / rhs,
|
||||
x03: self.x03 / rhs,
|
||||
x10: self.x10 / rhs,
|
||||
x11: self.x11 / rhs,
|
||||
x12: self.x12 / rhs,
|
||||
x13: self.x13 / rhs,
|
||||
x20: self.x20 / rhs,
|
||||
x21: self.x21 / rhs,
|
||||
x22: self.x22 / rhs,
|
||||
x23: self.x23 / rhs,
|
||||
x30: self.x30 / rhs,
|
||||
x31: self.x31 / rhs,
|
||||
x32: self.x32 / rhs,
|
||||
x33: self.x33 / rhs,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Into<[[f32;4];4]> for m4 {
|
||||
fn into(self) -> [[f32;4];4] {
|
||||
impl Into<[[f32; 4]; 4]> for m4 {
|
||||
fn into(self) -> [[f32; 4]; 4] {
|
||||
[
|
||||
[self.x00, self.x01, self.x02, self.x03],
|
||||
[self.x10, self.x11, self.x12, self.x13],
|
||||
|
|
@ -671,3 +883,46 @@ impl Into<[[f32;4];4]> for m4 {
|
|||
]
|
||||
}
|
||||
}
|
||||
|
||||
impl LinearTransformation for m2 {
|
||||
fn det(&self) -> f32 {
|
||||
self.x00 * self.x11 - self.x01 * self.x10
|
||||
}
|
||||
}
|
||||
|
||||
impl LinearTransformation for m3 {
|
||||
fn det(&self) -> f32 {
|
||||
self.x00 * (self.x11 * self.x22 - self.x12 * self.x21)
|
||||
- self.x01 * (self.x10 * self.x22 - self.x12 * self.x20)
|
||||
+ self.x02 * (self.x10 * self.x21 - self.x11 * self.x20)
|
||||
}
|
||||
}
|
||||
|
||||
impl LinearTransformation for m4 {
|
||||
fn det(&self) -> f32 {
|
||||
self.x00 * self.x11 * self.x22 * self.x33
|
||||
+ self.x00 * self.x12 * self.x23 * self.x31
|
||||
+ self.x00 * self.x13 * self.x21 * self.x32
|
||||
+ self.x01 * self.x10 * self.x23 * self.x32
|
||||
+ self.x01 * self.x12 * self.x20 * self.x33
|
||||
+ self.x01 * self.x13 * self.x22 * self.x30
|
||||
+ self.x02 * self.x10 * self.x21 * self.x33
|
||||
+ self.x02 * self.x11 * self.x23 * self.x30
|
||||
+ self.x02 * self.x13 * self.x20 * self.x31
|
||||
+ self.x03 * self.x10 * self.x22 * self.x31
|
||||
+ self.x03 * self.x11 * self.x20 * self.x32
|
||||
+ self.x03 * self.x12 * self.x21 * self.x30
|
||||
- self.x00 * self.x11 * self.x23 * self.x32
|
||||
- self.x00 * self.x12 * self.x21 * self.x33
|
||||
- self.x00 * self.x13 * self.x22 * self.x31
|
||||
- self.x01 * self.x10 * self.x22 * self.x33
|
||||
- self.x01 * self.x12 * self.x23 * self.x30
|
||||
- self.x01 * self.x13 * self.x20 * self.x32
|
||||
- self.x02 * self.x10 * self.x23 * self.x31
|
||||
- self.x02 * self.x11 * self.x20 * self.x33
|
||||
- self.x02 * self.x13 * self.x21 * self.x30
|
||||
- self.x03 * self.x10 * self.x21 * self.x32
|
||||
- self.x03 * self.x11 * self.x22 * self.x30
|
||||
- self.x03 * self.x12 * self.x20 * self.x31
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue