test map loading speed

This reverts commit 65b49d2726.

Cargo.toml

@@ -1,10 +1,5 @@
 [workspace]
 members = [
-	"engine/graphics",
-	"engine/physics",
-	"engine/session",
-	"engine/settings",
-	"integration-testing",
 	"lib/bsp_loader",
 	"lib/common",
 	"lib/deferred_loader",
@@ -12,10 +7,8 @@ members = [
 	"lib/linear_ops",
 	"lib/ratio_ops",
 	"lib/rbx_loader",
-	"lib/rbxassetid",
 	"lib/roblox_emulator",
 	"lib/snf",
-	"map-tool",
 	"strafe-client",
 ]
 resolver = "2"

README.md

@@ -13,4 +13,4 @@ See [releases](https://git.itzana.me/StrafesNET/strafe-project/releases) for dow
 4. `cargo run --release --bin strafe-client`
 
 ## Licenses
-Each project has its own license.  Most crates are MIT/Apache but notably the Strafe Client and engine crates have a sole proprietor license.
+Each project has its own license.  Most crates are MIT/Apache but notably the Strafe Client has a sole proprietor license.

engine/graphics/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "strafesnet_graphics"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bytemuck = { version = "1.13.1", features = ["derive"] }
-ddsfile = "0.5.1"
-glam = "0.29.0"
-id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
-strafesnet_session = { path = "../session", registry = "strafesnet" }
-strafesnet_settings = { path = "../settings", registry = "strafesnet" }
-wgpu = "24.0.0"

engine/graphics/LICENSE

@@ -1,8 +0,0 @@
-/*******************************************************
-* Copyright (C) 2023-2024 Rhys Lloyd <krakow20@gmail.com>
-*
-* This file is part of the StrafesNET bhop/surf client.
-*
-* StrafesNET can not be copied and/or distributed
-* without the express permission of Rhys Lloyd
-*******************************************************/

engine/graphics/src/lib.rs

@@ -1,2 +0,0 @@
-pub mod model;
-pub mod graphics;

engine/physics/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "strafesnet_physics"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-arrayvec = "0.7.6"
-glam = "0.29.0"
-id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }

engine/physics/LICENSE

@@ -1,8 +0,0 @@
-/*******************************************************
-* Copyright (C) 2023-2024 Rhys Lloyd <krakow20@gmail.com>
-*
-* This file is part of the StrafesNET bhop/surf client.
-*
-* StrafesNET can not be copied and/or distributed
-* without the express permission of Rhys Lloyd
-*******************************************************/

engine/physics/src/lib.rs

@@ -1,45 +0,0 @@
-mod body;
-mod push_solve;
-mod face_crawler;
-mod model;
-
-pub mod physics;
-
-// Physics bug fixes can easily desync all bots.
-//
-// When replaying a bot, use the exact physics version which it was recorded with.
-//
-// When validating a new bot, ignore the version and use the latest version,
-// and overwrite the version in the file.
-//
-// Compatible physics versions should be determined
-// empirically at development time via leaderboard resimulation.
-//
-// Compatible physics versions should result in an identical leaderboard state,
-// or the only bots which fail are ones exploiting a surgically patched bug.
-#[derive(Clone,Copy,Hash,Debug,id::Id,Eq,PartialEq,Ord,PartialOrd)]
-pub struct PhysicsVersion(u32);
-pub const VERSION:PhysicsVersion=PhysicsVersion(0);
-const LATEST_COMPATIBLE_VERSION:[u32;1+VERSION.0 as usize]=const{
-	let compat=[0];
-
-	let mut input_version=0;
-	while input_version<compat.len(){
-		// compatible version must be greater than or equal to the input version
-		assert!(input_version as u32<=compat[input_version]);
-		// compatible version must be a version that exists
-		assert!(compat[input_version]<=VERSION.0);
-		input_version+=1;
-	}
-	compat
-};
-pub enum PhysicsVersionError{
-	UnknownPhysicsVersion,
-}
-pub const fn get_latest_compatible_version(PhysicsVersion(version):PhysicsVersion)->Result<PhysicsVersion,PhysicsVersionError>{
-	if (version as usize)<LATEST_COMPATIBLE_VERSION.len(){
-		Ok(PhysicsVersion(LATEST_COMPATIBLE_VERSION[version as usize]))
-	}else{
-		Err(PhysicsVersionError::UnknownPhysicsVersion)
-	}
-}

engine/session/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "strafesnet_session"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-glam = "0.29.0"
-replace_with = "0.1.7"
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
-strafesnet_physics = { path = "../physics", registry = "strafesnet" }
-strafesnet_settings = { path = "../settings", registry = "strafesnet" }
-strafesnet_snf = { path = "../../lib/snf", registry = "strafesnet" }

engine/session/LICENSE

@@ -1,8 +0,0 @@
-/*******************************************************
-* Copyright (C) 2023-2024 Rhys Lloyd <krakow20@gmail.com>
-*
-* This file is part of the StrafesNET bhop/surf client.
-*
-* StrafesNET can not be copied and/or distributed
-* without the express permission of Rhys Lloyd
-*******************************************************/

engine/session/src/lib.rs

@@ -1,2 +0,0 @@
-mod mouse_interpolator;
-pub mod session;

engine/settings/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "strafesnet_settings"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-configparser = "3.0.2"
-directories = "6.0.0"
-glam = "0.29.0"
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }

engine/settings/LICENSE

@@ -1,8 +0,0 @@
-/*******************************************************
-* Copyright (C) 2023-2024 Rhys Lloyd <krakow20@gmail.com>
-*
-* This file is part of the StrafesNET bhop/surf client.
-*
-* StrafesNET can not be copied and/or distributed
-* without the express permission of Rhys Lloyd
-*******************************************************/

engine/settings/src/directories.rs

@@ -1,32 +0,0 @@
-use std::path::PathBuf;
-
-use crate::settings::{UserSettings,load_user_settings};
-
-pub struct Directories{
-	pub settings:PathBuf,
-	pub maps:PathBuf,
-	pub replays:PathBuf,
-}
-impl Directories{
-	pub fn settings(&self)->UserSettings{
-		load_user_settings(&self.settings)
-	}
-	pub fn user()->Option<Self>{
-		let dirs=directories::ProjectDirs::from("net.strafes","StrafesNET","Strafe Client")?;
-		Some(Self{
-			settings:dirs.config_dir().join("settings.conf"),
-			maps:dirs.cache_dir().join("maps"),
-			// separate directory for remote downloaded replays (cache)
-			// bots:dirs.cache_dir().join("bots"),
-			replays:dirs.data_local_dir().join("replays"),
-		})
-	}
-	pub fn portable()->Result<Self,std::io::Error>{
-		let current_dir=std::env::current_dir()?;
-		Ok(Self{
-			settings:current_dir.join("settings.conf"),
-			maps:current_dir.join("maps"),
-			replays:current_dir.join("replays"),
-		})
-	}
-}

engine/settings/src/lib.rs

@@ -1,2 +0,0 @@
-pub mod settings;
-pub mod directories;

integration-testing/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "integration-testing"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-strafesnet_common = { path = "../lib/common", registry = "strafesnet" }
-strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
-strafesnet_snf = { path = "../lib/snf", registry = "strafesnet" }

integration-testing/src/main.rs

@@ -1,221 +0,0 @@
-
-use std::{io::{Cursor,Read},path::Path};
-
-use strafesnet_physics::physics::{PhysicsData,PhysicsState,PhysicsContext};
-
-fn main(){
-	test_determinism().unwrap();
-}
-
-#[allow(unused)]
-#[derive(Debug)]
-enum ReplayError{
-	IO(std::io::Error),
-	SNF(strafesnet_snf::Error),
-	SNFM(strafesnet_snf::map::Error),
-	SNFB(strafesnet_snf::bot::Error),
-}
-impl From<std::io::Error> for ReplayError{
-	fn from(value:std::io::Error)->Self{
-		Self::IO(value)
-	}
-}
-impl From<strafesnet_snf::Error> for ReplayError{
-	fn from(value:strafesnet_snf::Error)->Self{
-		Self::SNF(value)
-	}
-}
-impl From<strafesnet_snf::map::Error> for ReplayError{
-	fn from(value:strafesnet_snf::map::Error)->Self{
-		Self::SNFM(value)
-	}
-}
-impl From<strafesnet_snf::bot::Error> for ReplayError{
-	fn from(value:strafesnet_snf::bot::Error)->Self{
-		Self::SNFB(value)
-	}
-}
-
-fn read_entire_file(path:impl AsRef<Path>)->Result<Cursor<Vec<u8>>,std::io::Error>{
-	let mut file=std::fs::File::open(path)?;
-	let mut data=Vec::new();
-	file.read_to_end(&mut data)?;
-	Ok(Cursor::new(data))
-}
-
-fn run_replay()->Result<(),ReplayError>{
-	println!("loading map file..");
-	let data=read_entire_file("../tools/bhop_maps/5692113331.snfm")?;
-	let map=strafesnet_snf::read_map(data)?.into_complete_map()?;
-
-	println!("loading bot file..");
-	let data=read_entire_file("../tools/replays/535s+159764769ns.snfb")?;
-	let bot=strafesnet_snf::read_bot(data)?.read_all()?;
-
-	// create recording
-	let mut physics_data=PhysicsData::default();
-	println!("generating models..");
-	physics_data.generate_models(&map);
-	println!("simulating...");
-	let mut physics=PhysicsState::default();
-	for ins in bot.instructions{
-		PhysicsContext::run_input_instruction(&mut physics,&physics_data,ins);
-	}
-	match physics.get_finish_time(){
-		Some(time)=>println!("finish time:{}",time),
-		None=>println!("simulation did not end in finished state"),
-	}
-
-	Ok(())
-}
-enum DeterminismResult{
-	Deterministic,
-	NonDeterministic,
-}
-fn segment_determinism(bot:strafesnet_snf::bot::Segment,physics_data:&PhysicsData)->DeterminismResult{
-	// create default physics state
-	let mut physics_deterministic=PhysicsState::default();
-	// create a second physics state
-	let mut physics_filtered=PhysicsState::default();
-
-	// invent a new bot id and insert the replay
-	println!("simulating...");
-
-	let mut non_idle_count=0;
-
-	for (i,ins) in bot.instructions.into_iter().enumerate(){
-		let state_deterministic=physics_deterministic.clone();
-		let state_filtered=physics_filtered.clone();
-		PhysicsContext::run_input_instruction(&mut physics_deterministic,&physics_data,ins.clone());
-		match ins{
-			strafesnet_common::instruction::TimedInstruction{instruction:strafesnet_common::physics::Instruction::Idle,..}=>(),
-			other=>{
-				non_idle_count+=1;
-				// run
-				PhysicsContext::run_input_instruction(&mut physics_filtered,&physics_data,other.clone());
-				// check if position matches
-				let b0=physics_deterministic.camera_body();
-				let b1=physics_filtered.camera_body();
-				if b0.position!=b1.position{
-					println!("desync at instruction #{}",i);
-					println!("non idle instructions completed={non_idle_count}");
-					println!("instruction #{i}={:?}",other);
-					println!("deterministic state0:\n{state_deterministic:?}");
-					println!("filtered state0:\n{state_filtered:?}");
-					println!("deterministic state1:\n{:?}",physics_deterministic);
-					println!("filtered state1:\n{:?}",physics_filtered);
-					return DeterminismResult::NonDeterministic;
-				}
-			},
-		}
-	}
-	match physics_deterministic.get_finish_time(){
-		Some(time)=>println!("[with idle] finish time:{}",time),
-		None=>println!("[with idle] simulation did not end in finished state"),
-	}
-	match physics_filtered.get_finish_time(){
-		Some(time)=>println!("[filtered] finish time:{}",time),
-		None=>println!("[filtered] simulation did not end in finished state"),
-	}
-	DeterminismResult::Deterministic
-}
-type ThreadResult=Result<Option<DeterminismResult>,ReplayError>;
-fn read_and_run(file_path:std::path::PathBuf,physics_data:&PhysicsData)->ThreadResult{
-	let data=read_entire_file(file_path.as_path())?;
-	let bot=strafesnet_snf::read_bot(data)?.read_all()?;
-	println!("Running {:?}",file_path.file_stem());
-	Ok(Some(segment_determinism(bot,physics_data)))
-}
-fn do_thread<'a>(s:&'a std::thread::Scope<'a,'_>,file_path:std::path::PathBuf,send:std::sync::mpsc::Sender<ThreadResult>,physics_data:&'a PhysicsData){
-	s.spawn(move ||{
-		let result=read_and_run(file_path,physics_data);
-		// send when thread is complete
-		send.send(result).unwrap();
-	});
-}
-fn get_file_path(dir_entry:std::fs::DirEntry)->Result<Option<std::path::PathBuf>,std::io::Error>{
-	Ok(dir_entry.file_type()?.is_file().then_some(
-		dir_entry.path()
-	))
-}
-fn test_determinism()->Result<(),ReplayError>{
-	let thread_limit=std::thread::available_parallelism()?.get();
-	println!("loading map file..");
-	let data=read_entire_file("../tools/bhop_maps/5692113331.snfm")?;
-	let map=strafesnet_snf::read_map(data)?.into_complete_map()?;
-
-	let mut physics_data=PhysicsData::default();
-	println!("generating models..");
-	physics_data.generate_models(&map);
-
-	let (send,recv)=std::sync::mpsc::channel();
-
-	let mut read_dir=std::fs::read_dir("../tools/replays")?;
-
-	// promise that &physics_data will outlive the spawned threads
-	let thread_results=std::thread::scope(|s|{
-		let mut thread_results=Vec::new();
-
-		// spawn threads
-		println!("spawning up to {thread_limit} threads...");
-		let mut active_thread_count=0;
-		while active_thread_count<thread_limit{
-			if let Some(dir_entry_result)=read_dir.next(){
-				if let Some(file_path)=get_file_path(dir_entry_result?)?{
-					active_thread_count+=1;
-					do_thread(s,file_path,send.clone(),&physics_data);
-				}
-			}else{
-				break;
-			}
-		}
-
-		// spawn another thread every time a message is received from the channel
-		println!("riding parallelism wave...");
-		while let Some(dir_entry_result)=read_dir.next(){
-			if let Some(file_path)=get_file_path(dir_entry_result?)?{
-				// wait for a thread to complete
-				thread_results.push(recv.recv().unwrap());
-				do_thread(s,file_path,send.clone(),&physics_data);
-			}
-		}
-
-		// wait for remaining threads to complete
-		println!("waiting for all threads to complete...");
-		for _ in 0..active_thread_count{
-			thread_results.push(recv.recv().unwrap());
-		}
-
-		println!("done.");
-		Ok::<_,ReplayError>(thread_results)
-	})?;
-
-	// tally results
-	#[derive(Default)]
-	struct Totals{
-		deterministic:u32,
-		nondeterministic:u32,
-		invalid:u32,
-		error:u32,
-	}
-	let Totals{deterministic,nondeterministic,invalid,error}=thread_results.into_iter().fold(Totals::default(),|mut totals,result|{
-		match result{
-			Ok(Some(DeterminismResult::Deterministic))=>totals.deterministic+=1,
-			Ok(Some(DeterminismResult::NonDeterministic))=>totals.nondeterministic+=1,
-			Ok(None)=>totals.invalid+=1,
-			Err(_)=>totals.error+=1,
-		}
-		totals
-	});
-
-	println!("deterministic={deterministic}");
-	println!("nondeterministic={nondeterministic}");
-	println!("invalid={invalid}");
-	println!("error={error}");
-
-	assert!(nondeterministic==0);
-	assert!(invalid==0);
-	assert!(error==0);
-
-	Ok(())
-}

lib/bsp_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_bsp_loader"
-version = "0.3.0"
+version = "0.2.2"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -11,8 +11,6 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 glam = "0.29.0"
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.0", path = "../deferred_loader", registry = "strafesnet" }
-vbsp = { version = "0.7.0-codegen1", registry = "strafesnet" }
+strafesnet_common = { path = "../common", registry = "strafesnet" }
+vbsp = "0.6.0"
 vmdl = "0.2.0"
-vpk = "0.2.0"

lib/bsp_loader/src/brush.rs

@@ -1,321 +0,0 @@
-use strafesnet_common::integer::Planar64;
-use strafesnet_common::{model,integer};
-use strafesnet_common::integer::{vec3::Vector3,Fixed,Ratio};
-
-use crate::{valve_transform_normal,valve_transform_dist};
-
-#[derive(Hash,Eq,PartialEq)]
-struct Face{
-	normal:integer::Planar64Vec3,
-	dot:integer::Planar64,
-}
-
-#[derive(Debug)]
-struct Faces{
-	faces:Vec<Vec<integer::Planar64Vec3>>,
-}
-
-fn solve3(c0:&Face,c1:&Face,c2:&Face)->Option<Ratio<Vector3<Fixed<3,96>>,Fixed<3,96>>>{
-	let n0_n1=c0.normal.cross(c1.normal);
-	let det=c2.normal.dot(n0_n1);
-	if det.abs().is_zero(){
-		return None;
-	}
-	Some((
-		c1.normal.cross(c2.normal)*c0.dot
-		+c2.normal.cross(c0.normal)*c1.dot
-		+c0.normal.cross(c1.normal)*c2.dot
-	)/det)
-}
-
-#[derive(Debug)]
-pub enum PlanesToFacesError{
-	InitFace1,
-	InitFace2,
-	InitIntersection,
-	FindNewIntersection,
-	EmptyFaces,
-	InfiniteLoop1,
-	InfiniteLoop2,
-}
-impl std::fmt::Display for PlanesToFacesError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl core::error::Error for PlanesToFacesError{}
-
-fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,PlanesToFacesError>{
-	let mut faces=Vec::new();
-	// for each face, determine one edge at a time until you complete the face
-	'face: for face0 in &face_list{
-		// 1. find first edge
-		// 2. follow edges around face
-
-		// === finding first edge ===
-		// 1. pick the most perpendicular set of 3 faces
-		// 2. check if any faces occlude the intersection
-		// 3. use this test to replace left and right alternating until they are not occluded
-
-		// find the most perpendicular face to face0
-		let mut face1=face_list.iter().min_by_key(|&p|{
-			face0.normal.dot(p.normal).abs()
-		}).ok_or(PlanesToFacesError::InitFace1)?;
-
-		// direction of edge formed by face0 x face1
-		let edge_dir=face0.normal.cross(face1.normal);
-
-		// find the most perpendicular face to both face0 and face1
-		let mut face2=face_list.iter().max_by_key(|&p|{
-			// find the best *oriented* face (no .abs())
-			edge_dir.dot(p.normal)
-		}).ok_or(PlanesToFacesError::InitFace2)?;
-
-		let mut detect_loop=200u8;
-
-		let mut intersection=solve3(face0,face1,face2).ok_or(PlanesToFacesError::InitIntersection)?;
-
-		// repeatedly update face0, face1 until all faces form part of the convex solid
-		'find: loop{
-			if let Some(a)=detect_loop.checked_sub(1){
-				detect_loop=a;
-			}else{
-				return Err(PlanesToFacesError::InfiniteLoop1);
-			}
-			// test if any *other* faces occlude the intersection
-			for new_face in &face_list{
-				// new face occludes intersection point
-				if (new_face.dot.fix_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
-					// replace one of the faces with the new face
-					// dont' try to replace face0 because we are exploring that face in particular
-					if let Some(new_intersection)=solve3(face0,new_face,face2){
-						// face1 does not occlude (or intersect) the new intersection
-						if (face1.dot.fix_2()/Planar64::ONE).gt_ratio(face1.normal.dot(new_intersection.num)/new_intersection.den){
-							face1=new_face;
-							intersection=new_intersection;
-							continue 'find;
-						}
-					}
-					if let Some(new_intersection)=solve3(face0,face1,new_face){
-						// face2 does not occlude (or intersect) the new intersection
-						if (face2.dot.fix_2()/Planar64::ONE).gt_ratio(face2.normal.dot(new_intersection.num)/new_intersection.den){
-							face2=new_face;
-							intersection=new_intersection;
-							continue 'find;
-						}
-					}
-				}
-			}
-
-			// we have found a set of faces for which the intersection is on the convex solid
-			break 'find;
-		}
-
-		// check if face0 must go, meaning it is a degenerate face and does not contribute anything to the convex solid
-		for new_face in &face_list{
-			if core::ptr::eq(face0,new_face){
-				continue;
-			}
-			if core::ptr::eq(face1,new_face){
-				continue;
-			}
-			if core::ptr::eq(face2,new_face){
-				continue;
-			}
-			if let Some(new_intersection)=solve3(new_face,face1,face2){
-				// face0 does not occlude (or intersect) the new intersection
-				if (face0.dot.fix_2()/Planar64::ONE).lt_ratio(face0.normal.dot(new_intersection.num)/new_intersection.den){
-					// abort! reject face0 entirely
-					continue 'face;
-				}
-			}
-		}
-
-		// === follow edges around face ===
-		// Note that we chose face2 such that the 3 faces create a particular winding order.
-		// If we choose a consistent face to follow (face1, face2) it will always wind with a consistent chirality
-
-		let mut detect_loop=200u8;
-
-		// keep looping until we meet this face again
-		let face1=face1;
-		let mut face=Vec::new();
-		loop{
-			// push point onto vertices
-			// problem: this may push a vertex that does not fit in the fixed point range and is thus meaningless
-			face.push(intersection.divide().fix_1());
-
-			// we looped back around to face1, we're done!
-			if core::ptr::eq(face1,face2){
-				break;
-			}
-
-			// the measure
-			let edge_dir=face0.normal.cross(face2.normal);
-
-			// the dot product to beat
-			let d_intersection=edge_dir.dot(intersection.num)/intersection.den;
-
-			// find the next face moving clockwise around face0
-			let (new_face,new_intersection,_)=face_list.iter().filter_map(|new_face|{
-				// ignore faces that are part of the current edge
-				if core::ptr::eq(face0,new_face)
-				  |core::ptr::eq(face2,new_face){
-					return None;
-				}
-				let new_intersection=solve3(face0,face2,new_face)?;
-
-				// the d value must be larger
-				let d_new_intersection=edge_dir.dot(new_intersection.num)/new_intersection.den;
-				if d_new_intersection.le_ratio(d_intersection){
-					return None;
-				}
-
-				Some((new_face,new_intersection,d_new_intersection))
-			}).min_by_key(|&(_,_,d)|d).ok_or(PlanesToFacesError::FindNewIntersection)?;
-
-			face2=new_face;
-			intersection=new_intersection;
-
-			if let Some(a)=detect_loop.checked_sub(1){
-				detect_loop=a;
-			}else{
-				return Err(PlanesToFacesError::InfiniteLoop2);
-			}
-		}
-
-		faces.push(face);
-	}
-
-	if faces.is_empty(){
-		Err(PlanesToFacesError::EmptyFaces)
-	}else{
-		Ok(Faces{
-			faces,
-		})
-	}
-}
-
-#[derive(Debug)]
-pub enum BrushToMeshError{
-	SliceBrushSides,
-	MissingPlane,
-	InvalidFaceCount{
-		count:usize,
-	},
-	InvalidPlanes(PlanesToFacesError),
-	SkipBecauseTexture,
-}
-impl std::fmt::Display for BrushToMeshError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl core::error::Error for BrushToMeshError{}
-
-pub fn faces_to_mesh(faces:Vec<Vec<integer::Planar64Vec3>>)->model::Mesh{
-	// generate the mesh
-	let mut mb=model::MeshBuilder::new();
-	let color=mb.acquire_color_id(glam::Vec4::ONE);
-	let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
-	// normals are ignored by physics
-	let normal=mb.acquire_normal_id(integer::vec3::ZERO);
-
-	let polygon_list=faces.into_iter().map(|face|{
-		face.into_iter().map(|pos|{
-			let pos=mb.acquire_pos_id(pos);
-			mb.acquire_vertex_id(model::IndexedVertex{
-				pos,
-				tex,
-				normal,
-				color,
-			})
-		}).collect()
-	}).collect();
-
-	let polygon_groups=vec![model::PolygonGroup::PolygonList(model::PolygonList::new(polygon_list))];
-	let physics_groups=vec![model::IndexedPhysicsGroup{
-		groups:vec![model::PolygonGroupId::new(0)],
-	}];
-	let graphics_groups=vec![];
-
-	mb.build(polygon_groups,graphics_groups,physics_groups)
-}
-
-pub fn brush_to_mesh(bsp:&vbsp::Bsp,brush:&vbsp::Brush)->Result<model::Mesh,BrushToMeshError>{
-	let brush_start_idx=brush.brush_side as usize;
-	let sides_range=brush_start_idx..brush_start_idx+brush.num_brush_sides as usize;
-	let sides=bsp.brush_sides.get(sides_range).ok_or(BrushToMeshError::SliceBrushSides)?;
-	for side in sides{
-		if let Some(texture_info)=bsp.textures_info.get(side.texture_info as usize){
-			let texture_info=vbsp::Handle::new(bsp,texture_info);
-			let s=texture_info.name();
-			if s.starts_with("tools/")||s.starts_with("TOOLS/"){
-				return Err(BrushToMeshError::SkipBecauseTexture);
-			}
-		}
-	}
-	let face_list=sides.iter().filter(|side|side.bevel==0).map(|side|{
-		let plane=bsp.plane(side.plane as usize)?;
-		Some(Face{
-			normal:valve_transform_normal(plane.normal.into()),
-			dot:valve_transform_dist(plane.dist.into()),
-		})
-	}).collect::<Option<std::collections::HashSet<_>>>().ok_or(BrushToMeshError::MissingPlane)?;
-
-	if face_list.len()<4{
-		return Err(BrushToMeshError::InvalidFaceCount{count:face_list.len()});
-	}
-
-	let faces=planes_to_faces(face_list).map_err(BrushToMeshError::InvalidPlanes)?;
-
-	let mesh=faces_to_mesh(faces.faces);
-
-	Ok(mesh)
-}
-
-pub fn unit_cube()->model::Mesh{
-	let face_list=[
-		Face{normal:integer::vec3::X,dot:Planar64::ONE},
-		Face{normal:integer::vec3::Y,dot:Planar64::ONE},
-		Face{normal:integer::vec3::Z,dot:Planar64::ONE},
-		Face{normal:integer::vec3::NEG_X,dot:Planar64::ONE},
-		Face{normal:integer::vec3::NEG_Y,dot:Planar64::ONE},
-		Face{normal:integer::vec3::NEG_Z,dot:Planar64::ONE},
-	].into_iter().collect();
-	let faces=planes_to_faces(face_list).unwrap();
-	let mesh=faces_to_mesh(faces.faces);
-	mesh
-}
-
-#[cfg(test)]
-mod test{
-	use super::*;
-	#[test]
-	fn test_cube(){
-		let face_list=[
-			Face{normal:integer::vec3::X,dot:Planar64::ONE},
-			Face{normal:integer::vec3::Y,dot:Planar64::ONE},
-			Face{normal:integer::vec3::Z,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_X,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_Y,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_Z,dot:Planar64::ONE},
-		].into_iter().collect();
-		let faces=planes_to_faces(face_list).unwrap();
-		dbg!(faces);
-	}
-	#[test]
-	fn test_cube_with_degernate_face(){
-		let face_list=[
-			Face{normal:integer::vec3::X,dot:Planar64::ONE},
-			Face{normal:integer::vec3::Y,dot:Planar64::ONE},
-			Face{normal:integer::vec3::Z,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_X,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_Y,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_Z,dot:Planar64::ONE},
-			Face{normal:integer::vec3::NEG_Z,dot:Planar64::EPSILON},
-		].into_iter().collect();
-		let faces=planes_to_faces(face_list).unwrap();
-		dbg!(faces);
-	}
-}

lib/bsp_loader/src/bsp.rs

@@ -1,60 +1,36 @@
-use std::borrow::Cow;
-
 use strafesnet_common::{map,model,integer,gameplay_attributes};
-use strafesnet_deferred_loader::deferred_loader::{MeshDeferredLoader,RenderConfigDeferredLoader};
-use strafesnet_deferred_loader::mesh::Meshes;
-use strafesnet_deferred_loader::texture::{RenderConfigs,Texture};
 
