redstrate/physis
1
Fork 0
mirror of https://github.com/redstrate/Physis.git synced 2025-04-21 20:27:46 +00:00
Code Activity

Fix rounding errors

Browse source 
Now model files can be read and written and are (almost) identical!
There's some mysterious padding issues yet to solve, but that's only at
the end of the file.
This commit is contained in:
Joshua Goins 2023-11-24 08:16:03 -05:00
parent 5f7dd355cf
commit cf79810dc9
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/model.rs
View file

@ -740,19 +740,19 @@ impl MDL {
} }
Some([ Some([
round(f32::from(cursor.read_le::<u8>().ok()?) / 255.0), (f32::from(cursor.read_le::<u8>().ok()?) / 255.0),
round(f32::from(cursor.read_le::<u8>().ok()?) / 255.0), (f32::from(cursor.read_le::<u8>().ok()?) / 255.0),
round(f32::from(cursor.read_le::<u8>().ok()?) / 255.0), (f32::from(cursor.read_le::<u8>().ok()?) / 255.0),
round(f32::from(cursor.read_le::<u8>().ok()?) / 255.0) (f32::from(cursor.read_le::<u8>().ok()?) / 255.0)
]) ])
} }
fn write_byte_float4<T: BinWriterExt>(cursor: &mut T, vec: &[f32; 4]) -> BinResult<()> { fn write_byte_float4<T: BinWriterExt>(cursor: &mut T, vec: &[f32; 4]) -> BinResult<()> {
cursor.write_le::<[u8; 4]>(&[ cursor.write_le::<[u8; 4]>(&[
(vec[0] * 255.0) as u8, (vec[0] * 255.0).round() as u8,
(vec[1] * 255.0) as u8, (vec[1] * 255.0).round() as u8,
(vec[2] * 255.0) as u8, (vec[2] * 255.0).round() as u8,
(vec[3] * 255.0) as u8]) (vec[3] * 255.0).round() as u8])
} }
fn read_half4(cursor: &mut Cursor<ByteSpan>) -> Option<[f32; 4]> { fn read_half4(cursor: &mut Cursor<ByteSpan>) -> Option<[f32; 4]> {
@ -809,6 +809,14 @@ mod tests {
use std::io::Cursor; use std::io::Cursor;
use crate::model::MDL; use crate::model::MDL;
macro_rules! assert_delta {
($x:expr, $y:expr, $d:expr) => {
for i in 0..4 {
if !($x[i] - $y[i] < $d || $y[i] - $x[i] < $d) { panic!(); }
}
}
}
#[test] #[test]
fn byte_float4() { fn byte_float4() {
let a = [0.0, 1.0, 0.5, 0.25]; let a = [0.0, 1.0, 0.5, 0.25];
@ -819,7 +827,9 @@ mod tests {
MDL::write_byte_float4(&mut cursor, &a).unwrap(); MDL::write_byte_float4(&mut cursor, &a).unwrap();
let mut read_cursor = Cursor::new(v.as_slice()); let mut read_cursor = Cursor::new(v.as_slice());
assert_eq!(MDL::read_byte_float4(&mut read_cursor).unwrap(), a);
let b = MDL::read_byte_float4(&mut read_cursor).unwrap();
assert_delta!(b, a, 0.1);
} }
#[test] #[test]