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

Move model stuff to it's own module

Browse source
This commit is contained in:
Joshua Goins 2025-04-28 16:57:02 -04:00
parent aae0055966
commit 61a24971c2
5 changed files with 49 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/exd.rs
View file

@ -3,12 +3,12 @@
use std::io::{BufWriter, Cursor, Read, Seek, SeekFrom, Write};
use binrw::{binrw, BinResult, BinWrite};
use binrw::{BinRead, Endian};
use binrw::{BinResult, BinWrite, binrw};
use crate::{ByteBuffer, ByteSpan};
use crate::common::Language;
use crate::exh::{ColumnDataType, EXH, ExcelColumnDefinition, ExcelDataPagination};
use crate::{ByteBuffer, ByteSpan};
#[binrw]
#[brw(magic = b"EXDF")]
@ -74,8 +74,7 @@ fn parse_rows(exh: &EXH, data_offsets: &Vec<ExcelDataOffset>) -> BinResult<Vec<E
let new_row = if row_header.row_count > 1 {
let mut rows = Vec::new();
for i in 0..row_header.row_count {
let subrow_offset =
data_offset + (i * exh.header.data_offset + 2 * (i + 1)) as u32;
let subrow_offset = data_offset + (i * exh.header.data_offset + 2 * (i + 1)) as u32;
rows.push(read_row(subrow_offset).unwrap());
}
@ -85,7 +84,7 @@ fn parse_rows(exh: &EXH, data_offsets: &Vec<ExcelDataOffset>) -> BinResult<Vec<E
};
rows.push(ExcelRow {
row_id: offset.row_id,
kind: new_row
kind: new_row,
});
}
@ -93,25 +92,26 @@ fn parse_rows(exh: &EXH, data_offsets: &Vec<ExcelDataOffset>) -> BinResult<Vec<E
}
#[binrw::writer(writer)]
fn write_rows(
rows: &Vec<ExcelRow>,
exh: &EXH,
) -> BinResult<()> {
fn write_rows(rows: &Vec<ExcelRow>, exh: &EXH) -> BinResult<()> {
// seek past the data offsets, which we will write later
let data_offsets_pos = writer.stream_position().unwrap();
writer.seek(SeekFrom::Current((core::mem::size_of::<ExcelDataOffset>() * rows.len()) as i64)).unwrap();
writer
.seek(SeekFrom::Current(
(core::mem::size_of::<ExcelDataOffset>() * rows.len()) as i64,
))
.unwrap();
let mut data_offsets = Vec::new();
for row in rows {
data_offsets.push(ExcelDataOffset {
row_id: row.row_id,
offset: writer.stream_position().unwrap() as u32
offset: writer.stream_position().unwrap() as u32,
});
let row_header = ExcelDataRowHeader {
data_size: 0,
row_count: 0
row_count: 0,
};
row_header.write(writer).unwrap();
@ -129,7 +129,7 @@ fn write_rows(
for row in excel_single_rows {
write_row(row);
}
},
}
}
}
@ -141,7 +141,7 @@ fn write_rows(
ColumnData::String(val) => {
let bytes = val.as_bytes();
bytes.write(writer).unwrap();
},
}
_ => {}
}
}
@ -153,7 +153,7 @@ fn write_rows(
for row in excel_single_rows {
write_row_strings(row);
}
},
}
}
}
@ -208,7 +208,7 @@ pub struct ExcelSingleRow {
#[derive(Debug)]
pub enum ExcelRowKind {
SingleRow(ExcelSingleRow),
SubRows(Vec<ExcelSingleRow>)
SubRows(Vec<ExcelSingleRow>),
}
#[derive(Debug)]
@ -272,12 +272,20 @@ impl EXD {
ColumnDataType::Int8 => Some(ColumnData::Int8(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt8 => Some(ColumnData::UInt8(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::Int16 => Some(ColumnData::Int16(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt16 => Some(ColumnData::UInt16(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt16 => {
Some(ColumnData::UInt16(Self::read_data_raw(cursor).unwrap()))
}
ColumnDataType::Int32 => Some(ColumnData::Int32(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt32 => Some(ColumnData::UInt32(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::Float32 => Some(ColumnData::Float32(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt32 => {
Some(ColumnData::UInt32(Self::read_data_raw(cursor).unwrap()))
}
ColumnDataType::Float32 => {
Some(ColumnData::Float32(Self::read_data_raw(cursor).unwrap()))
}
ColumnDataType::Int64 => Some(ColumnData::Int64(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt64 => Some(ColumnData::UInt64(Self::read_data_raw(cursor).unwrap())),
ColumnDataType::UInt64 => {
Some(ColumnData::UInt64(Self::read_data_raw(cursor).unwrap()))
}
ColumnDataType::PackedBool0 => Some(ColumnData::Bool(read_packed_bool(0))),
ColumnDataType::PackedBool1 => Some(ColumnData::Bool(read_packed_bool(1))),
ColumnDataType::PackedBool2 => Some(ColumnData::Bool(read_packed_bool(2))),
@ -307,9 +315,8 @@ impl EXD {
ColumnData::String(_) => {
let string_offset = 0u32; // TODO, but 0 is fine for single string column data
Self::write_data_raw(cursor, &string_offset);
},
ColumnData::Bool(val) => {
match column_definition.data_type {
}
ColumnData::Bool(val) => match column_definition.data_type {
ColumnDataType::Bool => todo!(),
ColumnDataType::PackedBool0 => write_packed_bool(cursor, 0, val),
ColumnDataType::PackedBool1 => write_packed_bool(cursor, 1, val),
@ -319,8 +326,7 @@ impl EXD {
ColumnDataType::PackedBool5 => write_packed_bool(cursor, 5, val),
ColumnDataType::PackedBool6 => write_packed_bool(cursor, 6, val),
ColumnDataType::PackedBool7 => write_packed_bool(cursor, 7, val),
_ => panic!("This makes no sense!")
}
_ => panic!("This makes no sense!"),
},
ColumnData::Int8(val) => Self::write_data_raw(cursor, val),
ColumnData::UInt8(val) => Self::write_data_raw(cursor, val),

4
src/lib.rs
View file

@ -90,10 +90,6 @@ pub mod pbd;
mod crc;
mod sha1;
mod model_file_operations;
pub mod model_vertex_declarations;
/// Reading layer information for a map (LGB)
pub mod layer;

0
src/model_file_operations.rs → src/model/file_operations.rs
View file

8
src/model.rs → src/model/mod.rs
View file

@ -3,6 +3,10 @@
#![allow(clippy::unnecessary_fallible_conversions)] // This wrongly trips on binrw code
mod file_operations;
pub mod vertex_declarations;
use std::io::{Cursor, Seek, SeekFrom};
use std::mem::size_of;
@ -11,11 +15,11 @@ use binrw::BinReaderExt;
use binrw::{BinWrite, BinWriterExt, binrw};
use crate::common_file_operations::{read_bool_from, write_bool_as};
use crate::model_vertex_declarations::{
use crate::{ByteBuffer, ByteSpan};
use vertex_declarations::{
VERTEX_ELEMENT_SIZE, VertexDeclaration, VertexType, VertexUsage, vertex_element_parser,
vertex_element_writer,
};
use crate::{ByteBuffer, ByteSpan};
pub const NUM_VERTICES: u32 = 17;

0
src/model_vertex_declarations.rs → src/model/vertex_declarations.rs
View file