Skip to content

Generic byte_mesh_file_map argument in init_from_mem #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swz-git wants to merge 2 commits into
base: v3-rust
Choose a base branch
from
Open

Generic byte_mesh_file_map argument in init_from_mem #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
990f19d
generic `byte_mesh_file_map` argument in `init_from_mem`
swz-git Jul 18, 2026
6d7d023
avoid unnecessary `.collect()` on iter.
swz-git Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions rocketsim/src/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ fn init_from_path(collision_meshes_folder: &Path, silent: bool) -> IoResult<()>
init_from_mem(mesh_file_map, silent)
}

pub fn init_from_mem(
byte_mesh_file_map: FxHashMap<GameMode, Vec<Vec<u8>>>,
silent: bool,
) -> IoResult<()> {
pub fn init_from_mem<I, V, B>(byte_mesh_file_map: I, silent: bool) -> IoResult<()>
where
I: IntoIterator<Item = (GameMode, V)>,
V: IntoIterator<Item = B>,
B: AsRef<[u8]>,
{
if !silent {
let _ = logging::try_init();
}
Expand All @@ -123,17 +125,19 @@ pub fn init_from_mem(
for (game_mode, byte_mesh_files) in byte_mesh_file_map {
info!("Loading arena meshes for {}...", game_mode.name());

if byte_mesh_files.is_empty() {
let mut byte_mesh_files = byte_mesh_files.into_iter().peekable();

if byte_mesh_files.peek().is_none() {
info!("\tNo meshes, skipping");
continue;
}

let mut meshes = Vec::with_capacity(byte_mesh_files.len());
let mut mesh_files = Vec::with_capacity(byte_mesh_files.len());
let mut meshes = Vec::new();
let mut mesh_files = Vec::new();
let mut target_hashes = game_mode.get_hashes();

for (i, entry) in byte_mesh_files.into_iter().enumerate() {
let mesh_file = CollisionMeshFile::read_from_bytes(&entry)?;
for (i, entry) in byte_mesh_files.enumerate() {
let mesh_file = CollisionMeshFile::read_from_bytes(entry.as_ref())?;
let hash = mesh_file.get_hash();
let Some(hash_count) = target_hashes.get_mut(&hash) else {
warn!(
Expand Down