primeret/retrotool
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/retrotool.git synced 2026-07-12 18:18:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix overlapping vertex attributes

Browse Source
This commit is contained in:
Luke Street
2023-03-05 18:39:36 -05:00
parent 779f261df8
commit 1cd80232e8
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
retrotool/src/cmd/cmdl.rs
+16 -15
View File
@@ -174,32 +174,33 @@ fn convert(args: ConvertArgs) -> Result<()> {
continue;
}
let mut reader = Cursor::new(&*buf);
let mut new_buf: Vec<u8> =
Vec::with_capacity(info.vertex_count as usize * info.out_stride as usize);
let mut reader = Cursor::new(&**buf);
let mut out_buf: Vec<u8> = vec![0; info.vertex_count as usize * info.out_stride as usize];
let mut w = Cursor::new(&mut *out_buf);
let mut tmp_buf = vec![0u8; 16]; // max size of attribute
let mut in_buf = vec![0u8; info.in_stride as usize];
for _ in 0..info.vertex_count as usize {
reader.read_exact(&mut in_buf)?;
let mut r = Cursor::new(&*in_buf);
for attribute in &info.attributes {
r.set_position(attribute.in_offset as u64);
if attribute.in_format == attribute.out_format {
let tmp = &mut tmp_buf[0..attribute.in_size as usize];
reader.read_exact(tmp)?;
new_buf.write_all(tmp)?;
r.read_exact(tmp)?;
w.write_all(tmp)?;
} else {
match (attribute.in_format, attribute.out_format) {
(EVertexDataFormat::R16Float, EVertexDataFormat::R32Float) => {
let tmp: R16F = reader.read_type(Endian::Little)?;
Cursor::new(&mut tmp_buf).write_type(&tmp, Endian::Little)?;
new_buf.write_all(&tmp_buf[0..4])?;
let tmp: R16F = r.read_type(Endian::Little)?;
w.write_type(&tmp, Endian::Little)?;
}
(EVertexDataFormat::Rg16Float, EVertexDataFormat::Rg32Float) => {
let tmp: Rg16F = reader.read_type(Endian::Little)?;
Cursor::new(&mut tmp_buf).write_type(&tmp, Endian::Little)?;
new_buf.write_all(&tmp_buf[0..8])?;
let tmp: Rg16F = r.read_type(Endian::Little)?;
w.write_type(&tmp, Endian::Little)?;
}
(EVertexDataFormat::Rgba16Float, EVertexDataFormat::Rgba32Float) => {
let tmp: Rgba16F = reader.read_type(Endian::Little)?;
Cursor::new(&mut tmp_buf).write_type(&tmp, Endian::Little)?;
new_buf.write_all(&tmp_buf[0..16])?;
let tmp: Rgba16F = r.read_type(Endian::Little)?;
w.write_type(&tmp, Endian::Little)?;
}
(in_format, out_format) => {
todo!("Convertion from {in_format:?} => {out_format:?}")
@@ -208,7 +209,7 @@ fn convert(args: ConvertArgs) -> Result<()> {
}
}
}
*buf = new_buf;
*buf = out_buf;
}
DirBuilder::new().recursive(true).create(&args.out_dir)?;