From efab61a45c8837d3c2aaec464d8f6243fecb7a38 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 19 Feb 2026 09:46:23 +0000 Subject: feat(render-core): add default UV scale and refactor UV mapping logic - Introduced a constant `DEFAULT_UV_SCALE` for UV scaling. - Refactored UV mapping in `build_render_mesh` to use the new constant. - Simplified `compute_bounds` functions by extracting common logic into `compute_bounds_impl`. test(render-core): add tests for rendering with empty and multi-node models - Added tests to verify behavior when building render meshes from models with no slots and multiple nodes. - Ensured UV scaling is correctly applied in tests. feat(render-demo): add FOV argument and improve error handling - Added a `--fov` command-line argument to set the field of view. - Enhanced error messages for texture resolution failures. - Updated MVP computation to use the new FOV parameter. fix(rsli): improve error handling in LZH decompression - Added checks to prevent out-of-bounds access in LZH decoding logic. refactor(texm): streamline texture parsing and decoding tests - Created a helper function `build_texm_payload` for constructing test payloads. - Added tests for various texture formats including RGB565, RGB556, ARGB4444, and Luminance Alpha. - Improved error handling for invalid TEXM headers and mip bounds. --- crates/msh-core/src/lib.rs | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'crates/msh-core/src/lib.rs') diff --git a/crates/msh-core/src/lib.rs b/crates/msh-core/src/lib.rs index 84e8a86..1a50fb7 100644 --- a/crates/msh-core/src/lib.rs +++ b/crates/msh-core/src/lib.rs @@ -164,6 +164,8 @@ pub fn parse_model_payload(payload: &[u8]) -> Result { let positions = parse_positions(&res3.bytes)?; let indices = parse_u16_array(&res6.bytes, "Res6")?; let batches = parse_batches(&res13.bytes)?; + validate_slot_batch_ranges(&slots, batches.len())?; + validate_batch_index_ranges(&batches, indices.len())?; let normals = match res4 { Some(raw) => Some(parse_i8x4_array(&raw.bytes, "Res4")?), @@ -192,6 +194,40 @@ pub fn parse_model_payload(payload: &[u8]) -> Result { }) } +fn validate_slot_batch_ranges(slots: &[Slot], batch_count: usize) -> Result<()> { + for slot in slots { + let start = usize::from(slot.batch_start); + let end = start + .checked_add(usize::from(slot.batch_count)) + .ok_or(Error::IntegerOverflow)?; + if end > batch_count { + return Err(Error::IndexOutOfBounds { + label: "Res2.batch_range", + index: end, + limit: batch_count, + }); + } + } + Ok(()) +} + +fn validate_batch_index_ranges(batches: &[Batch], index_count: usize) -> Result<()> { + for batch in batches { + let start = usize::try_from(batch.index_start).map_err(|_| Error::IntegerOverflow)?; + let end = start + .checked_add(usize::from(batch.index_count)) + .ok_or(Error::IntegerOverflow)?; + if end > index_count { + return Err(Error::IndexOutOfBounds { + label: "Res13.index_range", + index: end, + limit: index_count, + }); + } + } + Ok(()) +} + fn parse_positions(data: &[u8]) -> Result> { if !data.len().is_multiple_of(12) { return Err(Error::InvalidResourceSize { -- cgit v1.2.3