StrafesNET/strafe-project
6
Fork 4
Code Issues 1 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Drop Unit64, Angle64. Disable Unit32 for now

Browse Source
This commit is contained in:
Quaternions 2023-10-13 14:11:37 -07:00
parent fcf4d05baa
commit 4d62042549
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/integer.rs
View File

@ -236,15 +236,6 @@ impl std::ops::Mul<i64> for Ratio64Vec2{
} }
} }
///[-1.0,1.0] = [-2^30,2^30]
pub struct Unit32(i32);
impl Unit32{
#[inline]
pub fn as_planar64(&self) -> Planar64{
Planar64(4*(self.0 as i64))
}
}
///[-pi,pi) = [-2^31,2^31-1] ///[-pi,pi) = [-2^31,2^31-1]
#[derive(Clone,Copy,Hash)] #[derive(Clone,Copy,Hash)]
pub struct Angle32(i32); pub struct Angle32(i32);
@ -286,6 +277,7 @@ impl Angle32{
.wrapping_add(midpoint) .wrapping_add(midpoint)
) )
} }
/*
#[inline] #[inline]
pub fn cos(&self)->Unit32{ pub fn cos(&self)->Unit32{
//TODO: fix this rounding towards 0 //TODO: fix this rounding towards 0
@ -296,6 +288,7 @@ impl Angle32{
//TODO: fix this rounding towards 0 //TODO: fix this rounding towards 0
Unit32(unsafe{((self.0 as f64*(std::f64::consts::PI/((1<<31) as f64))).sin()*((1<<30) as f64)).to_int_unchecked()}) Unit32(unsafe{((self.0 as f64*(std::f64::consts::PI/((1<<31) as f64))).sin()*((1<<30) as f64)).to_int_unchecked()})
} }
*/
} }
impl Into<f32> for Angle32{ impl Into<f32> for Angle32{
fn into(self)->f32{ fn into(self)->f32{
@ -338,35 +331,30 @@ impl std::ops::Mul<Angle32> for Angle32{
Angle32(self.0.wrapping_mul(rhs.0)) Angle32(self.0.wrapping_mul(rhs.0))
} }
} }
///[-pi,pi) = [-2^31,2^31-1]
pub struct Angle32Vec2(glam::IVec2); /* Unit type unused for now, may revive it for map files
impl Angle32Vec2{ ///[-1.0,1.0] = [-2^30,2^30]
//? pub struct Unit32(i32);
impl Unit32{
#[inline]
pub fn as_planar64(&self) -> Planar64{
Planar64(4*(self.0 as i64))
}
} }
///[-1.0,1.0] = [-2^30,2^30] ///[-1.0,1.0] = [-2^30,2^30]
pub struct Unit32Vec3(glam::IVec3); pub struct Unit32Vec3(glam::IVec3);
///[-1.0,1.0] = [-2^30,2^30] impl TryFrom<[f32;3]> for Unit32Vec3{
pub struct Unit32Mat3{ type Error=Unit32TryFromFloatError;
x_axis:Unit32Vec3, fn try_from(value:[f32;3])->Result<Self,Self::Error>{
y_axis:Unit32Vec3, Ok(Self(glam::ivec3(
z_axis:Unit32Vec3, Unit32::try_from(Planar64::try_from(value[0])?)?.0,
Unit32::try_from(Planar64::try_from(value[1])?)?.0,
Unit32::try_from(Planar64::try_from(value[2])?)?.0,
)))
}
} }
*/
///[-1.0,1.0] = [-2^62,2^62]
pub struct Unit64(i64);
///[-pi,pi) = [-2^63,2^63-1]
pub struct Angle64(i64);
///[-1.0,1.0] = [-2^62,2^62]
pub struct Unit64Vec3(glam::IVec3);
///[-1.0,1.0] = [-2^62,2^62]
pub struct Unit64Mat3{
x_axis:Unit64Vec3,
y_axis:Unit64Vec3,
z_axis:Unit64Vec3,
}
///[-1.0,1.0] = [-2^32,2^32] ///[-1.0,1.0] = [-2^32,2^32]
#[derive(Clone,Copy,Hash,Eq,Ord,PartialEq,PartialOrd)] #[derive(Clone,Copy,Hash,Eq,Ord,PartialEq,PartialOrd)]