-use crate::valve_transform;
-
-fn ingest_vertex(
-	mb:&mut model::MeshBuilder,
-	world_position:vbsp::Vector,
-	texture_transform_u:glam::Vec4,
-	texture_transform_v:glam::Vec4,
-	normal:model::NormalId,
-	color:model::ColorId,
-)->model::VertexId{
-	//world_model.origin seems to always be 0,0,0
-	let vertex_xyz=world_position.into();
-	let pos=mb.acquire_pos_id(valve_transform(vertex_xyz));
-
-	//calculate texture coordinates
-	let pos_4d=glam::Vec3::from_array(vertex_xyz).extend(1.0);
-	let tex=glam::vec2(texture_transform_u.dot(pos_4d),texture_transform_v.dot(pos_4d));
-	let tex=mb.acquire_tex_id(tex);
-
-	mb.acquire_vertex_id(model::IndexedVertex{
-		pos,
-		tex,
-		normal,
-		color,
-	})
+const VALVE_SCALE:f32=1.0/16.0;
+fn valve_transform([x,y,z]:[f32;3])->integer::Planar64Vec3{
+	integer::vec3::try_from_f32_array([x*VALVE_SCALE,z*VALVE_SCALE,-y*VALVE_SCALE]).unwrap()
 }
-
-pub fn convert<'a>(
-	bsp:&'a crate::Bsp,
-	render_config_deferred_loader:&mut RenderConfigDeferredLoader<Cow<'a,str>>,
-	mesh_deferred_loader:&mut MeshDeferredLoader<&'a str>,
-)->PartialMap1{
-	let bsp=bsp.as_ref();
+pub fn convert_bsp<AcquireRenderConfigId,AcquireMeshId>(
+	bsp:&vbsp::Bsp,
+	mut acquire_render_config_id:AcquireRenderConfigId,
+	mut acquire_mesh_id:AcquireMeshId
+)->PartialMap1
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
+	AcquireMeshId:FnMut(&str)->model::MeshId,
+{
 	//figure out real attributes later
 	let mut unique_attributes=Vec::new();
 	unique_attributes.push(gameplay_attributes::CollisionAttributes::Decoration);
-	unique_attributes.push(gameplay_attributes::CollisionAttributes::contact_default());
-	unique_attributes.push(gameplay_attributes::CollisionAttributes::intersect_default());
-	const ATTRIBUTE_DECORATION:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(0);
-	const ATTRIBUTE_CONTACT_DEFAULT:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(1);
-	const ATTRIBUTE_INTERSECT_DEFAULT:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(2);
+	const TEMP_TOUCH_ME_ATTRIBUTE:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(0);
 
+	let mut prop_mesh_count=0;
 	//declare all prop models to Loader
 	let prop_models=bsp.static_props().map(|prop|{
 		//get or create mesh_id
-		let mesh_id=mesh_deferred_loader.acquire_mesh_id(prop.model());
+		let mesh_id=acquire_mesh_id(prop.model());
+		//not the most failsafe code but this is just for the map tool lmao
+		if prop_mesh_count==mesh_id.get(){
+			prop_mesh_count+=1;
+		};
 		let placement=prop.as_prop_placement();
 		model::Model{
 			mesh:mesh_id,
-			attributes:ATTRIBUTE_DECORATION,
+			attributes:TEMP_TOUCH_ME_ATTRIBUTE,
 			transform:integer::Planar64Affine3::new(
 				integer::mat3::try_from_f32_array_2d((
 					glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale))
@@ -71,12 +47,14 @@ pub fn convert<'a>(
 
 	//the generated MeshIds in here will collide with the Loader Mesh Ids
 	//but I can't think of a good workaround other than just remapping one later.
-	let mut world_meshes:Vec<model::Mesh>=bsp.models().map(|world_model|{
-		let mut mb=model::MeshBuilder::new();
-
-		let color=mb.acquire_color_id(glam::Vec4::ONE);
+	let world_meshes:Vec<model::Mesh>=bsp.models().map(|world_model|{
+		//non-deduplicated
+		let mut spam_pos=Vec::new();
+		let mut spam_tex=Vec::new();
+		let mut spam_normal=Vec::new();
+		let mut spam_vertices=Vec::new();
 		let mut graphics_groups=Vec::new();
-		let mut render_id_to_graphics_group_id=std::collections::HashMap::new();
+		let mut physics_group=model::IndexedPhysicsGroup::default();
 		let polygon_groups=world_model.faces().enumerate().map(|(polygon_group_id,face)|{
 			let polygon_group_id=model::PolygonGroupId::new(polygon_group_id as u32);
 			let face_texture=face.texture();
@@ -85,151 +63,107 @@ pub fn convert<'a>(
 			let texture_transform_u=glam::Vec4::from_array(face_texture.texture_transforms_u)/(face_texture_data.width as f32);
 			let texture_transform_v=glam::Vec4::from_array(face_texture.texture_transforms_v)/(face_texture_data.height as f32);
 
+			//this automatically figures out what the texture is trying to do and creates
+			//a render config for it, and then returns the id to that render config
+			let render_id=acquire_render_config_id(Some(face_texture_data.name()));
+
 			//normal
-			let normal=mb.acquire_normal_id(valve_transform(face.normal().into()));
-			let mut polygon_iter=face.vertex_positions().map(|vertex_position|
-				world_model.origin+vertex_position
-			);
+			let normal=face.normal();
+			let normal_idx=spam_normal.len() as u32;
+			spam_normal.push(valve_transform(normal.into()));
+			let mut polygon_iter=face.vertex_positions().map(|vertex_position|{
+				//world_model.origin seems to always be 0,0,0
+				let vertex_xyz=(world_model.origin+vertex_position).into();
+				let pos_idx=spam_pos.len();
+				spam_pos.push(valve_transform(vertex_xyz));
+
+				//calculate texture coordinates
+				let pos=glam::Vec3::from_array(vertex_xyz).extend(1.0);
+				let tex=glam::vec2(texture_transform_u.dot(pos),texture_transform_v.dot(pos));
+				let tex_idx=spam_tex.len() as u32;
+				spam_tex.push(tex);
+
+				let vertex_id=model::VertexId::new(spam_vertices.len() as u32);
+				spam_vertices.push(model::IndexedVertex{
+					pos:model::PositionId::new(pos_idx as u32),
+					tex:model::TextureCoordinateId::new(tex_idx as u32),
+					normal:model::NormalId::new(normal_idx),
+					color:model::ColorId::new(0),
+				});
+				vertex_id
+			});
 			let polygon_list=std::iter::from_fn(move||{
 				match (polygon_iter.next(),polygon_iter.next(),polygon_iter.next()){
-					(Some(v1),Some(v2),Some(v3))=>Some([v1,v2,v3]),
+					(Some(v1),Some(v2),Some(v3))=>Some(vec![v1,v2,v3]),
 					//ignore extra vertices, not sure what to do in this case, failing the whole conversion could be appropriate
 					_=>None,
 				}
-			}).map(|triplet|{
-				triplet.map(|world_position|
-					ingest_vertex(&mut mb,world_position,texture_transform_u,texture_transform_v,normal,color)
-				).to_vec()
 			}).collect();
 			if face.is_visible(){
-				//this automatically figures out what the texture is trying to do and creates
-				//a render config for it, and then returns the id to that render config
-				let render_id=render_config_deferred_loader.acquire_render_config_id(Some(Cow::Borrowed(face_texture_data.name())));
-				//deduplicate graphics groups by render id
-				let graphics_group_id=*render_id_to_graphics_group_id.entry(render_id).or_insert_with(||{
-					let graphics_group_id=graphics_groups.len();
-					graphics_groups.push(model::IndexedGraphicsGroup{
-						render:render_id,
-						groups:vec![],
-					});
-					graphics_group_id
-				});
-				graphics_groups[graphics_group_id].groups.push(polygon_group_id);
+				//TODO: deduplicate graphics groups by render id
+				graphics_groups.push(model::IndexedGraphicsGroup{
+					render:render_id,
+					groups:vec![polygon_group_id],
+				})
 			}
+			physics_group.groups.push(polygon_group_id);
 			model::PolygonGroup::PolygonList(model::PolygonList::new(polygon_list))
 		}).collect();
-
-		mb.build(polygon_groups,graphics_groups,vec![])
+		model::Mesh{
+			unique_pos:spam_pos,
+			unique_tex:spam_tex,
+			unique_normal:spam_normal,
+			unique_color:vec![glam::Vec4::ONE],
+			unique_vertices:spam_vertices,
+			polygon_groups,
+			graphics_groups,
+			physics_groups:vec![physics_group],
+		}
 	}).collect();
 
-	let mut found_spawn=None;
-
-	let mut world_models=Vec::new();
-
-	// the one and only world model 0
-	world_models.push(model::Model{
-		mesh:model::MeshId::new(0),
-		attributes:ATTRIBUTE_DECORATION,
-		transform:integer::Planar64Affine3::IDENTITY,
-		color:glam::Vec4::W,
-	});
-
-	for raw_ent in bsp.entities.iter(){
-		match raw_ent.parse(){
-			Ok(vbsp::basic::Entity::Brush(brush))
-			|Ok(vbsp::basic::Entity::BrushIllusionary(brush))
-			|Ok(vbsp::basic::Entity::BrushWall(brush))
-			|Ok(vbsp::basic::Entity::BrushWallToggle(brush))=>{
-				//The first character of brush.model is '*'
-				match brush.model[1..].parse(){
-					Ok(mesh_id)=>{
-						world_models.push(model::Model{
-							mesh:model::MeshId::new(mesh_id),
-							attributes:ATTRIBUTE_DECORATION,
-							transform:integer::Planar64Affine3::from_translation(
-								valve_transform(brush.origin.into())
-							),
-							color:(glam::Vec3::from_array([
-								brush.color.r as f32,
-								brush.color.g as f32,
-								brush.color.b as f32
-							])/255.0).extend(1.0),
-						});
-					},
-					Err(e)=>{
-						println!("Brush model int parse error: {e}");
-					},
-				}
-			},
-			_=>(),
-		}
-
-		match raw_ent.parse(){
-			Ok(vbsp::css::Entity::InfoPlayerCounterterrorist(spawn))=>{
-				found_spawn=Some(valve_transform(spawn.origin.into()));
-			},
-			Err(e)=>{
-				println!("Bsp Entity parse error: {e}");
-			},
-			_=>(),
-		}
-	}
-
-	// physics models
-	for brush in &bsp.brushes{
-		if !brush.flags.contains(vbsp::BrushFlags::SOLID){
-			continue;
-		}
-		let mesh_result=crate::brush::brush_to_mesh(bsp,brush);
-		match mesh_result{
-			Ok(mesh)=>{
-				let mesh_id=model::MeshId::new(world_meshes.len() as u32);
-				world_meshes.push(mesh);
-				world_models.push(model::Model{
-					mesh:mesh_id,
-					attributes:ATTRIBUTE_CONTACT_DEFAULT,
-					transform:integer::Planar64Affine3::new(
-						integer::mat3::identity(),
-						integer::vec3::ZERO,
-					),
-					color:glam::Vec4::ONE,
-				});
-			},
-			Err(e)=>println!("Brush mesh error: {e}"),
-		}
-	}
-
-	let mut modes_list=Vec::new();
-	if let Some(spawn_point)=found_spawn{
-		// create a new mesh
-		let mesh_id=model::MeshId::new(world_meshes.len() as u32);
-		world_meshes.push(crate::brush::unit_cube());
-		// create a new model
-		let model_id=model::ModelId::new(world_models.len() as u32);
-		world_models.push(model::Model{
+	let world_models:Vec<model::Model>=
+	//one instance of the main world mesh
+	std::iter::once((
+		//world_model
+		model::MeshId::new(0),
+		//model_origin
+		vbsp::Vector::from([0.0,0.0,0.0]),
+		//model_color
+		vbsp::Color{r:255,g:255,b:255},
+	)).chain(
+		//entities sprinkle instances of the other meshes around
+		bsp.entities.iter()
+		.flat_map(|ent|ent.parse())//ignore entity parsing errors
+		.filter_map(|ent|match ent{
+			vbsp::Entity::Brush(brush)=>Some(brush),
+			vbsp::Entity::BrushIllusionary(brush)=>Some(brush),
+			vbsp::Entity::BrushWall(brush)=>Some(brush),
+			vbsp::Entity::BrushWallToggle(brush)=>Some(brush),
+			_=>None,
+		}).flat_map(|brush|
+			//The first character of brush.model is '*'
+			brush.model[1..].parse().map(|mesh_id|//ignore parse int errors
+				(model::MeshId::new(mesh_id),brush.origin,brush.color)
+			)
+		)
+	).map(|(mesh_id,model_origin,vbsp::Color{r,g,b})|{
+		model::Model{
 			mesh:mesh_id,
-			attributes:ATTRIBUTE_INTERSECT_DEFAULT,
-			transform:integer::Planar64Affine3::from_translation(spawn_point),
-			color:glam::Vec4::W,
-		});
-
-		let first_stage=strafesnet_common::gameplay_modes::Stage::empty(model_id);
-		let main_mode=strafesnet_common::gameplay_modes::Mode::new(
-			strafesnet_common::gameplay_style::StyleModifiers::source_bhop(),
-			model_id,
-			std::collections::HashMap::new(),
-			vec![first_stage],
-			std::collections::HashMap::new(),
-		);
-		modes_list.push(main_mode);
-	}
+			attributes:TEMP_TOUCH_ME_ATTRIBUTE,
+			transform:integer::Planar64Affine3::new(
+				integer::mat3::identity(),
+				valve_transform(model_origin.into())
+			),
+			color:(glam::Vec3::from_array([r as f32,g as f32,b as f32])/255.0).extend(1.0),
+		}
+	}).collect();
 
 	PartialMap1{
 		attributes:unique_attributes,
 		world_meshes,
 		prop_models,
 		world_models,
-		modes:strafesnet_common::gameplay_modes::Modes::new(modes_list),
+		modes:strafesnet_common::gameplay_modes::Modes::new(Vec::new()),
 	}
 }
 
@@ -242,13 +176,26 @@ pub struct PartialMap1{
 	modes:strafesnet_common::gameplay_modes::Modes,
 }
 impl PartialMap1{
-	pub fn add_prop_meshes<'a>(
+	pub fn add_prop_meshes<AcquireRenderConfigId>(
 		self,
-		prop_meshes:Meshes,
-	)->PartialMap2{
+		prop_meshes:impl IntoIterator<Item=(model::MeshId,crate::data::ModelData)>,
+		mut acquire_render_config_id:AcquireRenderConfigId,
+	)->PartialMap2
+	where
+		AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
+	{
 		PartialMap2{
 			attributes:self.attributes,
-			prop_meshes:prop_meshes.consume().collect(),
+			prop_meshes:prop_meshes.into_iter().filter_map(|(mesh_id,model_data)|
+				//this will generate new render ids and texture ids
+				match convert_mesh(model_data,&mut acquire_render_config_id){
+					Ok(mesh)=>Some((mesh_id,mesh)),
+					Err(e)=>{
+						println!("error converting mesh: {e}");
+						None
+					}
+				}
+			).collect(),
 			prop_models:self.prop_models,
 			world_meshes:self.world_meshes,
 			world_models:self.world_models,
@@ -267,7 +214,8 @@ pub struct PartialMap2{
 impl PartialMap2{
 	pub fn add_render_configs_and_textures(
 		mut self,
-		render_configs:RenderConfigs,
+		render_configs:impl IntoIterator<Item=(model::RenderConfigId,model::RenderConfig)>,
+		textures:impl IntoIterator<Item=(model::TextureId,Vec<u8>)>,
 	)->map::CompleteMap{
 		//merge mesh and model lists, flatten and remap all ids
 		let mesh_id_offset=self.world_meshes.len();
@@ -286,14 +234,13 @@ impl PartialMap2{
 			})
 		));
 		//let mut models=Vec::new();
-		let (textures,render_configs)=render_configs.consume();
 		let (textures,texture_id_map):(Vec<Vec<u8>>,std::collections::HashMap<model::TextureId,model::TextureId>)
 		=textures.into_iter()
 		//.filter_map(f) cull unused textures
-		.enumerate().map(|(new_texture_id,(old_texture_id,Texture::ImageDDS(texture)))|{
+		.enumerate().map(|(new_texture_id,(old_texture_id,texture))|{
 			(texture,(old_texture_id,model::TextureId::new(new_texture_id as u32)))
 		}).unzip();
-		let render_configs=render_configs.into_iter().map(|(_render_config_id,mut render_config)|{
+		let render_configs=render_configs.into_iter().map(|(render_config_id,mut render_config)|{
 			//this may generate duplicate no-texture render configs but idc
 			render_config.texture=render_config.texture.and_then(|texture_id|
 				texture_id_map.get(&texture_id).copied()
@@ -310,3 +257,77 @@ impl PartialMap2{
 		}
 	}
 }
+
+fn convert_mesh<AcquireRenderConfigId>(
+	model_data:crate::data::ModelData,
+	acquire_render_config_id:&mut AcquireRenderConfigId,
+)->Result<model::Mesh,vmdl::ModelError>
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
+{
+	let model=model_data.read_model()?;
+	let texture_paths=model.texture_directories();
+	if texture_paths.len()!=1{
+		println!("WARNING: multiple texture paths");
+	}
+	let skin=model.skin_tables().nth(0).unwrap();
+
+	let mut spam_pos=Vec::with_capacity(model.vertices().len());
+	let mut spam_normal=Vec::with_capacity(model.vertices().len());
+	let mut spam_tex=Vec::with_capacity(model.vertices().len());
+	let mut spam_vertices=Vec::with_capacity(model.vertices().len());
+	for (i,vertex) in model.vertices().iter().enumerate(){
+		spam_pos.push(valve_transform(vertex.position.into()));
+		spam_normal.push(valve_transform(vertex.normal.into()));
+		spam_tex.push(glam::Vec2::from_array(vertex.texture_coordinates));
+		spam_vertices.push(model::IndexedVertex{
+			pos:model::PositionId::new(i as u32),
+			tex:model::TextureCoordinateId::new(i as u32),
+			normal:model::NormalId::new(i as u32),
+			color:model::ColorId::new(0),
+		});
+	}
+	let mut graphics_groups=Vec::new();
+	let mut physics_groups=Vec::new();
+	let polygon_groups=model.meshes().enumerate().map(|(polygon_group_id,mesh)|{
+		let polygon_group_id=model::PolygonGroupId::new(polygon_group_id as u32);
+
+		let render_id=if let (Some(texture_path),Some(texture_name))=(texture_paths.get(0),skin.texture(mesh.material_index())){
+			let mut path=std::path::PathBuf::from(texture_path.as_str());
+			path.push(texture_name);
+			acquire_render_config_id(path.as_os_str().to_str())
+		}else{
+			acquire_render_config_id(None)
+		};
+
+		graphics_groups.push(model::IndexedGraphicsGroup{
+			render:render_id,
+			groups:vec![polygon_group_id],
+		});
+		physics_groups.push(model::IndexedPhysicsGroup{
+			groups:vec![polygon_group_id],
+		});
+		model::PolygonGroup::PolygonList(model::PolygonList::new(
+			//looking at the code, it would seem that the strips are pre-deindexed into triangle lists when calling this function
+			mesh.vertex_strip_indices().flat_map(|mut strip|
+				std::iter::from_fn(move||{
+					match (strip.next(),strip.next(),strip.next()){
+						(Some(v1),Some(v2),Some(v3))=>Some([v1,v2,v3].map(|vertex_id|model::VertexId::new(vertex_id as u32)).to_vec()),
+						//ignore extra vertices, not sure what to do in this case, failing the whole conversion could be appropriate
+						_=>None,
+					}
+				})
+			).collect()
+		))
+	}).collect();
+	Ok(model::Mesh{
+		unique_pos:spam_pos,
+		unique_normal:spam_normal,
+		unique_tex:spam_tex,
+		unique_color:vec![glam::Vec4::ONE],
+		unique_vertices:spam_vertices,
+		polygon_groups,
+		graphics_groups,
+		physics_groups,
+	})
+}

lib/bsp_loader/src/data.rs

@@ -0,0 +1,60 @@
+pub struct Bsp(vbsp::Bsp);
+impl Bsp{
+	pub const fn new(value:vbsp::Bsp)->Self{
+		Self(value)
+	}
+}
+impl AsRef<vbsp::Bsp> for Bsp{
+	fn as_ref(&self)->&vbsp::Bsp{
+		&self.0
+	}
+}
+
+pub struct MdlData(Vec<u8>);
+impl MdlData{
+	pub const fn new(value:Vec<u8>)->Self{
+		Self(value)
+	}
+}
+impl AsRef<[u8]> for MdlData{
+	fn as_ref(&self)->&[u8]{
+		self.0.as_ref()
+	}
+}
+pub struct VtxData(Vec<u8>);
+impl VtxData{
+	pub const fn new(value:Vec<u8>)->Self{
+		Self(value)
+	}
+}
+impl AsRef<[u8]> for VtxData{
+	fn as_ref(&self)->&[u8]{
+		self.0.as_ref()
+	}
+}
+pub struct VvdData(Vec<u8>);
+impl VvdData{
+	pub const fn new(value:Vec<u8>)->Self{
+		Self(value)
+	}
+}
+impl AsRef<[u8]> for VvdData{
+	fn as_ref(&self)->&[u8]{
+		self.0.as_ref()
+	}
+}
+
+pub struct ModelData{
+	pub mdl:MdlData,
+	pub vtx:VtxData,
+	pub vvd:VvdData,
+}
+impl ModelData{
+	pub fn read_model(&self)->Result<vmdl::Model,vmdl::ModelError>{
+		Ok(vmdl::Model::from_parts(
+			vmdl::mdl::Mdl::read(self.mdl.as_ref())?,
+			vmdl::vtx::Vtx::read(self.vtx.as_ref())?,
+			vmdl::vvd::Vvd::read(self.vvd.as_ref())?,
+		))
+	}
+}

lib/bsp_loader/src/lib.rs

@@ -1,20 +1,7 @@
-use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
-
 mod bsp;
-mod mesh;
-mod brush;
-pub mod loader;
+pub mod data;
 
-const VALVE_SCALE:f32=1.0/16.0;
-pub(crate) fn valve_transform_dist(d:f32)->strafesnet_common::integer::Planar64{
-	(d*VALVE_SCALE).try_into().unwrap()
-}
-pub(crate) fn valve_transform_normal([x,y,z]:[f32;3])->strafesnet_common::integer::Planar64Vec3{
-	strafesnet_common::integer::vec3::try_from_f32_array([x,z,-y]).unwrap()
-}
-pub(crate) fn valve_transform([x,y,z]:[f32;3])->strafesnet_common::integer::Planar64Vec3{
-	strafesnet_common::integer::vec3::try_from_f32_array([x*VALVE_SCALE,z*VALVE_SCALE,-y*VALVE_SCALE]).unwrap()
-}
+pub use data::Bsp;
 
 #[derive(Debug)]
 pub enum ReadError{
@@ -28,38 +15,6 @@ impl std::fmt::Display for ReadError{
 }
 impl std::error::Error for ReadError{}
 
-
-#[derive(Debug)]
-pub enum LoadError{
-	Texture(loader::TextureError),
-	Mesh(loader::MeshError),
-}
-impl std::fmt::Display for LoadError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for LoadError{}
-impl From<loader::TextureError> for LoadError{
-	fn from(value:loader::TextureError)->Self{
-		Self::Texture(value)
-	}
-}
-impl From<loader::MeshError> for LoadError{
-	fn from(value:loader::MeshError)->Self{
-		Self::Mesh(value)
-	}
-}
-pub struct Bsp{
-	bsp:vbsp::Bsp,
-	case_folded_file_names:std::collections::HashMap<String,String>,
-}
-impl AsRef<vbsp::Bsp> for Bsp{
-	fn as_ref(&self)->&vbsp::Bsp{
-		&self.bsp
-	}
-}
-
 pub fn read<R:std::io::Read>(mut input:R)->Result<Bsp,ReadError>{
 	let mut s=Vec::new();
 
@@ -68,66 +23,15 @@ pub fn read<R:std::io::Read>(mut input:R)->Result<Bsp,ReadError>{
 
 	vbsp::Bsp::read(s.as_slice()).map(Bsp::new).map_err(ReadError::Bsp)
 }
-impl Bsp{
-	pub fn new(bsp:vbsp::Bsp)->Self{
-		let case_folded_file_names=bsp.pack.clone().into_zip().lock().unwrap().file_names().map(|s|{
-			(s.to_lowercase(),s.to_owned())
-		}).collect();
-		Self{
-			bsp,
-			case_folded_file_names,
-		}
-	}
-	pub fn pack_get(&self,name_lowercase:&str)->Result<Option<Vec<u8>>,vbsp::BspError>{
-		match self.case_folded_file_names.get(name_lowercase){
-			Some(name_folded)=>self.bsp.pack.get(name_folded),
-			None=>Ok(None),
-		}
-	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode,vpk_list:&[Vpk])->Result<strafesnet_common::map::CompleteMap,LoadError>{
-		let mut texture_deferred_loader=RenderConfigDeferredLoader::new();
-		let mut mesh_deferred_loader=MeshDeferredLoader::new();
 
-		let map_step1=bsp::convert(
-			self,
-			&mut texture_deferred_loader,
-			&mut mesh_deferred_loader,
-		);
-
-		let mut mesh_loader=loader::MeshLoader::new(loader::BspFinder{bsp:self,vpks:vpk_list},&mut texture_deferred_loader);
-		let prop_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,failure_mode).map_err(LoadError::Mesh)?;
-
-		let map_step2=map_step1.add_prop_meshes(prop_meshes);
-
-		let mut texture_loader=loader::TextureLoader::new();
-		let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,failure_mode).map_err(LoadError::Texture)?;
-
-		let map=map_step2.add_render_configs_and_textures(render_configs);
-
-		Ok(map)
-	}
-}
-pub struct Vpk{
-	vpk:vpk::VPK,
-	case_folded_file_names:std::collections::HashMap<String,String>,
-}
-impl AsRef<vpk::VPK> for Vpk{
-	fn as_ref(&self)->&vpk::VPK{
-		&self.vpk
-	}
-}
-impl Vpk{
-	pub fn new(vpk:vpk::VPK)->Vpk{
-		let case_folded_file_names=vpk.tree.keys().map(|s|{
-			(s.to_lowercase(),s.to_owned())
-		}).collect();
-		Vpk{
-			vpk,
-			case_folded_file_names,
-		}
-	}
-	pub fn tree_get(&self,name_lowercase:&str)->Option<&vpk::entry::VPKEntry>{
-		let name_folded=self.case_folded_file_names.get(name_lowercase)?;
-		self.vpk.tree.get(name_folded)
-	}
-}
+pub fn convert<AcquireRenderConfigId,AcquireMeshId>(
+	bsp:&Bsp,
+	acquire_render_config_id:AcquireRenderConfigId,
+	acquire_mesh_id:AcquireMeshId
+)->bsp::PartialMap1
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->strafesnet_common::model::RenderConfigId,
+	AcquireMeshId:FnMut(&str)->strafesnet_common::model::MeshId,
+{
+	bsp::convert_bsp(bsp.as_ref(),acquire_render_config_id,acquire_mesh_id)
+}

lib/bsp_loader/src/loader.rs

@@ -1,175 +0,0 @@
-use std::{borrow::Cow, io::Read};
-
-use strafesnet_common::model::Mesh;
-use strafesnet_deferred_loader::{loader::Loader,texture::Texture};
-
-use crate::{Bsp,Vpk};
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum TextureError{
-	Io(std::io::Error),
-}
-impl std::fmt::Display for TextureError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for TextureError{}
-impl From<std::io::Error> for TextureError{
-	fn from(value:std::io::Error)->Self{
-		Self::Io(value)
-	}
-}
-
-pub struct TextureLoader<'a>(std::marker::PhantomData<&'a ()>);
-impl TextureLoader<'_>{
-	pub fn new()->Self{
-		Self(std::marker::PhantomData)
-	}
-}
-impl<'a> Loader for TextureLoader<'a>{
-	type Error=TextureError;
-	type Index=Cow<'a,str>;
-	type Resource=Texture;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
-		let file_name=format!("textures/{}.dds",index);
-		let mut file=std::fs::File::open(file_name)?;
-		let mut data=Vec::new();
-		file.read_to_end(&mut data)?;
-		Ok(Texture::ImageDDS(data))
-	}
-}
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum MeshError{
-	Io(std::io::Error),
-	VMDL(vmdl::ModelError),
-	VBSP(vbsp::BspError),
-	MissingMdl,
-	MissingVtx,
-	MissingVvd,
-}
-impl std::fmt::Display for MeshError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for MeshError{}
-impl From<std::io::Error> for MeshError{
-	fn from(value:std::io::Error)->Self{
-		Self::Io(value)
-	}
-}
-impl From<vmdl::ModelError> for MeshError{
-	fn from(value:vmdl::ModelError)->Self{
-		Self::VMDL(value)
-	}
-}
-impl From<vbsp::BspError> for MeshError{
-	fn from(value:vbsp::BspError)->Self{
-		Self::VBSP(value)
-	}
-}
-
-#[derive(Clone,Copy)]
-pub struct BspFinder<'bsp,'vpk>{
-	pub bsp:&'bsp Bsp,
-	pub vpks:&'vpk [Vpk],
-}
-impl<'bsp,'vpk> BspFinder<'bsp,'vpk>{
-	pub fn find<'a>(&self,path:&str)->Result<Option<Cow<'a,[u8]>>,vbsp::BspError>
-		where
-			'bsp:'a,
-			'vpk:'a,
-	{
-		// search bsp
-		if let Some(data)=self.bsp.pack_get(path)?{
-			return Ok(Some(Cow::Owned(data)));
-		}
-
-		//search each vpk
-		for vpk in self.vpks{
-			if let Some(vpk_entry)=vpk.tree_get(path){
-				return Ok(Some(vpk_entry.get()?));
-			}
-		}
-
-		Ok(None)
-	}
-}
-
-pub struct ModelLoader<'bsp,'vpk,'a>{
-	finder:BspFinder<'bsp,'vpk>,
-	life:core::marker::PhantomData<&'a ()>,
-}
-impl ModelLoader<'_,'_,'_>{
-	#[inline]
-	pub const fn new<'bsp,'vpk,'a>(
-		finder:BspFinder<'bsp,'vpk>,
-	)->ModelLoader<'bsp,'vpk,'a>{
-		ModelLoader{
-			finder,
-			life:core::marker::PhantomData,
-		}
-	}
-}
-impl<'bsp,'vpk,'a> Loader for ModelLoader<'bsp,'vpk,'a>
-	where
-		'bsp:'a,
-		'vpk:'a,
-{
-	type Error=MeshError;
-	type Index=&'a str;
-	type Resource=vmdl::Model;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
-		let mdl_path_lower=index.to_lowercase();
-		//.mdl, .vvd, .dx90.vtx
-		let path=std::path::PathBuf::from(mdl_path_lower.as_str());
-		let mut vvd_path=path.clone();
-		let mut vtx_path=path;
-		vvd_path.set_extension("vvd");
-		vtx_path.set_extension("dx90.vtx");
-		// TODO: search more packs, possibly using an index of multiple packs
-		let mdl=self.finder.find(mdl_path_lower.as_str())?.ok_or(MeshError::MissingMdl)?;
-		let vtx=self.finder.find(vtx_path.as_os_str().to_str().unwrap())?.ok_or(MeshError::MissingVtx)?;
-		let vvd=self.finder.find(vvd_path.as_os_str().to_str().unwrap())?.ok_or(MeshError::MissingVvd)?;
-		Ok(vmdl::Model::from_parts(
-			vmdl::mdl::Mdl::read(mdl.as_ref())?,
-			vmdl::vtx::Vtx::read(vtx.as_ref())?,
-			vmdl::vvd::Vvd::read(vvd.as_ref())?,
-		))
-	}
-}
-
-pub struct MeshLoader<'bsp,'vpk,'load,'a>{
-	finder:BspFinder<'bsp,'vpk>,
-	deferred_loader:&'load mut strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader<Cow<'a,str>>,
-}
-impl MeshLoader<'_,'_,'_,'_>{
-	#[inline]
-	pub const fn new<'bsp,'vpk,'load,'a>(
-		finder:BspFinder<'bsp,'vpk>,
-		deferred_loader:&'load mut strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader<Cow<'a,str>>,
-	)->MeshLoader<'bsp,'vpk,'load,'a>{
-		MeshLoader{
-			finder,
-			deferred_loader
-		}
-	}
-}
-impl<'bsp,'vpk,'load,'a> Loader for MeshLoader<'bsp,'vpk,'load,'a>
-	where
-		'bsp:'a,
-		'vpk:'a,
-{
-	type Error=MeshError;
-	type Index=&'a str;
-	type Resource=Mesh;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
-		let model=ModelLoader::new(self.finder).load(index)?;
-		let mesh=crate::mesh::convert_mesh(model,&mut self.deferred_loader);
-		Ok(mesh)
-	}
-}

lib/bsp_loader/src/mesh.rs

@@ -1,78 +0,0 @@
-use std::borrow::Cow;
-
-use strafesnet_common::model;
-use strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader;
-
-use crate::valve_transform;
-
-fn ingest_vertex(mb:&mut model::MeshBuilder,vertex:&vmdl::vvd::Vertex,color:model::ColorId)->model::VertexId{
-	let pos=mb.acquire_pos_id(valve_transform(vertex.position.into()));
-	let normal=mb.acquire_normal_id(valve_transform(vertex.normal.into()));
-	let tex=mb.acquire_tex_id(glam::Vec2::from_array(vertex.texture_coordinates));
-	mb.acquire_vertex_id(model::IndexedVertex{
-		pos,
-		tex,
-		normal,
-		color,
-	})
-}
-
-pub fn convert_mesh(model:vmdl::Model,deferred_loader:&mut RenderConfigDeferredLoader<Cow<str>>)->model::Mesh{
-	let texture_paths=model.texture_directories();
-	if texture_paths.len()!=1{
-		println!("WARNING: multiple texture paths");
-	}
-	let skin=model.skin_tables().nth(0).unwrap();
-
-	let mut mb=model::MeshBuilder::new();
-
-	let color=mb.acquire_color_id(glam::Vec4::ONE);
-
-	let model_vertices=model.vertices();
-
-	let mut graphics_groups=Vec::new();
-	let mut physics_groups=Vec::new();
-	let polygon_groups=model.meshes().enumerate().map(|(polygon_group_id,mesh)|{
-		let polygon_group_id=model::PolygonGroupId::new(polygon_group_id as u32);
-
-		let render_id=if let (Some(texture_path),Some(texture_name))=(texture_paths.get(0),skin.texture(mesh.material_index())){
-			let mut path=std::path::PathBuf::from(texture_path.as_str());
-			path.push(texture_name);
-			let index=path.as_os_str().to_str().map(|s|Cow::Owned(s.to_owned()));
-			deferred_loader.acquire_render_config_id(index)
-		}else{
-			deferred_loader.acquire_render_config_id(None)
-		};
-
-		graphics_groups.push(model::IndexedGraphicsGroup{
-			render:render_id,
-			groups:vec![polygon_group_id],
-		});
-		physics_groups.push(model::IndexedPhysicsGroup{
-			groups:vec![polygon_group_id],
-		});
-		model::PolygonGroup::PolygonList(model::PolygonList::new(
-			//looking at the code, it would seem that the strips are pre-deindexed into triangle lists when calling this function
-			mesh.vertex_strip_indices().flat_map(|mut strip|{
-				std::iter::from_fn(move ||{
-					match (strip.next(),strip.next(),strip.next()){
-						(Some(v1),Some(v2),Some(v3))=>Some([v1,v2,v3]),
-						//ignore extra vertices, not sure what to do in this case, failing the whole conversion could be appropriate
-						_=>None,
-					}
-				})
-			}).flat_map(|[v1,v2,v3]|{
-				// this should probably be a fatal error :D
-				let v1=model_vertices.get(v1)?;
-				let v2=model_vertices.get(v2)?;
-				let v3=model_vertices.get(v3)?;
-				Some(vec![
-					ingest_vertex(&mut mb,v1,color),
-					ingest_vertex(&mut mb,v2,color),
-					ingest_vertex(&mut mb,v3,color),
-				])
-			}).collect()
-		))
-	}).collect();
-	mb.build(polygon_groups,graphics_groups,physics_groups)
-}

lib/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_common"
-version = "0.6.0"
+version = "0.5.2"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -12,8 +12,8 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 [dependencies]
 arrayvec = "0.7.4"
 bitflags = "2.6.0"
-fixed_wide = { version = "0.1.2", path = "../fixed_wide", registry = "strafesnet", features = ["deferred-division","zeroes","wide-mul"] }
-linear_ops = { version = "0.1.0", path = "../linear_ops", registry = "strafesnet", features = ["deferred-division","named-fields"] }
-ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet" }
+fixed_wide = { path = "../fixed_wide", registry = "strafesnet", features = ["deferred-division","zeroes","wide-mul"] }
+linear_ops = { path = "../linear_ops", registry = "strafesnet", features = ["deferred-division","named-fields"] }
+ratio_ops = { path = "../ratio_ops", registry = "strafesnet" }
 glam = "0.29.0"
 id = { version = "0.1.0", registry = "strafesnet" }

lib/common/src/bvh.rs

@@ -10,27 +10,35 @@ use crate::aabb::Aabb;
 //sort the centerpoints on each axis (3 lists)
 //bv is put into octant based on whether it is upper or lower in each list
 
-pub enum RecursiveContent<N,L>{
-	Branch(Vec<N>),
-	Leaf(L),
+pub enum RecursiveContent<R,T>{
+	Branch(Vec<R>),
+	Leaf(T),
 }
-impl<N,L> RecursiveContent<N,L>{
-	pub fn empty()->Self{
+impl<R,T> Default for RecursiveContent<R,T>{
+	fn default()->Self{
 		Self::Branch(Vec::new())
 	}
 }
-pub struct BvhNode<L>{
-	content:RecursiveContent<BvhNode<L>,L>,
+pub struct BvhNode<T>{
+	content:RecursiveContent<BvhNode<T>,T>,
 	aabb:Aabb,
 }
-impl<L> BvhNode<L>{
-	pub fn empty()->Self{
+impl<T> Default for BvhNode<T>{
+	fn default()->Self{
 		Self{
-			content:RecursiveContent::empty(),
+			content:Default::default(),
 			aabb:Aabb::default(),
 		}
 	}
-	pub fn sample_aabb<F:FnMut(&L)>(&self,aabb:&Aabb,f:&mut F){
+}
+pub struct BvhWeightNode<W,T>{
+	content:RecursiveContent<BvhWeightNode<W,T>,T>,
+	weight:W,
+	aabb:Aabb,
+}
+
+impl<T> BvhNode<T>{
+	pub fn the_tester<F:FnMut(&T)>(&self,aabb:&Aabb,f:&mut F){
 		match &self.content{
 			RecursiveContent::Leaf(model)=>f(model),
 			RecursiveContent::Branch(children)=>for child in children{
@@ -39,15 +47,51 @@ impl<L> BvhNode<L>{
 				//you're probably not going to spend a lot of time outside the map,
 				//so the test is extra work for nothing
 				if aabb.intersects(&child.aabb){
-					child.sample_aabb(aabb,f);
+					child.the_tester(aabb,f);
 				}
 			},
 		}
 	}
-	pub fn into_inner(self)->(RecursiveContent<BvhNode<L>,L>,Aabb){
-		(self.content,self.aabb)
+	pub fn into_visitor<F:FnMut(T)>(self,f:&mut F){
+		match self.content{
+			RecursiveContent::Leaf(model)=>f(model),
+			RecursiveContent::Branch(children)=>for child in children{
+				child.into_visitor(f)
+			},
+		}
 	}
-	pub fn into_visitor<F:FnMut(L)>(self,f:&mut F){
+	pub fn weigh_contents<W:Copy+std::iter::Sum<W>,F:Fn(&T)->W>(self,f:&F)->BvhWeightNode<W,T>{
+		match self.content{
+			RecursiveContent::Leaf(model)=>BvhWeightNode{
+				weight:f(&model),
+				content:RecursiveContent::Leaf(model),
+				aabb:self.aabb,
+			},
+			RecursiveContent::Branch(children)=>{
+				let branch:Vec<BvhWeightNode<W,T>>=children.into_iter().map(|child|
+					child.weigh_contents(f)
+				).collect();
+				BvhWeightNode{
+					weight:branch.iter().map(|node|node.weight).sum(),
+					content:RecursiveContent::Branch(branch),
+					aabb:self.aabb,
+				}
+			},
+		}
+	}
+}
+
+impl <W,T> BvhWeightNode<W,T>{
+	pub const fn weight(&self)->&W{
+		&self.weight
+	}
+	pub const fn aabb(&self)->&Aabb{
+		&self.aabb
+	}
+	pub fn into_content(self)->RecursiveContent<BvhWeightNode<W,T>,T>{
+		self.content
+	}
+	pub fn into_visitor<F:FnMut(T)>(self,f:&mut F){
 		match self.content{
 			RecursiveContent::Leaf(model)=>f(model),
 			RecursiveContent::Branch(children)=>for child in children{
@@ -86,9 +130,9 @@ fn generate_bvh_node<T>(boxen:Vec<(T,Aabb)>,force:bool)->BvhNode<T>{
 			sort_y.push((i,center.y));
 			sort_z.push((i,center.z));
 		}
-		sort_x.sort_by_key(|&(_,c)|c);
-		sort_y.sort_by_key(|&(_,c)|c);
-		sort_z.sort_by_key(|&(_,c)|c);
+		sort_x.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
+		sort_y.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
+		sort_z.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
 		let h=n/2;
 		let median_x=sort_x[h].1;
 		let median_y=sort_y[h].1;

lib/common/src/gameplay_attributes.rs

@@ -171,7 +171,4 @@ impl CollisionAttributes{
 	pub fn contact_default()->Self{
 		Self::Contact(ContactAttributes::default())
 	}
-	pub fn intersect_default()->Self{
-		Self::Intersect(IntersectAttributes::default())
-	}
 }

lib/common/src/instruction.rs

@@ -1,11 +1,13 @@
+use crate::integer::Time;
+
 #[derive(Clone,Debug)]
 pub struct TimedInstruction<I,T>{
-	pub time:T,
+	pub time:Time<T>,
 	pub instruction:I,
 }
 impl<I,T> TimedInstruction<I,T>{
 	#[inline]
-	pub fn set_time<T2>(self,new_time:T2)->TimedInstruction<I,T2>{
+	pub fn set_time<TimeInner>(self,new_time:Time<TimeInner>)->TimedInstruction<I,TimeInner>{
 		TimedInstruction{
 			time:new_time,
 			instruction:self.instruction,
@@ -15,21 +17,21 @@ impl<I,T> TimedInstruction<I,T>{
 
 /// Ensure all emitted instructions are processed before consuming external instructions
 pub trait InstructionEmitter<I>{
-	type Time;
-	fn next_instruction(&self,time_limit:Self::Time)->Option<TimedInstruction<I,Self::Time>>;
+	type TimeInner;
+	fn next_instruction(&self,time_limit:Time<Self::TimeInner>)->Option<TimedInstruction<I,Self::TimeInner>>;
 }
 /// Apply an atomic state update
 pub trait InstructionConsumer<I>{
-	type Time;
-	fn process_instruction(&mut self,instruction:TimedInstruction<I,Self::Time>);
+	type TimeInner;
+	fn process_instruction(&mut self,instruction:TimedInstruction<I,Self::TimeInner>);
 }
 /// If the object produces its own instructions, allow exhaustively feeding them back in
-pub trait InstructionFeedback<I,T>:InstructionEmitter<I,Time=T>+InstructionConsumer<I,Time=T>
+pub trait InstructionFeedback<I,T>:InstructionEmitter<I,TimeInner=T>+InstructionConsumer<I,TimeInner=T>
 	where
-		T:Copy,
+		Time<T>:Copy,
 {
 	#[inline]
-	fn process_exhaustive(&mut self,time_limit:T){
+	fn process_exhaustive(&mut self,time_limit:Time<T>){
 		while let Some(instruction)=self.next_instruction(time_limit){
 			self.process_instruction(instruction);
 		}
@@ -37,24 +39,39 @@ pub trait InstructionFeedback<I,T>:InstructionEmitter<I,Time=T>+InstructionConsu
 }
 impl<I,T,X> InstructionFeedback<I,T> for X
 	where
-		T:Copy,
-		X:InstructionEmitter<I,Time=T>+InstructionConsumer<I,Time=T>,
+		Time<T>:Copy,
+		X:InstructionEmitter<I,TimeInner=T>+InstructionConsumer<I,TimeInner=T>,
 {}
 
 //PROPER PRIVATE FIELDS!!!
 pub struct InstructionCollector<I,T>{
-	time:T,
+	time:Time<T>,
 	instruction:Option<I>,
 }
-impl<I,T> InstructionCollector<I,T>{
+impl<I,T> InstructionCollector<I,T>
+	where Time<T>:Copy+PartialOrd,
+{
 	#[inline]
-	pub const fn new(time:T)->Self{
+	pub const fn new(time:Time<T>)->Self{
 		Self{
 			time,
 			instruction:None
 		}
 	}
 	#[inline]
+	pub const fn time(&self)->Time<T>{
+		self.time
+	}
+	#[inline]
+	pub fn collect(&mut self,instruction:Option<TimedInstruction<I,T>>){
+		if let Some(ins)=instruction{
+			if ins.time<self.time{
+				self.time=ins.time;
+				self.instruction=Some(ins.instruction);
+			}
+		}
+	}
+	#[inline]
 	pub fn take(self)->Option<TimedInstruction<I,T>>{
 		//STEAL INSTRUCTION AND DESTROY INSTRUCTIONCOLLECTOR
 		self.instruction.map(|instruction|TimedInstruction{
@@ -63,20 +80,3 @@ impl<I,T> InstructionCollector<I,T>{
 		})
 	}
 }
-impl<I,T:Copy> InstructionCollector<I,T>{
-	#[inline]
-	pub const fn time(&self)->T{
-		self.time
-	}
-}
-impl<I,T:PartialOrd> InstructionCollector<I,T>{
-	#[inline]
-	pub fn collect(&mut self,instruction:Option<TimedInstruction<I,T>>){
-		if let Some(ins)=instruction{
-			if ins.time<self.time{
-				self.time=ins.time;
-				self.instruction=Some(ins.instruction);
-			}
-		}
-	}
-}

lib/common/src/integer.rs

@@ -63,12 +63,6 @@ impl<T> From<Planar64> for Time<T>{
 		Self::raw((value*Planar64::raw(1_000_000_000)).fix_1().to_raw())
 	}
 }
-impl<T> From<Time<T>> for Ratio<Planar64,Planar64>{
-	#[inline]
-	fn from(value:Time<T>)->Self{
-		value.to_ratio()
-	}
-}
 impl<T,Num,Den,N1,T1> From<Ratio<Num,Den>> for Time<T>
 	where
 		Num:core::ops::Mul<Planar64,Output=N1>,
@@ -654,19 +648,11 @@ pub struct Planar64Affine3{
 	pub translation:Planar64Vec3,
 }
 impl Planar64Affine3{
-	pub const IDENTITY:Self=Self::new(mat3::identity(),vec3::ZERO);
 	#[inline]
 	pub const fn new(matrix3:Planar64Mat3,translation:Planar64Vec3)->Self{
 		Self{matrix3,translation}
 	}
 	#[inline]
-	pub const fn from_translation(translation:Planar64Vec3)->Self{
-		Self{
-			matrix3:mat3::identity(),
-			translation,
-		}
-	}
-	#[inline]
 	pub fn transform_point3(&self,point:Planar64Vec3)->vec3::Vector3<Fixed<2,64>>{
 		self.translation.fix_2()+self.matrix3*point
 	}

lib/common/src/model.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use crate::integer::{Planar64Vec3,Planar64Affine3};
 use crate::gameplay_attributes;
 
@@ -125,87 +123,6 @@ pub struct Mesh{
 	pub physics_groups:Vec<IndexedPhysicsGroup>,
 }
 
-#[derive(Default)]
-pub struct MeshBuilder{
-	unique_pos:Vec<Planar64Vec3>,//Unit32Vec3
-	unique_normal:Vec<Planar64Vec3>,//Unit32Vec3
-	unique_tex:Vec<TextureCoordinate>,
-	unique_color:Vec<Color4>,
-	unique_vertices:Vec<IndexedVertex>,
-	pos_id_from:HashMap<Planar64Vec3,PositionId>,//Unit32Vec3
-	normal_id_from:HashMap<Planar64Vec3,NormalId>,//Unit32Vec3
-	tex_id_from:HashMap<[u32;2],TextureCoordinateId>,
-	color_id_from:HashMap<[u32;4],ColorId>,
-	vertex_id_from:HashMap<IndexedVertex,VertexId>,
-}
-impl MeshBuilder{
-	pub fn new()->Self{
-		Self::default()
-	}
-	pub fn build(
-		self,
-		polygon_groups:Vec<PolygonGroup>,
-		graphics_groups:Vec<IndexedGraphicsGroup>,
-		physics_groups:Vec<IndexedPhysicsGroup>,
-	)->Mesh{
-		let MeshBuilder{
-			unique_pos,
-			unique_normal,
-			unique_tex,
-			unique_color,
-			unique_vertices,
-			..
-		}=self;
-		Mesh{
-			unique_pos,
-			unique_normal,
-			unique_tex,
-			unique_color,
-			unique_vertices,
-			polygon_groups,
-			graphics_groups,
-			physics_groups,
-		}
-	}
-	pub fn acquire_pos_id(&mut self,pos:Planar64Vec3)->PositionId{
-		*self.pos_id_from.entry(pos).or_insert_with(||{
-			let pos_id=PositionId::new(self.unique_pos.len() as u32);
-			self.unique_pos.push(pos);
-			pos_id
-		})
-	}
-	pub fn acquire_normal_id(&mut self,normal:Planar64Vec3)->NormalId{
-		*self.normal_id_from.entry(normal).or_insert_with(||{
-			let normal_id=NormalId::new(self.unique_normal.len() as u32);
-			self.unique_normal.push(normal);
-			normal_id
-		})
-	}
-	pub fn acquire_tex_id(&mut self,tex:TextureCoordinate)->TextureCoordinateId{
-		let h=tex.to_array().map(f32::to_bits);
-		*self.tex_id_from.entry(h).or_insert_with(||{
-			let tex_id=TextureCoordinateId::new(self.unique_tex.len() as u32);
-			self.unique_tex.push(tex);
-			tex_id
-		})
-	}
-	pub fn acquire_color_id(&mut self,color:Color4)->ColorId{
-		let h=color.to_array().map(f32::to_bits);
-		*self.color_id_from.entry(h).or_insert_with(||{
-			let color_id=ColorId::new(self.unique_color.len() as u32);
-			self.unique_color.push(color);
-			color_id
-		})
-	}
-	pub fn acquire_vertex_id(&mut self,vertex:IndexedVertex)->VertexId{
-		*self.vertex_id_from.entry(vertex.clone()).or_insert_with(||{
-			let vertex_id=VertexId::new(self.unique_vertices.len() as u32);
-			self.unique_vertices.push(vertex);
-			vertex_id
-		})
-	}
-}
-
 #[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
 pub struct ModelId(u32);
 pub struct Model{

lib/common/src/timer.rs

@@ -23,7 +23,7 @@ impl PauseState for Unpaused{
 }
 
 #[derive(Clone,Copy,Hash,Eq,PartialEq,PartialOrd,Debug)]
-pub enum Inner{}
+enum Inner{}
 type InnerTime=Time<Inner>;
 
 #[derive(Clone,Copy,Debug)]

lib/common/src/updatable.rs

@@ -1,5 +1,3 @@
-// This whole thing should be a drive macro
-
 pub trait Updatable<Updater>{
 	fn update(&mut self,update:Updater);
 }
@@ -55,3 +53,4 @@ impl Updatable<OuterUpdate> for Outer{
 		}
 	}
 }
+//*/

lib/deferred_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_deferred_loader"
-version = "0.5.0"
+version = "0.4.1"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -9,5 +9,13 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = ["legacy"]
+legacy = ["dep:url","dep:vbsp"]
+#roblox = ["dep:lazy-regex"]
+#source = ["dep:vbsp"]
+
 [dependencies]
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
+strafesnet_common = { path = "../common", registry = "strafesnet" }
+url = { version = "2.5.2", optional = true }
+vbsp = { version = "0.6.0", optional = true }

lib/deferred_loader/src/deferred_loader.rs

@@ -1,116 +0,0 @@
-use std::collections::HashMap;
-use crate::loader::Loader;
-use crate::mesh::Meshes;
-use crate::texture::{RenderConfigs,Texture};
-use strafesnet_common::model::{Mesh,MeshId,RenderConfig,RenderConfigId,TextureId};
-
-#[derive(Clone,Copy,Debug)]
-pub enum LoadFailureMode{
-	DefaultToNone,
-	Fatal,
-}
-
-pub struct RenderConfigDeferredLoader<H>{
-	texture_count:u32,
-	render_configs:Vec<RenderConfig>,
-	render_config_id_from_asset_id:HashMap<Option<H>,RenderConfigId>,
-}
-impl<H> RenderConfigDeferredLoader<H>{
-	pub fn new()->Self{
-		Self{
-			texture_count:0,
-			render_configs:Vec::new(),
-			render_config_id_from_asset_id:HashMap::new(),
-		}
-	}
-}
-
-impl<H:core::hash::Hash+Eq> RenderConfigDeferredLoader<H>{
-	pub fn acquire_render_config_id(&mut self,index:Option<H>)->RenderConfigId{
-		let some_texture=index.is_some();
-		*self.render_config_id_from_asset_id.entry(index).or_insert_with(||{
-			//create the render config.
-			let render_config=if some_texture{
-				let render_config=RenderConfig::texture(TextureId::new(self.texture_count));
-				self.texture_count+=1;
-				render_config
-			}else{
-				RenderConfig::default()
-			};
-			let render_id=RenderConfigId::new(self.render_configs.len() as u32);
-			self.render_configs.push(render_config);
-			render_id
-		})
-	}
-	pub fn into_indices(self)->impl Iterator<Item=H>{
-		self.render_config_id_from_asset_id.into_keys().flatten()
-	}
-	pub fn into_render_configs<L:Loader<Resource=Texture,Index=H>>(mut self,loader:&mut L,failure_mode:LoadFailureMode)->Result<RenderConfigs,L::Error>{
-		let mut sorted_textures=vec![None;self.texture_count as usize];
-		for (index_option,render_config_id) in self.render_config_id_from_asset_id{
-			let render_config=&mut self.render_configs[render_config_id.get() as usize];
-			if let (Some(index),Some(texture_id))=(index_option,render_config.texture){
-				let resource_result=loader.load(index);
-				let texture=match failure_mode{
-					// if texture fails to load, use no texture
-					LoadFailureMode::DefaultToNone=>match resource_result{
-						Ok(texture)=>Some(texture),
-						Err(e)=>{
-							render_config.texture=None;
-							println!("Error loading texture: {e}");
-							None
-						},
-					},
-					// loading failure is fatal
-					LoadFailureMode::Fatal=>Some(resource_result?)
-				};
-				sorted_textures[texture_id.get() as usize]=texture;
-			}
-		}
-		Ok(RenderConfigs::new(
-			sorted_textures,
-			self.render_configs,
-		))
-	}
-}
-
-pub struct MeshDeferredLoader<H>{
-	mesh_id_from_asset_id:HashMap<H,MeshId>,
-}
-impl<H> MeshDeferredLoader<H>{
-	pub fn new()->Self{
-		Self{
-			mesh_id_from_asset_id:HashMap::new(),
-		}
-	}
-}
-
-impl<H:core::hash::Hash+Eq> MeshDeferredLoader<H>{
-	pub fn acquire_mesh_id(&mut self,index:H)->MeshId{
-		let mesh_id=MeshId::new(self.mesh_id_from_asset_id.len() as u32);
-		*self.mesh_id_from_asset_id.entry(index).or_insert(mesh_id)
-	}
-	pub fn into_indices(self)->impl Iterator<Item=H>{
-		self.mesh_id_from_asset_id.into_keys()
-	}
-	pub fn into_meshes<L:Loader<Resource=Mesh,Index=H>>(self,loader:&mut L,failure_mode:LoadFailureMode)->Result<Meshes,L::Error>{
-		let mut mesh_list=vec![None;self.mesh_id_from_asset_id.len()];
-		for (index,mesh_id) in self.mesh_id_from_asset_id{
-			let resource_result=loader.load(index);
-			let mesh=match failure_mode{
-				// if mesh fails to load, use no mesh
-				LoadFailureMode::DefaultToNone=>match resource_result{
-					Ok(mesh)=>Some(mesh),
-					Err(e)=>{
-						println!("Error loading mesh: {e}");
-						None
-					},
-				},
-				// loading failure is fatal
-				LoadFailureMode::Fatal=>Some(resource_result?)
-			};
-			mesh_list[mesh_id.get() as usize]=mesh;
-		}
-		Ok(Meshes::new(mesh_list))
-	}
-}

lib/deferred_loader/src/lib.rs

@@ -1,5 +1,34 @@
+#[cfg(feature="legacy")]
+mod roblox_legacy;
+#[cfg(feature="legacy")]
+mod source_legacy;
+#[cfg(feature="roblox")]
+mod roblox;
+#[cfg(feature="source")]
+mod source;
+
+#[cfg(any(feature="roblox",feature="legacy"))]
+pub mod rbxassetid;
 
-pub mod mesh;
-pub mod loader;
 pub mod texture;
-pub mod deferred_loader;
+#[cfg(any(feature="source",feature="legacy"))]
+pub mod valve_mesh;
+#[cfg(any(feature="roblox",feature="legacy"))]
+pub mod roblox_mesh;
+
+#[cfg(feature="legacy")]
+pub fn roblox_legacy()->roblox_legacy::Loader{
+	roblox_legacy::Loader::new()
+}
+#[cfg(feature="legacy")]
+pub fn source_legacy()->source_legacy::Loader{
+	source_legacy::Loader::new()
+}
+#[cfg(feature="roblox")]
+pub fn roblox()->roblox::Loader{
+	roblox::Loader::new()
+}
+#[cfg(feature="source")]
+pub fn source()->source::Loader{
+	source::Loader::new()
+}

lib/deferred_loader/src/loader.rs

@@ -1,8 +0,0 @@
-use std::error::Error;
-
-pub trait Loader{
-	type Error:Error;
-	type Index;
-	type Resource;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>;
-}

lib/deferred_loader/src/mesh.rs

@@ -1,17 +0,0 @@
-use strafesnet_common::model::{Mesh,MeshId};
-
-pub struct Meshes{
-	meshes:Vec<Option<Mesh>>,
-}
-impl Meshes{
-	pub(crate) const fn new(meshes:Vec<Option<Mesh>>)->Self{
-		Self{
-			meshes,
-		}
-	}
-	pub fn consume(self)->impl Iterator<Item=(MeshId,Mesh)>{
-		self.meshes.into_iter().enumerate().filter_map(|(mesh_id,maybe_mesh)|
-			maybe_mesh.map(|mesh|(MeshId::new(mesh_id as u32),mesh))
-		)
-	}
-}

lib/deferred_loader/src/rbxassetid.rs

@@ -0,0 +1,48 @@
+#[derive(Hash,Eq,PartialEq)]
+pub struct RobloxAssetId(pub u64);
+#[derive(Debug)]
+#[allow(dead_code)]
+pub struct StringWithError{
+	string:String,
+	error:RobloxAssetIdParseErr,
+}
+impl std::fmt::Display for StringWithError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for StringWithError{}
+impl StringWithError{
+	const fn new(
+		string:String,
+		error:RobloxAssetIdParseErr,
+	)->Self{
+		Self{string,error}
+	}
+}
+#[derive(Debug)]
+pub enum RobloxAssetIdParseErr{
+	Url(url::ParseError),
+	UnknownScheme,
+	ParseInt(std::num::ParseIntError),
+	MissingAssetId,
+}
+impl std::str::FromStr for RobloxAssetId{
+	type Err=StringWithError;
+	fn from_str(s:&str)->Result<Self,Self::Err>{
+		let url=url::Url::parse(s).map_err(|e|StringWithError::new(s.to_owned(),RobloxAssetIdParseErr::Url(e)))?;
+		let parsed_asset_id=match url.scheme(){
+			"rbxassetid"=>url.domain().ok_or_else(||StringWithError::new(s.to_owned(),RobloxAssetIdParseErr::MissingAssetId))?.parse(),
+			"http"|"https"=>{
+				let (_,asset_id)=url.query_pairs()
+				.find(|(id,_)|match id.as_ref(){
+					"ID"|"id"|"Id"|"iD"=>true,
+					_=>false,
+				}).ok_or_else(||StringWithError::new(s.to_owned(),RobloxAssetIdParseErr::MissingAssetId))?;
+				asset_id.parse()
+			},
+			_=>Err(StringWithError::new(s.to_owned(),RobloxAssetIdParseErr::UnknownScheme))?,
+		};
+		Ok(Self(parsed_asset_id.map_err(|e|StringWithError::new(s.to_owned(),RobloxAssetIdParseErr::ParseInt(e)))?))
+	}
+}

lib/deferred_loader/src/roblox_legacy.rs

@@ -0,0 +1,112 @@
+use std::io::Read;
+use std::collections::HashMap;
+use crate::roblox_mesh;
+use crate::texture::{RenderConfigs,Texture};
+use strafesnet_common::model::{MeshId,RenderConfig,RenderConfigId,TextureId};
+use crate::rbxassetid::RobloxAssetId;
+
+#[derive(Default)]
+pub struct RenderConfigLoader{
+	texture_count:u32,
+	render_configs:Vec<RenderConfig>,
+	render_config_id_from_asset_id:HashMap<Option<RobloxAssetId>,RenderConfigId>,
+}
+
+impl RenderConfigLoader{
+	pub fn acquire_render_config_id(&mut self,name:Option<&str>)->RenderConfigId{
+		let render_id=RenderConfigId::new(self.render_config_id_from_asset_id.len() as u32);
+		let index=name.and_then(|name|{
+			match name.parse::<RobloxAssetId>(){
+				Ok(asset_id)=>Some(asset_id),
+				Err(e)=>{
+					println!("Failed to parse AssetId: {e}");
+					None
+				},
+			}
+		});
+		*self.render_config_id_from_asset_id.entry(index).or_insert_with(||{
+			//create the render config.
+			let render_config=if name.is_some(){
+				let render_config=RenderConfig::texture(TextureId::new(self.texture_count));
+				self.texture_count+=1;
+				render_config
+			}else{
+				RenderConfig::default()
+			};
+			self.render_configs.push(render_config);
+			render_id
+		})
+	}
+}
+
+#[derive(Default)]
+pub struct MeshLoader{
+	mesh_id_from_asset_id:HashMap<Option<RobloxAssetId>,MeshId>,
+}
+
+impl MeshLoader{
+	pub fn acquire_mesh_id(&mut self,name:&str)->MeshId{
+		let mesh_id=MeshId::new(self.mesh_id_from_asset_id.len() as u32);
+		let index=match name.parse::<RobloxAssetId>(){
+			Ok(asset_id)=>Some(asset_id),
+			Err(e)=>{
+				println!("Failed to parse AssetId: {e}");
+				None
+			},
+		};
+		*self.mesh_id_from_asset_id.entry(index).or_insert(mesh_id)
+	}
+	pub fn load_meshes(&mut self)->Result<roblox_mesh::Meshes,std::io::Error>{
+		let mut mesh_data=vec![None;self.mesh_id_from_asset_id.len()];
+		for (asset_id_option,mesh_id) in &self.mesh_id_from_asset_id{
+			if let Some(asset_id)=asset_id_option{
+				if let Ok(mut file)=std::fs::File::open(format!("meshes/{}",asset_id.0)){
+					//TODO: parallel
+					let mut data=Vec::<u8>::new();
+					file.read_to_end(&mut data)?;
+					mesh_data[mesh_id.get() as usize]=Some(roblox_mesh::RobloxMeshData::new(data));
+				}else{
+					println!("[roblox_legacy] no mesh name={}",asset_id.0);
+				}
+			}
+		}
+		Ok(roblox_mesh::Meshes::new(mesh_data))
+	}
+}
+
+pub struct Loader{
+	render_config_loader:RenderConfigLoader,
+	mesh_loader:MeshLoader,
+}
+impl Loader{
+	pub fn new()->Self{
+		Self{
+			render_config_loader:RenderConfigLoader::default(),
+			mesh_loader:MeshLoader::default(),
+		}
+	}
+	pub fn get_inner_mut(&mut self)->(&mut RenderConfigLoader,&mut MeshLoader){
+		(&mut self.render_config_loader,&mut self.mesh_loader)
+	}
+	pub fn into_render_configs(mut self)->Result<RenderConfigs,std::io::Error>{
+		let mut sorted_textures=vec![None;self.render_config_loader.texture_count as usize];
+		for (asset_id_option,render_config_id) in self.render_config_loader.render_config_id_from_asset_id{
+			let render_config=self.render_config_loader.render_configs.get_mut(render_config_id.get() as usize).unwrap();
+			if let (Some(asset_id),Some(texture_id))=(asset_id_option,render_config.texture){
+				if let Ok(mut file)=std::fs::File::open(format!("textures/{}.dds",asset_id.0)){
+					//TODO: parallel
+					let mut data=Vec::<u8>::new();
+					file.read_to_end(&mut data)?;
+					sorted_textures[texture_id.get() as usize]=Some(Texture::ImageDDS(data));
+				}else{
+					//texture failed to load
+					render_config.texture=None;
+				}
+			}
+		}
+		Ok(RenderConfigs::new(
+			sorted_textures,
+			self.render_config_loader.render_configs,
+		))
+	}
+}

lib/deferred_loader/src/roblox_mesh.rs

@@ -0,0 +1,30 @@
+use strafesnet_common::model::MeshId;
+
+#[derive(Clone)]
+pub struct RobloxMeshData(Vec<u8>);
+impl RobloxMeshData{
+	pub(crate) fn new(data:Vec<u8>)->Self{
+		Self(data)
+	}
+	pub fn get(self)->Vec<u8>{
+		self.0
+	}
+}
+pub struct Meshes{
+	meshes:Vec<Option<RobloxMeshData>>,
+}
+impl Meshes{
+	pub(crate) const fn new(meshes:Vec<Option<RobloxMeshData>>)->Self{
+		Self{
+			meshes,
+		}
+	}
+	pub fn get_texture(&self,texture_id:MeshId)->Option<&RobloxMeshData>{
+		self.meshes.get(texture_id.get() as usize)?.as_ref()
+	}
+	pub fn into_iter(self)->impl Iterator<Item=(MeshId,RobloxMeshData)>{
+		self.meshes.into_iter().enumerate().filter_map(|(mesh_id,maybe_mesh)|
+			maybe_mesh.map(|mesh|(MeshId::new(mesh_id as u32),mesh))
+		)
+	}
+}

lib/deferred_loader/src/source_legacy.rs

@@ -0,0 +1,102 @@
+use std::io::Read;
+use std::collections::HashMap;
+use crate::valve_mesh;
+use crate::texture::{Texture,RenderConfigs};
+use strafesnet_common::model::{MeshId,TextureId,RenderConfig,RenderConfigId};
+
+pub struct RenderConfigLoader{
+	texture_count:u32,
+	render_configs:Vec<RenderConfig>,
+	texture_paths:HashMap<Option<Box<str>>,RenderConfigId>,
+}
+impl RenderConfigLoader{
+	pub fn acquire_render_config_id(&mut self,name:Option<&str>)->RenderConfigId{
+		let render_id=RenderConfigId::new(self.texture_paths.len() as u32);
+		*self.texture_paths.entry(name.map(Into::into)).or_insert_with(||{
+			//create the render config.
+			let render_config=if name.is_some(){
+				let render_config=RenderConfig::texture(TextureId::new(self.texture_count));
+				self.texture_count+=1;
+				render_config
+			}else{
+				RenderConfig::default()
+			};
+			self.render_configs.push(render_config);
+			render_id
+		})
+	}
+}
+pub struct MeshLoader{
+	mesh_paths:HashMap<Box<str>,MeshId>,
+}
+impl MeshLoader{
+	pub fn acquire_mesh_id(&mut self,name:&str)->MeshId{
+		let mesh_id=MeshId::new(self.mesh_paths.len() as u32);
+		*self.mesh_paths.entry(name.into()).or_insert(mesh_id)
+	}
+	//load_meshes should look like load_textures
+	pub fn load_meshes(&mut self,bsp:&vbsp::Bsp)->valve_mesh::Meshes{
+		let mut mesh_data=vec![None;self.mesh_paths.len()];
+		for (mesh_path,mesh_id) in &self.mesh_paths{
+			let mesh_path_lower=mesh_path.to_lowercase();
+			//.mdl, .vvd, .dx90.vtx
+			let path=std::path::PathBuf::from(mesh_path_lower.as_str());
+			let mut vvd_path=path.clone();
+			let mut vtx_path=path.clone();
+			vvd_path.set_extension("vvd");
+			vtx_path.set_extension("dx90.vtx");
+			match (bsp.pack.get(mesh_path_lower.as_str()),bsp.pack.get(vvd_path.as_os_str().to_str().unwrap()),bsp.pack.get(vtx_path.as_os_str().to_str().unwrap())){
+				(Ok(Some(mdl_file)),Ok(Some(vvd_file)),Ok(Some(vtx_file)))=>{
+					mesh_data[mesh_id.get() as usize]=Some(valve_mesh::ModelData{
+						mdl:valve_mesh::MdlData::new(mdl_file),
+						vtx:valve_mesh::VtxData::new(vtx_file),
+						vvd:valve_mesh::VvdData::new(vvd_file),
+					});
+				},
+				_=>println!("no model name={}",mesh_path),
+			}
+		}
+		valve_mesh::Meshes::new(mesh_data)
+	}
+}
+
+pub struct Loader{
+	render_config_loader:RenderConfigLoader,
+	mesh_loader:MeshLoader,
+}
+impl Loader{
+	pub fn new()->Self{
+		Self{
+			render_config_loader:RenderConfigLoader{
+				texture_count:0,
+				texture_paths:HashMap::new(),
+				render_configs:Vec::new(),
+			},
+			mesh_loader:MeshLoader{mesh_paths:HashMap::new()},
+		}
+	}
+	pub fn get_inner_mut(&mut self)->(&mut RenderConfigLoader,&mut MeshLoader){
+		(&mut self.render_config_loader,&mut self.mesh_loader)
+	}
+	pub fn into_render_configs(mut self)->Result<RenderConfigs,std::io::Error>{
+		let mut sorted_textures=vec![None;self.render_config_loader.texture_count as usize];
+		for (texture_path,render_config_id) in self.render_config_loader.texture_paths{
+			let render_config=self.render_config_loader.render_configs.get_mut(render_config_id.get() as usize).unwrap();
+			if let (Some(texture_path),Some(texture_id))=(texture_path,render_config.texture){
+				if let Ok(mut file)=std::fs::File::open(format!("textures/{}.dds",texture_path)){
+					//TODO: parallel
+					let mut data=Vec::<u8>::new();
+					file.read_to_end(&mut data)?;
+					sorted_textures[texture_id.get() as usize]=Some(Texture::ImageDDS(data));
+				}else{
+					//texture failed to load
+					render_config.texture=None;
+				}
+			}
+		}
+		Ok(RenderConfigs::new(
+			sorted_textures,
+			self.render_config_loader.render_configs,
+		))
+	}
+}

lib/deferred_loader/src/valve_mesh.rs

@@ -0,0 +1,60 @@
+use strafesnet_common::model::MeshId;
+
+//duplicate this code for now
+#[derive(Clone)]
+pub struct MdlData(Vec<u8>);
+impl MdlData{
+	pub const fn new(value:Vec<u8>)->Self{
+		Self(value)
+	}
+	pub fn get(self)->Vec<u8>{
+		self.0
+	}
+}
+#[derive(Clone)]
+pub struct VtxData(Vec<u8>);
+impl VtxData{
+	pub const fn new(value:Vec<u8>)->Self{
+		Self(value)
+	}
+	pub fn get(self)->Vec<u8>{
+		self.0
+	}
+}
+#[derive(Clone)]
+pub struct VvdData(Vec<u8>);
+impl VvdData{
+	pub const fn new(value:Vec<u8>)->Self{
+		Self(value)
+	}
+	pub fn get(self)->Vec<u8>{
+		self.0
+	}
+}
+
+#[derive(Clone)]
+pub struct ModelData{
+	pub mdl:MdlData,
+	pub vtx:VtxData,
+	pub vvd:VvdData,
+}
+
+//meshes is more prone to failure
+pub struct Meshes{
+	meshes:Vec<Option<ModelData>>,
+}
+impl Meshes{
+	pub(crate) const fn new(meshes:Vec<Option<ModelData>>)->Self{
+		Self{
+			meshes,
+		}
+	}
+	pub fn get_texture(&self,texture_id:MeshId)->Option<&ModelData>{
+		self.meshes.get(texture_id.get() as usize)?.as_ref()
+	}
+	pub fn into_iter(self)->impl Iterator<Item=(MeshId,ModelData)>{
+		self.meshes.into_iter().enumerate().filter_map(|(mesh_id,maybe_mesh)|
+			maybe_mesh.map(|mesh|(MeshId::new(mesh_id as u32),mesh))
+		)
+	}
+}

lib/fixed_wide/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fixed_wide"
-version = "0.1.2"
+version = "0.1.1"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -17,4 +17,4 @@ zeroes=["dep:arrayvec"]
 bnum = "0.12.0"
 arrayvec = { version = "0.7.6", optional = true }
 paste = "1.0.15"
-ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
+ratio_ops = { path = "../ratio_ops", registry = "strafesnet", optional = true }

lib/fixed_wide/src/tests.rs

@@ -57,7 +57,7 @@ fn from_f32(){
 	assert_eq!(b,Ok(a));
 	//I32F32::MIN hits a special case since it's not representable as a positive signed integer
 	//TODO: don't return an overflow because this is technically possible
-	let _a=I32F32::MIN;
+	let a=I32F32::MIN;
 	let b:Result<I32F32,_>=Into::<f32>::into(I32F32::MIN).try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Overflow));
 	//16 is within the 24 bits of float precision

lib/linear_ops/Cargo.toml

@@ -14,8 +14,8 @@ fixed-wide=["dep:fixed_wide","dep:paste"]
 deferred-division=["dep:ratio_ops"]
 
 [dependencies]
-ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
-fixed_wide = { version = "0.1.2", path = "../fixed_wide", registry = "strafesnet", optional = true }
+ratio_ops = { path = "../ratio_ops", registry = "strafesnet", optional = true }
+fixed_wide = { path = "../fixed_wide", registry = "strafesnet", optional = true }
 paste = { version = "1.0.15", optional = true }
 
 [dev-dependencies]

lib/linear_ops/src/matrix.rs

@@ -1,6 +1,5 @@
 use crate::vector::Vector;
 
-#[repr(transparent)]
 #[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
 pub struct Matrix<const X:usize,const Y:usize,T>{
 	pub(crate) array:[[T;Y];X],

lib/linear_ops/src/vector.rs

@@ -3,7 +3,6 @@
 /// v.x += v.z;
 /// println!("v.x={}",v.x);
 
-#[repr(transparent)]
 #[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
 pub struct Vector<const N:usize,T>{
 	pub(crate) array:[T;N],

lib/rbx_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_rbx_loader"
-version = "0.6.0"
+version = "0.5.2"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -15,10 +15,8 @@ glam = "0.29.0"
 lazy-regex = "3.1.0"
 rbx_binary = { version = "0.7.4", registry = "strafesnet" }
 rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
-rbx_mesh = "0.3.1"
+rbx_mesh = "0.1.2"
 rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
 rbx_xml = { version = "0.13.3", registry = "strafesnet" }
-rbxassetid = { version = "0.1.0", path = "../rbxassetid", registry = "strafesnet" }
-roblox_emulator = { version = "0.4.7", path = "../roblox_emulator", registry = "strafesnet" }
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.0", path = "../deferred_loader", registry = "strafesnet" }
+roblox_emulator = { path = "../roblox_emulator", registry = "strafesnet" }
+strafesnet_common = { path = "../common", registry = "strafesnet" }

lib/rbx_loader/src/lib.rs

@@ -1,11 +1,8 @@
 use std::io::Read;
 use rbx_dom_weak::WeakDom;
-use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
 
 mod rbx;
 mod mesh;
-mod union;
-pub mod loader;
 mod primitives;
 
 pub mod data{
@@ -33,9 +30,6 @@ impl Model{
 		let services=context.convert_into_place();
 		Place{dom,services}
 	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<strafesnet_common::map::CompleteMap,LoadError>{
-		to_snf(self,failure_mode)
-	}
 }
 impl AsRef<WeakDom> for Model{
 	fn as_ref(&self)->&WeakDom{
@@ -48,7 +42,7 @@ pub struct Place{
 	services:roblox_emulator::context::Services,
 }
 impl Place{
-	pub fn new(dom:WeakDom)->Option<Self>{
+	fn new(dom:WeakDom)->Option<Self>{
 		let context=roblox_emulator::context::Context::from_ref(&dom);
 		Some(Self{
 			services:context.find_services()?,
@@ -67,9 +61,6 @@ impl Place{
 			}
 		}
 	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<strafesnet_common::map::CompleteMap,LoadError>{
-		to_snf(self,failure_mode)
-	}
 }
 impl AsRef<WeakDom> for Place{
 	fn as_ref(&self)->&WeakDom{
@@ -101,49 +92,16 @@ pub fn read<R:Read>(input:R)->Result<Model,ReadError>{
 	}
 }
 
-#[derive(Debug)]
-pub enum LoadError{
-	Texture(loader::TextureError),
-	Mesh(loader::MeshError),
-}
-impl std::fmt::Display for LoadError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for LoadError{}
-impl From<loader::TextureError> for LoadError{
-	fn from(value:loader::TextureError)->Self{
-		Self::Texture(value)
-	}
-}
-impl From<loader::MeshError> for LoadError{
-	fn from(value:loader::MeshError)->Self{
-		Self::Mesh(value)
-	}
-}
-
-fn to_snf(dom:impl AsRef<WeakDom>,failure_mode:LoadFailureMode)->Result<strafesnet_common::map::CompleteMap,LoadError>{
-	let dom=dom.as_ref();
-
-	let mut texture_deferred_loader=RenderConfigDeferredLoader::new();
-	let mut mesh_deferred_loader=MeshDeferredLoader::new();
-
-	let map_step1=rbx::convert(
-		dom,
-		&mut texture_deferred_loader,
-		&mut mesh_deferred_loader,
-	);
-
-	let mut mesh_loader=loader::MeshLoader::new();
-	let meshpart_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,failure_mode).map_err(LoadError::Mesh)?;
-
-	let map_step2=map_step1.add_meshpart_meshes_and_calculate_attributes(meshpart_meshes);
-
-	let mut texture_loader=loader::TextureLoader::new();
-	let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,failure_mode).map_err(LoadError::Texture)?;
-
-	let map=map_step2.add_render_configs_and_textures(render_configs);
-
-	Ok(map)
+//ConvertError
+
+pub fn convert<AcquireRenderConfigId,AcquireMeshId>(
+	dom:impl AsRef<WeakDom>,
+	acquire_render_config_id:AcquireRenderConfigId,
+	acquire_mesh_id:AcquireMeshId
+)->rbx::PartialMap1
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->strafesnet_common::model::RenderConfigId,
+	AcquireMeshId:FnMut(&str)->strafesnet_common::model::MeshId,
+{
+	rbx::convert(&dom.as_ref(),acquire_render_config_id,acquire_mesh_id)
 }

lib/rbx_loader/src/loader.rs

@@ -1,191 +0,0 @@
-use std::io::Read;
-use rbxassetid::{RobloxAssetId,RobloxAssetIdParseErr};
-use strafesnet_common::model::Mesh;
-use strafesnet_deferred_loader::{loader::Loader,texture::Texture};
-
-use crate::data::RobloxMeshBytes;
-use crate::rbx::RobloxFaceTextureDescription;
-
-fn read_entire_file(path:impl AsRef<std::path::Path>)->Result<Vec<u8>,std::io::Error>{
-	let mut file=std::fs::File::open(path)?;
-	let mut data=Vec::new();
-	file.read_to_end(&mut data)?;
-	Ok(data)
-}
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum TextureError{
-	Io(std::io::Error),
-	RobloxAssetIdParse(RobloxAssetIdParseErr),
-}
-impl std::fmt::Display for TextureError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for TextureError{}
-impl From<std::io::Error> for TextureError{
-	fn from(value:std::io::Error)->Self{
-		Self::Io(value)
-	}
-}
-impl From<RobloxAssetIdParseErr> for TextureError{
-	fn from(value:RobloxAssetIdParseErr)->Self{
-		Self::RobloxAssetIdParse(value)
-	}
-}
-
-pub struct TextureLoader<'a>(std::marker::PhantomData<&'a ()>);
-impl TextureLoader<'_>{
-	pub fn new()->Self{
-		Self(std::marker::PhantomData)
-	}
-}
-impl<'a> Loader for TextureLoader<'a>{
-	type Error=TextureError;
-	type Index=&'a str;
-	type Resource=Texture;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
-		let RobloxAssetId(asset_id)=index.parse()?;
-		let file_name=format!("textures/{}.dds",asset_id);
-		let data=read_entire_file(file_name)?;
-		Ok(Texture::ImageDDS(data))
-	}
-}
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum MeshError{
-	Io(std::io::Error),
-	RobloxAssetIdParse(RobloxAssetIdParseErr),
-	Mesh(crate::mesh::Error),
-	Union(crate::union::Error),
-	DecodeBinary(rbx_binary::DecodeError),
-	OneChildPolicy,
-	MissingInstance,
-}
-impl std::fmt::Display for MeshError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for MeshError{}
-impl From<std::io::Error> for MeshError{
-	fn from(value:std::io::Error)->Self{
-		Self::Io(value)
-	}
-}
-impl From<RobloxAssetIdParseErr> for MeshError{
-	fn from(value:RobloxAssetIdParseErr)->Self{
-		Self::RobloxAssetIdParse(value)
-	}
-}
-impl From<crate::mesh::Error> for MeshError{
-	fn from(value:crate::mesh::Error)->Self{
-		Self::Mesh(value)
-	}
-}
-impl From<crate::union::Error> for MeshError{
-	fn from(value:crate::union::Error)->Self{
-		Self::Union(value)
-	}
-}
-impl From<rbx_binary::DecodeError> for MeshError{
-	fn from(value:rbx_binary::DecodeError)->Self{
-		Self::DecodeBinary(value)
-	}
-}
-
-#[derive(Hash,Eq,PartialEq)]
-pub enum MeshType<'a>{
-	FileMesh,
-	Union{
-		mesh_data:&'a [u8],
-		physics_data:&'a [u8],
-		size_float_bits:[u32;3],
-		part_texture_description:[Option<RobloxFaceTextureDescription>;6],
-	},
-}
-#[derive(Hash,Eq,PartialEq)]
-pub struct MeshIndex<'a>{
-	mesh_type:MeshType<'a>,
-	content:&'a str,
-}
-impl MeshIndex<'_>{
-	pub fn file_mesh(content:&str)->MeshIndex{
-		MeshIndex{
-			mesh_type:MeshType::FileMesh,
-			content,
-		}
-	}
-	pub fn union<'a>(
-		content:&'a str,
-		mesh_data:&'a [u8],
-		physics_data:&'a [u8],
-		size:&rbx_dom_weak::types::Vector3,
-		part_texture_description:crate::rbx::RobloxPartDescription,
-	)->MeshIndex<'a>{
-		MeshIndex{
-			mesh_type:MeshType::Union{
-				mesh_data,
-				physics_data,
-				size_float_bits:[size.x.to_bits(),size.y.to_bits(),size.z.to_bits()],
-				part_texture_description,
-			},
-			content,
-		}
-	}
-}
-
-pub struct MeshLoader<'a>(std::marker::PhantomData<&'a ()>);
-impl MeshLoader<'_>{
-	pub fn new()->Self{
-		Self(std::marker::PhantomData)
-	}
-}
-impl<'a> Loader for MeshLoader<'a>{
-	type Error=MeshError;
-	type Index=MeshIndex<'a>;
-	type Resource=Mesh;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
-		let mesh=match index.mesh_type{
-			MeshType::FileMesh=>{
-				let RobloxAssetId(asset_id)=index.content.parse()?;
-				let file_name=format!("meshes/{}",asset_id);
-				let data=read_entire_file(file_name)?;
-				crate::mesh::convert(RobloxMeshBytes::new(data))?
-			},
-			MeshType::Union{mut physics_data,mut mesh_data,size_float_bits,part_texture_description}=>{
-				// decode asset
-				let size=glam::Vec3::from_array(size_float_bits.map(f32::from_bits));
-				if !index.content.is_empty()&&(physics_data.is_empty()||mesh_data.is_empty()){
-					let RobloxAssetId(asset_id)=index.content.parse()?;
-					let file_name=format!("unions/{}",asset_id);
-					let data=read_entire_file(file_name)?;
-					let dom=rbx_binary::from_reader(std::io::Cursor::new(data))?;
-					let &[referent]=dom.root().children()else{
-						return Err(MeshError::OneChildPolicy);
-					};
-					let Some(instance)=dom.get_by_ref(referent)else{
-						return Err(MeshError::MissingInstance);
-					};
-					if physics_data.is_empty(){
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get("PhysicsData"){
-							physics_data=data.as_ref();
-						}
-					}
-					if mesh_data.is_empty(){
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get("MeshData"){
-							mesh_data=data.as_ref();
-						}
-					}
-					crate::union::convert(physics_data,mesh_data,size,part_texture_description)?
-				}else{
-					crate::union::convert(physics_data,mesh_data,size,part_texture_description)?
-				}
-			},
-		};
-		Ok(mesh)
-	}
-}

lib/rbx_loader/src/mesh.rs

@@ -1,9 +1,8 @@
 use std::collections::HashMap;
 
-use rbx_mesh::mesh::{Vertex2,Vertex2Truncated};
-use strafesnet_common::{integer::vec3,model::{self,ColorId,IndexedVertex,NormalId,PolygonGroup,PolygonList,PositionId,RenderConfigId,TextureCoordinateId,VertexId}};
+use rbx_mesh::mesh::{Vertex2, Vertex2Truncated};
+use strafesnet_common::{integer::vec3,model::{self, ColorId, IndexedVertex, NormalId, PolygonGroup, PolygonList, PositionId, TextureCoordinateId, VertexId}};
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Planar64Vec3(strafesnet_common::integer::Planar64TryFromFloatError),
@@ -205,13 +204,7 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<model::Me
 		unique_vertices,
 		polygon_groups,
 		//these should probably be moved to the model...
-		//but what if models want to use the same texture
-		graphics_groups:vec![model::IndexedGraphicsGroup{
-			render:RenderConfigId::new(0),
-			//the lowest lod is highest quality
-			groups:vec![model::PolygonGroupId::new(0)]
-		}],
-		//disable physics
+		graphics_groups:Vec::new(),
 		physics_groups:Vec::new(),
 	})
 }

lib/rbx_loader/src/primitives.rs

@@ -1,4 +1,4 @@
-use strafesnet_common::model::{Color4,TextureCoordinate,Mesh,IndexedGraphicsGroup,IndexedPhysicsGroup,IndexedVertex,PolygonGroupId,PolygonGroup,PolygonList,PositionId,TextureCoordinateId,NormalId,ColorId,VertexId,RenderConfigId};
+use strafesnet_common::model::{Color4,TextureCoordinate,Mesh,IndexedGraphicsGroup,IndexedPhysicsGroup,IndexedVertex,PolygonGroupId,PolygonGroup,PolygonList,IndexedVertexList,PositionId,TextureCoordinateId,NormalId,ColorId,VertexId,RenderConfigId};
 use strafesnet_common::integer::{vec3,Planar64Vec3};
 
 #[derive(Debug)]
@@ -42,6 +42,50 @@ const CUBE_DEFAULT_NORMALS:[Planar64Vec3;6]=[
 	vec3::int( 0,-1, 0),//CubeFace::Bottom
 	vec3::int( 0, 0,-1),//CubeFace::Front
 ];
+const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
+	// right (1, 0, 0)
+	[
+		[6,2,0],//[vertex,tex,norm]
+		[5,1,0],
+		[2,0,0],
+		[1,3,0],
+	],
+	// top (0, 1, 0)
+	[
+		[5,3,1],
+		[4,2,1],
+		[3,1,1],
+		[2,0,1],
+	],
+	// back (0, 0, 1)
+	[
+		[0,3,2],
+		[1,2,2],
+		[2,1,2],
+		[3,0,2],
+	],
+	// left (-1, 0, 0)
+	[
+		[0,2,3],
+		[3,1,3],
+		[4,0,3],
+		[7,3,3],
+	],
+	// bottom (0,-1, 0)
+	[
+		[1,1,4],
+		[0,0,4],
+		[7,3,4],
+		[6,2,4],
+	],
+	// front (0, 0,-1)
+	[
+		[4,1,5],
+		[5,0,5],
+		[6,3,5],
+		[7,2,5],
+	],
+];
 
 #[derive(Hash,PartialEq,Eq)]
 pub enum WedgeFace{
@@ -82,14 +126,17 @@ const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
 	vec3::int( 0,-1, 0),//CornerWedge::Bottom
 	vec3::int( 0, 0,-1),//CornerWedge::Front
 ];
+pub fn unit_sphere(render:RenderConfigId)->Mesh{
+	unit_cube(render)
+}
 #[derive(Default)]
 pub struct CubeFaceDescription([Option<FaceDescription>;6]);
 impl CubeFaceDescription{
 	pub fn insert(&mut self,index:CubeFace,value:FaceDescription){
 		self.0[index as usize]=Some(value);
 	}
-	pub fn pairs(self)->impl Iterator<Item=(usize,FaceDescription)>{
-		self.0.into_iter().enumerate().filter_map(|(i,v)|v.map(|u|(i,u)))
+	pub fn pairs(self)->std::iter::FilterMap<std::iter::Enumerate<std::array::IntoIter<Option<FaceDescription>,6>>,impl FnMut((usize,Option<FaceDescription>))->Option<(usize,FaceDescription)>>{
+		self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
 	}
 }
 pub fn unit_cube(render:RenderConfigId)->Mesh{
@@ -102,6 +149,10 @@ pub fn unit_cube(render:RenderConfigId)->Mesh{
 	t.insert(CubeFace::Front,FaceDescription::new_with_render_id(render));
 	generate_partial_unit_cube(t)
 }
+pub fn unit_cylinder(render:RenderConfigId)->Mesh{
+	//lmao
+	unit_cube(render)
+}
 #[derive(Default)]
 pub struct WedgeFaceDescription([Option<FaceDescription>;5]);
 impl WedgeFaceDescription{
@@ -112,15 +163,15 @@ impl WedgeFaceDescription{
 		self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
 	}
 }
-// pub fn unit_wedge(render:RenderConfigId)->Mesh{
-// 	let mut t=WedgeFaceDescription::default();
-// 	t.insert(WedgeFace::Right,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::TopFront,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::Back,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::Left,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::Bottom,FaceDescription::new_with_render_id(render));
-// 	generate_partial_unit_wedge(t)
-// }
+pub fn unit_wedge(render:RenderConfigId)->Mesh{
+	let mut t=WedgeFaceDescription::default();
+	t.insert(WedgeFace::Right,FaceDescription::new_with_render_id(render));
+	t.insert(WedgeFace::TopFront,FaceDescription::new_with_render_id(render));
+	t.insert(WedgeFace::Back,FaceDescription::new_with_render_id(render));
+	t.insert(WedgeFace::Left,FaceDescription::new_with_render_id(render));
+	t.insert(WedgeFace::Bottom,FaceDescription::new_with_render_id(render));
+	generate_partial_unit_wedge(t)
+}
 #[derive(Default)]
 pub struct CornerWedgeFaceDescription([Option<FaceDescription>;5]);
 impl CornerWedgeFaceDescription{
@@ -131,15 +182,15 @@ impl CornerWedgeFaceDescription{
 		self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
 	}
 }
-// pub fn unit_cornerwedge(render:RenderConfigId)->Mesh{
-// 	let mut t=CornerWedgeFaceDescription::default();
-// 	t.insert(CornerWedgeFace::Right,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::TopBack,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::TopLeft,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::Bottom,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::Front,FaceDescription::new_with_render_id(render));
-// 	generate_partial_unit_cornerwedge(t)
-// }
+pub fn unit_cornerwedge(render:RenderConfigId)->Mesh{
+	let mut t=CornerWedgeFaceDescription::default();
+	t.insert(CornerWedgeFace::Right,FaceDescription::new_with_render_id(render));
+	t.insert(CornerWedgeFace::TopBack,FaceDescription::new_with_render_id(render));
+	t.insert(CornerWedgeFace::TopLeft,FaceDescription::new_with_render_id(render));
+	t.insert(CornerWedgeFace::Bottom,FaceDescription::new_with_render_id(render));
+	t.insert(CornerWedgeFace::Front,FaceDescription::new_with_render_id(render));
+	generate_partial_unit_cornerwedge(t)
+}
 
 #[derive(Clone)]
 pub struct FaceDescription{
@@ -157,50 +208,6 @@ impl FaceDescription{
 	}
 }
 pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
-	const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
-		// right (1, 0, 0)
-		[
-			[6,2,0],//[vertex,tex,norm]
-			[5,1,0],
-			[2,0,0],
-			[1,3,0],
-		],
-		// top (0, 1, 0)
-		[
-			[5,3,1],
-			[4,2,1],
-			[3,1,1],
-			[2,0,1],
-		],
-		// back (0, 0, 1)
-		[
-			[0,3,2],
-			[1,2,2],
-			[2,1,2],
-			[3,0,2],
-		],
-		// left (-1, 0, 0)
-		[
-			[0,2,3],
-			[3,1,3],
-			[4,0,3],
-			[7,3,3],
-		],
-		// bottom (0,-1, 0)
-		[
-			[1,1,4],
-			[0,0,4],
-			[7,3,4],
-			[6,2,4],
-		],
-		// front (0, 0,-1)
-		[
-			[4,1,5],
-			[5,0,5],
-			[6,3,5],
-			[7,2,5],
-		],
-	];
 	let mut generated_pos=Vec::new();
 	let mut generated_tex=Vec::new();
 	let mut generated_normal=Vec::new();
@@ -279,35 +286,35 @@ pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
 }
 //don't think too hard about the copy paste because this is all going into the map tool eventually...
 pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh{
-	const WEDGE_DEFAULT_POLYS:[&[[u32;3]];5]=[
+	let wedge_default_polys=[
 		// right (1, 0, 0)
-		&[
+		vec![
 			[6,2,0],//[vertex,tex,norm]
 			[2,0,0],
 			[1,3,0],
 		],
 		// FrontTop (0, 1, -1)
-		&[
+		vec![
 			[3,1,1],
 			[2,0,1],
 			[6,3,1],
 			[7,2,1],
 		],
 		// back (0, 0, 1)
-		&[
+		vec![
 			[0,3,2],
 			[1,2,2],
 			[2,1,2],
 			[3,0,2],
 		],
 		// left (-1, 0, 0)
-		&[
+		vec![
 			[0,2,3],
 			[3,1,3],
 			[7,3,3],
 		],
 		// bottom (0,-1, 0)
-		&[
+		vec![
 			[1,1,4],
 			[0,0,4],
 			[7,3,4],
@@ -351,7 +358,7 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh
 		//push vertices as they are needed
 		let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
 		polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(vec![
-			WEDGE_DEFAULT_POLYS[face_id].iter().map(|tup|{
+			wedge_default_polys[face_id].iter().map(|tup|{
 				let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
 				let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
 					pos_index
@@ -392,34 +399,34 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh
 }
 
 pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescription)->Mesh{
-	const CORNERWEDGE_DEFAULT_POLYS:[&[[u32;3]];5]=[
+	let cornerwedge_default_polys=[
 		// right (1, 0, 0)
-		&[
+		vec![
 			[6,2,0],//[vertex,tex,norm]
 			[5,1,0],
 			[1,3,0],
 		],
 		// BackTop (0, 1, 1)
-		&[
+		vec![
 			[5,3,1],
 			[0,1,1],
 			[1,0,1],
 		],
 		// LeftTop (-1, 1, 0)
-		&[
+		vec![
 			[5,3,2],
 			[7,2,2],
 			[0,1,2],
 		],
 		// bottom (0,-1, 0)
-		&[
+		vec![
 			[1,1,3],
 			[0,0,3],
 			[7,3,3],
 			[6,2,3],
 		],
 		// front (0, 0,-1)
-		&[
+		vec![
 			[5,0,4],
 			[6,3,4],
 			[7,2,4],
@@ -462,7 +469,7 @@ pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescri
 		//push vertices as they are needed
 		let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
 		polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(vec![
-			CORNERWEDGE_DEFAULT_POLYS[face_id].iter().map(|tup|{
+			cornerwedge_default_polys[face_id].iter().map(|tup|{
 				let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
 				let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
 					pos_index

lib/rbx_loader/src/rbx.rs

@@ -1,7 +1,5 @@
 use std::collections::HashMap;
-use crate::loader::MeshIndex;
 use crate::primitives;
-use strafesnet_common::aabb::Aabb;
 use strafesnet_common::map;
 use strafesnet_common::model;
 use strafesnet_common::gameplay_modes;
@@ -10,9 +8,6 @@ use strafesnet_common::gameplay_attributes as attr;
 use strafesnet_common::integer::{self,vec3,Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
 use strafesnet_common::model::RenderConfigId;
 use strafesnet_common::updatable::Updatable;
-use strafesnet_deferred_loader::deferred_loader::{RenderConfigDeferredLoader,MeshDeferredLoader};
-use strafesnet_deferred_loader::mesh::Meshes;
-use strafesnet_deferred_loader::texture::{RenderConfigs,Texture};
 
 fn class_is_a(class: &str, superclass: &str) -> bool {
 	if class==superclass {
@@ -135,9 +130,9 @@ impl ModesBuilder{
 	fn push_mode_update(&mut self,mode_id:gameplay_modes::ModeId,mode_update:gameplay_modes::ModeUpdate){
 		self.mode_updates.push((mode_id,mode_update));
 	}
-	// fn push_stage_update(&mut self,mode_id:gameplay_modes::ModeId,stage_id:gameplay_modes::StageId,stage_update:gameplay_modes::StageUpdate){
-	// 	self.stage_updates.push((mode_id,stage_id,stage_update));
-	// }
+	fn push_stage_update(&mut self,mode_id:gameplay_modes::ModeId,stage_id:gameplay_modes::StageId,stage_update:gameplay_modes::StageUpdate){
+		self.stage_updates.push((mode_id,stage_id,stage_update));
+	}
 }
 fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:model::ModelId,modes_builder:&mut ModesBuilder,wormhole_in_model_to_id:&mut HashMap<model::ModelId,u32>,wormhole_id_to_out_model:&mut HashMap<u32,model::ModelId>)->attr::CollisionAttributes{
 	let mut general=attr::GeneralAttributes::default();
@@ -346,103 +341,58 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
 	}
 }
 
-#[derive(Clone,Copy)]
-pub struct RobloxTextureTransform{
-	offset_studs_u:f32,
-	offset_studs_v:f32,
-	studs_per_tile_u:f32,
-	studs_per_tile_v:f32,
-	size_u:f32,
-	size_v:f32,
+#[derive(Clone,Copy,PartialEq)]
+struct RobloxTextureTransform{
+	offset_u:f32,
+	offset_v:f32,
+	scale_u:f32,
+	scale_v:f32,
 }
-#[derive(Clone,Copy,Hash,Eq,PartialEq)]
-pub struct RobloxTextureTransformBits{
-	offset_studs_u:u32,
-	offset_studs_v:u32,
-	studs_per_tile_u:u32,
-	studs_per_tile_v:u32,
-	size_u:u32,
-	size_v:u32,
+impl std::cmp::Eq for RobloxTextureTransform{}//????
+impl std::default::Default for RobloxTextureTransform{
+    fn default()->Self{
+        Self{offset_u:0.0,offset_v:0.0,scale_u:1.0,scale_v:1.0}
+    }
 }
-impl RobloxTextureTransform{
-	fn identity()->Self{
-		Self{
-			offset_studs_u:0.0,
-			offset_studs_v:0.0,
-			studs_per_tile_u:1.0,
-			studs_per_tile_v:1.0,
-			size_u:1.0,
-			size_v:1.0,
-		}
-	}
-	pub fn to_bits(self)->RobloxTextureTransformBits{
-		RobloxTextureTransformBits{
-			offset_studs_u:self.offset_studs_u.to_bits(),
-			offset_studs_v:self.offset_studs_v.to_bits(),
-			studs_per_tile_u:self.studs_per_tile_u.to_bits(),
-			studs_per_tile_v:self.studs_per_tile_v.to_bits(),
-			size_u:self.size_u.to_bits(),
-			size_v:self.size_v.to_bits(),
-		}
-	}
-	pub fn affine(&self)->glam::Affine2{
-		glam::Affine2::from_translation(
-			glam::vec2(self.offset_studs_u/self.studs_per_tile_u,self.offset_studs_v/self.studs_per_tile_v)
-		)
-		*glam::Affine2::from_scale(
-			glam::vec2(self.size_u/self.studs_per_tile_u,self.size_v/self.studs_per_tile_v)
-		)
-	}
-	pub fn set_size(&mut self,size_u:f32,size_v:f32){
-		self.size_u=size_u;
-		self.size_v=size_v;
+impl std::hash::Hash for RobloxTextureTransform{
+	fn hash<H:std::hash::Hasher>(&self,state:&mut H) {
+		self.offset_u.to_ne_bytes().hash(state);
+		self.offset_v.to_ne_bytes().hash(state);
+		self.scale_u.to_ne_bytes().hash(state);
+		self.scale_v.to_ne_bytes().hash(state);
 	}
 }
-impl core::hash::Hash for RobloxTextureTransform{
-	fn hash<H:core::hash::Hasher>(&self,state:&mut H){
-		self.to_bits().hash(state);
-	}
-}
-#[derive(Clone,Copy,Hash,Eq,PartialEq)]
-pub struct RobloxFaceTextureDescriptionBits{
+#[derive(Clone,PartialEq)]
+struct RobloxFaceTextureDescription{
 	render:RenderConfigId,
-	color:[u32;4],
-	transform:RobloxTextureTransformBits,
+	color:glam::Vec4,
+	transform:RobloxTextureTransform,
 }
-#[derive(Clone,Copy)]
-pub struct RobloxFaceTextureDescription{
-	pub render:RenderConfigId,
-	pub color:glam::Vec4,
-	pub transform:RobloxTextureTransform,
-}
-impl core::cmp::PartialEq for RobloxFaceTextureDescription{
-	fn eq(&self,other:&Self)->bool{
-		self.to_bits().eq(&other.to_bits())
-	}
-}
-impl core::cmp::Eq for RobloxFaceTextureDescription{}
-impl core::hash::Hash for RobloxFaceTextureDescription{
-	fn hash<H:core::hash::Hasher>(&self,state:&mut H){
-		self.to_bits().hash(state);
-	}
+impl std::cmp::Eq for RobloxFaceTextureDescription{}//????
+impl std::hash::Hash for RobloxFaceTextureDescription{
+	fn hash<H:std::hash::Hasher>(&self,state:&mut H){
+		self.render.hash(state);
+		self.transform.hash(state);
+        for &el in self.color.as_ref().iter(){
+            el.to_ne_bytes().hash(state);
+        }
+    }
 }
 impl RobloxFaceTextureDescription{
-	pub fn to_bits(self)->RobloxFaceTextureDescriptionBits{
-		RobloxFaceTextureDescriptionBits{
-			render:self.render,
-			color:self.color.to_array().map(f32::to_bits),
-			transform:self.transform.to_bits(),
-		}
-	}
-	pub fn to_face_description(&self)->primitives::FaceDescription{
+	fn to_face_description(&self)->primitives::FaceDescription{
 		primitives::FaceDescription{
 			render:self.render,
-			transform:self.transform.affine(),
+			transform:glam::Affine2::from_translation(
+				glam::vec2(self.transform.offset_u,self.transform.offset_v)
+			)
+			*glam::Affine2::from_scale(
+				glam::vec2(self.transform.scale_u,self.transform.scale_v)
+			),
 			color:self.color,
 		}
 	}
 }
-pub type RobloxPartDescription=[Option<RobloxFaceTextureDescription>;6];
+type RobloxPartDescription=[Option<RobloxFaceTextureDescription>;6];
 type RobloxWedgeDescription=[Option<RobloxFaceTextureDescription>;5];
 type RobloxCornerWedgeDescription=[Option<RobloxFaceTextureDescription>;5];
 #[derive(Clone,Eq,Hash,PartialEq)]
@@ -453,134 +403,52 @@ enum RobloxBasePartDescription{
 	Wedge(RobloxWedgeDescription),
 	CornerWedge(RobloxCornerWedgeDescription),
 }
-fn get_texture_description<'a>(
-	temp_objects:&mut Vec<rbx_dom_weak::types::Ref>,
-	render_config_deferred_loader:&mut RenderConfigDeferredLoader<&'a str>,
-	dom:&'a rbx_dom_weak::WeakDom,
-	object:&rbx_dom_weak::Instance,
-	size:&rbx_dom_weak::types::Vector3,
-)->RobloxPartDescription{
-	//use the biggest one and cut it down later...
-	let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
-	temp_objects.clear();
-	recursive_collect_superclass(temp_objects,&dom,object,"Decal");
-	for &mut decal_ref in temp_objects{
-	if let Some(decal)=dom.get_by_ref(decal_ref){
-		if let (
-			Some(rbx_dom_weak::types::Variant::Content(content)),
-			Some(rbx_dom_weak::types::Variant::Enum(normalid)),
-			Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
-			Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
-		) = (
-			decal.properties.get("Texture"),
-			decal.properties.get("Face"),
-			decal.properties.get("Color3"),
-			decal.properties.get("Transparency"),
-		) {
-			let render_id=render_config_deferred_loader.acquire_render_config_id(Some(content.as_ref()));
-				let normal_id=normalid.to_u32();
-				if normal_id<6{
-					let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{
-						//generate tranform
-						if let (
-								Some(&rbx_dom_weak::types::Variant::Float32(offset_studs_u)),
-								Some(&rbx_dom_weak::types::Variant::Float32(offset_studs_v)),
-								Some(&rbx_dom_weak::types::Variant::Float32(studs_per_tile_u)),
-								Some(&rbx_dom_weak::types::Variant::Float32(studs_per_tile_v)),
-							) = (
-								decal.properties.get("OffsetStudsU"),
-								decal.properties.get("OffsetStudsV"),
-								decal.properties.get("StudsPerTileU"),
-								decal.properties.get("StudsPerTileV"),
-							)
-						{
-							let (size_u,size_v)=match normal_id{
-								0=>(size.z,size.y),//right
-								1=>(size.x,size.z),//top
-								2=>(size.x,size.y),//back
-								3=>(size.z,size.y),//left
-								4=>(size.x,size.z),//bottom
-								5=>(size.x,size.y),//front
-								_=>unreachable!(),
-							};
-							(
-								glam::vec4(decal_color3.r,decal_color3.g,decal_color3.b,1.0-*decal_transparency),
-								RobloxTextureTransform{
-									offset_studs_u,
-									offset_studs_v,
-									studs_per_tile_u,
-									studs_per_tile_v,
-									size_u,
-									size_v,
-								}
-							)
-						}else{
-							(glam::Vec4::ONE,RobloxTextureTransform::identity())
-						}
-					}else{
-						(glam::Vec4::ONE,RobloxTextureTransform::identity())
-					};
-					part_texture_description[normal_id as usize]=Some(RobloxFaceTextureDescription{
-						render:render_id,
-						color:roblox_texture_color,
-						transform:roblox_texture_transform,
-					});
-				}else{
-					println!("NormalId={} is invalid",normal_id);
-				}
-			}
-		}
-	}
-	part_texture_description
-}
 enum Shape{
 	Primitive(primitives::Primitives),
 	MeshPart,
-	PhysicsData,
 }
 enum MeshAvailability{
 	Immediate,
-	DeferredMesh(RenderConfigId),
-	DeferredUnion(RobloxPartDescription),
+	Deferred(RenderConfigId),
 }
-struct DeferredModelDeferredAttributes<'a>{
+struct DeferredModelDeferredAttributes{
 	render:RenderConfigId,
-	model:ModelDeferredAttributes<'a>,
+	model:ModelDeferredAttributes,
 }
-struct ModelDeferredAttributes<'a>{
+struct ModelDeferredAttributes{
 	mesh:model::MeshId,
-	deferred_attributes:GetAttributesArgs<'a>,
+	deferred_attributes:GetAttributesArgs,
 	color:model::Color4,//transparency is in here
 	transform:Planar64Affine3,
 }
-struct DeferredUnionDeferredAttributes<'a>{
-	render:RobloxPartDescription,
-	model:ModelDeferredAttributes<'a>,
-}
 struct ModelOwnedAttributes{
 	mesh:model::MeshId,
 	attributes:attr::CollisionAttributes,
 	color:model::Color4,//transparency is in here
 	transform:Planar64Affine3,
 }
-struct GetAttributesArgs<'a>{
-	name:&'a str,
+struct GetAttributesArgs{
+	name:Box<str>,
 	can_collide:bool,
 	velocity:Planar64Vec3,
 }
-pub fn convert<'a>(
-	dom:&'a rbx_dom_weak::WeakDom,
-	render_config_deferred_loader:&mut RenderConfigDeferredLoader<&'a str>,
-	mesh_deferred_loader:&mut MeshDeferredLoader<MeshIndex<'a>>,
-)->PartialMap1<'a>{
+pub fn convert<AcquireRenderConfigId,AcquireMeshId>(
+	dom:&rbx_dom_weak::WeakDom,
+	mut acquire_render_config_id:AcquireRenderConfigId,
+	mut acquire_mesh_id:AcquireMeshId,
+)->PartialMap1
+where
+	AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
+	AcquireMeshId:FnMut(&str)->model::MeshId,
+{
+
 	let mut deferred_models_deferred_attributes=Vec::new();
-	let mut deferred_unions_deferred_attributes=Vec::new();
 	let mut primitive_models_deferred_attributes=Vec::new();
 	let mut primitive_meshes=Vec::new();
 	let mut mesh_id_from_description=HashMap::new();
 
 	//just going to leave it like this for now instead of reworking the data structures for this whole thing
-	let textureless_render_group=render_config_deferred_loader.acquire_render_config_id(None);
+	let textureless_render_group=acquire_render_config_id(None);
 
 	let mut object_refs=Vec::new();
 	let mut temp_objects=Vec::new();
@@ -617,6 +485,9 @@ pub fn convert<'a>(
 					continue;
 				}
 
+				//at this point a new model is going to be generated for sure.
+				let model_id=model::ModelId::new(primitive_models_deferred_attributes.len() as u32);
+
 				//TODO: also detect "CylinderMesh" etc here
 				let shape=match object.class.as_str(){
 					"Part"=>if let Some(rbx_dom_weak::types::Variant::Enum(shape))=object.properties.get("Shape"){
@@ -635,7 +506,6 @@ pub fn convert<'a>(
 					"WedgePart"=>Shape::Primitive(primitives::Primitives::Wedge),
 					"CornerWedgePart"=>Shape::Primitive(primitives::Primitives::CornerWedge),
 					"MeshPart"=>Shape::MeshPart,
-					"UnionOperation"=>Shape::PhysicsData,
 					_=>{
 						println!("Unsupported BasePart ClassName={}; defaulting to cube",object.class);
 						Shape::Primitive(primitives::Primitives::Cube)
@@ -644,8 +514,74 @@ pub fn convert<'a>(
 
 				let (availability,mesh_id)=match shape{
 					Shape::Primitive(primitive_shape)=>{
-				//TODO: TAB TAB
-				let part_texture_description=get_texture_description(&mut temp_objects,render_config_deferred_loader,dom,object,size);
+						//TODO: TAB TAB
+				//use the biggest one and cut it down later...
+				let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
+				temp_objects.clear();
+				recursive_collect_superclass(&mut temp_objects, &dom, object,"Decal");
+				for &decal_ref in &temp_objects{
+					if let Some(decal)=dom.get_by_ref(decal_ref){
+						if let (
+							Some(rbx_dom_weak::types::Variant::Content(content)),
+							Some(rbx_dom_weak::types::Variant::Enum(normalid)),
+							Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
+							Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
+						) = (
+							decal.properties.get("Texture"),
+							decal.properties.get("Face"),
+							decal.properties.get("Color3"),
+							decal.properties.get("Transparency"),
+						) {
+							let render_id=acquire_render_config_id(Some(content.as_ref()));
+								let normal_id=normalid.to_u32();
+								if normal_id<6{
+									let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{
+										//generate tranform
+										if let (
+												Some(rbx_dom_weak::types::Variant::Float32(ox)),
+												Some(rbx_dom_weak::types::Variant::Float32(oy)),
+												Some(rbx_dom_weak::types::Variant::Float32(sx)),
+												Some(rbx_dom_weak::types::Variant::Float32(sy)),
+											) = (
+												decal.properties.get("OffsetStudsU"),
+												decal.properties.get("OffsetStudsV"),
+												decal.properties.get("StudsPerTileU"),
+												decal.properties.get("StudsPerTileV"),
+											)
+										{
+											let (size_u,size_v)=match normal_id{
+												0=>(size.z,size.y),//right
+												1=>(size.x,size.z),//top
+												2=>(size.x,size.y),//back
+												3=>(size.z,size.y),//left
+												4=>(size.x,size.z),//bottom
+												5=>(size.x,size.y),//front
+												_=>unreachable!(),
+											};
+											(
+												glam::vec4(decal_color3.r,decal_color3.g,decal_color3.b,1.0-*decal_transparency),
+												RobloxTextureTransform{
+													offset_u:*ox/(*sx),offset_v:*oy/(*sy),
+													scale_u:size_u/(*sx),scale_v:size_v/(*sy),
+												}
+											)
+										}else{
+											(glam::Vec4::ONE,RobloxTextureTransform::default())
+										}
+									}else{
+										(glam::Vec4::ONE,RobloxTextureTransform::default())
+									};
+									part_texture_description[normal_id as usize]=Some(RobloxFaceTextureDescription{
+										render:render_id,
+										color:roblox_texture_color,
+										transform:roblox_texture_transform,
+									});
+								}else{
+									println!("NormalId={} unsupported for shape={:?}",normal_id,primitive_shape);
+								}
+						}
+					}
+				}
 				//obscure rust syntax "slice pattern"
 				let [
 					f0,//Cube::Right
@@ -662,7 +598,7 @@ pub fn convert<'a>(
 					//use front face texture first and use top face texture as a fallback
 					primitives::Primitives::Wedge=>RobloxBasePartDescription::Wedge([
 						f0,//Cube::Right->Wedge::Right
-						f5.or(f1),//Cube::Front|Cube::Top->Wedge::TopFront
+						if f5.is_some(){f5}else{f1},//Cube::Front|Cube::Top->Wedge::TopFront
 						f2,//Cube::Back->Wedge::Back
 						f3,//Cube::Left->Wedge::Left
 						f4,//Cube::Bottom->Wedge::Bottom
@@ -670,8 +606,8 @@ pub fn convert<'a>(
 					//TODO: fix Left+Back texture coordinates to match roblox when not overwridden by Top
 					primitives::Primitives::CornerWedge=>RobloxBasePartDescription::CornerWedge([
 						f0,//Cube::Right->CornerWedge::Right
-						f2.or(f1.clone()),//Cube::Back|Cube::Top->CornerWedge::TopBack
-						f3.or(f1),//Cube::Left|Cube::Top->CornerWedge::TopLeft
+						if f2.is_some(){f2}else{f1.clone()},//Cube::Back|Cube::Top->CornerWedge::TopBack
+						if f3.is_some(){f3}else{f1},//Cube::Left|Cube::Top->CornerWedge::TopLeft
 						f4,//Cube::Bottom->CornerWedge::Bottom
 						f5,//Cube::Front->CornerWedge::Front
 					]),
@@ -758,51 +694,29 @@ pub fn convert<'a>(
 						object.properties.get("TextureID"),
 					){
 						(
-							MeshAvailability::DeferredMesh(render_config_deferred_loader.acquire_render_config_id(Some(texture_asset_id.as_ref()))),
-							mesh_deferred_loader.acquire_mesh_id(MeshIndex::file_mesh(mesh_asset_id.as_ref())),
+							MeshAvailability::Deferred(acquire_render_config_id(Some(texture_asset_id.as_ref()))),
+							acquire_mesh_id(mesh_asset_id.as_ref()),
 						)
 					}else{
 						panic!("Mesh has no Mesh or Texture");
 					},
-					Shape::PhysicsData=>{
-						let mut content="";
-						let mut mesh_data:&[u8]=&[];
-						let mut physics_data:&[u8]=&[];
-						if let Some(rbx_dom_weak::types::Variant::Content(asset_id))=object.properties.get("AssetId"){
-							content=asset_id.as_ref();
-						}
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=object.properties.get("MeshData"){
-							mesh_data=data.as_ref();
-						}
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=object.properties.get("PhysicsData"){
-							physics_data=data.as_ref();
-						}
-						let part_texture_description=get_texture_description(&mut temp_objects,render_config_deferred_loader,dom,object,size);
-						let mesh_index=MeshIndex::union(content,mesh_data,physics_data,size,part_texture_description.clone());
-						let mesh_id=mesh_deferred_loader.acquire_mesh_id(mesh_index);
-						(MeshAvailability::DeferredUnion(part_texture_description),mesh_id)
-					},
 				};
 				let model_deferred_attributes=ModelDeferredAttributes{
 					mesh:mesh_id,
 					transform:model_transform,
 					color:glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
 					deferred_attributes:GetAttributesArgs{
-						name:object.name.as_str(),
+						name:object.name.as_str().into(),
 						can_collide:*can_collide,
 						velocity:vec3::try_from_f32_array([velocity.x,velocity.y,velocity.z]).unwrap(),
 					},
 				};
 				match availability{
 					MeshAvailability::Immediate=>primitive_models_deferred_attributes.push(model_deferred_attributes),
-					MeshAvailability::DeferredMesh(render)=>deferred_models_deferred_attributes.push(DeferredModelDeferredAttributes{
+					MeshAvailability::Deferred(render)=>deferred_models_deferred_attributes.push(DeferredModelDeferredAttributes{
 						render,
 						model:model_deferred_attributes
 					}),
-					MeshAvailability::DeferredUnion(part_texture_description)=>deferred_unions_deferred_attributes.push(DeferredUnionDeferredAttributes{
-						render:part_texture_description,
-						model:model_deferred_attributes,
-					}),
 				}
 			}
 		}
@@ -811,71 +725,21 @@ pub fn convert<'a>(
 		primitive_meshes,
 		primitive_models_deferred_attributes,
 		deferred_models_deferred_attributes,
-		deferred_unions_deferred_attributes,
 	}
 }
 struct MeshWithAabb{
 	mesh:model::Mesh,
-	aabb:Aabb,
+	aabb:strafesnet_common::aabb::Aabb,
 }
-fn acquire_mesh_id_from_render_config_id<'a>(
-	primitive_meshes:&mut Vec<model::Mesh>,
-	mesh_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RenderConfigId,model::MeshId>>,
-	loaded_meshes:&'a HashMap<model::MeshId,MeshWithAabb>,
-	old_mesh_id:model::MeshId,
-	render:RenderConfigId,
-)->Option<(model::MeshId,&'a Aabb)>{
-	//ignore meshes that fail to load completely for now
-	loaded_meshes.get(&old_mesh_id).map(|mesh_with_aabb|(
-		*mesh_id_from_render_config_id.entry(old_mesh_id).or_insert_with(||HashMap::new())
-		.entry(render).or_insert_with(||{
-			let mesh_id=model::MeshId::new(primitive_meshes.len() as u32);
-			let mut mesh_clone=mesh_with_aabb.mesh.clone();
-			//set the render group lool
-			if let Some(graphics_group)=mesh_clone.graphics_groups.first_mut(){
-				graphics_group.render=render;
-			}
-			primitive_meshes.push(mesh_clone);
-			mesh_id
-		}),
-		&mesh_with_aabb.aabb,
-	))
-}
-fn acquire_union_id_from_render_config_id<'a>(
-	primitive_meshes:&mut Vec<model::Mesh>,
-	union_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RobloxPartDescription,model::MeshId>>,
-	loaded_meshes:&'a HashMap<model::MeshId,MeshWithAabb>,
-	old_union_id:model::MeshId,
-	part_texture_description:RobloxPartDescription,
-)->Option<(model::MeshId,&'a Aabb)>{
-	//ignore uniones that fail to load completely for now
-	loaded_meshes.get(&old_union_id).map(|union_with_aabb|(
-		*union_id_from_render_config_id.entry(old_union_id).or_insert_with(||HashMap::new())
-		.entry(part_texture_description.clone()).or_insert_with(||{
-			let union_id=model::MeshId::new(primitive_meshes.len() as u32);
-			let mut union_clone=union_with_aabb.mesh.clone();
-			//set the render groups
-			for (graphics_group,maybe_face_texture_description) in union_clone.graphics_groups.iter_mut().zip(part_texture_description){
-				if let Some(face_texture_description)=maybe_face_texture_description{
-					graphics_group.render=face_texture_description.render;
-				}
-			}
-			primitive_meshes.push(union_clone);
-			union_id
-		}),
-		&union_with_aabb.aabb,
-	))
-}
-pub struct PartialMap1<'a>{
+pub struct PartialMap1{
 	primitive_meshes:Vec<model::Mesh>,
-	primitive_models_deferred_attributes:Vec<ModelDeferredAttributes<'a>>,
-	deferred_models_deferred_attributes:Vec<DeferredModelDeferredAttributes<'a>>,
-	deferred_unions_deferred_attributes:Vec<DeferredUnionDeferredAttributes<'a>>,
+	primitive_models_deferred_attributes:Vec<ModelDeferredAttributes>,
+	deferred_models_deferred_attributes:Vec<DeferredModelDeferredAttributes>,
 }
-impl PartialMap1<'_>{
+impl PartialMap1{
 	pub fn add_meshpart_meshes_and_calculate_attributes(
 		mut self,
-		meshpart_meshes:Meshes,
+		meshpart_meshes:impl IntoIterator<Item=(model::MeshId,crate::data::RobloxMeshBytes)>,
 	)->PartialMap2{
 		//calculate attributes
 		let mut modes_builder=ModesBuilder::default();
@@ -888,32 +752,51 @@ impl PartialMap1<'_>{
 		//decode roblox meshes
 		//generate mesh_id_map based on meshes that failed to load
 		let loaded_meshes:HashMap<model::MeshId,MeshWithAabb>=
-		meshpart_meshes.consume().map(|(old_mesh_id,mesh)|{
-			let mut aabb=strafesnet_common::aabb::Aabb::default();
-			for &pos in &mesh.unique_pos{
-				aabb.grow(pos);
+		meshpart_meshes.into_iter().flat_map(|(old_mesh_id,roblox_mesh_bytes)|
+			match crate::mesh::convert(roblox_mesh_bytes){
+				Ok(mesh)=>{
+					let mut aabb=strafesnet_common::aabb::Aabb::default();
+					for &pos in &mesh.unique_pos{
+						aabb.grow(pos);
+					}
+					Some((old_mesh_id,MeshWithAabb{
+						mesh,
+						aabb,
+					}))
+				},
+				Err(e)=>{
+					println!("Error converting mesh: {e:?}");
+					None
+				},
 			}
-			(old_mesh_id,MeshWithAabb{
-				mesh,
-				aabb,
-			})
-		}).collect();
-
-		// SAFETY: I have no idea what I'm doing and this is definitely unsound in some subtle way
-		// I just want to chain iterators together man
-		let aint_no_way=core::cell::UnsafeCell::new(&mut self.primitive_meshes);
+		).collect();
 
 		let mut mesh_id_from_render_config_id=HashMap::new();
-		let mut union_id_from_render_config_id=HashMap::new();
+		//ignore meshes that fail to load completely for now
+		let mut acquire_mesh_id_from_render_config_id=|old_mesh_id,render|{
+			loaded_meshes.get(&old_mesh_id).map(|mesh_with_aabb|(
+				*mesh_id_from_render_config_id.entry(old_mesh_id).or_insert_with(||HashMap::new())
+				.entry(render).or_insert_with(||{
+					let mesh_id=model::MeshId::new(self.primitive_meshes.len() as u32);
+					let mut mesh_clone=mesh_with_aabb.mesh.clone();
+					//add a render group lool
+					mesh_clone.graphics_groups.push(model::IndexedGraphicsGroup{
+						render,
+						//the lowest lod is highest quality
+						groups:vec![model::PolygonGroupId::new(0)]
+					});
+					self.primitive_meshes.push(mesh_clone);
+					mesh_id
+				}),
+				&mesh_with_aabb.aabb,
+			))
+		};
 		//now that the meshes are loaded, these models can be generated
 		let models_owned_attributes:Vec<ModelOwnedAttributes>=
 		self.deferred_models_deferred_attributes.into_iter().flat_map(|deferred_model_deferred_attributes|{
 			//meshes need to be cloned from loaded_meshes with a new id when they are used with a new render_id
 			//insert into primitive_meshes
 			let (mesh,aabb)=acquire_mesh_id_from_render_config_id(
-				unsafe{*aint_no_way.get()},
-				&mut mesh_id_from_render_config_id,
-				&loaded_meshes,
 				deferred_model_deferred_attributes.model.mesh,
 				deferred_model_deferred_attributes.render
 			)?;
@@ -931,32 +814,7 @@ impl PartialMap1<'_>{
 					deferred_model_deferred_attributes.model.transform.translation
 				),
 			})
-		}).chain(self.deferred_unions_deferred_attributes.into_iter().flat_map(|deferred_union_deferred_attributes|{
-			//meshes need to be cloned from loaded_meshes with a new id when they are used with a new render_id
-			//insert into primitive_meshes
-			let (mesh,aabb)=acquire_union_id_from_render_config_id(
-				unsafe{*aint_no_way.get()},
-				&mut union_id_from_render_config_id,
-				&loaded_meshes,
-				deferred_union_deferred_attributes.model.mesh,
-				deferred_union_deferred_attributes.render
-			)?;
-			let size=aabb.size();
-			Some(ModelDeferredAttributes{
-				mesh,
-				deferred_attributes:deferred_union_deferred_attributes.model.deferred_attributes,
-				color:deferred_union_deferred_attributes.model.color,
-				transform:Planar64Affine3::new(
-					Planar64Mat3::from_cols([
-						(deferred_union_deferred_attributes.model.transform.matrix3.x_axis*2/size.x).divide().fix_1(),
-						(deferred_union_deferred_attributes.model.transform.matrix3.y_axis*2/size.y).divide().fix_1(),
-						(deferred_union_deferred_attributes.model.transform.matrix3.z_axis*2/size.z).divide().fix_1()
-					]),
-					deferred_union_deferred_attributes.model.transform.translation
-				),
-			})
-		}))
-		.chain(self.primitive_models_deferred_attributes.into_iter())
+		}).chain(self.primitive_models_deferred_attributes.into_iter())
 		.enumerate().map(|(model_id,model_deferred_attributes)|{
 			let model_id=model::ModelId::new(model_id as u32);
 			ModelOwnedAttributes{
@@ -1024,21 +882,15 @@ pub struct PartialMap2{
 impl PartialMap2{
 	pub fn add_render_configs_and_textures(
 		self,
-		render_configs:RenderConfigs,
+		render_configs:impl IntoIterator<Item=(model::RenderConfigId,model::RenderConfig)>,
+		textures:impl IntoIterator<Item=(model::TextureId,Vec<u8>)>,
 	)->map::CompleteMap{
-		let (textures,render_configs)=render_configs.consume();
 		let (textures,texture_id_map):(Vec<Vec<u8>>,HashMap<model::TextureId,model::TextureId>)
-		=textures.into_iter().enumerate().map(|(new_texture_id,(old_texture_id,Texture::ImageDDS(texture)))|{
+		=textures.into_iter().enumerate().map(|(new_texture_id,(old_texture_id,texture))|{
 			(texture,(old_texture_id,model::TextureId::new(new_texture_id as u32)))
 		}).unzip();
-		let render_configs=render_configs.into_iter().map(|(_render_config_id,mut render_config)|{
-			// This may generate duplicate no-texture render configs but idc
-			//
-			// This is because some textures may not exist, so the render config
-			// that it points to is unique but is texture.
-			//
-			// I don't think this needs to be fixed because missing textures
-			// should be a conversion error anyways.
+		let render_configs=render_configs.into_iter().map(|(render_config_id,mut render_config)|{
+			//this may generate duplicate no-texture render configs but idc
 			render_config.texture=render_config.texture.and_then(|texture_id|
 				texture_id_map.get(&texture_id).copied()
 			);

lib/rbx_loader/src/union.rs

@@ -1,177 +0,0 @@
-use rbx_mesh::mesh_data::NormalId2 as MeshDataNormalId2;
-use strafesnet_common::model::{self,IndexedVertex,PolygonGroup,PolygonGroupId,PolygonList,RenderConfigId};
-use strafesnet_common::integer::vec3;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	Block,
-	MissingVertexId(u32),
-	Planar64Vec3(strafesnet_common::integer::Planar64TryFromFloatError),
-	RobloxPhysicsData(rbx_mesh::physics_data::Error),
-	RobloxMeshData(rbx_mesh::mesh_data::Error),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-
-// wacky state machine to make sure all vertices in a face agree upon what NormalId to use.
-// Roblox duplicates this information per vertex when it should only exist per-face.
-enum MeshDataNormalStatus{
-	Agree(MeshDataNormalId2),
-	Conflicting,
-}
-struct MeshDataNormalChecker{
-	status:Option<MeshDataNormalStatus>,
-}
-impl MeshDataNormalChecker{
-	fn new()->Self{
-		Self{status:None}
-	}
-	fn check(&mut self,normal:MeshDataNormalId2){
-		self.status=match self.status.take(){
-			None=>Some(MeshDataNormalStatus::Agree(normal)),
-			Some(MeshDataNormalStatus::Agree(old_normal))=>{
-				if old_normal==normal{
-					Some(MeshDataNormalStatus::Agree(old_normal))
-				}else{
-					Some(MeshDataNormalStatus::Conflicting)
-				}
-			},
-			Some(MeshDataNormalStatus::Conflicting)=>Some(MeshDataNormalStatus::Conflicting),
-		};
-	}
-	fn into_agreed_normal(self)->Option<MeshDataNormalId2>{
-		self.status.and_then(|status|match status{
-			MeshDataNormalStatus::Agree(normal)=>Some(normal),
-			MeshDataNormalStatus::Conflicting=>None,
-		})
-	}
-}
-
-impl std::error::Error for Error{}
-pub fn convert(
-	roblox_physics_data:&[u8],
-	roblox_mesh_data:&[u8],
-	size:glam::Vec3,
-	part_texture_description:crate::rbx::RobloxPartDescription,
-)->Result<model::Mesh,Error>{
-	const NORMAL_FACES:usize=6;
-	let mut polygon_groups_normal_id=vec![Vec::new();NORMAL_FACES];
-
-	// build graphics and physics meshes
-	let mut mb=strafesnet_common::model::MeshBuilder::new();
-	// graphics
-	let graphics_groups=if !roblox_mesh_data.is_empty(){
-		// create per-face texture coordinate affine transforms
-		let cube_face_description=part_texture_description.map(|opt|opt.map(|mut t|{
-			t.transform.set_size(1.0,1.0);
-			t.to_face_description()
-		}));
-
-		let mesh_data=rbx_mesh::read_mesh_data_versioned(
-			std::io::Cursor::new(roblox_mesh_data)
-		).map_err(Error::RobloxMeshData)?;
-		let graphics_mesh=match mesh_data{
-			rbx_mesh::mesh_data::MeshData::CSGK(_)=>return Err(Error::Block),
-			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::CSGMDL2(mesh_data2))=>mesh_data2.mesh,
-			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::CSGMDL4(mesh_data4))=>mesh_data4.mesh,
-		};
-		for [vertex_id0,vertex_id1,vertex_id2] in graphics_mesh.faces{
-			let face=[
-				graphics_mesh.vertices.get(vertex_id0.0 as usize).ok_or(Error::MissingVertexId(vertex_id0.0))?,
-				graphics_mesh.vertices.get(vertex_id1.0 as usize).ok_or(Error::MissingVertexId(vertex_id1.0))?,
-				graphics_mesh.vertices.get(vertex_id2.0 as usize).ok_or(Error::MissingVertexId(vertex_id2.0))?,
-			];
-			let mut normal_agreement_checker=MeshDataNormalChecker::new();
-			let face=face.into_iter().map(|vertex|{
-				normal_agreement_checker.check(vertex.normal_id);
-				let pos=mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos)?);
-				let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?);
-				let tex_coord=glam::Vec2::from_array(vertex.tex);
-				let maybe_face_description=&cube_face_description[vertex.normal_id as usize-1];
-				let (tex,color)=match maybe_face_description{
-					Some(face_description)=>{
-						// transform texture coordinates and set decal color
-						let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
-						let color=mb.acquire_color_id(face_description.color);
-						(tex,color)
-					},
-					None=>{
-						// texture coordinates don't matter and pass through mesh vertex color
-						let tex=mb.acquire_tex_id(tex_coord);
-						let color=mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)));
-						(tex,color)
-					},
-				};
-				Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
-			}).collect::<Result<Vec<_>,_>>().map_err(Error::Planar64Vec3)?;
-			if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
-				polygon_groups_normal_id[normal_id as usize-1].push(face);
-			}else{
-				panic!("Empty face!");
-			}
-		}
-		(0..NORMAL_FACES).map(|polygon_group_id|{
-			model::IndexedGraphicsGroup{
-				render:cube_face_description[polygon_group_id].as_ref().map_or(RenderConfigId::new(0),|face_description|face_description.render),
-				groups:vec![PolygonGroupId::new(polygon_group_id as u32)]
-			}
-		}).collect()
-	}else{
-		Vec::new()
-	};
-
-	//physics
-	let physics_convex_meshes=if !roblox_physics_data.is_empty(){
-		let physics_data=rbx_mesh::read_physics_data_versioned(
-			std::io::Cursor::new(roblox_physics_data)
-		).map_err(Error::RobloxPhysicsData)?;
-		let physics_convex_meshes=match physics_data{
-			rbx_mesh::physics_data::PhysicsData::CSGK(_)
-			// have not seen this format in practice
-			|rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::Block)
-			=>return Err(Error::Block),
-			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::Meshes(meshes))
-			=>meshes.meshes,
-			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::PhysicsInfoMesh(pim))
-			=>vec![pim.mesh],
-		};
-		physics_convex_meshes
-	}else{
-		Vec::new()
-	};
-	let polygon_groups:Vec<PolygonGroup>=polygon_groups_normal_id.into_iter().map(|faces|
-		// graphics polygon groups (to be rendered)
-		Ok(PolygonGroup::PolygonList(PolygonList::new(faces)))
-	).chain(physics_convex_meshes.into_iter().map(|mesh|{
-		// this can be factored out of the loop but I am lazy
-		let color=mb.acquire_color_id(glam::Vec4::ONE);
-		let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
-		// physics polygon groups (to do physics)
-		Ok(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().map(|[vertex_id0,vertex_id1,vertex_id2]|{
-			let face=[
-				mesh.vertices.get(vertex_id0.0 as usize).ok_or(Error::MissingVertexId(vertex_id0.0))?,
-				mesh.vertices.get(vertex_id1.0 as usize).ok_or(Error::MissingVertexId(vertex_id1.0))?,
-				mesh.vertices.get(vertex_id2.0 as usize).ok_or(Error::MissingVertexId(vertex_id2.0))?,
-			].map(|v|glam::Vec3::from_slice(v)/size);
-			let vertex_norm=(face[1]-face[0])
-			          .cross(face[2]-face[0]);
-			let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex_norm.to_array()).map_err(Error::Planar64Vec3)?);
-			face.into_iter().map(|vertex_pos|{
-				let pos=mb.acquire_pos_id(vec3::try_from_f32_array(vertex_pos.to_array()).map_err(Error::Planar64Vec3)?);
-				Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
-			}).collect()
-		}).collect::<Result<_,_>>()?)))
-	})).collect::<Result<_,_>>()?;
-	let physics_groups=(NORMAL_FACES..polygon_groups.len()).map(|id|model::IndexedPhysicsGroup{
-		groups:vec![PolygonGroupId::new(id as u32)]
-	}).collect();
-	Ok(mb.build(
-		polygon_groups,
-		graphics_groups,
-		physics_groups,
-	))
-}

lib/rbxassetid/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "rbxassetid"
-version = "0.1.0"
-edition = "2021"
-repository = "https://git.itzana.me/StrafesNET/strafe-project"
-license = "MIT OR Apache-2.0"
-description = "Parse Roblox asset id from 'Content' urls."
-authors = ["Rhys Lloyd <krakow20@gmail.com>"]
-
-[dependencies]
-url = "2.5.4"

lib/rbxassetid/LICENSE-APACHE

@@ -1,176 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS

lib/rbxassetid/LICENSE-MIT

@@ -1,23 +0,0 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

lib/rbxassetid/README.md

@@ -1,26 +0,0 @@
-Roblox Asset Id
-===============
-
-## Example
-
-```rust
-use rbxassetid::RobloxAssetId;
-
-let content="rbxassetid://255299419";
-let RobloxAssetId(asset_id)=content.parse()?;
-```
-
-#### License
-
-<sup>
-Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
-2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
-</sup>
-
-<br>
-
-<sub>
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
-</sub>

lib/rbxassetid/src/lib.rs

@@ -1,41 +0,0 @@
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
-pub struct RobloxAssetId(pub u64);
-#[derive(Debug)]
-pub enum RobloxAssetIdParseErr{
-	Url(url::ParseError),
-	UnknownScheme,
-	ParseInt(std::num::ParseIntError),
-	MissingAssetId,
-	MissingIDQueryParam,
-}
-impl std::fmt::Display for RobloxAssetIdParseErr{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for RobloxAssetIdParseErr{}
-impl std::str::FromStr for RobloxAssetId{
-	type Err=RobloxAssetIdParseErr;
-	fn from_str(s:&str)->Result<Self,Self::Err>{
-		let url=url::Url::parse(s).map_err(RobloxAssetIdParseErr::Url)?;
-		let parsed_asset_id=match url.scheme(){
-			"rbxassetid"=>url.domain().ok_or(RobloxAssetIdParseErr::MissingAssetId)?.parse(),
-			"http"|"https"=>{
-				let (_,asset_id)=url.query_pairs()
-				.find(|(id,_)|match id.as_ref(){
-					"ID"|"id"|"Id"|"iD"=>true,
-					_=>false,
-				}).ok_or(RobloxAssetIdParseErr::MissingIDQueryParam)?;
-				asset_id.parse()
-			},
-			_=>Err(RobloxAssetIdParseErr::UnknownScheme)?,
-		};
-		Ok(Self(parsed_asset_id.map_err(RobloxAssetIdParseErr::ParseInt)?))
-	}
-}
-
-#[test]
-fn test_rbxassetid(){
-	let content="rbxassetid://255299419";
-	let RobloxAssetId(_asset_id)=content.parse().unwrap();
-}

lib/snf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_snf"
-version = "0.3.0"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 binrw = "0.14.0"
 id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
+strafesnet_common = { path = "../common", registry = "strafesnet" }

lib/snf/src/bot.rs

@@ -6,7 +6,7 @@ use strafesnet_common::physics::Time;
 
 const VERSION:u32=0;
 
-type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,strafesnet_common::physics::Time>;
+type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,strafesnet_common::physics::TimeInner>;
 
 #[derive(Debug)]
 pub enum Error{

lib/snf/src/map.rs

@@ -6,7 +6,7 @@ use crate::file::BlockId;
 use binrw::{binrw,BinReaderExt,BinWriterExt};
 use strafesnet_common::model;
 use strafesnet_common::aabb::Aabb;
-use strafesnet_common::bvh::{BvhNode,RecursiveContent};
+use strafesnet_common::bvh::BvhNode;
 use strafesnet_common::gameplay_modes;
 
 #[derive(Debug)]
@@ -95,6 +95,21 @@ enum ResourceType{
 	//Video,
 	//Animation,
 }
+const RESOURCE_TYPE_VARIANT_COUNT:u8=2;
+#[binrw]
+#[brw(little)]
+struct ResourceId(u128);
+impl ResourceId{
+	fn resource_type(&self)->Option<ResourceType>{
+		let discriminant=self.0 as u8;
+		//TODO: use this when it is stabilized https://github.com/rust-lang/rust/issues/73662
+		//if (discriminant as usize)<std::mem::variant_count::<ResourceType>(){
+		match discriminant<RESOURCE_TYPE_VARIANT_COUNT{
+			true=>Some(unsafe{std::mem::transmute::<u8,ResourceType>(discriminant)}),
+			false=>None,
+		}
+	}
+}
 
 struct ResourceMap<T>{
 	meshes:HashMap<strafesnet_common::model::MeshId,T>,
@@ -121,6 +136,11 @@ struct ResourceBlockHeader{
 	resource:ResourceType,
 	id:BlockId,
 }
+#[binrw]
+#[brw(little)]
+struct ResourceExternalHeader{
+	resource_uuid:ResourceId,
+}
 
 #[binrw]
 #[brw(little)]
@@ -233,7 +253,7 @@ impl<R:BinReaderExt> StreamableMap<R>{
 	}
 	pub fn get_intersecting_region_block_ids(&self,aabb:&Aabb)->Vec<BlockId>{
 		let mut block_ids=Vec::new();
-		self.bvh.sample_aabb(aabb,&mut |&block_id|block_ids.push(block_id));
+		self.bvh.the_tester(aabb,&mut |&block_id|block_ids.push(block_id));
 		block_ids
 	}
 	pub fn load_region(&mut self,block_id:BlockId)->Result<Vec<(model::ModelId,model::Model)>,Error>{
@@ -287,60 +307,12 @@ impl<R:BinReaderExt> StreamableMap<R>{
 	}
 }
 
-// silly redefinition of Bvh for determining the size of subnodes
-// without duplicating work by running weight calculation recursion top down on every node
-pub struct BvhWeightNode<W,T>{
-	content:RecursiveContent<BvhWeightNode<W,T>,T>,
-	weight:W,
-	aabb:Aabb,
-}
-impl <W,T> BvhWeightNode<W,T>{
-	pub const fn weight(&self)->&W{
-		&self.weight
-	}
-	pub const fn aabb(&self)->&Aabb{
-		&self.aabb
-	}
-	pub fn into_content(self)->RecursiveContent<BvhWeightNode<W,T>,T>{
-		self.content
-	}
-	pub fn into_visitor<F:FnMut(T)>(self,f:&mut F){
-		match self.content{
-			RecursiveContent::Leaf(model)=>f(model),
-			RecursiveContent::Branch(children)=>for child in children{
-				child.into_visitor(f)
-			},
-		}
-	}
-}
-
-pub fn weigh_contents<T,W:Copy+std::iter::Sum<W>,F:Fn(&T)->W>(node:BvhNode<T>,f:&F)->BvhWeightNode<W,T>{
-	let (content,aabb)=node.into_inner();
-	match content{
-		RecursiveContent::Leaf(model)=>BvhWeightNode{
-			weight:f(&model),
-			content:RecursiveContent::Leaf(model),
-			aabb,
-		},
-		RecursiveContent::Branch(children)=>{
-			let branch:Vec<BvhWeightNode<W,T>>=children.into_iter().map(|child|
-				weigh_contents(child,f)
-			).collect();
-			BvhWeightNode{
-				weight:branch.iter().map(|node|node.weight).sum(),
-				content:RecursiveContent::Branch(branch),
-				aabb,
-			}
-		},
-	}
-}
-
 const BVH_NODE_MAX_WEIGHT:usize=64*1024;//64 kB
 fn collect_spacial_blocks(
 	block_location:&mut Vec<u64>,
 	block_headers:&mut Vec<SpacialBlockHeader>,
 	sequential_block_data:&mut std::io::Cursor<&mut Vec<u8>>,
-	bvh_node:BvhWeightNode<usize,(model::ModelId,newtypes::model::Model)>
+	bvh_node:strafesnet_common::bvh::BvhWeightNode<usize,(model::ModelId,newtypes::model::Model)>
 )->Result<(),Error>{
 	//inspect the node weights top-down.
 	//When a node weighs less than the limit,
@@ -390,7 +362,7 @@ pub fn write_map<W:BinWriterExt>(mut writer:W,map:strafesnet_common::map::Comple
 		}
 		Ok(((model::ModelId::new(model_id as u32),model.into()),aabb))
 	}).collect::<Result<Vec<_>,_>>()?;
-	let bvh=weigh_contents(strafesnet_common::bvh::generate_bvh(boxen),&|_|std::mem::size_of::<newtypes::model::Model>());
+	let bvh=strafesnet_common::bvh::generate_bvh(boxen).weigh_contents(&|_|std::mem::size_of::<newtypes::model::Model>());
 	//build blocks
 	//block location is initialized with two values
 	//the first value represents the location of the first byte after the file header

lib/snf/src/newtypes/physics.rs

@@ -1,7 +1,7 @@
 use super::integer::Time;
 use super::common::{bool_from_u8,bool_into_u8};
 
-type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,strafesnet_common::physics::Time>;
+type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,strafesnet_common::physics::TimeInner>;
 
 #[binrw::binrw]
 #[brw(little)]

map-tool/Cargo.toml

@@ -1,37 +0,0 @@
-[package]
-name = "map-tool"
-version = "1.7.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = "1.0.75"
-clap = { version = "4.4.2", features = ["derive"] }
-flate2 = "1.0.27"
-futures = "0.3.31"
-image = "0.25.2"
-image_dds = "0.7.1"
-lazy-regex = "3.1.0"
-rbx_asset = { version = "0.2.5", registry = "strafesnet" }
-rbx_binary = { version = "0.7.4", registry = "strafesnet" }
-rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
-rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
-rbx_xml = { version = "0.13.3", registry = "strafesnet" }
-rbxassetid = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_bsp_loader = { version = "0.3.0", path = "../lib/bsp_loader", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.0", path = "../lib/deferred_loader", registry = "strafesnet" }
-strafesnet_rbx_loader = { version = "0.6.0", path = "../lib/rbx_loader", registry = "strafesnet" }
-strafesnet_snf = { version = "0.3.0", path = "../lib/snf", registry = "strafesnet" }
-thiserror = "2.0.11"
-tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread", "fs"] }
-vbsp = { version = "0.7.0-codegen1", registry = "strafesnet" }
-vmdl = "0.2.0"
-vmt-parser = "0.2.0"
-vpk = "0.2.0"
-vtf = "0.3.0"
-
-#[profile.release]
-#lto = true
-#strip = true
-#codegen-units = 1

map-tool/LICENSE

@@ -1,23 +0,0 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

map-tool/README.md

@@ -1,2 +0,0 @@
-# map-tool
-

map-tool/src/main.rs

@@ -1,30 +0,0 @@
-mod roblox;
-mod source;
-
-use clap::{Parser,Subcommand};
-use anyhow::Result as AResult;
-
-#[derive(Parser)]
-#[command(author, version, about, long_about = None)]
-#[command(propagate_version = true)]
-struct Cli {
-	#[command(subcommand)]
-	command: Commands,
-}
-
-#[derive(Subcommand)]
-enum Commands{
-	#[command(flatten)]
-	Roblox(roblox::Commands),
-	#[command(flatten)]
-	Source(source::Commands),
-}
-
-#[tokio::main]
-async fn main()->AResult<()>{
-	let cli=Cli::parse();
-	match cli.command{
-		Commands::Roblox(commands)=>commands.run().await,
-		Commands::Source(commands)=>commands.run().await,
-	}
-}

map-tool/src/roblox.rs

@@ -1,431 +0,0 @@
-use std::path::{Path,PathBuf};
-use std::io::{Cursor,Read,Seek};
-use std::collections::HashSet;
-use clap::{Args,Subcommand};
-use anyhow::Result as AResult;
-use rbx_dom_weak::Instance;
-use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
-use rbxassetid::RobloxAssetId;
-use tokio::io::AsyncReadExt;
-
-const DOWNLOAD_LIMIT:usize=16;
-
-#[derive(Subcommand)]
-pub enum Commands{
-	RobloxToSNF(RobloxToSNFSubcommand),
-	DownloadAssets(DownloadAssetsSubcommand),
-}
-
-#[derive(Args)]
-pub struct RobloxToSNFSubcommand {
-	#[arg(long)]
-	output_folder:PathBuf,
-	#[arg(required=true)]
-	input_files:Vec<PathBuf>,
-}
-#[derive(Args)]
-pub struct DownloadAssetsSubcommand{
-	#[arg(required=true)]
-	roblox_files:Vec<PathBuf>,
-	// #[arg(long)]
-	// cookie_file:Option<String>,
-}
-
-impl Commands{
-	pub async fn run(self)->AResult<()>{
-		match self{
-			Commands::RobloxToSNF(subcommand)=>roblox_to_snf(subcommand.input_files,subcommand.output_folder).await,
-			Commands::DownloadAssets(subcommand)=>download_assets(
-				subcommand.roblox_files,
-				rbx_asset::cookie::Cookie::new("".to_string()),
-			).await,
-		}
-	}
-}
-
-#[allow(unused)]
-#[derive(Debug)]
-enum LoadDomError{
-	IO(std::io::Error),
-	Binary(rbx_binary::DecodeError),
-	Xml(rbx_xml::DecodeError),
-	UnknownFormat,
-}
-fn load_dom<R:Read+Seek>(mut input:R)->Result<rbx_dom_weak::WeakDom,LoadDomError>{
-	let mut first_8=[0u8;8];
-	input.read_exact(&mut first_8).map_err(LoadDomError::IO)?;
-	input.rewind().map_err(LoadDomError::IO)?;
-	match &first_8{
-		b"<roblox!"=>rbx_binary::from_reader(input).map_err(LoadDomError::Binary),
-		b"<roblox "=>rbx_xml::from_reader(input,rbx_xml::DecodeOptions::default()).map_err(LoadDomError::Xml),
-		_=>Err(LoadDomError::UnknownFormat),
-	}
-}
-
-/* The ones I'm interested in:
-Beam.Texture
-Decal.Texture
-FileMesh.MeshId
-FileMesh.TextureId
-MaterialVariant.ColorMap
-MaterialVariant.MetalnessMap
-MaterialVariant.NormalMap
-MaterialVariant.RoughnessMap
-MeshPart.MeshId
-MeshPart.TextureID
-ParticleEmitter.Texture
-Sky.MoonTextureId
-Sky.SkyboxBk
-Sky.SkyboxDn
-Sky.SkyboxFt
-Sky.SkyboxLf
-Sky.SkyboxRt
-Sky.SkyboxUp
-Sky.SunTextureId
-SurfaceAppearance.ColorMap
-SurfaceAppearance.MetalnessMap
-SurfaceAppearance.NormalMap
-SurfaceAppearance.RoughnessMap
-SurfaceAppearance.TexturePack
-*/
-fn accumulate_content_id(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&str){
-	if let Some(rbx_dom_weak::types::Variant::Content(content))=object.properties.get(property){
-		let url:&str=content.as_ref();
-		if let Ok(asset_id)=url.parse(){
-			content_list.insert(asset_id);
-		}else{
-			println!("Content failed to parse into AssetID: {:?}",content);
-		}
-	}else{
-		println!("property={} does not exist for class={}",property,object.class.as_str());
-	}
-}
-async fn read_entire_file(path:impl AsRef<Path>)->Result<Cursor<Vec<u8>>,std::io::Error>{
-	let mut file=tokio::fs::File::open(path).await?;
-	let mut data=Vec::new();
-	file.read_to_end(&mut data).await?;
-	Ok(Cursor::new(data))
-}
-#[derive(Default)]
-struct UniqueAssets{
-	meshes:HashSet<RobloxAssetId>,
-	unions:HashSet<RobloxAssetId>,
-	textures:HashSet<RobloxAssetId>,
-}
-impl UniqueAssets{
-	fn collect(&mut self,object:&Instance){
-		match object.class.as_str(){
-			"Beam"=>accumulate_content_id(&mut self.textures,object,"Texture"),
-			"Decal"=>accumulate_content_id(&mut self.textures,object,"Texture"),
-			"Texture"=>accumulate_content_id(&mut self.textures,object,"Texture"),
-			"FileMesh"=>accumulate_content_id(&mut self.textures,object,"TextureId"),
-			"MeshPart"=>{
-				accumulate_content_id(&mut self.textures,object,"TextureID");
-				accumulate_content_id(&mut self.meshes,object,"MeshId");
-			},
-			"SpecialMesh"=>accumulate_content_id(&mut self.meshes,object,"MeshId"),
-			"ParticleEmitter"=>accumulate_content_id(&mut self.textures,object,"Texture"),
-			"Sky"=>{
-				accumulate_content_id(&mut self.textures,object,"MoonTextureId");
-				accumulate_content_id(&mut self.textures,object,"SkyboxBk");
-				accumulate_content_id(&mut self.textures,object,"SkyboxDn");
-				accumulate_content_id(&mut self.textures,object,"SkyboxFt");
-				accumulate_content_id(&mut self.textures,object,"SkyboxLf");
-				accumulate_content_id(&mut self.textures,object,"SkyboxRt");
-				accumulate_content_id(&mut self.textures,object,"SkyboxUp");
-				accumulate_content_id(&mut self.textures,object,"SunTextureId");
-			},
-			"UnionOperation"=>accumulate_content_id(&mut self.unions,object,"AssetId"),
-			_=>(),
-		}
-	}
-}
-
-#[allow(unused)]
-#[derive(Debug)]
-enum UniqueAssetError{
-	IO(std::io::Error),
-	LoadDom(LoadDomError),
-}
-async fn unique_assets(path:&Path)->Result<UniqueAssets,UniqueAssetError>{
-	// read entire file
-	let mut assets=UniqueAssets::default();
-	let data=read_entire_file(path).await.map_err(UniqueAssetError::IO)?;
-	let dom=load_dom(data).map_err(UniqueAssetError::LoadDom)?;
-	for object in dom.into_raw().1.into_values(){
-		assets.collect(&object);
-	}
-	Ok(assets)
-}
-enum DownloadType{
-	Texture(RobloxAssetId),
-	Mesh(RobloxAssetId),
-	Union(RobloxAssetId),
-}
-impl DownloadType{
-	fn path(&self)->PathBuf{
-		match self{
-			DownloadType::Texture(asset_id)=>format!("downloaded_textures/{}",asset_id.0.to_string()).into(),
-			DownloadType::Mesh(asset_id)=>format!("meshes/{}",asset_id.0.to_string()).into(),
-			DownloadType::Union(asset_id)=>format!("unions/{}",asset_id.0.to_string()).into(),
-		}
-	}
-	fn asset_id(&self)->u64{
-		match self{
-			DownloadType::Texture(asset_id)=>asset_id.0,
-			DownloadType::Mesh(asset_id)=>asset_id.0,
-			DownloadType::Union(asset_id)=>asset_id.0,
-		}
-	}
-}
-enum DownloadResult{
-	Cached(PathBuf),
-	Data(Vec<u8>),
-	Failed,
-}
-#[derive(Default,Debug)]
-struct Stats{
-	total_assets:u32,
-	cached_assets:u32,
-	downloaded_assets:u32,
-	failed_downloads:u32,
-	timed_out_downloads:u32,
-}
-async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::CookieContext,download_instruction:DownloadType)->Result<DownloadResult,std::io::Error>{
-	stats.total_assets+=1;
-	let download_instruction=download_instruction;
-	// check if file exists on disk
-	let path=download_instruction.path();
-	if tokio::fs::try_exists(path.as_path()).await?{
-		stats.cached_assets+=1;
-		return Ok(DownloadResult::Cached(path));
-	}
-	let asset_id=download_instruction.asset_id();
-	// if not, download file
-	let mut retry=0;
-	const BACKOFF_MUL:f32=1.3956124250860895286;//exp(1/3)
-	let mut backoff=1000f32;
-	loop{
-		let asset_result=context.get_asset(rbx_asset::cookie::GetAssetRequest{
-			asset_id,
-			version:None,
-		}).await;
-		match asset_result{
-			Ok(asset_result)=>{
-				stats.downloaded_assets+=1;
-				tokio::fs::write(path,&asset_result).await?;
-				break Ok(DownloadResult::Data(asset_result));
-			},
-			Err(rbx_asset::cookie::GetError::Response(rbx_asset::ResponseError::StatusCodeWithUrlAndBody(scwuab)))=>{
-				if scwuab.status_code.as_u16()==429{
-					if retry==12{
-						println!("Giving up asset download {asset_id}");
-						stats.timed_out_downloads+=1;
-						break Ok(DownloadResult::Failed);
-					}
-					println!("Hit roblox rate limit, waiting {:.0}ms...",backoff);
-					tokio::time::sleep(std::time::Duration::from_millis(backoff as u64)).await;
-					backoff*=BACKOFF_MUL;
-					retry+=1;
-				}else{
-					stats.failed_downloads+=1;
-					println!("weird scuwab error: {scwuab:?}");
-					break Ok(DownloadResult::Failed);
-				}
-			},
-			Err(e)=>{
-				stats.failed_downloads+=1;
-				println!("sadly error: {e}");
-				break Ok(DownloadResult::Failed);
-			},
-		}
-	}
-}
-#[derive(Debug,thiserror::Error)]
-enum ConvertTextureError{
-	#[error("Io error {0:?}")]
-	Io(#[from]std::io::Error),
-	#[error("Image error {0:?}")]
-	Image(#[from]image::ImageError),
-	#[error("DDS create error {0:?}")]
-	DDS(#[from]image_dds::CreateDdsError),
-	#[error("DDS write error {0:?}")]
-	DDSWrite(#[from]image_dds::ddsfile::Error),
-}
-async fn convert_texture(asset_id:RobloxAssetId,download_result:DownloadResult)->Result<(),ConvertTextureError>{
-	let data=match download_result{
-		DownloadResult::Cached(path)=>tokio::fs::read(path).await?,
-		DownloadResult::Data(data)=>data,
-		DownloadResult::Failed=>return Ok(()),
-	};
-	// image::ImageFormat::Png
-	// image::ImageFormat::Jpeg
-	let image=image::load_from_memory(&data)?.to_rgba8();
-
-	// pick format
-	let format=if image.width()%4!=0||image.height()%4!=0{
-		image_dds::ImageFormat::Rgba8UnormSrgb
-	}else{
-		image_dds::ImageFormat::BC7RgbaUnormSrgb
-	};
-
-	//this fails if the image dimensions are not a multiple of 4
-	let dds=image_dds::dds_from_image(
-		&image,
-		format,
-		image_dds::Quality::Slow,
-		image_dds::Mipmaps::GeneratedAutomatic,
-	)?;
-
-	let file_name=format!("textures/{}.dds",asset_id.0);
-	let mut file=std::fs::File::create(file_name)?;
-	dds.write(&mut file)?;
-	Ok(())
-}
-async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->AResult<()>{
-	tokio::try_join!(
-		tokio::fs::create_dir_all("downloaded_textures"),
-		tokio::fs::create_dir_all("textures"),
-		tokio::fs::create_dir_all("meshes"),
-		tokio::fs::create_dir_all("unions"),
-	)?;
-	// use mpsc
-	let thread_limit=std::thread::available_parallelism()?.get();
-	let (send_assets,mut recv_assets)=tokio::sync::mpsc::channel(DOWNLOAD_LIMIT);
-	let (send_texture,mut recv_texture)=tokio::sync::mpsc::channel(thread_limit);
-	// map decode dispatcher
-	// read files multithreaded
-	// produce UniqueAssetsResult per file
-	tokio::spawn(async move{
-		// move send so it gets dropped when all maps have been decoded
-		// closing the channel
-		let mut it=paths.into_iter();
-		static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
-		SEM.add_permits(thread_limit);
-		while let (Ok(permit),Some(path))=(SEM.acquire().await,it.next()){
-			let send=send_assets.clone();
-			tokio::spawn(async move{
-				let result=unique_assets(path.as_path()).await;
-				_=send.send(result).await;
-				drop(permit);
-			});
-		}
-	});
-	// download manager
-	// insert into global unique assets guy
-	// add to download queue if the asset is globally unique and does not already exist on disk
-	let mut stats=Stats::default();
-	let context=rbx_asset::cookie::CookieContext::new(cookie);
-	let mut globally_unique_assets=UniqueAssets::default();
-	// pop a job = retry_queue.pop_front() or ingest(recv.recv().await)
-	// SLOW MODE:
-	// acquire all permits
-	// drop all permits
-	// pop one job
-	// if it succeeds go into fast mode
-	// FAST MODE:
-	// acquire one permit
-	// pop a job
-	let download_thread=tokio::spawn(async move{
-		while let Some(result)=recv_assets.recv().await{
-			let unique_assets=match result{
-				Ok(unique_assets)=>unique_assets,
-				Err(e)=>{
-					println!("error: {e:?}");
-					continue;
-				},
-			};
-			for texture_id in unique_assets.textures{
-				if globally_unique_assets.textures.insert(texture_id){
-					let data=download_retry(&mut stats,&context,DownloadType::Texture(texture_id)).await?;
-					send_texture.send((texture_id,data)).await?;
-				}
-			}
-			for mesh_id in unique_assets.meshes{
-				if globally_unique_assets.meshes.insert(mesh_id){
-					download_retry(&mut stats,&context,DownloadType::Mesh(mesh_id)).await?;
-				}
-			}
-			for union_id in unique_assets.unions{
-				if globally_unique_assets.unions.insert(union_id){
-					download_retry(&mut stats,&context,DownloadType::Union(union_id)).await?;
-				}
-			}
-		}
-		dbg!(stats);
-		Ok::<(),anyhow::Error>(())
-	});
-	static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
-	SEM.add_permits(thread_limit);
-	while let (Ok(permit),Some((asset_id,download_result)))=(SEM.acquire().await,recv_texture.recv().await){
-		tokio::spawn(async move{
-			let result=convert_texture(asset_id,download_result).await;
-			drop(permit);
-			result.unwrap();
-		});
-	}
-	download_thread.await??;
-	_=SEM.acquire_many(thread_limit as u32).await.unwrap();
-	Ok(())
-}
-
-#[derive(Debug)]
-#[allow(dead_code)]
-enum ConvertError{
-	IO(std::io::Error),
-	SNFMap(strafesnet_snf::map::Error),
-	RobloxRead(strafesnet_rbx_loader::ReadError),
-	RobloxLoad(strafesnet_rbx_loader::LoadError),
-}
-impl std::fmt::Display for ConvertError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for ConvertError{}
-async fn convert_to_snf(path:&Path,output_folder:PathBuf)->AResult<()>{
-	let entire_file=tokio::fs::read(path).await?;
-
-	let model=strafesnet_rbx_loader::read(
-		std::io::Cursor::new(entire_file)
-	).map_err(ConvertError::RobloxRead)?;
-
-	let mut place=model.into_place();
-	place.run_scripts();
-
-	let map=place.to_snf(LoadFailureMode::DefaultToNone).map_err(ConvertError::RobloxLoad)?;
-
-	let mut dest=output_folder;
-	dest.push(path.file_stem().unwrap());
-	dest.set_extension("snfm");
-	let file=std::fs::File::create(dest).map_err(ConvertError::IO)?;
-
-	strafesnet_snf::map::write_map(file,map).map_err(ConvertError::SNFMap)?;
-
-	Ok(())
-}
-
-async fn roblox_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf)->AResult<()>{
-	let start=std::time::Instant::now();
-
-	let thread_limit=std::thread::available_parallelism()?.get();
-	let mut it=paths.into_iter();
-	static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
-	SEM.add_permits(thread_limit);
-
-	while let (Ok(permit),Some(path))=(SEM.acquire().await,it.next()){
-		let output_folder=output_folder.clone();
-		tokio::spawn(async move{
-			let result=convert_to_snf(path.as_path(),output_folder).await;
-			drop(permit);
-			match result{
-				Ok(())=>(),
-				Err(e)=>println!("Convert error: {e:?}"),
-			}
-		});
-	}
-	_=SEM.acquire_many(thread_limit as u32).await.unwrap();
-
-	println!("elapsed={:?}", start.elapsed());
-	Ok(())
-}

map-tool/src/source.rs

@@ -1,464 +0,0 @@
-use std::path::{Path,PathBuf};
-use std::borrow::Cow;
-use clap::{Args,Subcommand};
-use anyhow::Result as AResult;
-use futures::StreamExt;
-use strafesnet_bsp_loader::loader::BspFinder;
-use strafesnet_deferred_loader::loader::Loader;
-use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
-
-#[derive(Subcommand)]
-pub enum Commands{
-	SourceToSNF(SourceToSNFSubcommand),
-	ExtractTextures(ExtractTexturesSubcommand),
-	VPKContents(VPKContentsSubcommand),
-	BSPContents(BSPContentsSubcommand),
-}
-
-#[derive(Args)]
-pub struct SourceToSNFSubcommand {
-	#[arg(long)]
-	output_folder:PathBuf,
-	#[arg(required=true)]
-	input_files:Vec<PathBuf>,
-	#[arg(long)]
-	vpks:Vec<PathBuf>,
-}
-#[derive(Args)]
-pub struct ExtractTexturesSubcommand{
-	#[arg(required=true)]
-	bsp_files:Vec<PathBuf>,
-	#[arg(long)]
-	vpks:Vec<PathBuf>,
-}
-#[derive(Args)]
-pub struct VPKContentsSubcommand {
-	#[arg(long)]
-	input_file:PathBuf,
-}
-#[derive(Args)]
-pub struct BSPContentsSubcommand {
-	#[arg(long)]
-	input_file:PathBuf,
-}
-
-impl Commands{
-	pub async fn run(self)->AResult<()>{
-		match self{
-			Commands::SourceToSNF(subcommand)=>source_to_snf(subcommand.input_files,subcommand.output_folder,subcommand.vpks).await,
-			Commands::ExtractTextures(subcommand)=>extract_textures(subcommand.bsp_files,subcommand.vpks).await,
-			Commands::VPKContents(subcommand)=>vpk_contents(subcommand.input_file),
-			Commands::BSPContents(subcommand)=>bsp_contents(subcommand.input_file),
-		}
-	}
-}
-
-
-enum VMTContent{
-	VMT(String),
-	VTF(String),
-	Patch(vmt_parser::material::PatchMaterial),
-	Unsupported,//don't want to deal with whatever vmt variant
-	Unresolved,//could not locate a texture because of vmt content
-}
-impl VMTContent{
-	fn vtf(opt:Option<String>)->Self{
-		match opt{
-			Some(s)=>Self::VTF(s),
-			None=>Self::Unresolved,
-		}
-	}
-}
-
-fn get_some_texture(material:vmt_parser::material::Material)->VMTContent{
-	//just grab some texture from somewhere for now
-	match material{
-		vmt_parser::material::Material::LightMappedGeneric(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::VertexLitGeneric(mat)=>VMTContent::vtf(mat.base_texture.or(mat.decal_texture)),//this just dies if there is none
-		vmt_parser::material::Material::VertexLitGenericDx6(mat)=>VMTContent::vtf(mat.base_texture.or(mat.decal_texture)),
-		vmt_parser::material::Material::UnlitGeneric(mat)=>VMTContent::vtf(mat.base_texture),
-		vmt_parser::material::Material::UnlitTwoTexture(mat)=>VMTContent::vtf(mat.base_texture),
-		vmt_parser::material::Material::Water(mat)=>VMTContent::vtf(mat.base_texture),
-		vmt_parser::material::Material::WorldVertexTransition(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::EyeRefract(mat)=>VMTContent::vtf(Some(mat.cornea_texture)),
-		vmt_parser::material::Material::SubRect(mat)=>VMTContent::VMT(mat.material),//recursive
-		vmt_parser::material::Material::Sprite(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::SpriteCard(mat)=>VMTContent::vtf(mat.base_texture),
-		vmt_parser::material::Material::Cable(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::Refract(mat)=>VMTContent::vtf(mat.base_texture),
-		vmt_parser::material::Material::Modulate(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::DecalModulate(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::Sky(mat)=>VMTContent::vtf(Some(mat.base_texture)),
-		vmt_parser::material::Material::Replacements(_mat)=>VMTContent::Unsupported,
-		vmt_parser::material::Material::Patch(mat)=>VMTContent::Patch(mat),
-		_=>unreachable!(),
-	}
-}
-
-#[derive(Debug,thiserror::Error)]
-enum GetVMTError{
-	#[error("Bsp error {0:?}")]
-	Bsp(#[from]vbsp::BspError),
-	#[error("Utf8 error {0:?}")]
-	Utf8(#[from]std::str::Utf8Error),
-	#[error("Vdf error {0:?}")]
-	Vdf(#[from]vmt_parser::VdfError),
-	#[error("Vmt not found")]
-	NotFound,
-}
-
-fn get_vmt(finder:BspFinder,search_name:&str)->Result<vmt_parser::material::Material,GetVMTError>{
-	let vmt_data=finder.find(search_name)?.ok_or(GetVMTError::NotFound)?;
-	//decode vmt and then write
-	let vmt_str=core::str::from_utf8(&vmt_data)?;
-	let material=vmt_parser::from_str(vmt_str)?;
-	//println!("vmt material={:?}",material);
-	Ok(material)
-}
-
-#[derive(Debug,thiserror::Error)]
-enum LoadVMTError{
-	#[error("Bsp error {0:?}")]
-	Bsp(#[from]vbsp::BspError),
-	#[error("GetVMT error {0:?}")]
-	GetVMT(#[from]GetVMTError),
-	#[error("FromUtf8 error {0:?}")]
-	FromUtf8(#[from]std::string::FromUtf8Error),
-	#[error("Vdf error {0:?}")]
-	Vdf(#[from]vmt_parser::VdfError),
-	#[error("Vmt unsupported")]
-	Unsupported,
-	#[error("Vmt unresolved")]
-	Unresolved,
-	#[error("Vmt not found")]
-	NotFound,
-}
-fn recursive_vmt_loader<'bsp,'vpk,'a>(finder:BspFinder<'bsp,'vpk>,material:vmt_parser::material::Material)->Result<Option<Cow<'a,[u8]>>,LoadVMTError>
-	where
-		'bsp:'a,
-		'vpk:'a,
-{
-	match get_some_texture(material){
-		VMTContent::VMT(mut s)=>{
-			s.make_ascii_lowercase();
-			recursive_vmt_loader(finder,get_vmt(finder,&s)?)
-		},
-		VMTContent::VTF(s)=>{
-			let mut texture_file_name=PathBuf::from("materials");
-			texture_file_name.push(s);
-			texture_file_name.set_extension("vtf");
-			texture_file_name.as_mut_os_str().make_ascii_lowercase();
-			Ok(finder.find(texture_file_name.to_str().unwrap())?)
-		},
-		VMTContent::Patch(mat)=>recursive_vmt_loader(finder,
-			mat.resolve(|search_name|{
-				let name_lowercase=search_name.to_lowercase();
-				match finder.find(&name_lowercase)?{
-					Some(bytes)=>Ok(String::from_utf8(bytes.into_owned())?),
-					None=>Err(LoadVMTError::NotFound),
-				}
-			})?
-		),
-		VMTContent::Unsupported=>Err(LoadVMTError::Unsupported),
-		VMTContent::Unresolved=>Err(LoadVMTError::Unresolved),
-	}
-}
-fn load_texture<'bsp,'vpk,'a>(finder:BspFinder<'bsp,'vpk>,texture_name:&str)->Result<Option<Cow<'a,[u8]>>,LoadVMTError>
-	where
-		'bsp:'a,
-		'vpk:'a,
-{
-	let mut texture_file_name=PathBuf::from("materials");
-	//lower case
-	texture_file_name.push(texture_name);
-	texture_file_name.as_mut_os_str().make_ascii_lowercase();
-	//remove stem and search for both vtf and vmt files
-	let stem=texture_file_name.file_stem().unwrap().to_owned();
-	texture_file_name.pop();
-	texture_file_name.push(stem);
-	if let Some(stuff)=finder.find(texture_file_name.to_str().unwrap())?{
-		return Ok(Some(stuff));
-	}
-
-	// search for both vmt,vtf
-	let mut texture_file_name_vmt=texture_file_name.clone();
-	texture_file_name_vmt.set_extension("vmt");
-
-	let get_vmt_result=get_vmt(finder,texture_file_name_vmt.to_str().unwrap());
-	match get_vmt_result{
-		Ok(material)=>{
-			let vmt_result=recursive_vmt_loader(finder,material);
-			match vmt_result{
-				Ok(Some(stuff))=>return Ok(Some(stuff)),
-				Ok(None)
-				|Err(LoadVMTError::NotFound)=>(),
-				|Err(LoadVMTError::GetVMT(GetVMTError::NotFound))=>(),
-				Err(e)=>return Err(e),
-			}
-		}
-		|Err(GetVMTError::NotFound)=>(),
-		Err(e)=>Err(e)?,
-	}
-
-	// try looking for vtf
-	let mut texture_file_name_vtf=texture_file_name.clone();
-	texture_file_name_vtf.set_extension("vtf");
-
-	let get_vtf_result=get_vmt(finder,texture_file_name_vtf.to_str().unwrap());
-	match get_vtf_result{
-		Ok(material)=>{
-			let vtf_result=recursive_vmt_loader(finder,material);
-			match vtf_result{
-				Ok(Some(stuff))=>return Ok(Some(stuff)),
-				Ok(None)
-				|Err(LoadVMTError::NotFound)=>(),
-				|Err(LoadVMTError::GetVMT(GetVMTError::NotFound))=>(),
-				Err(e)=>return Err(e),
-			}
-		}
-		|Err(GetVMTError::NotFound)=>(),
-		Err(e)=>Err(e)?,
-	}
-
-	Ok(None)
-}
-#[derive(Debug,thiserror::Error)]
-enum ExtractTextureError{
-	#[error("Io error {0:?}")]
-	Io(#[from]std::io::Error),
-	#[error("Bsp error {0:?}")]
-	Bsp(#[from]vbsp::BspError),
-	#[error("MeshLoad error {0:?}")]
-	MeshLoad(#[from]strafesnet_bsp_loader::loader::MeshError),
-	#[error("Load VMT error {0:?}")]
-	LoadVMT(#[from]LoadVMTError),
-}
-async fn gimme_them_textures(path:&Path,vpk_list:&[strafesnet_bsp_loader::Vpk],send_texture:tokio::sync::mpsc::Sender<(Vec<u8>,String)>)->Result<(),ExtractTextureError>{
-	let bsp=vbsp::Bsp::read(tokio::fs::read(path).await?.as_ref())?;
-	let loader_bsp=strafesnet_bsp_loader::Bsp::new(bsp);
-	let bsp=loader_bsp.as_ref();
-
-	let mut texture_deferred_loader=RenderConfigDeferredLoader::new();
-	for texture in bsp.textures(){
-		texture_deferred_loader.acquire_render_config_id(Some(Cow::Borrowed(texture.name())));
-	}
-
-	let mut mesh_deferred_loader=MeshDeferredLoader::new();
-	for prop in bsp.static_props(){
-		mesh_deferred_loader.acquire_mesh_id(prop.model());
-	}
-
-	let finder=BspFinder{
-		bsp:&loader_bsp,
-		vpks:vpk_list
-	};
-
-	let mut mesh_loader=strafesnet_bsp_loader::loader::ModelLoader::new(finder);
-	// load models and collect requested textures
-	for model_path in mesh_deferred_loader.into_indices(){
-		let model:vmdl::Model=match mesh_loader.load(model_path){
-			Ok(model)=>model,
-			Err(e)=>{
-				println!("Model={model_path} Load model error: {e}");
-				continue;
-			},
-		};
-		for texture in model.textures(){
-			for search_path in &texture.search_paths{
-				let mut path=PathBuf::from(search_path.as_str());
-				path.push(texture.name.as_str());
-				let path=path.to_str().unwrap().to_owned();
-				texture_deferred_loader.acquire_render_config_id(Some(Cow::Owned(path)));
-			}
-		}
-	}
-
-	for texture_path in texture_deferred_loader.into_indices(){
-		match load_texture(finder,&texture_path){
-			Ok(Some(texture))=>send_texture.send(
-				(texture.into_owned(),texture_path.into_owned())
-			).await.unwrap(),
-			Ok(None)=>(),
-			Err(e)=>println!("Texture={texture_path} Load error: {e}"),
-		}
-	}
-
-	Ok(())
-}
-
-
-#[derive(Debug,thiserror::Error)]
-enum ConvertTextureError{
-	#[error("Bsp error {0:?}")]
-	Bsp(#[from]vbsp::BspError),
-	#[error("Vtf error {0:?}")]
-	Vtf(#[from]vtf::Error),
-	#[error("DDS create error {0:?}")]
-	DDS(#[from]image_dds::CreateDdsError),
-	#[error("DDS write error {0:?}")]
-	DDSWrite(#[from]image_dds::ddsfile::Error),
-	#[error("Io error {0:?}")]
-	Io(#[from]std::io::Error),
-}
-
-async fn convert_texture(texture:Vec<u8>,write_file_name:impl AsRef<Path>)->Result<(),ConvertTextureError>{
-	let image=vtf::from_bytes(&texture)?.highres_image.decode(0)?.to_rgba8();
-
-	let format=if image.width()%4!=0||image.height()%4!=0{
-		image_dds::ImageFormat::Rgba8UnormSrgb
-	}else{
-		image_dds::ImageFormat::BC7RgbaUnormSrgb
-	};
-	//this fails if the image dimensions are not a multiple of 4
-	let dds = image_dds::dds_from_image(
-		&image,
-		format,
-		image_dds::Quality::Slow,
-		image_dds::Mipmaps::GeneratedAutomatic,
-	)?;
-
-	//write dds
-	let mut dest=PathBuf::from("textures");
-	dest.push(write_file_name);
-	dest.set_extension("dds");
-	std::fs::create_dir_all(dest.parent().unwrap())?;
-	let mut writer=std::io::BufWriter::new(std::fs::File::create(dest)?);
-	dds.write(&mut writer)?;
-
-	Ok(())
-}
-
-async fn read_vpks(vpk_paths:Vec<PathBuf>,thread_limit:usize)->Vec<strafesnet_bsp_loader::Vpk>{
-	futures::stream::iter(vpk_paths).map(|vpk_path|async{
-		// idk why it doesn't want to pass out the errors but this is fatal anyways
-		tokio::task::spawn_blocking(move||Ok::<_,vpk::Error>(strafesnet_bsp_loader::Vpk::new(vpk::VPK::read(&vpk_path)?))).await.unwrap().unwrap()
-	})
-	.buffer_unordered(thread_limit)
-	.collect().await
-}
-
-async fn extract_textures(paths:Vec<PathBuf>,vpk_paths:Vec<PathBuf>)->AResult<()>{
-	tokio::try_join!(
-		tokio::fs::create_dir_all("extracted_textures"),
-		tokio::fs::create_dir_all("textures"),
-		tokio::fs::create_dir_all("meshes"),
-	)?;
-	let thread_limit=std::thread::available_parallelism()?.get();
-
-	// load vpk list and leak for static lifetime
-	let vpk_list:&[strafesnet_bsp_loader::Vpk]=read_vpks(vpk_paths,thread_limit).await.leak();
-
-	let (send_texture,mut recv_texture)=tokio::sync::mpsc::channel(thread_limit);
-	let mut it=paths.into_iter();
-	let extract_thread=tokio::spawn(async move{
-		static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
-		SEM.add_permits(thread_limit);
-		while let (Ok(permit),Some(path))=(SEM.acquire().await,it.next()){
-			let send=send_texture.clone();
-			tokio::spawn(async move{
-				let result=gimme_them_textures(&path,vpk_list,send).await;
-				drop(permit);
-				match result{
-					Ok(())=>(),
-					Err(e)=>println!("Map={path:?} Decode error: {e:?}"),
-				}
-			});
-		}
-	});
-
-	// convert images
-	static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
-	SEM.add_permits(thread_limit);
-	while let (Ok(permit),Some((data,dest)))=(SEM.acquire().await,recv_texture.recv().await){
-		// TODO: dedup dest?
-		tokio::spawn(async move{
-			let result=convert_texture(data,dest).await;
-			drop(permit);
-			match result{
-				Ok(())=>(),
-				Err(e)=>println!("Convert error: {e:?}"),
-			}
-		});
-	}
-	extract_thread.await?;
-	_=SEM.acquire_many(thread_limit as u32).await?;
-	Ok(())
-}
-
-fn vpk_contents(vpk_path:PathBuf)->AResult<()>{
-	let vpk_index=vpk::VPK::read(&vpk_path)?;
-	for (label,entry) in vpk_index.tree.into_iter(){
-		println!("vpk label={} entry={:?}",label,entry);
-	}
-	Ok(())
-}
-
-fn bsp_contents(path:PathBuf)->AResult<()>{
-	let bsp=vbsp::Bsp::read(std::fs::read(path)?.as_ref())?;
-	for file_name in bsp.pack.into_zip().into_inner().unwrap().file_names(){
-		println!("file_name={:?}",file_name);
-	}
-	Ok(())
-}
-
-#[derive(Debug)]
-#[allow(dead_code)]
-enum ConvertError{
-	IO(std::io::Error),
-	SNFMap(strafesnet_snf::map::Error),
-	BspRead(strafesnet_bsp_loader::ReadError),
-	BspLoad(strafesnet_bsp_loader::LoadError),
-}
-impl std::fmt::Display for ConvertError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for ConvertError{}
-
-async fn convert_to_snf(path:&Path,vpk_list:&[strafesnet_bsp_loader::Vpk],output_folder:PathBuf)->AResult<()>{
-	let entire_file=tokio::fs::read(path).await?;
-
-	let bsp=strafesnet_bsp_loader::read(
-		std::io::Cursor::new(entire_file)
-	).map_err(ConvertError::BspRead)?;
-
-	let map=bsp.to_snf(LoadFailureMode::DefaultToNone,vpk_list).map_err(ConvertError::BspLoad)?;
-
-	let mut dest=output_folder;
-	dest.push(path.file_stem().unwrap());
-	dest.set_extension("snfm");
-	let file=std::fs::File::create(dest).map_err(ConvertError::IO)?;
-
-	strafesnet_snf::map::write_map(file,map).map_err(ConvertError::SNFMap)?;
-
-	Ok(())
-}
-async fn source_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf,vpk_paths:Vec<PathBuf>)->AResult<()>{
-	let start=std::time::Instant::now();
-
-	let thread_limit=std::thread::available_parallelism()?.get();
-
-	// load vpk list and leak for static lifetime
-	let vpk_list:&[strafesnet_bsp_loader::Vpk]=read_vpks(vpk_paths,thread_limit).await.leak();
-
-	let mut it=paths.into_iter();
-	static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
-	SEM.add_permits(thread_limit);
-
-	while let (Ok(permit),Some(path))=(SEM.acquire().await,it.next()){
-		let output_folder=output_folder.clone();
-		tokio::spawn(async move{
-			let result=convert_to_snf(path.as_path(),vpk_list,output_folder).await;
-			drop(permit);
-			match result{
-				Ok(())=>(),
-				Err(e)=>println!("Convert error: {e:?}"),
-			}
-		});
-	}
-	_=SEM.acquire_many(thread_limit as u32).await.unwrap();
-
-	println!("elapsed={:?}", start.elapsed());
-	Ok(())
-}

strafe-client/Cargo.toml

@@ -9,24 +9,25 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-user-install=[] # as opposed to portable install
 default = ["snf"]
 snf = ["dep:strafesnet_snf"]
 source = ["dep:strafesnet_deferred_loader", "dep:strafesnet_bsp_loader"]
 roblox = ["dep:strafesnet_deferred_loader", "dep:strafesnet_rbx_loader"]
 
 [dependencies]
+arrayvec = "0.7.6"
+bytemuck = { version = "1.13.1", features = ["derive"] }
+configparser = "3.0.2"
+ddsfile = "0.5.1"
 glam = "0.29.0"
+id = { version = "0.1.0", registry = "strafesnet" }
 parking_lot = "0.12.1"
 pollster = "0.4.0"
+replace_with = "0.1.7"
 strafesnet_bsp_loader = { path = "../lib/bsp_loader", registry = "strafesnet", optional = true }
 strafesnet_common = { path = "../lib/common", registry = "strafesnet" }
-strafesnet_deferred_loader = { path = "../lib/deferred_loader", registry = "strafesnet", optional = true }
-strafesnet_graphics = { path = "../engine/graphics", registry = "strafesnet" }
-strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
+strafesnet_deferred_loader = { path = "../lib/deferred_loader", features = ["legacy"], registry = "strafesnet", optional = true }
 strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet", optional = true }
-strafesnet_session = { path = "../engine/session", registry = "strafesnet" }
-strafesnet_settings = { path = "../engine/settings", registry = "strafesnet" }
 strafesnet_snf = { path = "../lib/snf", registry = "strafesnet", optional = true }
 wgpu = "24.0.0"
 winit = "0.30.7"

strafe-client/src/app.rs

@@ -1,68 +0,0 @@
-use crate::window::Instruction;
-use strafesnet_common::integer;
-use strafesnet_common::instruction::TimedInstruction;
-use strafesnet_common::session::Time as SessionTime;
-
-pub struct App<'a>{
-	root_time:std::time::Instant,
-	window_thread:crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTime>>,
-}
-impl<'a> App<'a>{
-	pub fn new(
-		root_time:std::time::Instant,
-		window_thread:crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTime>>,
-	)->App<'a>{
-		Self{
-			root_time,
-			window_thread,
-		}
-	}
-	fn send_timed_instruction(&mut self,instruction:Instruction){
-		let time=integer::Time::from_nanos(self.root_time.elapsed().as_nanos() as i64);
-		self.window_thread.send(TimedInstruction{time,instruction}).unwrap();
-	}
-}
-impl winit::application::ApplicationHandler for App<'_>{
-	fn resumed(&mut self,_event_loop:&winit::event_loop::ActiveEventLoop){
-		//
-	}
-
-	fn window_event(
-		&mut self,
-		event_loop:&winit::event_loop::ActiveEventLoop,
-		_window_id:winit::window::WindowId,
-		event:winit::event::WindowEvent,
-	){
-		match event{
-			winit::event::WindowEvent::KeyboardInput{
-				event:winit::event::KeyEvent{
-					logical_key:winit::keyboard::Key::Named(winit::keyboard::NamedKey::Escape),
-					state:winit::event::ElementState::Pressed,
-					..
-				},
-				..
-			}
-			|winit::event::WindowEvent::CloseRequested=>{
-				event_loop.exit();
-			},
-			_=>(),
-		}
-		self.send_timed_instruction(Instruction::WindowEvent(event));
-	}
-
-	fn device_event(
-		&mut self,
-		_event_loop:&winit::event_loop::ActiveEventLoop,
-		_device_id:winit::event::DeviceId,
-		event:winit::event::DeviceEvent,
-	){
-		self.send_timed_instruction(Instruction::DeviceEvent(event));
-	}
-
-	fn about_to_wait(
-		&mut self,
-		_event_loop:&winit::event_loop::ActiveEventLoop
-	){
-		self.send_timed_instruction(Instruction::WindowEvent(winit::event::WindowEvent::RedrawRequested));
-	}
-}

strafe-client/src/body.rs

@@ -31,14 +31,6 @@ impl<T> Body<T>
 			time,
 		}
 	}
-	pub const fn relative_to<'a>(&'a self,body0:&'a Body<T>)->VirtualBody<'a,T>{
-		//(p0,v0,a0,t0)
-		//(p1,v1,a1,t1)
-		VirtualBody{
-			body0,
-			body1:self,
-		}
-	}
 	pub fn extrapolated_position(&self,time:Time<T>)->Planar64Vec3{
 		let dt=time-self.time;
 		self.position
@@ -90,7 +82,7 @@ impl<T> Body<T>
 		// a*dt + v
 		self.acceleration.map(|elem|(dt*elem).divide().fix())+self.velocity
 	}
-	pub fn advance_time_ratio_dt(&mut self,dt:crate::model::GigaTime){
+	pub fn advance_time_ratio_dt(&mut self,dt:crate::model_physics::GigaTime){
 		self.position=self.extrapolated_position_ratio_dt(dt);
 		self.velocity=self.extrapolated_velocity_ratio_dt(dt);
 		self.time+=dt.into();
@@ -145,6 +137,14 @@ pub struct VirtualBody<'a,T>{
 impl<T> VirtualBody<'_,T>
 	where Time<T>:Copy,
 {
+	pub const fn relative<'a>(body0:&'a Body<T>,body1:&'a Body<T>)->VirtualBody<'a,T>{
+		//(p0,v0,a0,t0)
+		//(p1,v1,a1,t1)
+		VirtualBody{
+			body0,
+			body1,
+		}
+	}
 	pub fn extrapolated_position(&self,time:Time<T>)->Planar64Vec3{
 		self.body1.extrapolated_position(time)-self.body0.extrapolated_position(time)
 	}

strafe-client/src/face_crawler.rs

@@ -1,4 +1,4 @@
-use crate::model::{GigaTime,FEV,MeshQuery,DirectedEdge};
+use crate::model_physics::{GigaTime,FEV,MeshQuery,DirectedEdge};
 use strafesnet_common::integer::{Fixed,Ratio,vec3::Vector3};
 use crate::physics::{Time,Body};
 

strafe-client/src/file.rs

@@ -1,9 +1,5 @@
 use std::io::Read;
 
-#[cfg(any(feature="roblox",feature="source"))]
-use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
-
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum ReadError{
 	#[cfg(feature="roblox")]
@@ -38,11 +34,20 @@ pub enum ReadFormat{
 }
 
 pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
+	let t=std::time::Instant::now();
+	println!("reading fourcc...");
 	let mut buf=std::io::BufReader::new(input);
 	let peek=std::io::BufRead::fill_buf(&mut buf).map_err(ReadError::Io)?[0..4].to_owned();
+	let dt=t.elapsed();
+	println!("{:?} elapsed={:?}",core::str::from_utf8(&peek),dt);
+
+	let t=std::time::Instant::now();
+	println!("reading entire file...");
 	// reading the entire file is way faster than round tripping the disk constantly
 	let mut entire_file=Vec::new();
 	buf.read_to_end(&mut entire_file).map_err(ReadError::Io)?;
+	println!("elapsed={:?}",t.elapsed());
+
 	let cursor=std::io::Cursor::new(entire_file);
 	match peek.as_slice(){
 		#[cfg(feature="roblox")]
@@ -50,10 +55,15 @@ pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
 		#[cfg(feature="source")]
 		b"VBSP"=>Ok(ReadFormat::Source(strafesnet_bsp_loader::read(cursor).map_err(ReadError::Source)?)),
 		#[cfg(feature="snf")]
-		b"SNFM"=>Ok(ReadFormat::SNFM(
-			strafesnet_snf::read_map(cursor).map_err(ReadError::StrafesNET)?
-			.into_complete_map().map_err(ReadError::StrafesNETMap)?
-		)),
+		b"SNFM"=>{
+			let t=std::time::Instant::now();
+			println!("decoding map...");
+			let map=
+				strafesnet_snf::read_map(cursor).map_err(ReadError::StrafesNET)?
+				.into_complete_map().map_err(ReadError::StrafesNETMap)?;
+			println!("elapsed={:?}",t.elapsed());
+			Ok(ReadFormat::SNFM(map))
+		},
 		#[cfg(feature="snf")]
 		b"SNFB"=>Ok(ReadFormat::SNFB(
 			strafesnet_snf::read_bot(cursor).map_err(ReadError::StrafesNET)?
@@ -63,15 +73,11 @@ pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
 	}
 }
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum LoadError{
 	ReadError(ReadError),
 	File(std::io::Error),
-	#[cfg(feature="roblox")]
-	LoadRoblox(strafesnet_rbx_loader::LoadError),
-	#[cfg(feature="source")]
-	LoadSource(strafesnet_bsp_loader::LoadError),
+	Io(std::io::Error),
 }
 impl std::fmt::Display for LoadError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -81,7 +87,7 @@ impl std::fmt::Display for LoadError{
 impl std::error::Error for LoadError{}
 
 pub enum LoadFormat{
-	#[cfg(any(feature="snf",feature="roblox",feature="source"))]
+	#[cfg(feature="snf")]
 	Map(strafesnet_common::map::CompleteMap),
 	#[cfg(feature="snf")]
 	Bot(strafesnet_snf::bot::Segment),
@@ -99,13 +105,76 @@ pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<LoadFormat,LoadError>{
 		ReadFormat::Roblox(model)=>{
 			let mut place=model.into_place();
 			place.run_scripts();
-			Ok(LoadFormat::Map(
-				place.to_snf(LoadFailureMode::DefaultToNone).map_err(LoadError::LoadRoblox)?
-			))
+
+			let mut loader=strafesnet_deferred_loader::roblox_legacy();
+
+			let (texture_loader,mesh_loader)=loader.get_inner_mut();
+
+			let map_step1=strafesnet_rbx_loader::convert(
+				&place,
+				|name|texture_loader.acquire_render_config_id(name),
+				|name|mesh_loader.acquire_mesh_id(name),
+			);
+
+			let meshpart_meshes=mesh_loader.load_meshes().map_err(LoadError::Io)?;
+
+			let map_step2=map_step1.add_meshpart_meshes_and_calculate_attributes(
+				meshpart_meshes.into_iter().map(|(mesh_id,loader_model)|
+					(mesh_id,strafesnet_rbx_loader::data::RobloxMeshBytes::new(loader_model.get()))
+				)
+			);
+
+			let (textures,render_configs)=loader.into_render_configs().map_err(LoadError::Io)?.consume();
+
+			let map=map_step2.add_render_configs_and_textures(
+				render_configs.into_iter(),
+				textures.into_iter().map(|(texture_id,texture)|
+					(texture_id,match texture{
+						strafesnet_deferred_loader::texture::Texture::ImageDDS(data)=>data,
+					})
+				)
+			);
+
+			Ok(LoadFormat::Map(map))
 		},
 		#[cfg(feature="source")]
-		ReadFormat::Source(bsp)=>Ok(LoadFormat::Map(
-			bsp.to_snf(LoadFailureMode::DefaultToNone,&[]).map_err(LoadError::LoadSource)?
-		)),
+		ReadFormat::Source(bsp)=>{
+			let mut loader=strafesnet_deferred_loader::source_legacy();
+
+			let (texture_loader,mesh_loader)=loader.get_inner_mut();
+
+			let map_step1=strafesnet_bsp_loader::convert(
+				&bsp,
+				|name|texture_loader.acquire_render_config_id(name),
+				|name|mesh_loader.acquire_mesh_id(name),
+			);
+
+			let prop_meshes=mesh_loader.load_meshes(bsp.as_ref());
+
+			let map_step2=map_step1.add_prop_meshes(
+				//the type conflagulator 9000
+				prop_meshes.into_iter().map(|(mesh_id,loader_model)|
+					(mesh_id,strafesnet_bsp_loader::data::ModelData{
+						mdl:strafesnet_bsp_loader::data::MdlData::new(loader_model.mdl.get()),
+						vtx:strafesnet_bsp_loader::data::VtxData::new(loader_model.vtx.get()),
+						vvd:strafesnet_bsp_loader::data::VvdData::new(loader_model.vvd.get()),
+					})
+				),
+				|name|texture_loader.acquire_render_config_id(name),
+			);
+
+			let (textures,render_configs)=loader.into_render_configs().map_err(LoadError::Io)?.consume();
+
+			let map=map_step2.add_render_configs_and_textures(
+				render_configs.into_iter(),
+				textures.into_iter().map(|(texture_id,texture)|
+					(texture_id,match texture{
+						strafesnet_deferred_loader::texture::Texture::ImageDDS(data)=>data,
+					})
+				),
+			);
+
+			Ok(LoadFormat::Map(map))
+		},
 	}
 }

strafe-client/src/graphics.rs

@@ -1,15 +1,9 @@
 use std::borrow::Cow;
 use std::collections::{HashSet,HashMap};
 use strafesnet_common::map;
-use strafesnet_settings::settings;
-use strafesnet_session::session;
 use strafesnet_common::model::{self, ColorId, NormalId, PolygonIter, PositionId, RenderConfigId, TextureCoordinateId, VertexId};
 use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
-use crate::model::{self as model_graphics,IndexedGraphicsMeshOwnedRenderConfig,IndexedGraphicsMeshOwnedRenderConfigId,GraphicsMeshOwnedRenderConfig,GraphicsModelColor4,GraphicsModelOwned,GraphicsVertex};
-
-pub fn required_limits()->wgpu::Limits{
-	wgpu::Limits::default()
-}
+use crate::model_graphics::{self,IndexedGraphicsMeshOwnedRenderConfig,IndexedGraphicsMeshOwnedRenderConfigId,GraphicsMeshOwnedRenderConfig,GraphicsModelColor4,GraphicsModelOwned,GraphicsVertex};
 
 struct Indices{
 	count:u32,
@@ -142,7 +136,7 @@ impl GraphicsState{
 	pub fn clear(&mut self){
 		self.models.clear();
 	}
-	pub fn load_user_settings(&mut self,user_settings:&settings::UserSettings){
+	pub fn load_user_settings(&mut self,user_settings:&crate::settings::UserSettings){
 		self.camera.fov=user_settings.calculate_fov(1.0,&self.camera.screen_size).as_vec2();
 	}
 	pub fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,map:&map::CompleteMap){
@@ -454,7 +448,7 @@ impl GraphicsState{
 		//.into_iter() the modeldata vec so entities can be /moved/ to models.entities
 		let mut model_count=0;
 		let mut instance_count=0;
-		let uniform_buffer_binding_size=required_limits().max_uniform_buffer_binding_size as usize;
+		let uniform_buffer_binding_size=crate::setup::required_limits().max_uniform_buffer_binding_size as usize;
 		let chunk_size=uniform_buffer_binding_size/MODEL_BUFFER_SIZE_BYTES;
 		self.models.reserve(models.len());
 		for model in models.into_iter(){
@@ -614,7 +608,7 @@ impl GraphicsState{
 		// Create the render pipeline
 		let shader=device.create_shader_module(wgpu::ShaderModuleDescriptor{
 			label:None,
-			source:wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("../../../strafe-client/src/shader.wgsl"))),
+			source:wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
 		});
 
 		//load textures
@@ -642,10 +636,10 @@ impl GraphicsState{
 				wgpu::TextureFormat::Astc{
 					block:AstcBlock::B4x4,
 					channel:AstcChannel::UnormSrgb,
-				}=>&include_bytes!("../../../strafe-client/images/astc.dds")[..],
-				wgpu::TextureFormat::Etc2Rgb8UnormSrgb=>&include_bytes!("../../../strafe-client/images/etc2.dds")[..],
-				wgpu::TextureFormat::Bc1RgbaUnormSrgb=>&include_bytes!("../../../strafe-client/images/bc1.dds")[..],
-				wgpu::TextureFormat::Bgra8UnormSrgb=>&include_bytes!("../../../strafe-client/images/bgra.dds")[..],
+				}=>&include_bytes!("../images/astc.dds")[..],
+				wgpu::TextureFormat::Etc2Rgb8UnormSrgb=>&include_bytes!("../images/etc2.dds")[..],
+				wgpu::TextureFormat::Bc1RgbaUnormSrgb=>&include_bytes!("../images/bc1.dds")[..],
+				wgpu::TextureFormat::Bgra8UnormSrgb=>&include_bytes!("../images/bgra.dds")[..],
 				_=>unreachable!(),
 			};
 
@@ -688,7 +682,7 @@ impl GraphicsState{
 
 		//squid
 		let squid_texture_view={
-			let bytes=include_bytes!("../../../strafe-client/images/squid.dds");
+			let bytes=include_bytes!("../images/squid.dds");
 
 			let image=ddsfile::Dds::read(&mut std::io::Cursor::new(bytes)).unwrap();
 
@@ -870,7 +864,7 @@ impl GraphicsState{
 		&mut self,
 		device:&wgpu::Device,
 		config:&wgpu::SurfaceConfiguration,
-		user_settings:&settings::UserSettings,
+		user_settings:&crate::settings::UserSettings,
 	){
 		self.depth_view=Self::create_depth_texture(config,device);
 		self.camera.screen_size=glam::uvec2(config.width,config.height);
@@ -881,7 +875,7 @@ impl GraphicsState{
 		view:&wgpu::TextureView,
 		device:&wgpu::Device,
 		queue:&wgpu::Queue,
-		frame_state:session::FrameState,
+		frame_state:crate::session::FrameState,
 	){
 		//TODO:use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
 

strafe-client/src/graphics_worker.rs

@@ -1,11 +1,7 @@
-use strafesnet_graphics::graphics;
-use strafesnet_session::session;
-use strafesnet_settings::settings;
-
 pub enum Instruction{
-	Render(session::FrameState),
-	//UpdateModel(graphics::GraphicsModelUpdate),
-	Resize(winit::dpi::PhysicalSize<u32>,settings::UserSettings),
+	Render(crate::session::FrameState),
+	//UpdateModel(crate::graphics::GraphicsModelUpdate),
+	Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
 	ChangeMap(strafesnet_common::map::CompleteMap),
 }
 
@@ -19,7 +15,7 @@ WorkerDescription{
 //up to three frames in flight, dropping new frame requests when all three are busy, and dropping output frames when one renders out of order
 
 pub fn new(
-	mut graphics:graphics::GraphicsState,
+	mut graphics:crate::graphics::GraphicsState,
 	mut config:wgpu::SurfaceConfiguration,
 	surface:wgpu::Surface,
 	device:wgpu::Device,

strafe-client/src/main.rs

@@ -1,10 +1,20 @@
-mod app;
+mod body;
 mod file;
 mod setup;
 mod window;
+mod worker;
+mod physics;
+mod session;
+mod graphics;
+mod settings;
+mod push_solve;
+mod face_crawler;
 mod compat_worker;
+mod model_physics;
+mod model_graphics;
 mod physics_worker;
 mod graphics_worker;
+mod mouse_interpolator;
 
 const TITLE:&'static str=concat!("Strafe Client v",env!("CARGO_PKG_VERSION"));
 

strafe-client/src/model_physics.rs

@@ -1005,3 +1005,9 @@ fn test_is_empty_volume(){
 	assert!(!is_empty_volume([vec3::X.fix_3(),vec3::Y.fix_3(),vec3::Z.fix_3()].to_vec()));
 	assert!(is_empty_volume([vec3::X.fix_3(),vec3::Y.fix_3(),vec3::Z.fix_3(),vec3::NEG_X.fix_3()].to_vec()));
 }
+
+#[test]
+fn build_me_a_cube(){
+	let mesh=PhysicsMesh::unit_cube();
+	//println!("mesh={:?}",mesh);
+}

strafe-client/src/mouse_interpolator.rs

@@ -5,13 +5,13 @@ use strafesnet_common::physics::{
 	TimeInner as PhysicsTimeInner,
 	Time as PhysicsTime,
 };
-use strafesnet_common::session::Time as SessionTime;
+use strafesnet_common::session::{Time as SessionTime,TimeInner as SessionTimeInner};
 use strafesnet_common::instruction::{InstructionConsumer,InstructionEmitter,TimedInstruction};
 
-type TimedSelfInstruction=TimedInstruction<Instruction,PhysicsTime>;
-type DoubleTimedSelfInstruction=TimedInstruction<TimedSelfInstruction,SessionTime>;
+type TimedSelfInstruction=TimedInstruction<Instruction,PhysicsTimeInner>;
+type DoubleTimedSelfInstruction=TimedInstruction<TimedSelfInstruction,SessionTimeInner>;
 
-type TimedPhysicsInstruction=TimedInstruction<PhysicsInstruction,PhysicsTime>;
+type TimedPhysicsInstruction=TimedInstruction<PhysicsInstruction,PhysicsTimeInner>;
 
 const MOUSE_TIMEOUT:SessionTime=SessionTime::from_millis(10);
 
@@ -89,14 +89,14 @@ pub struct MouseInterpolator{
 // Maybe MouseInterpolator manipulation is better expressed using impls
 // and called from Instruction trait impls in session
 impl InstructionConsumer<TimedSelfInstruction> for MouseInterpolator{
-	type Time=SessionTime;
+	type TimeInner=SessionTimeInner;
 	fn process_instruction(&mut self,ins:DoubleTimedSelfInstruction){
 		self.push_unbuffered_input(ins.time,ins.instruction.time,ins.instruction.instruction.into())
 	}
 }
 impl InstructionEmitter<StepInstruction> for MouseInterpolator{
-	type Time=SessionTime;
-	fn next_instruction(&self,time_limit:SessionTime)->Option<TimedInstruction<StepInstruction,Self::Time>>{
+	type TimeInner=SessionTimeInner;
+	fn next_instruction(&self,time_limit:SessionTime)->Option<TimedInstruction<StepInstruction,Self::TimeInner>>{
 		self.buffered_instruction_with_timeout(time_limit)
 	}
 }
@@ -108,7 +108,7 @@ impl MouseInterpolator{
 			output:std::collections::VecDeque::new(),
 		}
 	}
-	fn push_mouse_and_flush_buffer(&mut self,ins:TimedInstruction<MouseInstruction,PhysicsTime>){
+	fn push_mouse_and_flush_buffer(&mut self,ins:TimedInstruction<MouseInstruction,PhysicsTimeInner>){
 		self.buffer.push_front(TimedInstruction{
 			time:ins.time,
 			instruction:BufferedInstruction::Mouse(ins.instruction).into(),
@@ -219,7 +219,7 @@ impl MouseInterpolator{
 			}
 		}
 	}
-	fn buffered_instruction_with_timeout(&self,time_limit:SessionTime)->Option<TimedInstruction<StepInstruction,SessionTime>>{
+	fn buffered_instruction_with_timeout(&self,time_limit:SessionTime)->Option<TimedInstruction<StepInstruction,SessionTimeInner>>{
 		match self.get_mouse_timedout_at(time_limit){
 			Some(timeout)=>Some(TimedInstruction{
 				time:timeout,
@@ -232,7 +232,7 @@ impl MouseInterpolator{
 			}),
 		}
 	}
-	pub fn pop_buffered_instruction(&mut self,ins:TimedInstruction<StepInstruction,PhysicsTime>)->Option<TimedPhysicsInstruction>{
+	pub fn pop_buffered_instruction(&mut self,ins:TimedInstruction<StepInstruction,PhysicsTimeInner>)->Option<TimedPhysicsInstruction>{
 		match ins.instruction{
 			StepInstruction::Pop=>(),
 			StepInstruction::Timeout=>self.timeout_mouse(ins.time),
@@ -244,7 +244,6 @@ impl MouseInterpolator{
 #[cfg(test)]
 mod test{
 	use super::*;
-	use strafesnet_common::session::TimeInner as SessionTimeInner;
 	#[test]
 	fn test(){
 		let mut interpolator=MouseInterpolator::new();

strafe-client/src/physics.rs

@@ -1,5 +1,5 @@
 use std::collections::{HashMap,HashSet};
-use crate::model::{self as model_physics,PhysicsMesh,PhysicsMeshTransform,TransformedMesh,MeshQuery,PhysicsMeshId,PhysicsSubmeshId};
+use crate::model_physics::{self,PhysicsMesh,PhysicsMeshTransform,TransformedMesh,MeshQuery,PhysicsMeshId,PhysicsSubmeshId};
 use strafesnet_common::bvh;
 use strafesnet_common::map;
 use strafesnet_common::run;
@@ -14,6 +14,45 @@ use strafesnet_common::integer::{self,vec3,mat3,Planar64,Planar64Vec3,Planar64Ma
 pub use strafesnet_common::physics::{Time,TimeInner};
 use gameplay::ModeState;
 
+// Physics bug fixes can easily desync all bots.
+//
+// When replaying a bot, use the exact physics version which it was recorded with.
+//
+// When validating a new bot, ignore the version and use the latest version,
+// and overwrite the version in the file.
+//
+// Compatible physics versions should be determined
+// empirically at development time via leaderboard resimulation.
+//
+// Compatible physics versions should result in an identical leaderboard state,
+// or the only bots which fail are ones exploiting a surgically patched bug.
+#[derive(Clone,Copy,Hash,Debug,id::Id,Eq,PartialEq,Ord,PartialOrd)]
+pub struct PhysicsVersion(u32);
+pub const VERSION:PhysicsVersion=PhysicsVersion(2);
+const LATEST_COMPATIBLE_VERSION:[u32;1+VERSION.0 as usize]=const{
+	let compat=[0,1,2];
+
+	let mut input_version=0;
+	while input_version<compat.len(){
+		// compatible version must be greater that or equal to the input version
+		assert!(input_version as u32<=compat[input_version]);
+		// compatible version must be a version that exists
+		assert!(compat[input_version]<=VERSION.0);
+		input_version+=1;
+	}
+	compat
+};
+pub enum PhysicsVersionError{
+	UnknownPhysicsVersion,
+}
+pub const fn get_latest_compatible_version(PhysicsVersion(version):PhysicsVersion)->Result<PhysicsVersion,PhysicsVersionError>{
+	if (version as usize)<LATEST_COMPATIBLE_VERSION.len(){
+		Ok(PhysicsVersion(LATEST_COMPATIBLE_VERSION[version as usize]))
+	}else{
+		Err(PhysicsVersionError::UnknownPhysicsVersion)
+	}
+}
+
 pub type Body=crate::body::Body<TimeInner>;
 type MouseState=strafesnet_common::mouse::MouseState<TimeInner>;
 
@@ -229,6 +268,12 @@ impl PhysicsModels{
 				.map(|model|&model.transform),
 		}
 	}
+	fn contact_model(&self,model_id:ContactModelId)->&ContactModel{
+		&self.contact_models[&model_id]
+	}
+	fn intersect_model(&self,model_id:IntersectModelId)->&IntersectModel{
+		&self.intersect_models[&model_id]
+	}
 	fn contact_attr(&self,model_id:ContactModelId)->&gameplay_attributes::ContactAttributes{
 		&self.contact_attributes[&self.contact_models[&model_id].attr_id]
 	}
@@ -263,7 +308,7 @@ impl PhysicsCamera{
 		);
 		self.clamped_mouse_pos=unclamped_mouse_pos;
 	}
-	pub fn simulate_move_angles(&self,mouse_delta:glam::IVec2)->glam::Vec2{
+	pub fn simulate_move_angles(&self,mouse_delta:glam::IVec2)->glam::Vec2 {
 		let a=-self.sensitivity.mul_int((self.clamped_mouse_pos+mouse_delta).as_i64vec2());
 		let ax=Angle32::wrap_from_i64(a.x);
 		let ay=Angle32::clamp_from_i64(a.y)
@@ -556,7 +601,7 @@ impl MoveState{
 			=>None,
 		}
 	}
-	fn next_move_instruction(&self,strafe:&Option<gameplay_style::StrafeSettings>,time:Time)->Option<TimedInstruction<InternalInstruction,Time>>{
+	fn next_move_instruction(&self,strafe:&Option<gameplay_style::StrafeSettings>,time:Time)->Option<TimedInstruction<InternalInstruction,TimeInner>>{
 		//check if you have a valid walk state and create an instruction
 		match self{
 			MoveState::Walk(walk_state)|MoveState::Ladder(walk_state)=>match &walk_state.target{
@@ -784,8 +829,8 @@ impl TouchingState{
 		}).collect();
 		crate::push_solve::push_solve(&contacts,acceleration)
 	}
-	fn predict_collision_end(&self,collector:&mut instruction::InstructionCollector<InternalInstruction,Time>,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,body:&Body,start_time:Time){
-		// let relative_body=body.relative_to(&Body::ZERO);
+	fn predict_collision_end(&self,collector:&mut instruction::InstructionCollector<InternalInstruction,TimeInner>,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,body:&Body,start_time:Time){
+		// let relative_body=crate::body::VirtualBody::relative(&Body::ZERO,body).body(time);
 		let relative_body=body;
 		for contact in &self.contacts{
 			//detect face slide off
@@ -878,7 +923,7 @@ impl PhysicsState{
 	fn reset_to_default(&mut self){
 		*self=Self::default();
 	}
-	fn next_move_instruction(&self)->Option<TimedInstruction<InternalInstruction,Time>>{
+	fn next_move_instruction(&self)->Option<TimedInstruction<InternalInstruction,TimeInner>>{
 		self.move_state.next_move_instruction(&self.style.strafe,self.time)
 	}
 	fn cull_velocity(&mut self,data:&PhysicsData,velocity:Planar64Vec3){
@@ -935,7 +980,7 @@ pub struct PhysicsData{
 impl Default for PhysicsData{
 	fn default()->Self{
  		Self{
-			bvh:bvh::BvhNode::empty(),
+			bvh:bvh::BvhNode::default(),
 			models:Default::default(),
 			modes:Default::default(),
 			hitbox_mesh:StyleModifiers::default().calculate_mesh(),
@@ -950,21 +995,21 @@ pub struct PhysicsContext<'a>{
 // the physics consumes both Instruction and PhysicsInternalInstruction,
 // but can only emit PhysicsInternalInstruction
 impl InstructionConsumer<InternalInstruction> for PhysicsContext<'_>{
-	type Time=Time;
-	fn process_instruction(&mut self,ins:TimedInstruction<InternalInstruction,Time>){
+	type TimeInner=TimeInner;
+	fn process_instruction(&mut self,ins:TimedInstruction<InternalInstruction,TimeInner>){
 		atomic_internal_instruction(&mut self.state,&self.data,ins)
 	}
 }
 impl InstructionConsumer<Instruction> for PhysicsContext<'_>{
-	type Time=Time;
-	fn process_instruction(&mut self,ins:TimedInstruction<Instruction,Time>){
+	type TimeInner=TimeInner;
+	fn process_instruction(&mut self,ins:TimedInstruction<Instruction,TimeInner>){
 		atomic_input_instruction(&mut self.state,&self.data,ins)
 	}
 }
 impl InstructionEmitter<InternalInstruction> for PhysicsContext<'_>{
-	type Time=Time;
+	type TimeInner=TimeInner;
 	//this little next instruction function could cache its return value and invalidate the cached value by watching the State.
-	fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<InternalInstruction,Time>>{
+	fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<InternalInstruction,TimeInner>>{
 		next_instruction_internal(&self.state,&self.data,time_limit)
 	}
 }
@@ -972,7 +1017,7 @@ impl PhysicsContext<'_>{
 	pub fn run_input_instruction(
 		state:&mut PhysicsState,
 		data:&PhysicsData,
-		instruction:TimedInstruction<Instruction,Time>
+		instruction:TimedInstruction<Instruction,TimeInner>
 	){
 		let mut context=PhysicsContext{state,data};
 		context.process_exhaustive(instruction.time);
@@ -1121,7 +1166,7 @@ impl PhysicsData{
 }
 
 	//this is the one who asks
-	fn next_instruction_internal(state:&PhysicsState,data:&PhysicsData,time_limit:Time)->Option<TimedInstruction<InternalInstruction,Time>>{
+	fn next_instruction_internal(state:&PhysicsState,data:&PhysicsData,time_limit:Time)->Option<TimedInstruction<InternalInstruction,TimeInner>>{
 		//JUST POLLING!!! NO MUTATION
 		let mut collector=instruction::InstructionCollector::new(time_limit);
 
@@ -1134,9 +1179,9 @@ impl PhysicsData{
 		state.body.grow_aabb(&mut aabb,state.time,collector.time());
 		aabb.inflate(data.hitbox_mesh.halfsize);
 		//relative to moving platforms
-		//let relative_body=state.body.relative_to(&Body::ZERO);
+		//let relative_body=&VirtualBody::relative(&Body::default(),&state.body).body(state.time);
 		let relative_body=&state.body;
-		data.bvh.sample_aabb(&aabb,&mut |&convex_mesh_id|{
+		data.bvh.the_tester(&aabb,&mut |&convex_mesh_id|{
 			//no checks are needed because of the time limits.
 			let model_mesh=data.models.mesh(convex_mesh_id);
 			let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,data.hitbox_mesh.transformed_mesh());
@@ -1197,8 +1242,8 @@ fn recalculate_touching(
 	aabb.grow(body.position);
 	aabb.inflate(hitbox_mesh.halfsize);
 	//relative to moving platforms
-	//let relative_body=state.body.relative_to(&Body::ZERO);
-	bvh.sample_aabb(&aabb,&mut |&convex_mesh_id|{
+	//let relative_body=&VirtualBody::relative(&Body::default(),&state.body).body(state.time);
+	bvh.the_tester(&aabb,&mut |&convex_mesh_id|{
 		//no checks are needed because of the time limits.
 		let model_mesh=models.mesh(convex_mesh_id);
 		let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,hitbox_mesh.transformed_mesh());
@@ -1651,7 +1696,7 @@ fn collision_end_intersect(
 		}
 	}
 }
-fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedInstruction<InternalInstruction,Time>){
+fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedInstruction<InternalInstruction,TimeInner>){
 	state.time=ins.time;
 	let (should_advance_body,goober_time)=match ins.instruction{
 		InternalInstruction::CollisionStart(_,dt)
@@ -1747,7 +1792,7 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 		}
 	}
 
-fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedInstruction<Instruction,Time>){
+fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedInstruction<Instruction,TimeInner>){
 	state.time=ins.time;
 	let should_advance_body=match ins.instruction{
 		//the body may as well be a quantum wave function
@@ -1867,6 +1912,8 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
 
 #[cfg(test)]
 mod test{
+	use crate::file;
+	use crate::body::VirtualBody;
 	use strafesnet_common::integer::{vec3::{self,int as int3},mat3};
 	use super::*;
 	fn test_collision_axis_aligned(relative_body:Body,expected_collision_time:Option<Time>){
@@ -1947,111 +1994,111 @@ mod test{
 	}
 	#[test]
 	fn test_collision_parabola_edge_east_from_west(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(3,3,0),
 			int3(100,-1,0),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_south_from_north(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(0,3,3),
 			int3(0,-1,100),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_west_from_east(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(-3,3,0),
 			int3(-100,-1,0),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_north_from_south(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(0,3,-3),
 			int3(0,-1,-100),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_north_from_ne(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(0,6,-7)>>1,
 			int3(-10,-1,1),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_north_from_nw(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(0,6,-7)>>1,
 			int3(10,-1,1),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_east_from_se(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(7,6,0)>>1,
 			int3(-1,-1,-10),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_east_from_ne(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(7,6,0)>>1,
 			int3(-1,-1,10),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_south_from_se(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(0,6,7)>>1,
 			int3(-10,-1,-1),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_south_from_sw(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(0,6,7)>>1,
 			int3(10,-1,-1),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_west_from_se(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(-7,6,0)>>1,
 			int3(1,-1,-10),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_parabola_edge_west_from_ne(){
-		test_collision(Body::new(
+		test_collision(VirtualBody::relative(&Body::ZERO,&Body::new(
 			int3(-7,6,0)>>1,
 			int3(1,-1,10),
 			int3(0,-1,0),
 			Time::ZERO
-		).relative_to(&Body::ZERO).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
+		)).body(Time::from_secs(-1)),Some(Time::from_secs(0)));
 	}
 	#[test]
 	fn test_collision_oblique(){
@@ -2080,4 +2127,202 @@ mod test{
 			Time::ZERO
 		),None);
 	}
+	#[test]
+	fn run_replay(){
+		println!("loading map file..");
+		let map=file::load("../tools/bhop_maps/5692113331.snfm");
+		println!("loading bot file..");
+		let bot=file::load("../tools/replays/534s+997497968ns.snfb");
+		if let (Ok(file::LoadFormat::Map(map)),Ok(file::LoadFormat::Bot(bot)))=(map,bot){
+			// create recording
+			let mut physics_data=PhysicsData::default();
+			println!("generating models..");
+			physics_data.generate_models(&map);
+			println!("simulating...");
+			let mut physics=PhysicsState::default();
+			for ins in bot.instructions{
+				PhysicsContext::run_input_instruction(&mut physics,&physics_data,ins);
+			}
+			match physics.get_finish_time(){
+				Some(time)=>println!("finish time:{}",time),
+				None=>println!("simulation did not end in finished state"),
+			}
+		}else{
+			panic!("missing files");
+		}
+	}
+	enum DeterminismResult{
+		Deterministic,
+		NonDeterministic,
+	}
+	#[allow(unused)]
+	#[derive(Debug)]
+	enum ReplayError{
+		Load(file::LoadError),
+		IO(std::io::Error),
+	}
+	impl From<file::LoadError> for ReplayError{
+		fn from(value:file::LoadError)->Self{
+			Self::Load(value)
+		}
+	}
+	impl From<std::io::Error> for ReplayError{
+		fn from(value:std::io::Error)->Self{
+			Self::IO(value)
+		}
+	}
+	fn segment_determinism(bot:strafesnet_snf::bot::Segment,physics_data:&PhysicsData)->DeterminismResult{
+		// create default physics state
+		let mut physics_deterministic=PhysicsState::default();
+		// create a second physics state
+		let mut physics_filtered=PhysicsState::default();
+
+		// invent a new bot id and insert the replay
+		println!("simulating...");
+
+		let mut non_idle_count=0;
+
+		for (i,ins) in bot.instructions.into_iter().enumerate(){
+			let state_deterministic=physics_deterministic.clone();
+			let state_filtered=physics_filtered.clone();
+			PhysicsContext::run_input_instruction(&mut physics_deterministic,&physics_data,ins.clone());
+			match ins{
+				strafesnet_common::instruction::TimedInstruction{instruction:strafesnet_common::physics::Instruction::Idle,..}=>(),
+				other=>{
+					non_idle_count+=1;
+					// run
+					PhysicsContext::run_input_instruction(&mut physics_filtered,&physics_data,other.clone());
+					// check if position matches
+					let b0=physics_deterministic.camera_body();
+					let b1=physics_filtered.camera_body();
+					if b0.position!=b1.position{
+						println!("desync at instruction #{}",i);
+						println!("non idle instructions completed={non_idle_count}");
+						println!("instruction #{i}={:?}",other);
+						println!("deterministic state0:\n{state_deterministic:?}");
+						println!("filtered state0:\n{state_filtered:?}");
+						println!("deterministic state1:\n{:?}",physics_deterministic);
+						println!("filtered state1:\n{:?}",physics_filtered);
+						return DeterminismResult::NonDeterministic;
+					}
+				},
+			}
+		}
+		match physics_deterministic.get_finish_time(){
+			Some(time)=>println!("[with idle] finish time:{}",time),
+			None=>println!("[with idle] simulation did not end in finished state"),
+		}
+		match physics_filtered.get_finish_time(){
+			Some(time)=>println!("[filtered] finish time:{}",time),
+			None=>println!("[filtered] simulation did not end in finished state"),
+		}
+		DeterminismResult::Deterministic
+	}
+	type ThreadResult=Result<Option<DeterminismResult>,file::LoadError>;
+	fn do_thread<'a>(s:&'a std::thread::Scope<'a,'_>,file_path:std::path::PathBuf,send:std::sync::mpsc::Sender<ThreadResult>,physics_data:&'a PhysicsData){
+		s.spawn(move ||{
+			let result=match file::load(file_path.as_path()){
+				Ok(file::LoadFormat::Bot(bot))=>{
+					println!("Running {:?}",file_path.file_stem());
+					Ok(Some(segment_determinism(bot,physics_data)))
+				},
+				Ok(_)=>{
+					println!("Provided bot file is not a bot file!");
+					Ok(None)
+				}
+				Err(e)=>{
+					println!("Load error");
+					Err(e)
+				},
+			};
+			// send when thread is complete
+			send.send(result).unwrap();
+		});
+	}
+	fn get_file_path(dir_entry:std::fs::DirEntry)->Result<Option<std::path::PathBuf>,std::io::Error>{
+		Ok(dir_entry.file_type()?.is_file().then_some(
+			dir_entry.path()
+		))
+	}
+	#[test]
+	fn test_determinism()->Result<(),ReplayError>{
+		let thread_limit=std::thread::available_parallelism()?.get();
+		println!("loading map file..");
+		let file::LoadFormat::Map(map)=file::load("../tools/bhop_maps/5692113331.snfm")? else{
+			panic!("Provided map file is not a map file!");
+		};
+		let mut physics_data=PhysicsData::default();
+		println!("generating models..");
+		physics_data.generate_models(&map);
+		let (send,recv)=std::sync::mpsc::channel();
+
+		let mut read_dir=std::fs::read_dir("../tools/replays")?;
+
+		// promise that &physics_data will outlive the spawned threads
+		let thread_results=std::thread::scope(|s|{
+			let mut thread_results=Vec::new();
+
+			// spawn threads
+			println!("spawning up to {thread_limit} threads...");
+			let mut active_thread_count=0;
+			while active_thread_count<thread_limit{
+				if let Some(dir_entry_result)=read_dir.next(){
+					if let Some(file_path)=get_file_path(dir_entry_result?)?{
+						active_thread_count+=1;
+						do_thread(s,file_path,send.clone(),&physics_data);
+					}
+				}else{
+					break;
+				}
+			}
+
+			// spawn another thread every time a message is received from the channel
+			println!("riding parallelism wave...");
+			while let Some(dir_entry_result)=read_dir.next(){
+				if let Some(file_path)=get_file_path(dir_entry_result?)?{
+					// wait for a thread to complete
+					thread_results.push(recv.recv().unwrap());
+					do_thread(s,file_path,send.clone(),&physics_data);
+				}
+			}
+
+			// wait for remaining threads to complete
+			println!("waiting for all threads to complete...");
+			for _ in 0..active_thread_count{
+				thread_results.push(recv.recv().unwrap());
+			}
+
+			println!("done.");
+			Ok::<_,ReplayError>(thread_results)
+		})?;
+
+		// tally results
+		#[derive(Default)]
+		struct Totals{
+			deterministic:u32,
+			nondeterministic:u32,
+			invalid:u32,
+			error:u32,
+		}
+		let Totals{deterministic,nondeterministic,invalid,error}=thread_results.into_iter().fold(Totals::default(),|mut totals,result|{
+			match result{
+				Ok(Some(DeterminismResult::Deterministic))=>totals.deterministic+=1,
+				Ok(Some(DeterminismResult::NonDeterministic))=>totals.nondeterministic+=1,
+				Ok(None)=>totals.invalid+=1,
+				Err(_)=>totals.error+=1,
+			}
+			totals
+		});
+
+		println!("deterministic={deterministic}");
+		println!("nondeterministic={nondeterministic}");
+		println!("invalid={invalid}");
+		println!("error={error}");
+
+		assert!(nondeterministic==0);
+		assert!(invalid==0);
+		assert!(error==0);
+
+		Ok(())
+	}
 }

strafe-client/src/physics_worker.rs

@@ -1,12 +1,11 @@
 use crate::graphics_worker::Instruction as GraphicsInstruction;
-use strafesnet_settings::{directories::Directories,settings};
-use strafesnet_session::session::{
-	Session,Simulation,SessionInputInstruction,SessionControlInstruction,SessionPlaybackInstruction,ImplicitModeInstruction,
+use crate::session::{
+	Session,Simulation,SessionInputInstruction,SessionControlInstruction,SessionPlaybackInstruction,
 	Instruction as SessionInstruction,
 };
 use strafesnet_common::instruction::{TimedInstruction,InstructionConsumer};
 use strafesnet_common::physics::Time as PhysicsTime;
-use strafesnet_common::session::Time as SessionTime;
+use strafesnet_common::session::{Time as SessionTime,TimeInner as SessionTimeInner};
 use strafesnet_common::timer::Timer;
 
 pub enum Instruction{
@@ -21,18 +20,16 @@ pub enum Instruction{
 
 pub fn new<'a>(
 	mut graphics_worker:crate::compat_worker::INWorker<'a,crate::graphics_worker::Instruction>,
-	directories:Directories,
-	user_settings:settings::UserSettings,
-)->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTime>>{
-	let physics=strafesnet_physics::physics::PhysicsState::default();
+	user_settings:crate::settings::UserSettings,
+)->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTimeInner>>{
+	let physics=crate::physics::PhysicsState::default();
 	let timer=Timer::unpaused(SessionTime::ZERO,PhysicsTime::ZERO);
 	let simulation=Simulation::new(timer,physics);
 	let mut session=Session::new(
 		user_settings,
-		directories,
 		simulation,
 	);
-	crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction,SessionTime>|{
+	crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction,SessionTimeInner>|{
 		// excruciating pain
 		macro_rules! run_session_instruction{
 			($time:expr,$instruction:expr)=>{
@@ -70,7 +67,7 @@ pub fn new<'a>(
 			},
 			Instruction::ChangeMap(complete_map)=>{
 				run_session_instruction!(ins.time,SessionInstruction::ChangeMap(&complete_map));
-				run_session_instruction!(ins.time,SessionInstruction::Input(SessionInputInstruction::Mode(ImplicitModeInstruction::ResetAndSpawn(strafesnet_common::gameplay_modes::ModeId::MAIN,strafesnet_common::gameplay_modes::StageId::FIRST))));
+				run_session_instruction!(ins.time,SessionInstruction::Input(SessionInputInstruction::Mode(crate::session::ImplicitModeInstruction::ResetAndSpawn(strafesnet_common::gameplay_modes::ModeId::MAIN,strafesnet_common::gameplay_modes::StageId::FIRST))));
 				run_graphics_worker_instruction!(GraphicsInstruction::ChangeMap(complete_map));
 			},
 			Instruction::LoadReplay(bot)=>{

strafe-client/src/session.rs

@@ -12,11 +12,10 @@ use strafesnet_common::physics::{
 };
 use strafesnet_common::timer::{Scaled,Timer};
 use strafesnet_common::session::{TimeInner as SessionTimeInner,Time as SessionTime};
-use strafesnet_settings::directories::Directories;
 
 use crate::mouse_interpolator::{MouseInterpolator,StepInstruction,Instruction as MouseInterpolatorInstruction};
-use strafesnet_physics::physics::{self,PhysicsContext,PhysicsData};
-use strafesnet_settings::settings::UserSettings;
+use crate::physics::{PhysicsContext,PhysicsData};
+use crate::settings::UserSettings;
 
 pub enum Instruction<'a>{
 	Input(SessionInputInstruction),
@@ -58,19 +57,19 @@ pub enum SessionPlaybackInstruction{
 }
 
 pub struct FrameState{
-	pub body:physics::Body,
-	pub camera:physics::PhysicsCamera,
+	pub body:crate::physics::Body,
+	pub camera:crate::physics::PhysicsCamera,
 	pub time:PhysicsTime,
 }
 
 pub struct Simulation{
 	timer:Timer<Scaled<SessionTimeInner,PhysicsTimeInner>>,
-	physics:physics::PhysicsState,
+	physics:crate::physics::PhysicsState,
 }
 impl Simulation{
 	pub const fn new(
 		timer:Timer<Scaled<SessionTimeInner,PhysicsTimeInner>>,
-		physics:physics::PhysicsState,
+		physics:crate::physics::PhysicsState,
 	)->Self{
 		Self{
 			timer,
@@ -88,11 +87,11 @@ impl Simulation{
 
 #[derive(Default)]
 pub struct Recording{
-	instructions:Vec<TimedInstruction<PhysicsInputInstruction,PhysicsTime>>,
+	instructions:Vec<TimedInstruction<PhysicsInputInstruction,PhysicsTimeInner>>,
 }
 impl Recording{
 	pub fn new(
-		instructions:Vec<TimedInstruction<PhysicsInputInstruction,PhysicsTime>>,
+		instructions:Vec<TimedInstruction<PhysicsInputInstruction,PhysicsTimeInner>>,
 	)->Self{
 		Self{instructions}
 	}
@@ -150,12 +149,11 @@ enum ViewState{
 }
 
 pub struct Session{
-	directories:Directories,
 	user_settings:UserSettings,
 	mouse_interpolator:crate::mouse_interpolator::MouseInterpolator,
 	view_state:ViewState,
 	//gui:GuiState
-	geometry_shared:physics::PhysicsData,
+	geometry_shared:crate::physics::PhysicsData,
 	simulation:Simulation,
 	// below fields not included in lite session
 	recording:Recording,
@@ -165,12 +163,10 @@ pub struct Session{
 impl Session{
 	pub fn new(
 		user_settings:UserSettings,
-		directories:Directories,
 		simulation:Simulation,
 	)->Self{
 		Self{
 			user_settings,
-			directories,
 			mouse_interpolator:MouseInterpolator::new(),
 			geometry_shared:Default::default(),
 			simulation,
@@ -207,8 +203,8 @@ impl Session{
 // Session emits DoStep
 
 impl InstructionConsumer<Instruction<'_>> for Session{
-	type Time=SessionTime;
-	fn process_instruction(&mut self,ins:TimedInstruction<Instruction,Self::Time>){
+	type TimeInner=SessionTimeInner;
+	fn process_instruction(&mut self,ins:TimedInstruction<Instruction,Self::TimeInner>){
 		// repetitive procedure macro
 		macro_rules! run_mouse_interpolator_instruction{
 			($instruction:expr)=>{
@@ -299,17 +295,11 @@ impl InstructionConsumer<Instruction<'_>> for Session{
 				match view_state{
 					ViewState::Play=>(),
 					ViewState::Replay(bot_id)=>if let Some(replay)=self.replays.remove(&bot_id){
-						let mut replays_path=self.directories.replays.clone();
-						let file_name=format!("{}.snfb",ins.time);
+						let file_name=format!("replays/{}.snfb",ins.time);
 						std::thread::spawn(move ||{
-							std::fs::create_dir_all(replays_path.as_path()).unwrap();
-							replays_path.push(file_name);
-							let file=std::fs::File::create(replays_path).unwrap();
-							strafesnet_snf::bot::write_bot(
-								std::io::BufWriter::new(file),
-								strafesnet_physics::VERSION.get(),
-								replay.recording.instructions
-							).unwrap();
+							std::fs::create_dir_all("replays").unwrap();
+							let file=std::fs::File::create(file_name).unwrap();
+							strafesnet_snf::bot::write_bot(std::io::BufWriter::new(file),crate::physics::VERSION.get(),replay.recording.instructions).unwrap();
 							println!("Finished writing bot file!");
 						});
 					},
@@ -425,8 +415,8 @@ impl InstructionConsumer<Instruction<'_>> for Session{
 	}
 }
 impl InstructionConsumer<StepInstruction> for Session{
-	type Time=SessionTime;
-	fn process_instruction(&mut self,ins:TimedInstruction<StepInstruction,Self::Time>){
+	type TimeInner=SessionTimeInner;
+	fn process_instruction(&mut self,ins:TimedInstruction<StepInstruction,Self::TimeInner>){
 		let time=self.simulation.timer.time(ins.time);
 		if let Some(instruction)=self.mouse_interpolator.pop_buffered_instruction(ins.set_time(time)){
 			//record
@@ -436,8 +426,8 @@ impl InstructionConsumer<StepInstruction> for Session{
 	}
 }
 impl InstructionEmitter<StepInstruction> for Session{
-	type Time=SessionTime;
-	fn next_instruction(&self,time_limit:SessionTime)->Option<TimedInstruction<StepInstruction,Self::Time>>{
+	type TimeInner=SessionTimeInner;
+	fn next_instruction(&self,time_limit:SessionTime)->Option<TimedInstruction<StepInstruction,Self::TimeInner>>{
 		self.mouse_interpolator.next_instruction(time_limit)
 	}
 }

strafe-client/src/settings.rs

@@ -74,9 +74,9 @@ sensitivity_y_from_x_ratio=1
 Sensitivity::DeriveY{x:0.0.001,y:DerivedSensitivity{ratio:1.0}}
 */
 
-pub fn load_user_settings(path:&std::path::Path)->UserSettings{
+pub fn read_user_settings()->UserSettings{
 	let mut cfg=configparser::ini::Ini::new();
-	if let Ok(_)=cfg.load(path){
+	if let Ok(_)=cfg.load("settings.conf"){
 		let (cfg_fov_x,cfg_fov_y)=(cfg.getfloat("camera","fov_x"),cfg.getfloat("camera","fov_y"));
 		let fov=match(cfg_fov_x,cfg_fov_y){
 			(Ok(Some(fov_x)),Ok(Some(fov_y)))=>Fov::Exactly {
@@ -136,4 +136,4 @@ pub fn load_user_settings(path:&std::path::Path)->UserSettings{
 	}else{
 		UserSettings::default()
 	}
-}
+}

strafe-client/src/setup.rs

@@ -1,3 +1,8 @@
+use crate::window::Instruction;
+use strafesnet_common::instruction::TimedInstruction;
+use strafesnet_common::integer;
+use strafesnet_common::session::TimeInner as SessionTimeInner;
+
 fn optional_features()->wgpu::Features{
 	wgpu::Features::TEXTURE_COMPRESSION_ASTC
 	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
@@ -12,6 +17,9 @@ fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
 		..wgpu::DownlevelCapabilities::default()
 	}
 }
+pub fn required_limits()->wgpu::Limits{
+	wgpu::Limits::default()
+}
 
 struct SetupContextPartial1{
 	backends:wgpu::Backends,
@@ -20,6 +28,11 @@ struct SetupContextPartial1{
 fn create_window(title:&str,event_loop:&winit::event_loop::EventLoop<()>)->Result<winit::window::Window,winit::error::OsError>{
 	let mut attr=winit::window::WindowAttributes::default();
 	attr=attr.with_title(title);
+	#[cfg(windows_OFF)] // TODO
+	{
+		use winit::platform::windows::WindowBuilderExtWindows;
+		builder=builder.with_no_redirection_bitmap(true);
+	}
 	event_loop.create_window(attr)
 }
 fn create_instance()->SetupContextPartial1{
@@ -100,12 +113,14 @@ impl<'a> SetupContextPartial2<'a>{
 			required_downlevel_capabilities.flags - downlevel_capabilities.flags
 		);
 		SetupContextPartial3{
+			instance:self.instance,
 			surface:self.surface,
 			adapter,
 		}
 	}
 }
 struct SetupContextPartial3<'a>{
+	instance:wgpu::Instance,
 	surface:wgpu::Surface<'a>,
 	adapter:wgpu::Adapter,
 }
@@ -115,7 +130,7 @@ impl<'a> SetupContextPartial3<'a>{
 		let required_features=required_features();
 
 		// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
-		let needed_limits=strafesnet_graphics::graphics::required_limits().using_resolution(self.adapter.limits());
+		let needed_limits=required_limits().using_resolution(self.adapter.limits());
 
 		let trace_dir=std::env::var("WGPU_TRACE");
 		let (device, queue)=pollster::block_on(self.adapter
@@ -131,6 +146,7 @@ impl<'a> SetupContextPartial3<'a>{
 			.expect("Unable to find a suitable GPU adapter!");
 
 		SetupContextPartial4{
+			instance:self.instance,
 			surface:self.surface,
 			adapter:self.adapter,
 			device,
@@ -139,6 +155,7 @@ impl<'a> SetupContextPartial3<'a>{
 	}
 }
 struct SetupContextPartial4<'a>{
+	instance:wgpu::Instance,
 	surface:wgpu::Surface<'a>,
 	adapter:wgpu::Adapter,
 	device:wgpu::Device,
@@ -155,6 +172,7 @@ impl<'a> SetupContextPartial4<'a>{
 		self.surface.configure(&self.device, &config);
 
 		SetupContext{
+			instance:self.instance,
 			surface:self.surface,
 			device:self.device,
 			queue:self.queue,
@@ -163,6 +181,7 @@ impl<'a> SetupContextPartial4<'a>{
 	}
 }
 pub struct SetupContext<'a>{
+	pub instance:wgpu::Instance,
 	pub surface:wgpu::Surface<'a>,
 	pub device:wgpu::Device,
 	pub queue:wgpu::Queue,
@@ -197,16 +216,73 @@ pub fn setup_and_start(title:&str){
 	);
 
 	for arg in std::env::args().skip(1){
-		window_thread.send(strafesnet_common::instruction::TimedInstruction{
-			time:strafesnet_common::integer::Time::ZERO,
-			instruction:crate::window::Instruction::WindowEvent(winit::event::WindowEvent::DroppedFile(arg.into())),
+		let path=std::path::PathBuf::from(arg);
+		window_thread.send(TimedInstruction{
+			time:integer::Time::ZERO,
+			instruction:Instruction::WindowEvent(winit::event::WindowEvent::DroppedFile(path)),
 		}).unwrap();
 	};
 
 	println!("Entering event loop...");
-	let mut app=crate::app::App::new(
-		std::time::Instant::now(),
-		window_thread
-	);
-	event_loop.run_app(&mut app).unwrap();
+	let root_time=std::time::Instant::now();
+	run_event_loop(event_loop,window_thread,root_time).unwrap();
+}
+
+fn run_event_loop(
+	event_loop:winit::event_loop::EventLoop<()>,
+	mut window_thread:crate::compat_worker::QNWorker<TimedInstruction<Instruction,SessionTimeInner>>,
+	root_time:std::time::Instant
+	)->Result<(),winit::error::EventLoopError>{
+		event_loop.run(move |event,elwt|{
+			let time=integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64);
+			// *control_flow=if cfg!(feature="metal-auto-capture"){
+			// 	winit::event_loop::ControlFlow::Exit
+			// }else{
+			// 	winit::event_loop::ControlFlow::Poll
+			// };
+			match event{
+				winit::event::Event::AboutToWait=>{
+					window_thread.send(TimedInstruction{time,instruction:Instruction::RequestRedraw}).unwrap();
+				}
+				winit::event::Event::WindowEvent {
+					event:
+						// WindowEvent::Resized(size)
+						// | WindowEvent::ScaleFactorChanged {
+						// 	new_inner_size: &mut size,
+						// 	..
+						// },
+						winit::event::WindowEvent::Resized(size),//ignoring scale factor changed for now because mutex bruh
+					window_id:_,
+				} => {
+					window_thread.send(TimedInstruction{time,instruction:Instruction::Resize(size)}).unwrap();
+				}
+				winit::event::Event::WindowEvent{event,..}=>match event{
+					winit::event::WindowEvent::KeyboardInput{
+						event:
+							winit::event::KeyEvent {
+							logical_key: winit::keyboard::Key::Named(winit::keyboard::NamedKey::Escape),
+								state: winit::event::ElementState::Pressed,
+								..
+							},
+						..
+					}
+					|winit::event::WindowEvent::CloseRequested=>{
+						elwt.exit();
+					}
+					winit::event::WindowEvent::RedrawRequested=>{
+						window_thread.send(TimedInstruction{time,instruction:Instruction::Render}).unwrap();
+					}
+					_=>{
+						window_thread.send(TimedInstruction{time,instruction:Instruction::WindowEvent(event)}).unwrap();
+					}
+				},
+				winit::event::Event::DeviceEvent{
+					event,
+					..
+				} => {
+					window_thread.send(TimedInstruction{time,instruction:Instruction::DeviceEvent(event)}).unwrap();
+				},
+				_=>{}
+			}
+		})
 }

strafe-client/src/window.rs

@@ -1,14 +1,16 @@
 use strafesnet_common::instruction::TimedInstruction;
-use strafesnet_common::session::Time as SessionTime;
+use strafesnet_common::session::{Time as SessionTime,TimeInner as SessionTimeInner};
 use strafesnet_common::physics::{MiscInstruction,SetControlInstruction};
 use crate::file::LoadFormat;
 use crate::physics_worker::Instruction as PhysicsWorkerInstruction;
-use strafesnet_session::session::{self,SessionInputInstruction,SessionControlInstruction,SessionPlaybackInstruction};
-use strafesnet_settings::directories::Directories;
+use crate::session::{SessionInputInstruction,SessionControlInstruction,SessionPlaybackInstruction};
 
 pub enum Instruction{
+	Resize(winit::dpi::PhysicalSize<u32>),
 	WindowEvent(winit::event::WindowEvent),
 	DeviceEvent(winit::event::DeviceEvent),
+	RequestRedraw,
+	Render,
 }
 
 //holds thread handles to dispatch to
@@ -17,7 +19,7 @@ struct WindowContext<'a>{
 	mouse_pos:glam::DVec2,
 	screen_size:glam::UVec2,
 	window:&'a winit::window::Window,
-	physics_thread:crate::compat_worker::QNWorker<'a,TimedInstruction<PhysicsWorkerInstruction,SessionTime>>,
+	physics_thread:crate::compat_worker::QNWorker<'a,TimedInstruction<PhysicsWorkerInstruction,SessionTimeInner>>,
 }
 
 impl WindowContext<'_>{
@@ -148,7 +150,7 @@ impl WindowContext<'_>{
 								"R"|"r"=>s.then(||{
 									//mouse needs to be reset since the position is absolute
 									self.mouse_pos=glam::DVec2::ZERO;
-									SessionInstructionSubset::Input(SessionInputInstruction::Mode(session::ImplicitModeInstruction::ResetAndRestart))
+									SessionInstructionSubset::Input(SessionInputInstruction::Mode(crate::session::ImplicitModeInstruction::ResetAndRestart))
 								}),
 								"F"|"f"=>input_misc!(PracticeFly,s),
 								"B"|"b"=>session_ctrl!(CopyRecordingIntoReplayAndSpectate,s),
@@ -167,23 +169,6 @@ impl WindowContext<'_>{
 					},
 				}
 			},
-			winit::event::WindowEvent::Resized(size)=>{
-				self.physics_thread.send(
-					TimedInstruction{
-						time,
-						instruction:PhysicsWorkerInstruction::Resize(size)
-					}
-				).unwrap();
-			},
-			winit::event::WindowEvent::RedrawRequested=>{
-				self.window.request_redraw();
-				self.physics_thread.send(
-					TimedInstruction{
-						time,
-						instruction:PhysicsWorkerInstruction::Render
-					}
-				).unwrap();
-			},
 			_=>(),
 		}
 	}
@@ -223,16 +208,11 @@ impl WindowContext<'_>{
 pub fn worker<'a>(
 	window:&'a winit::window::Window,
 	setup_context:crate::setup::SetupContext<'a>,
-)->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTime>>{
+)->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTimeInner>>{
 	// WindowContextSetup::new
-	#[cfg(feature="user-install")]
-	let directories=Directories::user().unwrap();
-	#[cfg(not(feature="user-install"))]
-	let directories=Directories::portable().unwrap();
+	let user_settings=crate::settings::read_user_settings();
 
-	let user_settings=directories.settings();
-
-	let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&setup_context.device,&setup_context.queue,&setup_context.config);
+	let mut graphics=crate::graphics::GraphicsState::new(&setup_context.device,&setup_context.queue,&setup_context.config);
 	graphics.load_user_settings(&user_settings);
 
 	//WindowContextSetup::into_context
@@ -246,20 +226,38 @@ pub fn worker<'a>(
 		window,
 		physics_thread:crate::physics_worker::new(
 			graphics_thread,
-			directories,
 			user_settings,
 		),
 	};
 
 	//WindowContextSetup::into_worker
-	crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction,SessionTime>|{
+	crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction,SessionTimeInner>|{
 		match ins.instruction{
+			Instruction::RequestRedraw=>{
+				window_context.window.request_redraw();
+			}
 			Instruction::WindowEvent(window_event)=>{
 				window_context.window_event(ins.time,window_event);
 			},
 			Instruction::DeviceEvent(device_event)=>{
 				window_context.device_event(ins.time,device_event);
 			},
+			Instruction::Resize(size)=>{
+				window_context.physics_thread.send(
+					TimedInstruction{
+						time:ins.time,
+						instruction:PhysicsWorkerInstruction::Resize(size)
+					}
+				).unwrap();
+			}
+			Instruction::Render=>{
+				window_context.physics_thread.send(
+					TimedInstruction{
+						time:ins.time,
+						instruction:PhysicsWorkerInstruction::Render
+					}
+				).unwrap();
+			}
 		}
 	})
 }

strafe-client/src/worker.rs

@@ -176,7 +176,7 @@ impl<'a,Task:Send+'a> INWorker<'a,Task>{
 #[cfg(test)]
 mod test{
 	use super::{thread,QRWorker};
-	type Body=strafesnet_physics::physics::Body;
+	type Body=crate::physics::Body;
 	use strafesnet_common::{integer,instruction};
 	#[test]//How to run this test with printing: cargo test --release -- --nocapture
 	fn test_worker() {

tools/bhop_maps

@@ -1 +1 @@
-/run/media/quat/Files/Documents/map-files/strafesnet/maps/bhop_snfm
+/run/media/quat/Files/Documents/map-files/verify-scripts/maps/bhop_snfm

tools/meshes

@@ -1 +0,0 @@
-/run/media/quat/Files/Documents/map-files/strafesnet/meshes

tools/replays

@@ -1 +1 @@
-/run/media/quat/Files/Documents/map-files/strafesnet/replays
+/run/media/quat/Files/Documents/map-files/verify-scripts/replays

tools/surf_maps

@@ -1 +1 @@
-/run/media/quat/Files/Documents/map-files/strafesnet/maps/surf_snfm
+/run/media/quat/Files/Documents/map-files/verify-scripts/maps/surf_snfm

tools/textures

@@ -1 +0,0 @@
-/run/media/quat/Files/Documents/map-files/strafesnet/textures

tools/unions

@@ -1 +0,0 @@
-/run/media/quat/Files/Documents/map-files/strafesnet/unions