graphics: fix fullscreen

Rather involved update due to it being the foundation of the physics.

Reviewed-on: #45
Co-authored-by: Rhys Lloyd <krakow20@gmail.com>
Co-committed-by: Rhys Lloyd <krakow20@gmail.com>

Cargo.toml

@@ -35,3 +35,23 @@ unused_lifetimes = "warn"
 unused_qualifications = "warn"
 # variant_size_differences = "warn"
 unexpected_cfgs = "warn"
+
+[workspace.dependencies]
+glam = "0.32.0"
+wgpu = "29.0.0"
+
+# engine
+strafesnet_graphics = { path = "engine/graphics", registry = "strafesnet" }
+strafesnet_physics = { path = "engine/physics", registry = "strafesnet" }
+strafesnet_session = { path = "engine/session", registry = "strafesnet" }
+strafesnet_settings = { path = "engine/settings", registry = "strafesnet" }
+
+# lib
+fixed_wide = { version = "0.3.0", path = "lib/fixed_wide", registry = "strafesnet" }
+linear_ops = { version = "0.2.0", path = "lib/linear_ops", registry = "strafesnet" }
+ratio_ops = { version = "0.1.0", path = "lib/ratio_ops", registry = "strafesnet" }
+strafesnet_bsp_loader = { version = "0.5.0", path = "lib/bsp_loader", registry = "strafesnet" }
+strafesnet_common = { version = "0.9.0", path = "lib/common", registry = "strafesnet" }
+strafesnet_deferred_loader = { version = "0.6.0", path = "lib/deferred_loader", registry = "strafesnet" }
+strafesnet_rbx_loader = { version = "0.10.2", path = "lib/rbx_loader", registry = "strafesnet" }
+strafesnet_snf = { version = "0.4.0", path = "lib/snf", registry = "strafesnet" }

engine/graphics/Cargo.toml

@@ -1,17 +1,15 @@
 [package]
 name = "strafesnet_graphics"
-version = "0.1.0"
+version = "0.0.11"
 edition = "2024"
 
 [dependencies]
 bytemuck = { version = "1.13.1", features = ["derive"] }
 ddsfile = "0.5.1"
-glam = "0.30.0"
+glam.workspace = true
 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 = "28.0.0"
+strafesnet_common.workspace = true
+wgpu.workspace = true
 
 [lints]
 workspace = true

engine/graphics/shaders/shader.wgsl

@@ -44,11 +44,11 @@ struct ModelInstance{
 	transform:mat4x4<f32>,
 	normal_transform:mat3x3<f32>,
 	color:vec4<f32>,
+	texture_color:vec4<f32>,
 }
 //my fancy idea is to create a megatexture for each model that includes all the textures each intance will need
 //the texture transform then maps the texture coordinates to the location of the specific texture
 //group 1 is the model
-const MAX_MODEL_INSTANCES=512;
 @group(2)
 @binding(0)
 var<uniform> model_instances: array<ModelInstance, MAX_MODEL_INSTANCES>;
@@ -66,6 +66,7 @@ struct EntityOutputTexture {
 	@location(3) view: vec3<f32>,
 	@location(4) color: vec4<f32>,
 	@location(5) @interpolate(flat) model_color: vec4<f32>,
+	@location(6) @interpolate(flat) texture_color: vec4<f32>,
 };
 @vertex
 fn vs_entity_texture(
@@ -81,6 +82,7 @@ fn vs_entity_texture(
 	result.texture = texture;
 	result.color = color;
 	result.model_color = model_instances[instance].color;
+	result.texture_color = model_instances[instance].texture_color;
 	result.view = position.xyz - camera.view_inv[3].xyz;//col(3)
 	result.position = camera.proj * camera.view * position;
 	return result;
@@ -106,7 +108,9 @@ fn fs_entity_texture(vertex: EntityOutputTexture) -> @location(0) vec4<f32> {
 	let d = dot(normal, incident);
 	let reflected = incident - 2.0 * d * normal;
 
-	let fragment_color = textureSample(model_texture, model_sampler, vertex.texture)*vertex.color;
+	let fragment_color = textureSample(model_texture, model_sampler, vertex.texture)*vertex.texture_color;
 	let reflected_color = textureSample(cube_texture, cube_sampler, reflected).rgb;
-	return mix(vec4<f32>(vec3<f32>(0.05) + 0.2 * reflected_color,1.0),mix(vertex.model_color,vec4<f32>(fragment_color.rgb,1.0),fragment_color.a),0.5+0.5*abs(d));
+	let entity_color = mix(vertex.model_color*vertex.color,vec4<f32>(fragment_color.rgb,1.0),fragment_color.a);
+	let sky_color = vec4<f32>(vec3<f32>(0.05) + 0.2 * reflected_color,1.0);
+	return mix(sky_color,entity_color,0.5+0.5*abs(d));
 }

engine/graphics/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::{self as model_graphics,IndexedGraphicsMeshOwnedRenderConfig,IndexedGraphicsMeshOwnedRenderConfigId,GraphicsMeshOwnedRenderConfig,GraphicsModelOwned,GraphicsVertex};
 
 struct Indices{
 	count:u32,
@@ -54,6 +48,10 @@ struct GraphicsPipelines{
 	model:wgpu::RenderPipeline,
 }
 
+pub fn view_inv(pos:glam::Vec3,angles:glam::Vec2)->glam::Mat4{
+	//f32 good enough for view matrix
+	glam::Mat4::from_mat3_translation(glam::Mat3::from_euler(glam::EulerRot::YXZ,angles.x,angles.y,0f32),pos)
+}
 struct GraphicsCamera{
 	screen_size:glam::UVec2,
 	fov:glam::Vec2,//slope
@@ -75,15 +73,10 @@ impl GraphicsCamera{
 	pub fn proj(&self)->glam::Mat4{
 		perspective_rh(self.fov.x,self.fov.y,0.4,4000.0)
 	}
-	pub fn world(&self,pos:glam::Vec3,angles:glam::Vec2)->glam::Mat4{
-		//f32 good enough for view matrix
-		glam::Mat4::from_translation(pos)*glam::Mat4::from_euler(glam::EulerRot::YXZ,angles.x,angles.y,0f32)
-	}
 
-	pub fn to_uniform_data(&self,pos:glam::Vec3,angles:glam::Vec2)->[f32;16*4]{
+	pub fn to_uniform_data(&self,view_inv:glam::Mat4)->[f32;16*4]{
 		let proj=self.proj();
 		let proj_inv=proj.inverse();
-		let view_inv=self.world(pos,angles);
 		let view=view_inv.inverse();
 
 		let mut raw=[0f32; 16 * 4];
@@ -103,7 +96,7 @@ impl Default for GraphicsCamera{
 	}
 }
 
-const MODEL_BUFFER_SIZE:usize=4*4 + 12 + 4;//let size=std::mem::size_of::<ModelInstance>();
+const MODEL_BUFFER_SIZE:usize=4*4 + 12 + 4 + 4;//let size=std::mem::size_of::<ModelInstance>();
 const MODEL_BUFFER_SIZE_BYTES:usize=MODEL_BUFFER_SIZE*4;
 fn get_instances_buffer_data(instances:&[GraphicsModelOwned])->Vec<f32>{
 	let mut raw=Vec::with_capacity(MODEL_BUFFER_SIZE*instances.len());
@@ -118,7 +111,9 @@ fn get_instances_buffer_data(instances:&[GraphicsModelOwned])->Vec<f32>{
 		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.z_axis));
 		raw.extend_from_slice(&[0.0]);
 		//color
-		raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color.get()));
+		raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color));
+		//texture color
+		raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.texture_color));
 	}
 	raw
 }
@@ -132,20 +127,22 @@ pub struct GraphicsState{
 	camera_buf:wgpu::Buffer,
 	temp_squid_texture_view:wgpu::TextureView,
 	models:Vec<GraphicsModel>,
+	depth:wgpu::Texture,
 	depth_view:wgpu::TextureView,
 	staging_belt:wgpu::util::StagingBelt,
+	model_instances_uniform_len:usize,
 }
 
 impl GraphicsState{
 	const DEPTH_FORMAT:wgpu::TextureFormat=wgpu::TextureFormat::Depth24Plus;
 	fn create_depth_texture(
-		config:&wgpu::SurfaceConfiguration,
+		size:glam::UVec2,
 		device:&wgpu::Device,
-	)->wgpu::TextureView{
-		let depth_texture=device.create_texture(&wgpu::TextureDescriptor{
+	)->wgpu::Texture{
+		device.create_texture(&wgpu::TextureDescriptor{
 			size:wgpu::Extent3d{
-				width:config.width,
-				height:config.height,
+				width:size.x,
+				height:size.y,
 				depth_or_array_layers:1,
 			},
 			mip_level_count:1,
@@ -153,18 +150,19 @@ impl GraphicsState{
 			dimension:wgpu::TextureDimension::D2,
 			format:Self::DEPTH_FORMAT,
 			usage:wgpu::TextureUsages::RENDER_ATTACHMENT,
-			label:None,
+			label:Some("Depth Texture"),
 			view_formats:&[],
-		});
-
-		depth_texture.create_view(&wgpu::TextureViewDescriptor::default())
+		})
+	}
+	pub const fn depth_texture(&self)->&wgpu::Texture{
+		&self.depth
+	}
+	pub const fn depth_texture_view(&self)->&wgpu::TextureView{
+		&self.depth_view
 	}
 	pub fn clear(&mut self){
 		self.models.clear();
 	}
-	pub fn load_user_settings(&mut self,user_settings:&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){
 		//generate texture view per texture
 		let texture_views:HashMap<model::TextureId,wgpu::TextureView>=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{
@@ -239,7 +237,8 @@ impl GraphicsState{
 			let instance=GraphicsModelOwned{
 				transform:model.transform.into(),
 				normal_transform:glam::Mat3::from_cols_array_2d(&model.transform.matrix3.to_array().map(|row|row.map(Into::into))).inverse().transpose(),
-				color:GraphicsModelColor4::new(model.color),
+				color:model.color,
+				texture_color:glam::Vec4::ONE,
 			};
 			//get or create owned mesh map
 			let owned_mesh_map=owned_mesh_id_from_mesh_id_render_config_id
@@ -269,16 +268,15 @@ impl GraphicsState{
 							owned_mesh_id
 						});
 						let owned_mesh=unique_render_config_models.get_mut(owned_mesh_id.get() as usize).unwrap();
-						match &mut owned_mesh.polys{
-							model::PolygonGroup::PolygonList(polygon_list)=>polygon_list.extend(
-								graphics_group.groups.iter().flat_map(|polygon_group_id|{
-									mesh.polygon_groups[polygon_group_id.get() as usize].polys()
-								})
-								.map(|vertex_id_slice|
-									vertex_id_slice.to_vec()
-								)
-							),
-						}
+						let model::PolygonGroup::PolygonList(polygon_list)=&mut owned_mesh.polys;
+						polygon_list.extend(
+							graphics_group.groups.iter().flat_map(|polygon_group_id|{
+								mesh.polygon_groups[polygon_group_id.get() as usize].polys()
+							})
+							.map(|vertex_id_slice|
+								vertex_id_slice.to_vec()
+							)
+						);
 					}
 				}
 				owned_mesh_map
@@ -286,10 +284,20 @@ impl GraphicsState{
 			for owned_mesh_id in owned_mesh_map.values(){
 				let owned_mesh=unique_render_config_models.get_mut(owned_mesh_id.get() as usize).unwrap();
 				let render_config=&map.render_configs[owned_mesh.render_config.get() as usize];
-				if model.color.w==0.0&&render_config.texture.is_none(){
-					continue;
-				}
-				owned_mesh.instances.push(instance.clone());
+				let no_texture=render_config.texture.is_none();
+				let instance_clone=if no_texture{
+					// this model has no chance of affecting pixels on the screen
+					if model.color.w==0.0{
+						continue;
+					}
+					// hack texture_color to zero to make the texture invisible
+					let mut instance=instance.clone();
+					instance.texture_color=glam::Vec4::ZERO;
+					instance
+				}else{
+					instance.clone()
+				};
+				owned_mesh.instances.push(instance_clone);
 			}
 		}
 		//check every model to see if it's using the same (texture,color) but has few instances,if it is combine it into one model
@@ -315,7 +323,7 @@ impl GraphicsState{
 			//separate instances by color
 			for (instance_id,instance) in model.instances.iter().enumerate(){
 				let model_instance_list=unique_color
-				.entry(instance.color)
+				.entry(instance.hashable_color())
 				.or_insert_with(||Vec::new());
 				//add model instance to list
 				model_instance_list.push((model_id,instance_id));
@@ -404,6 +412,7 @@ impl GraphicsState{
 							).collect()
 						));
 					}
+					let (color,texture_color)=color.color();
 					//push model into dedup
 					deduplicated_models.push(IndexedGraphicsMeshOwnedRenderConfig{
 						unique_pos,
@@ -416,7 +425,8 @@ impl GraphicsState{
 						instances:vec![GraphicsModelOwned{
 							transform:glam::Mat4::IDENTITY,
 							normal_transform:glam::Mat3::IDENTITY,
-							color
+							color,
+							texture_color,
 						}],
 					});
 				}
@@ -474,16 +484,14 @@ 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 chunk_size=uniform_buffer_binding_size/MODEL_BUFFER_SIZE_BYTES;
 		self.models.reserve(models.len());
 		for model in models.into_iter(){
 			instance_count+=model.instances.len();
-			for instances_chunk in model.instances.rchunks(chunk_size){
+			for instances_chunk in model.instances.rchunks(self.model_instances_uniform_len){
 				model_count+=1;
 				let mut model_uniforms=get_instances_buffer_data(instances_chunk);
 				//TEMP: fill with zeroes to pass validation
-				model_uniforms.resize(MODEL_BUFFER_SIZE*512,0.0f32);
+				model_uniforms.resize(MODEL_BUFFER_SIZE*self.model_instances_uniform_len,0.0f32);
 				let model_buf=device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
 					label:Some(format!("Model{} Buf",model_count).as_str()),
 					contents:bytemuck::cast_slice(&model_uniforms),
@@ -539,7 +547,9 @@ impl GraphicsState{
 	pub fn new(
 		device:&wgpu::Device,
 		queue:&wgpu::Queue,
-		config:&wgpu::SurfaceConfiguration,
+		size:glam::UVec2,
+		view_format:wgpu::TextureFormat,
+		limits:wgpu::Limits,
 	)->Self{
 		let camera_bind_group_layout=device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor{
 			label:None,
@@ -631,10 +641,18 @@ impl GraphicsState{
 			..Default::default()
 		});
 
+		let model_instances_uniform_len=limits.max_uniform_buffer_binding_size as usize/MODEL_BUFFER_SIZE_BYTES;
+
+		// write dynamic value into shader
+		let shader=format!("
+			// This is equal to the CHUNK_SIZE constant from graphics.rs
+			const MAX_MODEL_INSTANCES={model_instances_uniform_len};
+		")+include_str!("../shaders/shader.wgsl");
+
 		// 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::Owned(shader)),
 		});
 
 		//load textures
@@ -662,10 +680,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!(),
 			};
 
@@ -708,7 +726,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();
 
@@ -750,17 +768,17 @@ impl GraphicsState{
 		let model_pipeline_layout=device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor{
 			label:None,
 			bind_group_layouts:&[
-				&camera_bind_group_layout,
-				&skybox_texture_bind_group_layout,
-				&model_bind_group_layout,
+				Some(&camera_bind_group_layout),
+				Some(&skybox_texture_bind_group_layout),
+				Some(&model_bind_group_layout),
 			],
 			immediate_size:0,
 		});
 		let sky_pipeline_layout=device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor{
 			label:None,
 			bind_group_layouts:&[
-				&camera_bind_group_layout,
-				&skybox_texture_bind_group_layout,
+				Some(&camera_bind_group_layout),
+				Some(&skybox_texture_bind_group_layout),
 			],
 			immediate_size:0,
 		});
@@ -778,7 +796,7 @@ impl GraphicsState{
 			fragment:Some(wgpu::FragmentState{
 				module:&shader,
 				entry_point:Some("fs_sky"),
-				targets:&[Some(config.view_formats[0].into())],
+				targets:&[Some(view_format.into())],
 				compilation_options:wgpu::PipelineCompilationOptions::default(),
 			}),
 			primitive:wgpu::PrimitiveState{
@@ -787,8 +805,8 @@ impl GraphicsState{
 			},
 			depth_stencil:Some(wgpu::DepthStencilState{
 				format:Self::DEPTH_FORMAT,
-				depth_write_enabled:false,
-				depth_compare:wgpu::CompareFunction::LessEqual,
+				depth_write_enabled:Some(false),
+				depth_compare:Some(wgpu::CompareFunction::LessEqual),
 				stencil:wgpu::StencilState::default(),
 				bias:wgpu::DepthBiasState::default(),
 			}),
@@ -812,7 +830,7 @@ impl GraphicsState{
 			fragment:Some(wgpu::FragmentState{
 				module:&shader,
 				entry_point:Some("fs_entity_texture"),
-				targets:&[Some(config.view_formats[0].into())],
+				targets:&[Some(view_format.into())],
 				compilation_options:wgpu::PipelineCompilationOptions::default(),
 			}),
 			primitive:wgpu::PrimitiveState{
@@ -822,8 +840,8 @@ impl GraphicsState{
 			},
 			depth_stencil:Some(wgpu::DepthStencilState{
 				format:Self::DEPTH_FORMAT,
-				depth_write_enabled:true,
-				depth_compare:wgpu::CompareFunction::LessEqual,
+				depth_write_enabled:Some(true),
+				depth_compare:Some(wgpu::CompareFunction::LessEqual),
 				stencil:wgpu::StencilState::default(),
 				bias:wgpu::DepthBiasState::default(),
 			}),
@@ -833,7 +851,7 @@ impl GraphicsState{
 		});
 
 		let camera=GraphicsCamera::default();
-		let camera_uniforms=camera.to_uniform_data(glam::Vec3::ZERO,glam::Vec2::ZERO);
+		let camera_uniforms=camera.to_uniform_data(view_inv(glam::Vec3::ZERO,glam::Vec2::ZERO));
 		let camera_buf=device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
 			label:Some("Camera"),
 			contents:bytemuck::cast_slice(&camera_uniforms),
@@ -865,7 +883,8 @@ impl GraphicsState{
 			label:Some("Sky Texture"),
 		});
 
-		let depth_view=Self::create_depth_texture(config,device);
+		let depth=Self::create_depth_texture(size,device);
+		let depth_view=depth.create_view(&wgpu::TextureViewDescriptor::default());
 
 		Self{
 			pipelines:GraphicsPipelines{
@@ -879,42 +898,41 @@ impl GraphicsState{
 			camera,
 			camera_buf,
 			models:Vec::new(),
+			depth,
 			depth_view,
 			staging_belt:wgpu::util::StagingBelt::new(device.clone(),0x100),
 			bind_group_layouts:GraphicsBindGroupLayouts{model:model_bind_group_layout},
 			samplers:GraphicsSamplers{repeat:repeat_sampler},
 			temp_squid_texture_view:squid_texture_view,
+			model_instances_uniform_len,
 		}
 	}
 	pub fn resize(
 		&mut self,
 		device:&wgpu::Device,
-		config:&wgpu::SurfaceConfiguration,
-		user_settings:&settings::UserSettings,
+		size:glam::UVec2,
+		fov:glam::Vec2,
 	){
-		self.depth_view=Self::create_depth_texture(config,device);
-		self.camera.screen_size=glam::uvec2(config.width,config.height);
-		self.load_user_settings(user_settings);
+		self.depth=Self::create_depth_texture(size,device);
+		self.depth_view=self.depth.create_view(&wgpu::TextureViewDescriptor::default());
+		self.camera.screen_size=size;
+		self.camera.fov=fov;
 	}
-	pub fn render(
+	pub fn encode_commands(
 		&mut self,
+		encoder:&mut wgpu::CommandEncoder,
 		view:&wgpu::TextureView,
-		device:&wgpu::Device,
-		queue:&wgpu::Queue,
-		frame_state:session::FrameState,
+		camera:glam::Mat4,
 	){
 		//TODO:use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
 
-		let mut encoder=device.create_command_encoder(&wgpu::CommandEncoderDescriptor{label:None});
-
+		// TODO: find a way to call this directly after queue.submit()
+		self.staging_belt.recall();
 		// update rotation
-		let camera_uniforms=self.camera.to_uniform_data(
-			frame_state.trajectory.extrapolated_position(frame_state.time).map(Into::<f32>::into).to_array().into(),
-			frame_state.camera.simulate_move_angles(glam::IVec2::ZERO)
-		);
+		let camera_uniforms=self.camera.to_uniform_data(camera);
 		self.staging_belt
 			.write_buffer(
-				&mut encoder,
+				encoder,
 				&self.camera_buf,
 				0,
 				wgpu::BufferSize::new((camera_uniforms.len() * 4) as wgpu::BufferAddress).unwrap(),
@@ -982,9 +1000,5 @@ impl GraphicsState{
 			rpass.set_pipeline(&self.pipelines.skybox);
 			rpass.draw(0..3,0..1);
 		}
-
-		queue.submit(std::iter::once(encoder.finish()));
-
-		self.staging_belt.recall();
 	}
 }

engine/graphics/src/lib.rs

@@ -1,2 +1,4 @@
 pub mod model;
+pub mod setup;
+pub mod surface;
 pub mod graphics;

engine/graphics/src/model.rs

@@ -30,19 +30,23 @@ pub struct GraphicsMeshOwnedRenderConfig{
 	pub render_config:RenderConfigId,
 	pub instances:Vec<GraphicsModelOwned>,
 }
-#[derive(Clone,Copy,PartialEq,id::Id)]
-pub struct GraphicsModelColor4(glam::Vec4);
-impl std::hash::Hash for GraphicsModelColor4{
-	fn hash<H:std::hash::Hasher>(&self,state:&mut H) {
-		for &f in self.0.as_ref(){
-			bytemuck::cast::<f32,u32>(f).hash(state);
-		}
-	}
-}
-impl Eq for GraphicsModelColor4{}
 #[derive(Clone)]
 pub struct GraphicsModelOwned{
 	pub transform:glam::Mat4,
 	pub normal_transform:glam::Mat3,
-	pub color:GraphicsModelColor4,
+	pub color:glam::Vec4,
+	pub texture_color:glam::Vec4,
+}
+impl GraphicsModelOwned{
+	pub fn hashable_color(&self)->HashableColor{
+		HashableColor([bytemuck::cast::<[f32;4],[u32;4]>(self.color.to_array()),bytemuck::cast::<[f32;4],[u32;4]>(self.texture_color.to_array())])
+	}
+}
+#[derive(Clone,Copy,Eq,Hash,PartialEq)]
+pub struct HashableColor([[u32;4];2]);
+impl HashableColor{
+	pub fn color(self)->(glam::Vec4,glam::Vec4){
+		let [color,texture_color]=bytemuck::cast::<[[u32;4];2],[[f32;4];2]>(self.0);
+		(glam::Vec4::from_array(color),glam::Vec4::from_array(texture_color))
+	}
 }

engine/graphics/src/setup.rs

@@ -0,0 +1,116 @@
+fn optional_features()->wgpu::Features{
+	wgpu::Features::TEXTURE_COMPRESSION_ASTC
+	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
+}
+fn required_features()->wgpu::Features{
+	wgpu::Features::TEXTURE_COMPRESSION_BC
+}
+fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
+	wgpu::DownlevelCapabilities{
+		flags:wgpu::DownlevelFlags::empty(),
+		shader_model:wgpu::ShaderModel::Sm5,
+		..wgpu::DownlevelCapabilities::default()
+	}
+}
+
+pub mod step1{
+	pub fn create_instance()->wgpu::Instance{
+		Default::default()
+	}
+}
+
+pub mod step2{
+	pub fn create_surface<'window>(instance:&wgpu::Instance,target:impl Into<wgpu::SurfaceTarget<'window>>)->Result<wgpu::Surface<'window>,wgpu::CreateSurfaceError>{
+		instance.create_surface(target)
+	}
+}
+
+pub mod step3{
+	pub async fn pick_adapter(instance:&wgpu::Instance,surface:&wgpu::Surface<'_>)->Option<wgpu::Adapter>{
+		let backends=wgpu::Backends::from_env().unwrap_or_default();
+		//TODO: prefer adapter that implements optional features
+		//let optional_features=optional_features();
+		let required_features=super::required_features();
+		let required_downlevel_capabilities=super::required_downlevel_capabilities();
+
+		//no helper function smh gotta write it myself
+		let adapters=instance.enumerate_adapters(backends).await;
+
+		let adapter=adapters.into_iter()
+			// reverse because we want to select adapters that appear first in ties,
+			// and max_by_key selects the last equal element in the iterator.
+			.rev()
+			.filter(|adapter|
+				adapter.is_surface_supported(surface)
+				&&adapter.features().contains(required_features)
+				&&{
+					let downlevel_capabilities=adapter.get_downlevel_capabilities();
+					downlevel_capabilities.shader_model>=required_downlevel_capabilities.shader_model
+					&&downlevel_capabilities.flags.contains(required_downlevel_capabilities.flags)
+				}
+			)
+			.max_by_key(|adapter|match adapter.get_info().device_type{
+				wgpu::DeviceType::IntegratedGpu=>3,
+				wgpu::DeviceType::DiscreteGpu=>4,
+				wgpu::DeviceType::VirtualGpu=>2,
+				wgpu::DeviceType::Other|wgpu::DeviceType::Cpu=>1,
+			})?;
+
+		Some(adapter)
+	}
+}
+
+pub mod step4{
+	pub async fn request_device(adapter:&wgpu::Adapter,limits:wgpu::Limits)->Result<(wgpu::Device,wgpu::Queue),wgpu::RequestDeviceError>{
+		let optional_features=super::optional_features();
+		let required_features=super::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=limits.using_resolution(adapter.limits());
+
+		let (device, queue)=adapter
+			.request_device(
+				&wgpu::DeviceDescriptor{
+					label:None,
+					required_features:(optional_features&adapter.features())|required_features,
+					required_limits:needed_limits,
+					memory_hints:wgpu::MemoryHints::Performance,
+					trace:wgpu::Trace::Off,
+					experimental_features:wgpu::ExperimentalFeatures::disabled(),
+				},
+			).await?;
+
+		Ok((
+			device,
+			queue,
+		))
+	}
+}
+
+pub mod step5{
+	use crate::surface::Surface;
+	#[derive(Debug)]
+	pub struct ErrorSurfaceNotSupported;
+	impl std::fmt::Display for ErrorSurfaceNotSupported{
+		fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+			write!(f,"Surface isn't supported by the adapter.")
+		}
+	}
+	pub fn configure_surface<'window>(
+		adapter:&wgpu::Adapter,
+		device:&wgpu::Device,
+		surface:wgpu::Surface<'window>,
+		(width,height):(u32,u32),
+	)->Result<Surface<'window>,ErrorSurfaceNotSupported>{
+		let mut config=surface
+			.get_default_config(adapter, width, height)
+			.ok_or(ErrorSurfaceNotSupported)?;
+
+		let surface_view_format=config.format.add_srgb_suffix();
+		config.view_formats.push(surface_view_format);
+		config.present_mode=wgpu::PresentMode::AutoNoVsync;
+		surface.configure(device,&config);
+
+		Ok(Surface::new(surface,config))
+	}
+}

engine/graphics/src/surface.rs

@@ -0,0 +1,75 @@
+/// A texture view which can be targeted by draw calls in the command buffer, and then presented to the surface texture.
+pub struct Frame{
+	surface_texture:wgpu::SurfaceTexture,
+	view:wgpu::TextureView,
+}
+impl Frame{
+	pub const fn view(&self)->&wgpu::TextureView{
+		&self.view
+	}
+	pub fn present(self){
+		self.surface_texture.present();
+	}
+}
+
+#[derive(Debug)]
+pub enum FrameError{
+	Skip,
+	DeviceLost,
+}
+impl core::fmt::Display for FrameError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl core::error::Error for FrameError{}
+
+/// A render surface configuration, containing information such as resolution and pixel format
+pub struct Surface<'window>{
+	surface:wgpu::Surface<'window>,
+	config:wgpu::SurfaceConfiguration,
+}
+
+impl<'window> Surface<'window>{
+	pub(crate) fn new(
+		surface:wgpu::Surface<'window>,
+		config:wgpu::SurfaceConfiguration,
+	)->Self{
+		Self{surface,config}
+	}
+	#[must_use]
+	pub fn new_frame(&self,device:&wgpu::Device)->Result<Frame,FrameError>{
+		let frame=loop{
+			match self.surface.get_current_texture(){
+				wgpu::CurrentSurfaceTexture::Success(surface_texture)=>break surface_texture,
+				// Suboptimal -> surface_texture must be dropped and surface reconfigured
+				wgpu::CurrentSurfaceTexture::Suboptimal(_)
+				|wgpu::CurrentSurfaceTexture::Outdated=>{},
+				wgpu::CurrentSurfaceTexture::Timeout
+				|wgpu::CurrentSurfaceTexture::Occluded=>return Err(FrameError::Skip),
+				wgpu::CurrentSurfaceTexture::Lost=>return Err(FrameError::DeviceLost),
+				wgpu::CurrentSurfaceTexture::Validation=>unreachable!(),
+			};
+			self.surface.configure(device,&self.config);
+		};
+		let view=frame.texture.create_view(&wgpu::TextureViewDescriptor{
+			format:Some(self.config.view_formats[0]),
+			..wgpu::TextureViewDescriptor::default()
+		});
+		Ok(Frame{
+			surface_texture:frame,
+			view,
+		})
+	}
+	pub const fn size(&self)->glam::UVec2{
+		glam::uvec2(self.config.width,self.config.height)
+	}
+	pub fn view_format(&self)->wgpu::TextureFormat{
+		self.config.view_formats[0]
+	}
+	pub fn configure(&mut self,device:&wgpu::Device,size:glam::UVec2){
+		self.config.width=size.x.max(1);
+		self.config.height=size.y.max(1);
+		self.surface.configure(device,&self.config);
+	}
+}

engine/physics/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "strafesnet_physics"
-version = "0.1.0"
+version = "0.0.2"
 edition = "2024"
 
 [dependencies]
 arrayvec = "0.7.6"
-glam = "0.30.0"
+glam.workspace = true
 id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

engine/physics/src/body.rs

@@ -86,12 +86,12 @@ impl<T> Trajectory<T>
 	pub fn extrapolated_position(&self,time:Time<T>)->Planar64Vec3{
 		let dt=time-self.time;
 		self.position
-		+(self.velocity*dt).map(|elem|elem.divide().clamp_1())
-		+self.acceleration.map(|elem|(dt*dt*elem/2).divide().clamp_1())
+		+(self.velocity*dt).map(|elem|elem.divide().clamp_64())
+		+self.acceleration.map(|elem|(dt*dt*elem/2).divide().clamp_64())
 	}
 	pub fn extrapolated_velocity(&self,time:Time<T>)->Planar64Vec3{
 		let dt=time-self.time;
-		self.velocity+(self.acceleration*dt).map(|elem|elem.divide().clamp_1())
+		self.velocity+(self.acceleration*dt).map(|elem|elem.divide().clamp_64())
 	}
 	pub fn extrapolated_body(&self,time:Time<T>)->Body<T>{
 		Body::new(

engine/physics/src/face_crawler.rs

@@ -1,5 +1,7 @@
 use crate::model::{into_giga_time,GigaTime};
-use strafesnet_common::integer::{Fixed,Ratio,vec3::Vector3,Planar64Vec3};
+use strafesnet_common::integer::fixed_types::{F64_32,F128_64,F256_128};
+use strafesnet_common::integer::vec3::Vector3;
+use strafesnet_common::integer::{Ratio,Planar64Vec3};
 use crate::physics::{Time,Trajectory};
 use crate::mesh_query::{FEV,DirectedEdge,MeshQuery,MeshTopology};
 
@@ -65,16 +67,16 @@ where
 	}
 }
 
-impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64Vec3,Direction=Planar64Vec3>> FEV<M>
+impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=F256_128,Position=Planar64Vec3,Direction=Planar64Vec3>> FEV<M>
 	where
 		// This is hardcoded for MinkowskiMesh lol
 		M::Face:Copy,
 		M::Edge:Copy,
 		M::DirectedEdge:Copy,
 		M::Vert:Copy,
-		F:core::ops::Mul<Fixed<1,32>,Output=Fixed<4,128>>,
-		<F as core::ops::Mul<Fixed<1,32>>>::Output:core::iter::Sum,
-		M::Offset:core::ops::Sub<<F as std::ops::Mul<Fixed<1,32>>>::Output>,
+		F:core::ops::Mul<F64_32,Output=F256_128>,
+		<F as core::ops::Mul<F64_32>>::Output:core::iter::Sum,
+		M::Offset:core::ops::Sub<<F as std::ops::Mul<F64_32>>::Output>,
 {
 	fn next_transition(&self,mesh:&M,trajectory:&Trajectory,lower_bound:Bound<GigaTime>,mut upper_bound:Bound<GigaTime>)->Transition<M>{
 		//conflicting derivative means it crosses in the wrong direction.
@@ -88,7 +90,7 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64V
 				let (n,d)=mesh.face_nd(face_id);
 				//TODO: use higher precision d value?
 				//use the mesh transform translation instead of baking it into the d value.
-				for dt in Fixed::<4,128>::zeroes2((n.dot(trajectory.position)-d)*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
+				for dt in F256_128::zeroes2((n.dot(trajectory.position)-d)*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
 					if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 						upper_bound=Bound::Included(dt);
 						best_transition=Transition::Hit(face_id,dt);
@@ -103,7 +105,7 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64V
 					//WARNING: d is moved out of the *2 block because of adding two vertices!
 					//WARNING: precision is swept under the rug!
 					//wrap for speed
-					for dt in Fixed::<4,128>::zeroes2(n.dot(trajectory.position*2-(mesh.vert(v0)+mesh.vert(v1))).wrap_4(),n.dot(trajectory.velocity).wrap_4()*2,n.dot(trajectory.acceleration).wrap_4()){
+					for dt in F256_128::zeroes2(n.dot(trajectory.position*2-(mesh.vert(v0)+mesh.vert(v1))).wrap_256(),n.dot(trajectory.velocity).wrap_256()*2,n.dot(trajectory.acceleration).wrap_256()){
 						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Edge(directed_edge_id.as_undirected()),dt);
@@ -126,7 +128,7 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64V
 					let n=face_n.cross(edge_n)*((i as i64)*2-1);
 					//WARNING yada yada d *2
 					//wrap for speed
-					for dt in Fixed::<4,128>::zeroes2(n.dot(delta_pos).wrap_4(),n.dot(trajectory.velocity).wrap_4()*2,n.dot(trajectory.acceleration).wrap_4()){
+					for dt in F256_128::zeroes2(n.dot(delta_pos).wrap_256(),n.dot(trajectory.velocity).wrap_256()*2,n.dot(trajectory.acceleration).wrap_256()){
 						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Face(edge_face_id),dt);
@@ -138,9 +140,9 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64V
 				for (i,&vert_id) in edge_verts.as_ref().iter().enumerate(){
 					//vertex normal gets parity from vert index
 					let n=edge_n*(1-2*(i as i64));
-					for dt in Fixed::<2,64>::zeroes2((n.dot(trajectory.position-mesh.vert(vert_id)))*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
+					for dt in F128_64::zeroes2((n.dot(trajectory.position-mesh.vert(vert_id)))*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
 						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-							let dt=Ratio::new(dt.num.widen_4(),dt.den.widen_4());
+							let dt=Ratio::new(dt.num.widen_256(),dt.den.widen_256());
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Vert(vert_id),dt);
 							break;
@@ -154,9 +156,9 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64V
 				mesh.for_each_vert_edge(vert_id,|directed_edge_id|{
 					//edge is directed away from vertex, but we want the dot product to turn out negative
 					let n=-mesh.directed_edge_n(directed_edge_id);
-					for dt in Fixed::<2,64>::zeroes2((n.dot(trajectory.position-mesh.vert(vert_id)))*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
+					for dt in F128_64::zeroes2((n.dot(trajectory.position-mesh.vert(vert_id)))*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
 						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-							let dt=Ratio::new(dt.num.widen_4(),dt.den.widen_4());
+							let dt=Ratio::new(dt.num.widen_256(),dt.den.widen_256());
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Edge(directed_edge_id.as_undirected()),dt);
 							break;

engine/physics/src/mesh_query.rs

@@ -1,3 +1,4 @@
+#[derive(Debug)]
 pub enum FEV<M:MeshTopology>{
 	Vert(M::Vert),
 	Edge(M::Edge),

engine/physics/src/minimum_difference.rs

@@ -1,3 +1,4 @@
+use strafesnet_common::integer::fixed_types::{F128_64,F192_96,F256_128};
 use strafesnet_common::integer::vec3;
 use strafesnet_common::integer::vec3::Vector3;
 use strafesnet_common::integer::{Fixed,Planar64,Planar64Vec3};
@@ -100,35 +101,35 @@ const fn choose_any_direction()->Planar64Vec3{
 	vec3::X
 }
 
-fn narrow_dir2(dir:Vector3<Fixed<2,64>>)->Planar64Vec3{
+fn narrow_dir2(dir:Vector3<F128_64>)->Planar64Vec3{
 	if dir==vec3::zero(){
-		return dir.narrow_1().unwrap();
+		return dir.narrow_64().unwrap();
 	}
-	let x=dir.x.as_bits().unsigned_abs().bits();
-	let y=dir.y.as_bits().unsigned_abs().bits();
-	let z=dir.z.as_bits().unsigned_abs().bits();
+	let x=dir.x.as_bits().unsigned_abs().bit_width();
+	let y=dir.y.as_bits().unsigned_abs().bit_width();
+	let z=dir.z.as_bits().unsigned_abs().bit_width();
 	let big=x.max(y).max(z);
 	const MAX_BITS:u32=64+31;
 	if MAX_BITS<big{
 		dir>>(big-MAX_BITS)
 	}else{
 		dir
-	}.narrow_1().unwrap()
+	}.narrow_64().unwrap()
 }
-fn narrow_dir3(dir:Vector3<Fixed<3,96>>)->Planar64Vec3{
+fn narrow_dir3(dir:Vector3<F192_96>)->Planar64Vec3{
 	if dir==vec3::zero(){
-		return dir.narrow_1().unwrap();
+		return dir.narrow_64().unwrap();
 	}
-	let x=dir.x.as_bits().unsigned_abs().bits();
-	let y=dir.y.as_bits().unsigned_abs().bits();
-	let z=dir.z.as_bits().unsigned_abs().bits();
+	let x=dir.x.as_bits().unsigned_abs().bit_width();
+	let y=dir.y.as_bits().unsigned_abs().bit_width();
+	let z=dir.z.as_bits().unsigned_abs().bit_width();
 	let big=x.max(y).max(z);
 	const MAX_BITS:u32=96+31;
 	if MAX_BITS<big{
 		dir>>(big-MAX_BITS)
 	}else{
 		dir
-	}.narrow_1().unwrap()
+	}.narrow_64().unwrap()
 }
 
 fn reduce1<M:MeshQuery<Position=Planar64Vec3>>(
@@ -565,8 +566,8 @@ trait Contains{
 // convenience type to check if a point is within some threshold of a plane.
 struct ThickPlane{
 	point:Planar64Vec3,
-	normal:Vector3<Fixed<2,64>>,
-	epsilon:Fixed<3,96>,
+	normal:Vector3<F128_64>,
+	epsilon:F192_96,
 }
 impl ThickPlane{
 	fn new<M:MeshQuery<Position=Planar64Vec3>>(mesh:&M,[v0,v1,v2]:Simplex<3,M::Vert>)->Self{
@@ -577,7 +578,7 @@ impl ThickPlane{
 		let normal=(p1-p0).cross(p2-p0);
 		// Allow ~ 2*sqrt(3) units of thickness on the plane
 		// This is to account for the variance of two voxels across the longest diagonal
-		let epsilon=(normal.length()*(Planar64::EPSILON*3)).wrap_3();
+		let epsilon=(normal.length()*(Planar64::EPSILON*3)).wrap_192();
 		Self{point,normal,epsilon}
 	}
 }
@@ -590,7 +591,7 @@ impl Contains for ThickPlane{
 struct ThickLine{
 	point:Planar64Vec3,
 	dir:Planar64Vec3,
-	epsilon:Fixed<4,128>,
+	epsilon:F256_128,
 }
 impl ThickLine{
 	fn new<M:MeshQuery<Position=Planar64Vec3>>(mesh:&M,[v0,v1]:Simplex<2,M::Vert>)->Self{
@@ -600,7 +601,7 @@ impl ThickLine{
 		let dir=p1-p0;
 		// Allow ~ 2*sqrt(3) units of thickness on the plane
 		// This is to account for the variance of two voxels across the longest diagonal
-		let epsilon=(dir.length_squared()*(Planar64::EPSILON*3)).widen_4();
+		let epsilon=(dir.length_squared()*(Planar64::EPSILON*3)).widen_256();
 		Self{point,dir,epsilon}
 	}
 }
@@ -613,7 +614,7 @@ impl Contains for ThickLine{
 struct EVFinder<'a,M,C>{
 	mesh:&'a M,
 	constraint:C,
-	best_distance_squared:Fixed<2,64>,
+	best_distance_squared:F128_64,
 }
 
 impl<M:MeshQuery<Position=Planar64Vec3>,C:Contains> EVFinder<'_,M,C>
@@ -657,7 +658,7 @@ impl<M:MeshQuery<Position=Planar64Vec3>,C:Contains> EVFinder<'_,M,C>
 				let distance_squared={
 					let c=diff.cross(edge_n);
 					//wrap for speed
-					(c.dot(c)/edge_nn).divide().wrap_2()
+					(c.dot(c)/edge_nn).divide().wrap_128()
 				};
 				if distance_squared<=self.best_distance_squared{
 					best_transition=EV::Edge(directed_edge_id.as_undirected());

engine/physics/src/minkowski.rs

@@ -1,6 +1,8 @@
 use core::ops::{Bound,RangeBounds};
 
-use strafesnet_common::integer::{Planar64Vec3,Ratio,Fixed,vec3::Vector3};
+use strafesnet_common::integer::fixed_types::{F192_96,F256_128,F512_256};
+use strafesnet_common::integer::vec3::Vector3;
+use strafesnet_common::integer::{Planar64Vec3,Ratio,Fixed};
 use crate::model::into_giga_time;
 use crate::model::{SubmeshVertId,SubmeshEdgeId,SubmeshDirectedEdgeId,SubmeshFaceId,TransformedMesh,GigaTime};
 use crate::mesh_query::{MeshQuery,MeshTopology,DirectedEdge,UndirectedEdge};
@@ -142,7 +144,7 @@ impl MinkowskiMesh<'_>{
 			//WARNING! d outside of *2
 			//WARNING: truncated precision
 			//wrap for speed
-			for dt in Fixed::<4,128>::zeroes2(((n.dot(trajectory.position))*2-d).wrap_4(),n.dot(trajectory.velocity).wrap_4()*2,n.dot(trajectory.acceleration).wrap_4()){
+			for dt in F256_128::zeroes2(((n.dot(trajectory.position))*2-d).wrap_256(),n.dot(trajectory.velocity).wrap_256()*2,n.dot(trajectory.acceleration).wrap_256()){
 				if low(&start_time,&dt)&&upp(&dt,&best_time)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 					best_time=Bound::Included(dt);
 					best_edge=Some((directed_edge_id,dt));
@@ -159,8 +161,8 @@ impl MinkowskiMesh<'_>{
 impl MeshQuery for MinkowskiMesh<'_>{
 	type Direction=Planar64Vec3;
 	type Position=Planar64Vec3;
-	type Normal=Vector3<Fixed<3,96>>;
-	type Offset=Fixed<4,128>;
+	type Normal=Vector3<F192_96>;
+	type Offset=F256_128;
 	// TODO: relative d
 	fn face_nd(&self,face_id:MinkowskiFace)->(Self::Normal,Self::Offset){
 		match face_id{
@@ -176,7 +178,7 @@ impl MeshQuery for MinkowskiMesh<'_>{
 				let n=edge0_n.cross(edge1_n);
 				let e0d=n.dot(self.mesh0.vert(e0v0)+self.mesh0.vert(e0v1));
 				let e1d=n.dot(self.mesh1.vert(e1v0)+self.mesh1.vert(e1v1));
-				((n*(parity as i64*4-2)).widen_3(),((e0d-e1d)*(parity as i64*2-1)).widen_4())
+				((n*(parity as i64*4-2)).widen_192(),((e0d-e1d)*(parity as i64*2-1)).widen_256())
 			},
 			MinkowskiFace::FaceVert(f0,v1)=>{
 				let (n,d)=self.mesh0.face_nd(f0);
@@ -240,7 +242,7 @@ impl MeshTopology for MinkowskiMesh<'_>{
 					for face_n in &v1f_n{
 						//add reflected mesh1 faces
 						//wrap for speed
-						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
+						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_192());
 					}
 					if is_empty_volume(&face_normals){
 						f(MinkowskiDirectedEdge::EdgeVert(directed_edge_id,v1));
@@ -255,7 +257,7 @@ impl MeshTopology for MinkowskiMesh<'_>{
 					// make a set of faces from mesh1's perspective
 					for face_n in &v0f_n{
 						//wrap for speed
-						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
+						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_192());
 					}
 					if is_empty_volume(&face_normals){
 						f(MinkowskiDirectedEdge::VertEdge(v0,directed_edge_id));
@@ -279,7 +281,7 @@ impl MeshTopology for MinkowskiMesh<'_>{
 				let &[e1f0,e1f1]=self.mesh1.edge_faces(e1).as_ref();
 				AsRefHelper([(e1f1,false),(e1f0,true)].map(|(edge_face_id1,face_parity)|{
 					let mut best_edge=None;
-					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
+					let mut best_d:Ratio<F512_256,F512_256>=Ratio::new(Fixed::ZERO,Fixed::ONE);
 					let edge_face1_n=self.mesh1.face_nd(edge_face_id1).0;
 					let edge_face1_nn=edge_face1_n.dot(edge_face1_n);
 					for &directed_edge_id0 in &v0e{
@@ -313,7 +315,7 @@ impl MeshTopology for MinkowskiMesh<'_>{
 				let &[e0f0,e0f1]=self.mesh0.edge_faces(e0).as_ref();
 				AsRefHelper([(e0f0,true),(e0f1,false)].map(|(edge_face_id0,face_parity)|{
 					let mut best_edge=None;
-					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
+					let mut best_d:Ratio<F512_256,F512_256>=Ratio::new(Fixed::ZERO,Fixed::ONE);
 					let edge_face0_n=self.mesh0.face_nd(edge_face_id0).0;
 					let edge_face0_nn=edge_face0_n.dot(edge_face0_n);
 					for &directed_edge_id1 in &v1e{
@@ -375,7 +377,7 @@ impl MeshTopology for MinkowskiMesh<'_>{
 	}
 }
 
-fn is_empty_volume(normals:&[Vector3<Fixed<3,96>>])->bool{
+fn is_empty_volume(normals:&[Vector3<F192_96>])->bool{
 	let len=normals.len();
 	for i in 0..len-1{
 		for j in i+1..len{
@@ -402,6 +404,6 @@ fn is_empty_volume(normals:&[Vector3<Fixed<3,96>>])->bool{
 #[test]
 fn test_is_empty_volume(){
 	use strafesnet_common::integer::vec3;
-	assert!(!is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3()]));
-	assert!(is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3(),vec3::NEG_X.widen_3()]));
+	assert!(!is_empty_volume(&[vec3::X.widen_192(),vec3::Y.widen_192(),vec3::Z.widen_192()]));
+	assert!(is_empty_volume(&[vec3::X.widen_192(),vec3::Y.widen_192(),vec3::Z.widen_192(),vec3::NEG_X.widen_192()]));
 }

engine/physics/src/model.rs

@@ -1,4 +1,5 @@
 use std::collections::{HashSet,HashMap};
+use strafesnet_common::integer::fixed_types::{F128_64,F192_96,F256_128};
 use strafesnet_common::integer::vec3::Vector3;
 use strafesnet_common::model::{self,MeshId,PolygonIter};
 use strafesnet_common::integer::{self,vec3,Fixed,Planar64,Planar64Vec3,Ratio};
@@ -349,8 +350,8 @@ impl TryFrom<&model::Mesh> for PhysicsMesh{
 					}
 					//assume face hash is stable, and there are no flush faces...
 					let face=Face{
-						normal:(normal/len as i64).divide().narrow_1().unwrap(),
-						dot:(dot/(len*len) as i64).narrow_1().unwrap(),
+						normal:(normal/len as i64).divide().narrow_64().unwrap(),
+						dot:(dot/(len*len) as i64).narrow_64().unwrap(),
 					};
 					let face_id=*face_id_from_face.entry(face).or_insert_with(||{
 						let face_id=MeshFaceId::new(faces.len() as u32);
@@ -461,8 +462,8 @@ impl MeshTopology for PhysicsMeshView<'_>{
 #[derive(Debug)]
 pub struct PhysicsMeshTransform{
 	pub vertex:integer::Planar64Affine3,
-	pub normal:integer::mat3::Matrix3<Fixed<2,64>>,
-	pub det:Fixed<3,96>,
+	pub normal:integer::mat3::Matrix3<F128_64>,
+	pub det:F192_96,
 }
 impl PhysicsMeshTransform{
 	pub fn new(transform:integer::Planar64Affine3)->Self{
@@ -489,15 +490,15 @@ impl TransformedMesh<'_>{
 			transform,
 		}
 	}
-	pub fn verts<'a>(&'a self)->impl Iterator<Item=Vector3<Fixed<2,64>>>+'a{
+	pub fn verts<'a>(&'a self)->impl Iterator<Item=Vector3<F128_64>>+'a{
 		self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos))
 	}
 }
 impl MeshQuery for TransformedMesh<'_>{
 	type Direction=Planar64Vec3;
 	type Position=Planar64Vec3;
-	type Normal=Vector3<Fixed<3,96>>;
-	type Offset=Fixed<4,128>;
+	type Normal=Vector3<F192_96>;
+	type Offset=F256_128;
 	fn face_nd(&self,face_id:SubmeshFaceId)->(Self::Normal,Self::Offset){
 		let (n,d)=self.view.face_nd(face_id);
 		let transformed_n=self.transform.normal*n;
@@ -506,7 +507,7 @@ impl MeshQuery for TransformedMesh<'_>{
 	}
 	fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
 		// wrap for speed
-		self.transform.vertex.transform_point3(self.view.vert(vert_id)).wrap_1()
+		self.transform.vertex.transform_point3(self.view.vert(vert_id)).wrap_64()
 	}
 	fn hint_point(&self)->Planar64Vec3{
 		self.transform.vertex.translation
@@ -553,8 +554,8 @@ impl MeshTopology for TransformedMesh<'_>{
 	fn edge_verts(&self,edge_id:Self::Edge)->impl AsRef<[Self::Vert;2]>{
 		self.view.edge_verts(edge_id)
 	}
-	fn for_each_face_vert(&self,face_id:Self::Face,f:impl FnMut(Self::Vert)){
-		self.view.for_each_face_vert(face_id,f)
+	fn for_each_face_vert(&self,_face_id:Self::Face,_f:impl FnMut(Self::Vert)){
+		unimplemented!()
 	}
 	#[inline]
 	fn for_each_face_edge(&self,face_id:Self::Face,f:impl FnMut(Self::DirectedEdge)){
@@ -562,8 +563,8 @@ impl MeshTopology for TransformedMesh<'_>{
 	}
 }
 
-pub type GigaTime=Ratio<Fixed<4,128>,Fixed<4,128>>;
+pub type GigaTime=Ratio<F256_128,F256_128>;
 pub fn into_giga_time(time:Time,relative_to:Time)->GigaTime{
 	let r=(time-relative_to).to_ratio();
-	Ratio::new(r.num.widen_4(),r.den.widen_4())
+	Ratio::new(r.num.widen_256(),r.den.widen_256())
 }

engine/physics/src/physics.rs

@@ -129,8 +129,8 @@ impl TransientAcceleration{
 		}else{
 			//normal friction acceleration is clippedAcceleration.dot(normal)*friction
 			TransientAcceleration::Reachable{
-				acceleration:target_diff.with_length(accel).divide().wrap_1(),
-				time:time+Time::from((target_diff.length()/accel).divide().clamp_1())
+				acceleration:target_diff.with_length(accel).divide().wrap_64(),
+				time:time+Time::from((target_diff.length()/accel).divide().clamp_64())
 			}
 		}
 	}
@@ -268,6 +268,12 @@ pub struct PhysicsCamera{
 impl PhysicsCamera{
 	const ANGLE_PITCH_LOWER_LIMIT:Angle32=Angle32::NEG_FRAC_PI_2;
 	const ANGLE_PITCH_UPPER_LIMIT:Angle32=Angle32::FRAC_PI_2;
+	fn set_sensitivity(&mut self,sensitivity:Ratio64Vec2){
+		// Calculate nearest mouse position in new sensitivity
+		self.clamped_mouse_pos.x=(self.clamped_mouse_pos.x as i128*self.sensitivity.x.num() as i128*sensitivity.x.den() as i128/(sensitivity.x.num() as i128*self.sensitivity.x.den() as i128)) as i32;
+		self.clamped_mouse_pos.y=(self.clamped_mouse_pos.y as i128*self.sensitivity.y.num() as i128*sensitivity.y.den() as i128/(sensitivity.y.num() as i128*self.sensitivity.y.den() as i128)) as i32;
+		self.sensitivity=sensitivity;
+	}
 	pub fn move_mouse(&mut self,mouse_delta:glam::IVec2){
 		let mut unclamped_mouse_pos=self.clamped_mouse_pos+mouse_delta;
 		unclamped_mouse_pos.y=unclamped_mouse_pos.y.clamp(
@@ -422,7 +428,7 @@ impl HitboxMesh{
 		let transform=PhysicsMeshTransform::new(transform);
 		let transformed_mesh=TransformedMesh::new(mesh.complete_mesh_view(),&transform);
 		for vert in transformed_mesh.verts(){
-			aabb.grow(vert.narrow_1().unwrap());
+			aabb.grow(vert.narrow_64().unwrap());
 		}
 		Self{
 			halfsize:aabb.size()>>1,
@@ -475,12 +481,12 @@ impl StyleHelper for StyleModifiers{
 	}
 
 	fn get_y_control_dir(&self,camera:&PhysicsCamera,controls:Controls)->Planar64Vec3{
-		(camera.rotation_y()*self.get_control_dir(controls)).wrap_1()
+		(camera.rotation_y()*self.get_control_dir(controls)).wrap_64()
 	}
 
 	fn get_propulsion_control_dir(&self,camera:&PhysicsCamera,controls:Controls)->Planar64Vec3{
 		//don't interpolate this! discrete mouse movement, constant acceleration
-		(camera.rotation()*self.get_control_dir(controls)).wrap_1()
+		(camera.rotation()*self.get_control_dir(controls)).wrap_64()
 	}
 	fn calculate_mesh(&self)->HitboxMesh{
 		let mesh=match self.hitbox.mesh{
@@ -1112,7 +1118,7 @@ impl PhysicsData{
 				let mut aabb=aabb::Aabb::default();
 				let transformed_mesh=TransformedMesh::new(view,transform);
 				for v in transformed_mesh.verts(){
-					aabb.grow(v.narrow_1().unwrap());
+					aabb.grow(v.narrow_64().unwrap());
 				}
 				(ConvexMeshId{
 					model_id,
@@ -1245,7 +1251,7 @@ fn contact_normal(
 	let minkowski=MinkowskiMesh::minkowski_sum(model_mesh,hitbox_mesh.transformed_mesh());
 	// TODO: normalize to i64::MAX>>1
 	// wrap for speed
-	minkowski.face_nd(face_id).0.wrap_1()
+	minkowski.face_nd(face_id).0.wrap_64()
 }
 
 fn recalculate_touching(
@@ -1385,7 +1391,7 @@ fn teleport_to_spawn(
 	const EPSILON:Planar64=Planar64::raw((1<<32)/16);
 	let transform=models.get_model_transform(spawn_model_id).ok_or(TeleportToSpawnError::NoModel)?;
 	//TODO: transform.vertex.matrix3.col(1)+transform.vertex.translation
-	let point=transform.vertex.transform_point3(vec3::Y).clamp_1()+Planar64Vec3::new([Planar64::ZERO,style.hitbox.halfsize.y+EPSILON,Planar64::ZERO]);
+	let point=transform.vertex.transform_point3(vec3::Y).clamp_64()+Planar64Vec3::new([Planar64::ZERO,style.hitbox.halfsize.y+EPSILON,Planar64::ZERO]);
 	teleport(point,move_state,body,touching,run,mode_state,Some(mode),models,hitbox_mesh,bvh,style,camera,input_state,time);
 	Ok(())
 }
@@ -1549,7 +1555,7 @@ fn collision_start_contact(
 		Some(gameplay_attributes::ContactingBehaviour::Surf)=>(),
 		Some(gameplay_attributes::ContactingBehaviour::Cling)=>println!("Unimplemented!"),
 		&Some(gameplay_attributes::ContactingBehaviour::Elastic(elasticity))=>{
-			let reflected_velocity=body.velocity+((body.velocity-incident_velocity)*Planar64::raw(elasticity as i64+1)).wrap_1();
+			let reflected_velocity=body.velocity+((body.velocity-incident_velocity)*Planar64::raw(elasticity as i64+1)).wrap_64();
 			set_velocity(body,touching,models,hitbox_mesh,reflected_velocity);
 		},
 		Some(gameplay_attributes::ContactingBehaviour::Ladder(contacting_ladder))=>
@@ -1803,7 +1809,7 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 						// manually advance time
 						let extrapolated_body=state.body.with_acceleration(state.acceleration(data)).extrapolated_body(state.time);
 						let camera_mat=state.camera.simulate_move_rotation_y(state.input_state.lerp_delta(state.time).x);
-						if let Some(ticked_velocity)=strafe_settings.tick_velocity(extrapolated_body.velocity,(camera_mat*control_dir).with_length(Planar64::ONE).divide().wrap_1()){
+						if let Some(ticked_velocity)=strafe_settings.tick_velocity(extrapolated_body.velocity,(camera_mat*control_dir).with_length(Planar64::ONE).divide().wrap_64()){
 							state.body=extrapolated_body;
 							//this is wrong but will work ig
 							//need to note which push planes activate in push solve and keep those
@@ -1873,10 +1879,11 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
 			state.input_state.set_next_mouse(m);
 		},
 		Instruction::Mouse(MouseInstruction::ReplaceMouse{m0,m1})=>{
-			state.camera.move_mouse(m0.pos-state.input_state.mouse.pos);
+			state.camera.move_mouse(state.input_state.mouse_delta());
+			state.camera.move_mouse(m0.pos-state.input_state.next_mouse.pos);
 			state.input_state.replace_mouse(m0,m1);
 		},
-		Instruction::Misc(MiscInstruction::SetSensitivity(sensitivity))=>state.camera.sensitivity=sensitivity,
+		Instruction::Misc(MiscInstruction::SetSensitivity(sensitivity))=>state.camera.set_sensitivity(sensitivity),
 		Instruction::SetControl(SetControlInstruction::SetMoveForward(s))=>state.input_state.set_control(Controls::MoveForward,s),
 		Instruction::SetControl(SetControlInstruction::SetMoveLeft(s))=>state.input_state.set_control(Controls::MoveLeft,s),
 		Instruction::SetControl(SetControlInstruction::SetMoveBack(s))=>state.input_state.set_control(Controls::MoveBackward,s),
@@ -2013,6 +2020,24 @@ mod test{
 		),Some(Time::from_secs(2)));
 	}
 	#[test]
+	fn test_collision_zero_time_exact(){
+		test_collision(Trajectory::new(
+			int3(0,3,0),
+			int3(0,-1,0),
+			vec3::zero(),
+			Time::ZERO
+		),Some(Time::from_secs(0)));
+	}
+	#[test]
+	fn test_collision_zero_time_epsilon(){
+		test_collision(Trajectory::new(
+			int3(0,3,0)+(vec3::Y>>32),
+			int3(0,-1,0),
+			vec3::zero(),
+			Time::ZERO
+		),Some(Time::from_secs(0)));
+	}
+	#[test]
 	fn test_collision_small_mv(){
 		test_collision(Trajectory::new(
 			int3(0,5,0),

engine/physics/src/push_solve.rs

@@ -1,3 +1,4 @@
+use strafesnet_common::integer::fixed_types::{F64_32,F128_64,F192_96,F256_128,F320_160};
 use strafesnet_common::integer::vec3::{self,Vector3};
 use strafesnet_common::integer::{Fixed,Planar64Vec3,Ratio};
 use strafesnet_common::ray::Ray;
@@ -12,7 +13,7 @@ use strafesnet_common::ray::Ray;
 type Conts<'a>=arrayvec::ArrayVec<&'a Contact,4>;
 
 // hack to allow comparing ratios to zero
-const RATIO_ZERO:Ratio<Fixed<1,32>,Fixed<1,32>>=Ratio::new(Fixed::ZERO,Fixed::EPSILON);
+const RATIO_ZERO:Ratio<F64_32,F64_32>=Ratio::new(Fixed::ZERO,Fixed::EPSILON);
 
 /// Information about a contact restriction
 #[derive(Debug,PartialEq)]
@@ -29,17 +30,17 @@ impl Contact{
 			normal:self.normal,
 		}
 	}
-	fn relative_dot(&self,direction:Planar64Vec3)->Fixed<2,64>{
+	fn relative_dot(&self,direction:Planar64Vec3)->F128_64{
 		(direction-self.velocity).dot(self.normal)
 	}
 	/// Calculate the time of intersection. (previously get_touch_time)
-	fn solve(&self,ray:&Ray)->Ratio<Fixed<2,64>,Fixed<2,64>>{
+	fn solve(&self,ray:&Ray)->Ratio<F128_64,F128_64>{
 		(self.position-ray.origin).dot(self.normal)/(ray.direction-self.velocity).dot(self.normal)
 	}
 }
 
 //note that this is horrible with fixed point arithmetic
-fn solve1(c0:&Contact)->Option<Ratio<Vector3<Fixed<3,96>>,Fixed<2,64>>>{
+fn solve1(c0:&Contact)->Option<Ratio<Vector3<F192_96>,F128_64>>{
 	let det=c0.normal.dot(c0.velocity);
 	if det.abs()==Fixed::ZERO{
 		return None;
@@ -47,7 +48,7 @@ fn solve1(c0:&Contact)->Option<Ratio<Vector3<Fixed<3,96>>,Fixed<2,64>>>{
 	let d0=c0.normal.dot(c0.position);
 	Some(c0.normal*d0/det)
 }
-fn solve2(c0:&Contact,c1:&Contact)->Option<Ratio<Vector3<Fixed<5,160>>,Fixed<4,128>>>{
+fn solve2(c0:&Contact,c1:&Contact)->Option<Ratio<Vector3<F320_160>,F256_128>>{
 	let u0_u1=c0.velocity.cross(c1.velocity);
 	let n0_n1=c0.normal.cross(c1.normal);
 	let det=u0_u1.dot(n0_n1);
@@ -58,7 +59,7 @@ fn solve2(c0:&Contact,c1:&Contact)->Option<Ratio<Vector3<Fixed<5,160>>,Fixed<4,1
 	let d1=c1.normal.dot(c1.position);
 	Some((c1.normal.cross(u0_u1)*d0+u0_u1.cross(c0.normal)*d1)/det)
 }
-fn solve3(c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ratio<Vector3<Fixed<4,128>>,Fixed<3,96>>>{
+fn solve3(c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ratio<Vector3<F256_128>,F192_96>>{
 	let n0_n1=c0.normal.cross(c1.normal);
 	let det=c2.normal.dot(n0_n1);
 	if det.abs()==Fixed::ZERO{
@@ -70,7 +71,7 @@ fn solve3(c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ratio<Vector3<Fixed<4,128
 	Some((c1.normal.cross(c2.normal)*d0+c2.normal.cross(c0.normal)*d1+c0.normal.cross(c1.normal)*d2)/det)
 }
 
-fn decompose1(point:Planar64Vec3,u0:Planar64Vec3)->Option<[Ratio<Fixed<2,64>,Fixed<2,64>>;1]>{
+fn decompose1(point:Planar64Vec3,u0:Planar64Vec3)->Option<[Ratio<F128_64,F128_64>;1]>{
 	let det=u0.dot(u0);
 	if det==Fixed::ZERO{
 		return None;
@@ -78,7 +79,7 @@ fn decompose1(point:Planar64Vec3,u0:Planar64Vec3)->Option<[Ratio<Fixed<2,64>,Fix
 	let s0=u0.dot(point)/det;
 	Some([s0])
 }
-fn decompose2(point:Planar64Vec3,u0:Planar64Vec3,u1:Planar64Vec3)->Option<[Ratio<Fixed<4,128>,Fixed<4,128>>;2]>{
+fn decompose2(point:Planar64Vec3,u0:Planar64Vec3,u1:Planar64Vec3)->Option<[Ratio<F256_128,F256_128>;2]>{
 	let u0_u1=u0.cross(u1);
 	let det=u0_u1.dot(u0_u1);
 	if det==Fixed::ZERO{
@@ -88,7 +89,7 @@ fn decompose2(point:Planar64Vec3,u0:Planar64Vec3,u1:Planar64Vec3)->Option<[Ratio
 	let s1=u0_u1.dot(u0.cross(point))/det;
 	Some([s0,s1])
 }
-fn decompose3(point:Planar64Vec3,u0:Planar64Vec3,u1:Planar64Vec3,u2:Planar64Vec3)->Option<[Ratio<Fixed<3,96>,Fixed<3,96>>;3]>{
+fn decompose3(point:Planar64Vec3,u0:Planar64Vec3,u1:Planar64Vec3,u2:Planar64Vec3)->Option<[Ratio<F192_96,F192_96>;3]>{
 	let det=u0.cross(u1).dot(u2);
 	if det==Fixed::ZERO{
 		return None;
@@ -151,18 +152,18 @@ const fn get_push_ray_0(point:Planar64Vec3)->Ray{
 }
 fn get_push_ray_1(point:Planar64Vec3,c0:&Contact)->Option<Ray>{
 	//wrap for speed
-	let direction=solve1(c0)?.divide().wrap_1();
+	let direction=solve1(c0)?.divide().wrap_64();
 	let [s0]=decompose1(direction,c0.velocity)?;
 	if s0.lt_ratio(RATIO_ZERO){
 		return None;
 	}
 	let origin=point+solve1(
 		&c0.relative_to(point),
-	)?.divide().wrap_1();
+	)?.divide().wrap_64();
 	Some(Ray{origin,direction})
 }
 fn get_push_ray_2(point:Planar64Vec3,c0:&Contact,c1:&Contact)->Option<Ray>{
-	let direction=solve2(c0,c1)?.divide().wrap_1();
+	let direction=solve2(c0,c1)?.divide().wrap_64();
 	let [s0,s1]=decompose2(direction,c0.velocity,c1.velocity)?;
 	if s0.lt_ratio(RATIO_ZERO)||s1.lt_ratio(RATIO_ZERO){
 		return None;
@@ -170,11 +171,11 @@ fn get_push_ray_2(point:Planar64Vec3,c0:&Contact,c1:&Contact)->Option<Ray>{
 	let origin=point+solve2(
 		&c0.relative_to(point),
 		&c1.relative_to(point),
-	)?.divide().wrap_1();
+	)?.divide().wrap_64();
 	Some(Ray{origin,direction})
 }
 fn get_push_ray_3(point:Planar64Vec3,c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ray>{
-	let direction=solve3(c0,c1,c2)?.divide().wrap_1();
+	let direction=solve3(c0,c1,c2)?.divide().wrap_64();
 	let [s0,s1,s2]=decompose3(direction,c0.velocity,c1.velocity,c2.velocity)?;
 	if s0.lt_ratio(RATIO_ZERO)||s1.lt_ratio(RATIO_ZERO)||s2.lt_ratio(RATIO_ZERO){
 		return None;
@@ -183,7 +184,7 @@ fn get_push_ray_3(point:Planar64Vec3,c0:&Contact,c1:&Contact,c2:&Contact)->Optio
 		&c0.relative_to(point),
 		&c1.relative_to(point),
 		&c2.relative_to(point),
-	)?.divide().wrap_1();
+	)?.divide().wrap_64();
 	Some(Ray{origin,direction})
 }
 
@@ -272,10 +273,10 @@ fn get_best_push_ray_and_conts<'a>(
 	}
 }
 
-fn get_first_touch<'a>(contacts:&'a [Contact],ray:&Ray,conts:&Conts)->Option<(Ratio<Fixed<2,64>,Fixed<2,64>>,&'a Contact)>{
+fn get_first_touch<'a>(contacts:&'a [Contact],ray:&Ray,conts:&Conts)->Option<(Ratio<F128_64,F128_64>,&'a Contact)>{
 	contacts.iter()
 		.filter(|&contact|
-			!conts.iter().any(|&c|std::ptr::eq(c,contact))
+			!conts.iter().any(|&c|core::ptr::eq(c,contact))
 			&&contact.relative_dot(ray.direction).is_negative()
 		)
 		.map(|contact|(contact.solve(ray),contact))

engine/session/Cargo.toml

@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-glam = "0.30.0"
+glam.workspace = true
 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" }
+strafesnet_common.workspace = true
+strafesnet_physics.workspace = true
+strafesnet_settings.workspace = true
+strafesnet_snf.workspace = true
 
 [lints]
 workspace = true

engine/session/src/session.rs

@@ -61,6 +61,14 @@ pub struct FrameState{
 	pub camera:physics::PhysicsCamera,
 	pub time:PhysicsTime,
 }
+impl FrameState{
+	pub fn pos(&self)->glam::Vec3{
+		self.trajectory.extrapolated_position(self.time).map(Into::<f32>::into).to_array().into()
+	}
+	pub fn angles(&self)->glam::Vec2{
+		self.camera.simulate_move_angles(glam::IVec2::ZERO)
+	}
+}
 
 pub struct Simulation{
 	timer:Timer<Scaled<SessionTimeInner,PhysicsTimeInner>>,

engine/settings/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2024"
 [dependencies]
 configparser = "3.0.2"
 directories = "6.0.0"
-glam = "0.30.0"
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
+glam.workspace = true
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

integration-testing/Cargo.toml

@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-glam = "0.30.0"
-strafesnet_common = { path = "../lib/common", registry = "strafesnet" }
-strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
-strafesnet_snf = { path = "../lib/snf", registry = "strafesnet" }
+glam.workspace = true
+strafesnet_common.workspace = true
+strafesnet_physics.workspace = true
+strafesnet_snf.workspace = true
 # this is just for the primitive constructor
-strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet" }
+strafesnet_rbx_loader.workspace = true
 
 [lints]
 workspace = true

lib/bsp_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_bsp_loader"
-version = "0.3.1"
+version = "0.5.0"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -10,9 +10,9 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-glam = "0.30.0"
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
+glam.workspace = true
+strafesnet_common.workspace = true
+strafesnet_deferred_loader.workspace = true
 vbsp = "0.9.1"
 vbsp-entities-css = "0.6.0"
 vmdl = "0.2.0"

lib/bsp_loader/src/brush.rs

@@ -1,21 +1,22 @@
-use strafesnet_common::integer::Planar64;
 use strafesnet_common::{model,integer};
-use strafesnet_common::integer::{vec3::Vector3,Fixed,Ratio};
+use strafesnet_common::integer::fixed_types::F192_96;
+use strafesnet_common::integer::vec3::Vector3;
+use strafesnet_common::integer::{Planar64,Planar64Vec3,Ratio};
 
 use crate::{valve_transform_normal,valve_transform_dist};
 
 #[derive(Hash,Eq,PartialEq)]
 struct Face{
-	normal:integer::Planar64Vec3,
+	normal:Planar64Vec3,
 	dot:Planar64,
 }
 
 #[derive(Debug)]
 struct Faces{
-	faces:Vec<Vec<integer::Planar64Vec3>>,
+	faces:Vec<Vec<Planar64Vec3>>,
 }
 
-fn solve3(c0:&Face,c1:&Face,c2:&Face)->Option<Ratio<Vector3<Fixed<3,96>>,Fixed<3,96>>>{
+fn solve3(c0:&Face,c1:&Face,c2:&Face)->Option<Ratio<Vector3<F192_96>,F192_96>>{
 	let n0_n1=c0.normal.cross(c1.normal);
 	let det=c2.normal.dot(n0_n1);
 	if det.abs().is_zero(){
@@ -82,12 +83,12 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 			// test if any *other* faces occlude the intersection
 			for new_face in &face_list{
 				// new face occludes intersection point
-				if (new_face.dot.widen_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
+				if (new_face.dot.widen_128()/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.widen_2()/Planar64::ONE).gt_ratio(face1.normal.dot(new_intersection.num)/new_intersection.den){
+						if (face1.dot.widen_128()/Planar64::ONE).gt_ratio(face1.normal.dot(new_intersection.num)/new_intersection.den){
 							face1=new_face;
 							intersection=new_intersection;
 							continue 'find;
@@ -95,7 +96,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 					}
 					if let Some(new_intersection)=solve3(face0,face1,new_face){
 						// face2 does not occlude (or intersect) the new intersection
-						if (face2.dot.widen_2()/Planar64::ONE).gt_ratio(face2.normal.dot(new_intersection.num)/new_intersection.den){
+						if (face2.dot.widen_128()/Planar64::ONE).gt_ratio(face2.normal.dot(new_intersection.num)/new_intersection.den){
 							face2=new_face;
 							intersection=new_intersection;
 							continue 'find;
@@ -120,7 +121,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 				continue;
 			}
 			// new_face occludes intersection meaning intersection is not on convex solid and face0 is degenrate
-			if (new_face.dot.widen_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
+			if (new_face.dot.widen_128()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
 				// abort! reject face0 entirely
 				continue 'face;
 			}
@@ -138,7 +139,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 		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().narrow_1().unwrap());
+			face.push(intersection.divide().narrow_64().unwrap());
 
 			// we looped back around to face1, we're done!
 			if core::ptr::eq(face1,face2){
@@ -204,7 +205,7 @@ impl std::fmt::Display for BrushToMeshError{
 }
 impl core::error::Error for BrushToMeshError{}
 
-pub fn faces_to_mesh(faces:Vec<Vec<integer::Planar64Vec3>>)->model::Mesh{
+pub fn faces_to_mesh(faces:Vec<Vec<Planar64Vec3>>)->model::Mesh{
 	// generate the mesh
 	let mut mb=model::MeshBuilder::new();
 	let color=mb.acquire_color_id(glam::Vec4::ONE);

lib/bsp_loader/src/lib.rs

@@ -1,9 +1,6 @@
-use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
-
-mod bsp;
-mod mesh;
+pub mod bsp;
+pub mod mesh;
 mod brush;
-pub mod loader;
 
 const VALVE_SCALE:f32=1.0/16.0;
 pub(crate) fn valve_transform_dist(d:f32)->strafesnet_common::integer::Planar64{
@@ -28,28 +25,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>,
@@ -84,28 +59,6 @@ impl Bsp{
 			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,

lib/bsp_loader/src/mesh.rs

@@ -5,6 +5,8 @@ use strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader;
 
 use crate::valve_transform;
 
+pub use model::Mesh;
+
 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()));
@@ -17,7 +19,7 @@ fn ingest_vertex(mb:&mut model::MeshBuilder,vertex:&vmdl::vvd::Vertex,color:mode
 	})
 }
 
-pub fn convert_mesh(model:vmdl::Model,deferred_loader:&mut RenderConfigDeferredLoader<Cow<str>>)->model::Mesh{
+pub fn convert_mesh(model:vmdl::Model,deferred_loader:&mut RenderConfigDeferredLoader<Cow<str>>)->Mesh{
 	let texture_paths=model.texture_directories();
 	if texture_paths.len()!=1{
 		println!("WARNING: multiple texture paths");

lib/common/Cargo.toml

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

lib/common/src/aabb.rs

@@ -62,7 +62,7 @@ impl Aabb{
 		self.min.map_zip(self.max,|(min,max)|min.midpoint(max))
 	}
 	#[inline]
-	pub fn area_weight(&self)->fixed_wide::fixed::Fixed<2,64>{
+	pub fn area_weight(&self)->fixed_wide::types::F128_64{
 		let d=self.max-self.min;
 		d.x*d.y+d.y*d.z+d.z*d.x
 	}

lib/common/src/bvh.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 
 use crate::aabb::Aabb;
 use crate::ray::Ray;
-use crate::integer::{Ratio,Planar64};
+use crate::integer::{Ratio,Planar64,Planar64Vec3};
 use crate::instruction::{InstructionCollector,TimedInstruction};
 
 //da algaritum
@@ -140,33 +140,34 @@ impl<L> BvhNode<L>{
 			},
 		}
 	}
-	fn populate_nodes<'a,T,F>(
+	fn populate_nodes<'a,T,IntersectLeaf,IntersectAabb>(
 		&'a self,
-		collector:&mut InstructionCollector<&'a L,Ratio<Planar64,Planar64>>,
-		nodes:&mut BTreeMap<Ratio<Planar64,Planar64>,&'a BvhNode<L>>,
-		ray:&Ray,
-		start_time:Ratio<Planar64,Planar64>,
-		f:&F,
+		start_point:Planar64Vec3,
+		collector:&mut InstructionCollector<&'a L,T>,
+		nodes:&mut BTreeMap<T,&'a BvhNode<L>>,
+		start_time:T,
+		intersect_leaf:&IntersectLeaf,
+		intersect_aabb:&IntersectAabb,
 	)
 		where
 			T:Ord+Copy,
-			Ratio<Planar64,Planar64>:From<T>,
-			F:Fn(&L,&Ray)->Option<T>,
+			IntersectLeaf:Fn(&L)->Option<T>,
+			IntersectAabb:Fn(&Aabb)->Option<T>,
 	{
 		match &self.content{
-			RecursiveContent::Leaf(leaf)=>if let Some(time)=f(leaf,ray){
-				let ins=TimedInstruction{time:time.into(),instruction:leaf};
-				if start_time.lt_ratio(ins.time)&&ins.time.lt_ratio(collector.time()){
+			RecursiveContent::Leaf(leaf)=>if let Some(time)=intersect_leaf(leaf){
+				let ins=TimedInstruction{time,instruction:leaf};
+				if start_time<ins.time&&ins.time<collector.time(){
 					collector.collect(Some(ins));
 				}
 			},
 			RecursiveContent::Branch(children)=>for child in children{
-				if child.aabb.contains(ray.origin){
-					child.populate_nodes(collector,nodes,ray,start_time,f);
+				if child.aabb.contains(start_point){
+					child.populate_nodes(start_point,collector,nodes,start_time,intersect_leaf,intersect_aabb);
 				}else{
 					// Am I an upcoming superstar?
-					if let Some(t)=intersect_aabb(ray,&child.aabb){
-						if start_time.lt_ratio(t)&&t.lt_ratio(collector.time()){
+					if let Some(t)=intersect_aabb(&child.aabb){
+						if start_time<t&&t<collector.time(){
 							nodes.insert(t,child);
 						}
 					}
@@ -174,27 +175,29 @@ impl<L> BvhNode<L>{
 			},
 		}
 	}
-	pub fn sample_ray<T,F>(
+	/// Traverse the BVH using the given sampling functions.
+	/// Nodes are tested in order of T returned by IntersectAabb.
+	/// The algorithm ends when T for the next node to test is
+	/// greater than the current best collected T from IntersectLeaf.
+	pub fn traverse<T,IntersectLeaf,IntersectAabb>(
 		&self,
-		ray:&Ray,
+		start_point:Planar64Vec3,
 		start_time:T,
 		time_limit:T,
-		f:F,
+		intersect_leaf:IntersectLeaf,
+		intersect_aabb:IntersectAabb,
 	)->Option<(T,&L)>
 		where
 			T:Ord+Copy,
-			T:From<Ratio<Planar64,Planar64>>,
-			Ratio<Planar64,Planar64>:From<T>,
-			F:Fn(&L,&Ray)->Option<T>,
+			IntersectLeaf:Fn(&L)->Option<T>,
+			IntersectAabb:Fn(&Aabb)->Option<T>,
 	{
 		// source of nondeterminism when Aabb boundaries are coplanar
 		let mut nodes=BTreeMap::new();
 
-		let start_time=start_time.into();
-		let time_limit=time_limit.into();
 		let mut collector=InstructionCollector::new(time_limit);
 		// break open all nodes that contain ray.origin and populate nodes with future intersection times
-		self.populate_nodes(&mut collector,&mut nodes,ray,start_time,&f);
+		self.populate_nodes(start_point,&mut collector,&mut nodes,start_time,&intersect_leaf,&intersect_aabb);
 
 		// swim through nodes one at a time
 		while let Some((t,node))=nodes.pop_first(){
@@ -202,18 +205,18 @@ impl<L> BvhNode<L>{
 				break;
 			}
 			match &node.content{
-				RecursiveContent::Leaf(leaf)=>if let Some(time)=f(leaf,ray){
+				RecursiveContent::Leaf(leaf)=>if let Some(time)=intersect_leaf(leaf){
 					let ins=TimedInstruction{time:time.into(),instruction:leaf};
 					// this lower bound can also be omitted
 					// but it causes type inference errors lol
-					if start_time.lt_ratio(ins.time)&&ins.time.lt_ratio(collector.time()){
+					if start_time<ins.time&&ins.time<collector.time(){
 						collector.collect(Some(ins));
 					}
 				},
 				// break open the node and predict collisions with the child nodes
 				RecursiveContent::Branch(children)=>for child in children{
 					// Am I an upcoming superstar?
-					if let Some(t)=intersect_aabb(ray,&child.aabb){
+					if let Some(t)=intersect_aabb(&child.aabb){
 						// we don't need to check the lower bound
 						// because child aabbs are guaranteed to be within the parent bounds.
 						if t<collector.time(){

lib/common/src/gameplay_style.rs

@@ -66,7 +66,7 @@ impl JumpImpulse{
 		_mass:Planar64,
 	)->Planar64Vec3{
 		match self{
-			&JumpImpulse::Time(time)=>velocity-(*gravity*time).map(|t|t.divide().clamp_1()),
+			&JumpImpulse::Time(time)=>velocity-(*gravity*time).map(|t|t.divide().clamp_64()),
 			&JumpImpulse::Height(height)=>{
 				//height==-v.y*v.y/(2*g.y);
 				//use energy to determine max height
@@ -74,10 +74,10 @@ impl JumpImpulse{
 				let g=gg.sqrt();
 				let v_g=gravity.dot(velocity);
 				//do it backwards
-				let radicand=v_g*v_g+(g*height*2).widen_4();
-				velocity-(*gravity*(radicand.sqrt().wrap_2()+v_g)/gg).divide().clamp_1()
+				let radicand=v_g*v_g+(g*height*2).widen_256();
+				velocity-(*gravity*(radicand.sqrt().wrap_128()+v_g)/gg).divide().clamp_64()
 			},
-			&JumpImpulse::Linear(jump_speed)=>velocity+(jump_dir*jump_speed/jump_dir.length()).divide().clamp_1(),
+			&JumpImpulse::Linear(jump_speed)=>velocity+(jump_dir*jump_speed/jump_dir.length()).divide().clamp_64(),
 			&JumpImpulse::Energy(_energy)=>{
 				//calculate energy
 				//let e=gravity.dot(velocity);
@@ -91,10 +91,10 @@ impl JumpImpulse{
 	pub fn get_jump_deltav(&self,gravity:&Planar64Vec3,mass:Planar64)->Planar64{
 		//gravity.length() is actually the proper calculation because the jump is always opposite the gravity direction
 		match self{
-			&JumpImpulse::Time(time)=>(gravity.length().wrap_1()*time/2).divide().clamp_1(),
-			&JumpImpulse::Height(height)=>(gravity.length()*height*2).sqrt().wrap_1(),
+			&JumpImpulse::Time(time)=>(gravity.length().wrap_64()*time/2).divide().clamp_64(),
+			&JumpImpulse::Height(height)=>(gravity.length()*height*2).sqrt().wrap_64(),
 			&JumpImpulse::Linear(deltav)=>deltav,
-			&JumpImpulse::Energy(energy)=>(energy.sqrt()*2/mass.sqrt()).divide().clamp_1(),
+			&JumpImpulse::Energy(energy)=>(energy.sqrt()*2/mass.sqrt()).divide().clamp_64(),
 		}
 	}
 }
@@ -126,10 +126,10 @@ impl JumpSettings{
 					None=>rel_velocity,
 				};
 				let j=boost_vel.dot(jump_dir);
-				let js=jump_speed.widen_2();
+				let js=jump_speed.widen_128();
 				if j<js{
 					//weak booster: just do a regular jump
-					boost_vel+jump_dir.with_length(js-j).divide().wrap_1()
+					boost_vel+jump_dir.with_length(js-j).divide().wrap_64()
 				}else{
 					//activate booster normally, jump does nothing
 					boost_vel
@@ -142,13 +142,13 @@ impl JumpSettings{
 					None=>rel_velocity,
 				};
 				let j=boost_vel.dot(jump_dir);
-				let js=jump_speed.widen_2();
+				let js=jump_speed.widen_128();
 				if j<js{
 					//speed in direction of jump cannot be lower than amount
-					boost_vel+jump_dir.with_length(js-j).divide().wrap_1()
+					boost_vel+jump_dir.with_length(js-j).divide().wrap_64()
 				}else{
 					//boost and jump add together
-					boost_vel+jump_dir.with_length(js).divide().wrap_1()
+					boost_vel+jump_dir.with_length(js).divide().wrap_64()
 				}
 			}
 			(false,JumpCalculation::Max)=>{
@@ -159,10 +159,10 @@ impl JumpSettings{
 					None=>rel_velocity,
 				};
 				let boost_dot=boost_vel.dot(jump_dir);
-				let js=jump_speed.widen_2();
+				let js=jump_speed.widen_128();
 				if boost_dot<js{
 					//weak boost is extended to jump speed
-					boost_vel+jump_dir.with_length(js-boost_dot).divide().wrap_1()
+					boost_vel+jump_dir.with_length(js-boost_dot).divide().wrap_64()
 				}else{
 					//activate booster normally, jump does nothing
 					boost_vel
@@ -174,7 +174,7 @@ impl JumpSettings{
 					Some(booster)=>booster.boost(rel_velocity),
 					None=>rel_velocity,
 				};
-				boost_vel+jump_dir.with_length(jump_speed).divide().wrap_1()
+				boost_vel+jump_dir.with_length(jump_speed).divide().wrap_64()
 			},
 		}
 	}
@@ -267,9 +267,9 @@ pub struct StrafeSettings{
 impl StrafeSettings{
 	pub fn tick_velocity(&self,velocity:Planar64Vec3,control_dir:Planar64Vec3)->Option<Planar64Vec3>{
 		let d=velocity.dot(control_dir);
-		let mv=self.mv.widen_2();
+		let mv=self.mv.widen_128();
 		match d<mv{
-			true=>Some(velocity+(control_dir*self.air_accel_limit.map_or(mv-d,|limit|limit.widen_2().min(mv-d))).wrap_1()),
+			true=>Some(velocity+(control_dir*self.air_accel_limit.map_or(mv-d,|limit|limit.widen_128().min(mv-d))).wrap_64()),
 			false=>None,
 		}
 	}
@@ -290,7 +290,7 @@ pub struct PropulsionSettings{
 }
 impl PropulsionSettings{
 	pub fn acceleration(&self,control_dir:Planar64Vec3)->Planar64Vec3{
-		(control_dir*self.magnitude).clamp_1()
+		(control_dir*self.magnitude).clamp_64()
 	}
 }
 
@@ -310,13 +310,13 @@ pub struct WalkSettings{
 impl WalkSettings{
 	pub fn accel(&self,target_diff:Planar64Vec3,gravity:Planar64Vec3)->Planar64{
 		//TODO: fallible walk accel
-		let diff_len=target_diff.length().wrap_1();
+		let diff_len=target_diff.length().wrap_64();
 		let friction=if diff_len<self.accelerate.topspeed{
 			self.static_friction
 		}else{
 			self.kinetic_friction
 		};
-		self.accelerate.accel.min((-gravity.y*friction).clamp_1())
+		self.accelerate.accel.min((-gravity.y*friction).clamp_64())
 	}
 	pub fn get_walk_target_velocity(&self,control_dir:Planar64Vec3,normal:Planar64Vec3)->Planar64Vec3{
 		if control_dir==crate::integer::vec3::zero(){
@@ -332,7 +332,7 @@ impl WalkSettings{
 			if cr==crate::integer::vec3::zero(){
 				crate::integer::vec3::zero()
 			}else{
-				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
+				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_64()
 			}
 		}else{
 			crate::integer::vec3::zero()
@@ -341,7 +341,7 @@ impl WalkSettings{
 	pub fn is_slope_walkable(&self,normal:Planar64Vec3,up:Planar64Vec3)->bool{
 		//normal is not guaranteed to be unit length
 		let ny=normal.dot(up);
-		let h=normal.length().wrap_1();
+		let h=normal.length().wrap_64();
 		//remember this is a normal vector
 		ny.is_positive()&&h*self.surf_dot<ny
 	}
@@ -368,13 +368,13 @@ impl LadderSettings{
 		let nnmm=nn*mm;
 		let d=normal.dot(control_dir);
 		let mut dd=d*d;
-		if (self.dot*self.dot*nnmm).clamp_4()<dd{
+		if (self.dot*self.dot*nnmm).clamp_256()<dd{
 			if d.is_negative(){
-				control_dir=Planar64Vec3::new([Planar64::ZERO,mm.clamp_1(),Planar64::ZERO]);
+				control_dir=Planar64Vec3::new([Planar64::ZERO,mm.clamp_64(),Planar64::ZERO]);
 			}else{
-				control_dir=Planar64Vec3::new([Planar64::ZERO,-mm.clamp_1(),Planar64::ZERO]);
+				control_dir=Planar64Vec3::new([Planar64::ZERO,-mm.clamp_64(),Planar64::ZERO]);
 			}
-			dd=(normal.y*normal.y).widen_4();
+			dd=(normal.y*normal.y).widen_256();
 		}
 		//n=d if you are standing on top of a ladder and press E.
 		//two fixes:
@@ -385,7 +385,7 @@ impl LadderSettings{
 			if cr==crate::integer::vec3::zero(){
 				crate::integer::vec3::zero()
 			}else{
-				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
+				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_64()
 			}
 		}else{
 			crate::integer::vec3::zero()
@@ -417,7 +417,7 @@ impl Hitbox{
 	}
 	pub fn source()->Self{
 		Self{
-			halfsize:((int3(33,73,33)>>1)*VALVE_SCALE).narrow_1().unwrap(),
+			halfsize:((int3(33,73,33)>>1)*VALVE_SCALE).narrow_64().unwrap(),
 			mesh:HitboxMesh::Box,
 		}
 	}
@@ -538,11 +538,11 @@ impl StyleModifiers{
 				tick_rate:Ratio64::new(100,AbsoluteTime::ONE_SECOND.get() as u64).unwrap(),
 			}),
 			jump:Some(JumpSettings{
-				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).narrow_1().unwrap()),
+				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).narrow_64().unwrap()),
 				calculation:JumpCalculation::JumpThenBoost,
 				limit_minimum:true,
 			}),
-			gravity:(int3(0,-800,0)*VALVE_SCALE).narrow_1().unwrap(),
+			gravity:(int3(0,-800,0)*VALVE_SCALE).narrow_64().unwrap(),
 			mass:int(1),
 			rocket:None,
 			walk:Some(WalkSettings{
@@ -565,7 +565,7 @@ impl StyleModifiers{
 				magnitude:int(12),//?
 			}),
 			hitbox:Hitbox::source(),
-			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).narrow_1().unwrap(),
+			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).narrow_64().unwrap(),
 		}
 	}
 	pub fn source_surf()->Self{
@@ -574,16 +574,16 @@ impl StyleModifiers{
 			controls_mask_state:Controls::all(),
 			strafe:Some(StrafeSettings{
 				enable:ControlsActivation::full_2d(),
-				air_accel_limit:Some((int(150)*66*VALVE_SCALE).narrow_1().unwrap()),
+				air_accel_limit:Some((int(150)*66*VALVE_SCALE).narrow_64().unwrap()),
 				mv:Planar64::raw(30<<28),
 				tick_rate:Ratio64::new(66,AbsoluteTime::ONE_SECOND.get() as u64).unwrap(),
 			}),
 			jump:Some(JumpSettings{
-				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).narrow_1().unwrap()),
+				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).narrow_64().unwrap()),
 				calculation:JumpCalculation::JumpThenBoost,
 				limit_minimum:true,
 			}),
-			gravity:(int3(0,-800,0)*VALVE_SCALE).narrow_1().unwrap(),
+			gravity:(int3(0,-800,0)*VALVE_SCALE).narrow_64().unwrap(),
 			mass:int(1),
 			rocket:None,
 			walk:Some(WalkSettings{
@@ -606,7 +606,7 @@ impl StyleModifiers{
 				magnitude:int(12),//?
 			}),
 			hitbox:Hitbox::source(),
-			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).narrow_1().unwrap(),
+			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).narrow_64().unwrap(),
 		}
 	}
 }

lib/common/src/integer.rs

@@ -1,6 +1,12 @@
 pub use fixed_wide::fixed::*;
 pub use ratio_ops::ratio::{Ratio,Divide,Parity};
 
+pub mod fixed_types{
+	pub use fixed_wide::types::*;
+}
+
+use fixed_wide::types::F128_64;
+
 //integer units
 
 /// specific example of a "default" time type
@@ -56,11 +62,19 @@ impl<T> Time<T>{
 	pub const fn coerce<U>(self)->Time<U>{
 		Time::raw(self.0)
 	}
+	#[inline]
+	pub const fn div_euclid(self,other:Self)->Self{
+		Time::raw(self.0.div_euclid(other.0))
+	}
+	#[inline]
+	pub const fn rem_euclid(self,other:Self)->Self{
+		Time::raw(self.0.rem_euclid(other.0))
+	}
 }
 impl<T> From<Planar64> for Time<T>{
 	#[inline]
 	fn from(value:Planar64)->Self{
-		Self::raw((value*Planar64::raw(1_000_000_000)).clamp_1().to_raw())
+		Self::raw((value*Planar64::raw(1_000_000_000)).clamp_64().to_raw())
 	}
 }
 impl<T> From<Time<T>> for Ratio<Planar64,Planar64>{
@@ -126,10 +140,10 @@ impl_time_additive_assign_operator!(core::ops::AddAssign,add_assign);
 impl_time_additive_assign_operator!(core::ops::SubAssign,sub_assign);
 impl_time_additive_assign_operator!(core::ops::RemAssign,rem_assign);
 impl<T> std::ops::Mul for Time<T>{
-	type Output=Ratio<Fixed<2,64>,Fixed<2,64>>;
+	type Output=Ratio<F128_64,F128_64>;
 	#[inline]
 	fn mul(self,rhs:Self)->Self::Output{
-		Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
+		Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::from_u64(1_000_000_000u64.pow(2)))
 	}
 }
 macro_rules! impl_time_i64_rhs_operator {
@@ -148,14 +162,28 @@ impl_time_i64_rhs_operator!(Mul,mul);
 impl_time_i64_rhs_operator!(Shr,shr);
 impl_time_i64_rhs_operator!(Shl,shl);
 impl<T> core::ops::Mul<Time<T>> for Planar64{
-	type Output=Ratio<Fixed<2,64>,Planar64>;
+	type Output=Ratio<F128_64,Planar64>;
+	#[inline]
 	fn mul(self,rhs:Time<T>)->Self::Output{
 		Ratio::new(self*Fixed::raw(rhs.0),Planar64::raw(1_000_000_000))
 	}
 }
+impl<T> From<Time<T>> for f32{
+	#[inline]
+	fn from(value:Time<T>)->Self{
+		value.get() as f32/Time::<T>::ONE_SECOND.get() as f32
+	}
+}
+impl<T> From<Time<T>> for f64{
+	#[inline]
+	fn from(value:Time<T>)->Self{
+		value.get() as f64/Time::<T>::ONE_SECOND.get() as f64
+	}
+}
 #[cfg(test)]
 mod test_time{
 	use super::*;
+	use fixed_wide::types::F64_32;
 	type Time=AbsoluteTime;
 	#[test]
 	fn time_from_planar64(){
@@ -170,13 +198,13 @@ mod test_time{
 	#[test]
 	fn time_squared(){
 		let a=Time::from_secs(2);
-		assert_eq!(a*a,Ratio::new(Fixed::<2,64>::raw_digit(1_000_000_000i64.pow(2))*4,Fixed::<2,64>::raw_digit(1_000_000_000i64.pow(2))));
+		assert_eq!(a*a,Ratio::new(F128_64::from_u64(1_000_000_000u64.pow(2))*4,F128_64::from_u64(1_000_000_000u64.pow(2))));
 	}
 	#[test]
 	fn time_times_planar64(){
 		let a=Time::from_secs(2);
 		let b=Planar64::from(2);
-		assert_eq!(b*a,Ratio::new(Fixed::<2,64>::raw_digit(1_000_000_000*(1<<32))<<2,Fixed::<1,32>::raw_digit(1_000_000_000)));
+		assert_eq!(b*a,Ratio::new(F128_64::from_u64(1_000_000_000*(1<<32))<<2,F64_32::from_u64(1_000_000_000)));
 	}
 }
 
@@ -214,11 +242,11 @@ impl Ratio64{
 	}
 	#[inline]
 	pub const fn mul_int(&self,rhs:i64)->i64{
-		rhs*self.num/(self.den as i64)
+		(rhs as i128*self.num as i128/self.den as i128) as i64
 	}
 	#[inline]
 	pub const fn rhs_div_int(&self,rhs:i64)->i64{
-		rhs*(self.den as i64)/self.num
+		(rhs as i128*self.den as i128/self.num as i128) as i64
 	}
 	#[inline]
 	pub const fn mul_ref(&self,rhs:&Ratio64)->Ratio64{
@@ -263,7 +291,6 @@ fn integer_decode_f64(f: f64) -> (u64, i16, i8) {
 pub enum Ratio64TryFromFloatError{
 	Nan,
 	Infinite,
-	Subnormal,
 	HighlyNegativeExponent(i16),
 	HighlyPositiveExponent(i16),
 }
@@ -298,8 +325,10 @@ fn ratio64_from_mes((m,e,s):(u64,i16,i8))->Result<Ratio64,Ratio64TryFromFloatErr
 
 		Ok(Ratio64::new(num as i64,den as u64).unwrap())
 	}else if e<0{
+		// simple exact representation
 		Ok(Ratio64::new((m as i64)*(s as i64),1<<-e).unwrap())
 	}else if (64-m.leading_zeros() as i16)+e<64{
+		// integer
 		Ok(Ratio64::new((m as i64)*(s as i64)*(1<<e),1).unwrap())
 	}else{
 		Err(Ratio64TryFromFloatError::HighlyPositiveExponent(e))
@@ -331,6 +360,29 @@ impl TryFrom<f64> for Ratio64{
 		}
 	}
 }
+#[cfg(test)]
+fn req(r0:Ratio64,r1:Ratio64){
+	println!("r0={r0:?} r1={r1:?}");
+	assert_eq!(r0.num(),r1.num(),"Nums not eq");
+	assert_eq!(r0.den(),r1.den(),"Dens not eq");
+}
+#[test]
+fn test_ratio64_from_float(){
+	req(2.0.try_into().unwrap(),Ratio64::new(2,1).unwrap());
+	req(1.0.try_into().unwrap(),Ratio64::new(1,1).unwrap());
+	req(0.5.try_into().unwrap(),Ratio64::new(1,2).unwrap());
+	req(1.1.try_into().unwrap(),Ratio64::new(2476979795053773,2251799813685248).unwrap());
+	req(0.8.try_into().unwrap(),Ratio64::new(3602879701896397,4503599627370496).unwrap());
+	req(0.61.try_into().unwrap(),Ratio64::new(5494391545392005,9007199254740992).unwrap());
+	req(0.01.try_into().unwrap(),Ratio64::new(5764607523034235,576460752303423488).unwrap());
+	req(0.001.try_into().unwrap(),Ratio64::new(1152921504606847,1152921504606846976).unwrap());
+	req(0.00001.try_into().unwrap(),Ratio64::new(89605456633725,8960545663372499267).unwrap());
+	req(0.00000000001.try_into().unwrap(),Ratio64::new(35204848,3520484800000000213).unwrap());
+	req(0.000000000000000001.try_into().unwrap(),Ratio64::new(11,10999999999999999213).unwrap());
+	req(2222222222222.0.try_into().unwrap(),Ratio64::new(2222222222222,1).unwrap());
+	req(core::f64::consts::PI.try_into().unwrap(),Ratio64::new(884279719003555,281474976710656).unwrap());
+}
+
 impl std::ops::Mul<Ratio64> for Ratio64{
 	type Output=Ratio64;
 	#[inline]
@@ -520,8 +572,8 @@ fn angle_sin_cos(){
 		println!("cordic s={} c={}",(s/h).divide(),(c/h).divide());
 		let (fs,fc)=f.sin_cos();
 		println!("float s={} c={}",fs,fc);
-		assert!(close_enough((c/h).divide().wrap_1(),Planar64::raw((fc*((1u64<<32) as f64)) as i64)));
-		assert!(close_enough((s/h).divide().wrap_1(),Planar64::raw((fs*((1u64<<32) as f64)) as i64)));
+		assert!(close_enough((c/h).divide().wrap_64(),Planar64::raw((fc*((1u64<<32) as f64)) as i64)));
+		assert!(close_enough((s/h).divide().wrap_64(),Planar64::raw((fs*((1u64<<32) as f64)) as i64)));
 	}
 	test_angle(1.0);
 	test_angle(std::f64::consts::PI/4.0);
@@ -553,7 +605,7 @@ impl TryFrom<[f32;3]> for Unit32Vec3{
 */
 
 pub type Planar64TryFromFloatError=FixedFromFloatError;
-pub type Planar64=fixed_wide::types::I32F32;
+pub type Planar64=fixed_wide::types::F64_32;
 pub type Planar64Vec3=linear_ops::types::Vector3<Planar64>;
 pub type Planar64Mat3=linear_ops::types::Matrix3<Planar64>;
 pub mod vec3{
@@ -632,8 +684,8 @@ pub mod mat3{
 		let (yc,ys)=y.cos_sin();
 		Planar64Mat3::from_cols([
 			Planar64Vec3::new([xc,Planar64::ZERO,-xs]),
-			Planar64Vec3::new([(xs*ys).wrap_1(),yc,(xc*ys).wrap_1()]),
-			Planar64Vec3::new([(xs*yc).wrap_1(),-ys,(xc*yc).wrap_1()]),
+			Planar64Vec3::new([(xs*ys).wrap_64(),yc,(xc*ys).wrap_64()]),
+			Planar64Vec3::new([(xs*yc).wrap_64(),-ys,(xc*yc).wrap_64()]),
 		])
 	}
 	#[inline]
@@ -674,8 +726,8 @@ impl Planar64Affine3{
 		}
 	}
 	#[inline]
-	pub fn transform_point3(&self,point:Planar64Vec3)->vec3::Vector3<Fixed<2,64>>{
-		self.translation.widen_2()+self.matrix3*point
+	pub fn transform_point3(&self,point:Planar64Vec3)->vec3::Vector3<F128_64>{
+		self.translation.widen_128()+self.matrix3*point
 	}
 }
 impl Into<glam::Mat4> for Planar64Affine3{

lib/common/src/run.rs

@@ -53,36 +53,23 @@ impl std::fmt::Display for Error{
 impl std::error::Error for Error{}
 
 #[derive(Clone,Copy,Debug)]
-enum RunState{
+pub enum RunState{
 	Created,
 	Started{timer:TimerFixed<Realtime<PhysicsTimeInner,TimeInner>,Unpaused>},
 	Finished{timer:TimerFixed<Realtime<PhysicsTimeInner,TimeInner>,Paused>},
 }
-
-#[derive(Clone,Copy,Debug)]
-pub struct Run{
-	state:RunState,
-	flagged:Option<FlagReason>,
-}
-
-impl Run{
-	pub fn new()->Self{
-		Self{
-			state:RunState::Created,
-			flagged:None,
-		}
-	}
+impl RunState{
 	pub fn time(&self,time:PhysicsTime)->Time{
-		match &self.state{
+		match &self{
 			RunState::Created=>Time::ZERO,
 			RunState::Started{timer}=>timer.time(time),
 			RunState::Finished{timer}=>timer.time(),
 		}
 	}
 	pub fn start(&mut self,time:PhysicsTime)->Result<(),Error>{
-		match &self.state{
+		match &self{
 			RunState::Created=>{
-				self.state=RunState::Started{
+				*self=RunState::Started{
 					timer:TimerFixed::new(time,Time::ZERO),
 				};
 				Ok(())
@@ -93,10 +80,10 @@ impl Run{
 	}
 	pub fn finish(&mut self,time:PhysicsTime)->Result<(),Error>{
 		//this uses Copy
-		match &self.state{
+		match &self{
 			RunState::Created=>Err(Error::NotStarted),
 			RunState::Started{timer}=>{
-				self.state=RunState::Finished{
+				*self=RunState::Finished{
 					timer:timer.into_paused(time),
 				};
 				Ok(())
@@ -104,12 +91,39 @@ impl Run{
 			RunState::Finished{..}=>Err(Error::AlreadyFinished),
 		}
 	}
+}
+
+#[derive(Clone,Copy,Debug)]
+pub struct Run{
+	state:RunState,
+	flag_reason:Option<FlagReason>,
+}
+
+impl Run{
+	pub fn new()->Self{
+		Self{
+			state:RunState::Created,
+			flag_reason:None,
+		}
+	}
+	pub fn time(&self,time:PhysicsTime)->Time{
+		self.state.time(time)
+	}
+	pub fn start(&mut self,time:PhysicsTime)->Result<(),Error>{
+		self.state.start(time)
+	}
+	pub fn finish(&mut self,time:PhysicsTime)->Result<(),Error>{
+		self.state.finish(time)
+	}
 	pub fn flag(&mut self,flag_reason:FlagReason){
 		//don't replace the first reason the run was flagged
-		if self.flagged.is_none(){
-			self.flagged=Some(flag_reason);
+		if self.flag_reason.is_none(){
+			self.flag_reason=Some(flag_reason);
 		}
 	}
+	pub fn flag_reason(&self)->Option<FlagReason>{
+		self.flag_reason
+	}
 	pub fn get_finish_time(&self)->Option<Time>{
 		match &self.state{
 			RunState::Finished{timer}=>Some(timer.time()),

lib/common/src/timer.rs

@@ -69,10 +69,8 @@ impl<In,Out> Scaled<In,Out>
 	const fn get_scale(&self)->Ratio64{
 		self.scale
 	}
-	fn set_scale(&mut self,time:Time<In>,new_scale:Ratio64){
-		let new_time=self.get_time(time);
+	const fn set_scale(&mut self,new_scale:Ratio64){
 		self.scale=new_scale;
-		self.set_time(time,new_time);
 	}
 }
 
@@ -132,7 +130,7 @@ pub struct TimerFixed<T:TimerState,P:PauseState>{
 	_paused:P,
 }
 
-//scaled timer methods are generic across PauseState
+//some scaled timer methods are generic across PauseState
 impl<P:PauseState,In,Out> TimerFixed<Scaled<In,Out>,P>
 	where Time<In>:Copy,
 {
@@ -147,8 +145,22 @@ impl<P:PauseState,In,Out> TimerFixed<Scaled<In,Out>,P>
 	pub const fn get_scale(&self)->Ratio64{
 		self.state.get_scale()
 	}
+}
+// setting the scale of an unpaused timer is different than a paused timer
+impl<In,Out> TimerFixed<Scaled<In,Out>,Unpaused>
+	where Time<In>:Copy,
+{
 	pub fn set_scale(&mut self,time:Time<In>,new_scale:Ratio64){
-		self.state.set_scale(time,new_scale)
+		let new_time=self.state.get_time(time);
+		self.state.set_scale(new_scale);
+		self.state.set_time(time,new_time);
+	}
+}
+impl<In,Out> TimerFixed<Scaled<In,Out>,Paused>
+	where Time<In>:Copy,
+{
+	pub fn set_scale(&mut self,new_scale:Ratio64){
+		self.state.set_scale(new_scale);
 	}
 }
 
@@ -305,7 +317,7 @@ impl<In,Out> Timer<Scaled<In,Out>>
 	}
 	pub fn set_scale(&mut self,time:Time<In>,new_scale:Ratio64){
 		match self{
-			Self::Paused(timer)=>timer.set_scale(time,new_scale),
+			Self::Paused(timer)=>timer.set_scale(new_scale),
 			Self::Unpaused(timer)=>timer.set_scale(time,new_scale),
 		}
 	}

lib/deferred_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_deferred_loader"
-version = "0.5.1"
+version = "0.6.0"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -10,7 +10,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

lib/fixed_wide/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fixed_wide"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -14,10 +14,10 @@ wide-mul=[]
 zeroes=["dep:arrayvec"]
 
 [dependencies]
-bnum = "0.13.0"
+bnum = "0.14.3"
 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 = { workspace = true, optional = true }
 
 [lints]
 workspace = true

lib/fixed_wide/src/lib.rs

@@ -1,5 +1,4 @@
 pub mod fixed;
-pub mod ratio;
 pub mod types;
 
 #[cfg(feature="zeroes")]

lib/fixed_wide/src/ratio.rs

@@ -1,22 +0,0 @@
-use bnum::{BInt,BUInt,cast::As};
-use crate::fixed::Fixed;
-
-pub struct Ratio<const N:usize,const D:usize,const NF:usize,const DF:usize>{
-	num:BInt<{N}>,
-	den:BUInt<{D}>,
-}
-
-// Fixed<N = 8 bits,NF = 4 frac> / Fixed<D = 8 bits,DF = 3 frac>
-// 0100.0000/00100.000
-// 01000000<<DF/00100000 = 10>>NF
-
-impl Ratio{
-	/// Evaluate a ratio to a specific precision
-	pub fn evaluate<const OUT_N:usize,const OUT_F:usize>(&self)->Fixed<OUT_N,OUT_F>{
-		// TODO: Think (this is completely wrong)
-		// (lhs/2^LHS_FRAC)/(rhs/2^RHS_FRAC)
-		let lhs=num.bits.as_::<BInt<OUT_N>>().shl(OUT_N*64);
-		let rhs=rhs.bits.as_::<BInt<OUT_N>>();
-		Fixed::from_bits(lhs/rhs)
-	}
-}

lib/fixed_wide/src/tests.rs

@@ -1,208 +1,273 @@
-use crate::types::I32F32;
-use crate::types::I256F256;
+use crate::fixed::Fixed;
+use crate::types::{F64_32,F128_64,F192_96,F512_256};
 
 #[test]
 fn you_can_add_numbers(){
-	let a=I256F256::from((3i128*2).pow(4));
-	assert_eq!(a+a,I256F256::from((3i128*2).pow(4)*2));
+	let a=F512_256::from((3i128*2).pow(4));
+	assert_eq!(a+a,F512_256::from((3i128*2).pow(4)*2));
+}
+
+macro_rules! test_bit_by_bit{
+	($n:expr,$float:ty,$mantissa_bits:expr)=>{{
+		const MANT:u64=(1<<$mantissa_bits)-1;
+		// all bits in range
+		for i in 0..$n-$mantissa_bits{
+			let a=Fixed::<{$n/8},{$n>>1}>::from_bits(bnum::cast::As::as_::<bnum::Int::<{$n/8}>>(MANT).shl(i));
+			let b=(MANT as $float)*(2.0 as $float).powi(i as i32-{$n>>1});
+			let f:$float=a.into();
+			assert_eq!(f,b,"F{}_{} Into float {i}",$n,$n>>1);
+			assert_eq!(a,b.try_into().unwrap(),"F{}_{} From float {i}",$n,$n>>1);
+		}
+		// underflow
+		for i in 0u32..$mantissa_bits{
+			let a=Fixed::<{$n/8},{$n>>1}>::from_bits(bnum::cast::As::as_::<bnum::Int::<{$n/8}>>(MANT>>i));
+			let b=((MANT>>i) as $float)*(2.0 as $float).powi(-{$n>>1});
+			let f:$float=a.into();
+			assert_eq!(f,b,"Underflow F{}_{} Into float {i}",$n,$n>>1);
+			assert_eq!(a,b.try_into().unwrap(),"Underflow F{}_{} From float {i}",$n,$n>>1);
+		}
+	}};
+}
+
+#[test]
+fn test_many(){
+	test_bit_by_bit!(64,f32,24);
+	test_bit_by_bit!(128,f32,24);
+	// f32 is reaching its limits here
+	// test_bit_by_bit!(256,f32,24);
+	// test_bit_by_bit!(512,f32,24);
+	test_bit_by_bit!(64,f64,53);
+	test_bit_by_bit!(128,f64,53);
+	test_bit_by_bit!(256,f64,53);
+	test_bit_by_bit!(512,f64,53);
 }
 
 #[test]
 fn to_f32(){
-	let a=I256F256::from(1)>>2;
+	let a=F64_32::ZERO;
+	let f:f32=a.into();
+	assert_eq!(f,0.0f32);
+	let a=F64_32::from(1)>>2;
 	let f:f32=a.into();
 	assert_eq!(f,0.25f32);
 	let f:f32=(-a).into();
 	assert_eq!(f,-0.25f32);
-	let a=I256F256::from(0);
+	let a=F64_32::MIN;
+	let f:f32=a.into();
+	assert_eq!(f,i32::MIN as f32);
+	let a=F512_256::from(1)>>2;
+	let f:f32=a.into();
+	assert_eq!(f,0.25f32);
+	let f:f32=(-a).into();
+	assert_eq!(f,-0.25f32);
+	let a=F512_256::from(0);
 	let f:f32=(-a).into();
 	assert_eq!(f,0f32);
-	let a=I256F256::from(237946589723468975i64)<<16;
+	let a=F512_256::from(237946589723468975i64)<<16;
 	let f:f32=a.into();
 	assert_eq!(f,237946589723468975f32*2.0f32.powi(16));
 }
 
 #[test]
 fn to_f64(){
-	let a=I256F256::from(1)>>2;
+	let a=F64_32::ZERO;
+	let f:f64=a.into();
+	assert_eq!(f,0.0f64);
+	let a=F64_32::from(1)>>2;
 	let f:f64=a.into();
 	assert_eq!(f,0.25f64);
 	let f:f64=(-a).into();
 	assert_eq!(f,-0.25f64);
-	let a=I256F256::from(0);
+	let a=F64_32::MIN;
+	let f:f64=a.into();
+	assert_eq!(f,i32::MIN as f64);
+	let a=F512_256::from(1)>>2;
+	let f:f64=a.into();
+	assert_eq!(f,0.25f64);
+	let f:f64=(-a).into();
+	assert_eq!(f,-0.25f64);
+	let a=F512_256::from(0);
 	let f:f64=(-a).into();
 	assert_eq!(f,0f64);
-	let a=I256F256::from(237946589723468975i64)<<16;
+	let a=F512_256::from(237946589723468975i64)<<16;
 	let f:f64=a.into();
 	assert_eq!(f,237946589723468975f64*2.0f64.powi(16));
 }
 
 #[test]
 fn from_f32(){
-	let a=I256F256::from(1)>>2;
-	let b:Result<I256F256,_>=0.25f32.try_into();
+	let a=F64_32::ZERO;
+	let b:Result<F64_32,_>=0.0f32.try_into();
 	assert_eq!(b,Ok(a));
-	let a=I256F256::from(-1)>>2;
-	let b:Result<I256F256,_>=(-0.25f32).try_into();
+	let a=F512_256::from(1)>>2;
+	let b:Result<F512_256,_>=0.25f32.try_into();
 	assert_eq!(b,Ok(a));
-	let a=I256F256::from(0);
-	let b:Result<I256F256,_>=0.try_into();
+	let a=F512_256::from(-1)>>2;
+	let b:Result<F512_256,_>=(-0.25f32).try_into();
 	assert_eq!(b,Ok(a));
-	let a=I256F256::from(0b101011110101001010101010000000000000000000000000000i64)<<16;
-	let b:Result<I256F256,_>=(0b101011110101001010101010000000000000000000000000000u64 as f32*2.0f32.powi(16)).try_into();
+	let a=F512_256::from(0);
+	let b:Result<F512_256,_>=0.try_into();
+	assert_eq!(b,Ok(a));
+	let a=F512_256::from(0b101011110101001010101010000000000000000000000000000i64)<<16;
+	let b:Result<F512_256,_>=(0b101011110101001010101010000000000000000000000000000u64 as f32*2.0f32.powi(16)).try_into();
 	assert_eq!(b,Ok(a));
 	//I32F32::MAX into f32 is truncated into this value
-	let a=I32F32::raw(0b111111111111111111111111000000000000000000000000000000000000000i64);
-	let b:Result<I32F32,_>=Into::<f32>::into(I32F32::MAX).try_into();
+	let a=F64_32::raw(0b111111111111111111111111000000000000000000000000000000000000000i64);
+	let b:Result<F64_32,_>=Into::<f32>::into(F64_32::MAX).try_into();
 	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 b:Result<I32F32,_>=Into::<f32>::into(I32F32::MIN).try_into();
+	let a=F64_32::MIN;
+	let f:f32=a.into();
+	let b:Result<F64_32,_>=f.try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Overflow));
 	//16 is within the 24 bits of float precision
-	let b:Result<I32F32,_>=Into::<f32>::into(-I32F32::MIN.widen_2()).try_into();
+	let a=-F64_32::MIN.widen_128();
+	let f:f32=a.into();
+	let b:Result<F64_32,_>=f.try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Overflow));
-	let b:Result<I32F32,_>=f32::MIN_POSITIVE.try_into();
+	let b:Result<F64_32,_>=f32::MIN_POSITIVE.try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Underflow));
 	//test many cases
 	for i in 0..64{
-		let a=crate::fixed::Fixed::<2,64>::raw_digit(0b111111111111111111111111000000000000000000000000000000000000000i64)<<i;
+		let a=F128_64::from_u64(0b111111111111111111111111000000000000000000000000000000000000000u64)<<i;
 		let f:f32=a.into();
-		let b:Result<crate::fixed::Fixed<2,64>,_>=f.try_into();
+		let b:Result<F128_64,_>=f.try_into();
 		assert_eq!(b,Ok(a));
 	}
 }
 
 #[test]
 fn from_f64(){
-	let a=I256F256::from(1)>>2;
-	let b:Result<I256F256,_>=0.25f64.try_into();
+	let a=F64_32::ZERO;
+	let b:Result<F64_32,_>=0.0f64.try_into();
 	assert_eq!(b,Ok(a));
-	let a=I256F256::from(-1)>>2;
-	let b:Result<I256F256,_>=(-0.25f64).try_into();
+	let a=F512_256::from(1)>>2;
+	let b:Result<F512_256,_>=0.25f64.try_into();
 	assert_eq!(b,Ok(a));
-	let a=I256F256::from(0);
-	let b:Result<I256F256,_>=0.try_into();
+	let a=F512_256::from(-1)>>2;
+	let b:Result<F512_256,_>=(-0.25f64).try_into();
 	assert_eq!(b,Ok(a));
-	let a=I256F256::from(0b101011110101001010101010000000000000000000000000000i64)<<16;
-	let b:Result<I256F256,_>=(0b101011110101001010101010000000000000000000000000000u64 as f64*2.0f64.powi(16)).try_into();
+	let a=F512_256::from(0);
+	let b:Result<F512_256,_>=0.try_into();
+	assert_eq!(b,Ok(a));
+	let a=F512_256::from(0b101011110101001010101010000000000000000000000000000i64)<<16;
+	let b:Result<F512_256,_>=(0b101011110101001010101010000000000000000000000000000u64 as f64*2.0f64.powi(16)).try_into();
 	assert_eq!(b,Ok(a));
 }
 
 #[test]
 fn you_can_shr_numbers(){
-	let a=I32F32::from(4);
-	assert_eq!(a>>1,I32F32::from(2));
+	let a=F64_32::from(4);
+	assert_eq!(a>>1,F64_32::from(2));
 }
 
 #[test]
 fn test_wide_mul(){
-	let a=I32F32::ONE;
-	let aa=a.wide_mul_1_1(a);
-	assert_eq!(aa,crate::types::I64F64::ONE);
+	let a=F64_32::ONE;
+	let aa=a.wide_mul_64_64(a);
+	assert_eq!(aa,F128_64::ONE);
 }
 
 #[test]
 fn test_wide_div(){
-	let a=I32F32::ONE*4;
-	let b=I32F32::ONE*2;
-	let wide_a=a.wide_mul_1_1(I32F32::ONE);
-	let wide_b=b.wide_mul_1_1(I32F32::ONE);
-	let ab=a.wide_div_1_1(b);
-	assert_eq!(ab,crate::types::I64F64::ONE*2);
-	let wab=wide_a.wide_div_2_1(b);
-	assert_eq!(wab,crate::fixed::Fixed::<3,96>::ONE*2);
-	let awb=a.wide_div_1_2(wide_b);
-	assert_eq!(awb,crate::fixed::Fixed::<3,96>::ONE*2);
+	let a=F64_32::ONE*4;
+	let b=F64_32::ONE*2;
+	let wide_a=a.wide_mul_64_64(F64_32::ONE);
+	let wide_b=b.wide_mul_64_64(F64_32::ONE);
+	let ab=a.wide_div_64_64(b);
+	assert_eq!(ab,F128_64::ONE*2);
+	let wab=wide_a.wide_div_128_64(b);
+	assert_eq!(wab,F192_96::ONE*2);
+	let awb=a.wide_div_64_128(wide_b);
+	assert_eq!(awb,F192_96::ONE*2);
 }
 
 #[test]
 fn test_wide_mul_repeated() {
-	let a=I32F32::from(2);
-	let b=I32F32::from(3);
+	let a=F64_32::from(2);
+	let b=F64_32::from(3);
 
-	let w1=a.wide_mul_1_1(b);
-	let w2=w1.wide_mul_2_2(w1);
-	let w3=w2.wide_mul_4_4(w2);
+	let w1=a.wide_mul_64_64(b);
+	let w2=w1.wide_mul_128_128(w1);
+	let w3=w2.wide_mul_256_256(w2);
 
-	assert_eq!(w3,I256F256::from((3i128*2).pow(4)));
+	assert_eq!(w3,F512_256::from((3i128*2).pow(4)));
 }
 
 #[test]
 fn test_bint(){
-	let a=I32F32::ONE;
-	assert_eq!(a*2,I32F32::from(2));
+	let a=F64_32::ONE;
+	assert_eq!(a*2,F64_32::from(2));
 }
 
 #[test]
 fn test_wrap(){
-	assert_eq!(I32F32::ONE,I256F256::ONE.wrap_1());
-	assert_eq!(I32F32::NEG_ONE,I256F256::NEG_ONE.wrap_1());
+	assert_eq!(F64_32::ONE,F512_256::ONE.wrap_64());
+	assert_eq!(F64_32::NEG_ONE,F512_256::NEG_ONE.wrap_64());
 }
 #[test]
 fn test_narrow(){
-	assert_eq!(Ok(I32F32::ONE),I256F256::ONE.narrow_1());
-	assert_eq!(Ok(I32F32::NEG_ONE),I256F256::NEG_ONE.narrow_1());
+	assert_eq!(Ok(F64_32::ONE),F512_256::ONE.narrow_64());
+	assert_eq!(Ok(F64_32::NEG_ONE),F512_256::NEG_ONE.narrow_64());
 }
 #[test]
 fn test_widen(){
-	assert_eq!(I32F32::ONE.widen_8(),I256F256::ONE);
-	assert_eq!(I32F32::NEG_ONE.widen_8(),I256F256::NEG_ONE);
+	assert_eq!(F64_32::ONE.widen_512(),F512_256::ONE);
+	assert_eq!(F64_32::NEG_ONE.widen_512(),F512_256::NEG_ONE);
 }
 #[test]
 fn test_clamp(){
-	assert_eq!(I32F32::ONE,I256F256::ONE.clamp_1());
-	assert_eq!(I32F32::NEG_ONE,I256F256::NEG_ONE.clamp_1());
+	assert_eq!(F64_32::ONE,F512_256::ONE.clamp_64());
+	assert_eq!(F64_32::NEG_ONE,F512_256::NEG_ONE.clamp_64());
 }
 #[test]
 fn test_sqrt(){
-	let a=I32F32::ONE*4;
-	assert_eq!(a.sqrt(),I32F32::from(2));
+	let a=F64_32::ONE*4;
+	assert_eq!(a.sqrt(),F64_32::from(2));
 }
 #[test]
 fn test_sqrt_zero(){
-	let a=I32F32::ZERO;
-	assert_eq!(a.sqrt(),I32F32::ZERO);
+	let a=F64_32::ZERO;
+	assert_eq!(a.sqrt(),F64_32::ZERO);
 }
 #[test]
 fn test_sqrt_low(){
-	let a=I32F32::HALF;
+	let a=F64_32::HALF;
 	let b=a.fixed_mul(a);
 	assert_eq!(b.sqrt(),a);
 }
-fn find_equiv_sqrt_via_f64(n:I32F32)->I32F32{
+fn find_equiv_sqrt_via_f64(n:F64_32)->F64_32{
 	//GIMME THEM BITS BOY
-	let &[bits]=n.to_bits().to_bits().digits();
-	let ibits=bits as i64;
+	let ibits=i64::from_le_bytes(n.to_bits().to_bytes());
 	let f=(ibits as f64)/((1u64<<32) as f64);
 	let f_ans=f.sqrt();
-	let i=(f_ans*((1u64<<32) as f64)) as i64;
-	let r=I32F32::from_bits(bnum::BInt::<1>::from(i));
+	let i=(f_ans*((1u64<<32) as f64)) as u64;
+	let r=F64_32::from_u64(i);
 	//mimic the behaviour of the algorithm,
 	//return the result if it truncates to the exact answer
-	if (r+I32F32::EPSILON).wide_mul_1_1(r+I32F32::EPSILON)==n.wide_mul_1_1(I32F32::ONE){
-		return r+I32F32::EPSILON;
+	if (r+F64_32::EPSILON).wide_mul_64_64(r+F64_32::EPSILON)==n.wide_mul_64_64(F64_32::ONE){
+		return r+F64_32::EPSILON;
 	}
-	if (r-I32F32::EPSILON).wide_mul_1_1(r-I32F32::EPSILON)==n.wide_mul_1_1(I32F32::ONE){
-		return r-I32F32::EPSILON;
+	if (r-F64_32::EPSILON).wide_mul_64_64(r-F64_32::EPSILON)==n.wide_mul_64_64(F64_32::ONE){
+		return r-F64_32::EPSILON;
 	}
 	return r;
 }
-fn test_exact(n:I32F32){
+fn test_exact(n:F64_32){
 	assert_eq!(n.sqrt(),find_equiv_sqrt_via_f64(n));
 }
 #[test]
 fn test_sqrt_exact(){
 	//43
 	for i in 0..((i64::MAX as f32).ln() as u32){
-		let n=I32F32::from_bits(bnum::BInt::<1>::from((i as f32).exp() as i64));
+		let n=F64_32::from_u64((i as f32).exp() as u64);
 		test_exact(n);
 	}
 }
 #[test]
 fn test_sqrt_max(){
-	let a=I32F32::MAX;
+	let a=F64_32::MAX;
 	test_exact(a);
 }
 #[test]
@@ -210,9 +275,9 @@ fn test_sqrt_max(){
 fn test_zeroes_normal(){
 	// (x-1)*(x+1)
 	// x^2-1
-	let zeroes=I32F32::zeroes2(I32F32::NEG_ONE,I32F32::ZERO,I32F32::ONE);
+	let zeroes=F64_32::zeroes2(F64_32::NEG_ONE,F64_32::ZERO,F64_32::ONE);
 	assert_eq!(zeroes,arrayvec::ArrayVec::from_iter([I32F32::NEG_ONE,I32F32::ONE]));
-	let zeroes=I32F32::zeroes2(I32F32::NEG_ONE*3,I32F32::ONE*2,I32F32::ONE);
+	let zeroes=F64_32::zeroes2(F64_32::NEG_ONE*3,F64_32::ONE*2,F64_32::ONE);
 	assert_eq!(zeroes,arrayvec::ArrayVec::from_iter([I32F32::NEG_ONE*3,I32F32::ONE]));
 }
 #[test]
@@ -220,25 +285,25 @@ fn test_zeroes_normal(){
 fn test_zeroes_deferred_division(){
 	// (x-1)*(x+1)
 	// x^2-1
-	let zeroes=I32F32::zeroes2(I32F32::NEG_ONE,I32F32::ZERO,I32F32::ONE);
+	let zeroes=F64_32::zeroes2(F64_32::NEG_ONE,F64_32::ZERO,F64_32::ONE);
 	assert_eq!(
 		zeroes,
 		arrayvec::ArrayVec::from_iter([
-			ratio_ops::ratio::Ratio::new(I32F32::ONE*2,I32F32::NEG_ONE*2),
-			ratio_ops::ratio::Ratio::new(I32F32::ONE*2,I32F32::ONE*2),
+			ratio_ops::ratio::Ratio::new(F64_32::ONE*2,F64_32::NEG_ONE*2),
+			ratio_ops::ratio::Ratio::new(F64_32::ONE*2,F64_32::ONE*2),
 		])
 	);
 }
 
 #[test]
 fn test_debug(){
-	assert_eq!(format!("{:?}",I32F32::EPSILON),"0.00000001");
-	assert_eq!(format!("{:?}",I32F32::ONE),"1.00000000");
-	assert_eq!(format!("{:?}",I32F32::TWO),"2.00000000");
-	assert_eq!(format!("{:?}",I32F32::MAX),"7fffffff.ffffffff");
-	assert_eq!(format!("{:?}",I32F32::try_from(core::f64::consts::PI).unwrap()),"3.243f6a88");
-	assert_eq!(format!("{:?}",I32F32::NEG_EPSILON),"-0.00000001");
-	assert_eq!(format!("{:?}",I32F32::NEG_ONE),"-1.00000000");
-	assert_eq!(format!("{:?}",I32F32::NEG_TWO),"-2.00000000");
-	assert_eq!(format!("{:?}",I32F32::MIN),"-80000000.00000000");
+	assert_eq!(format!("{:?}",F64_32::EPSILON),"0.00000001");
+	assert_eq!(format!("{:?}",F64_32::ONE),"1.00000000");
+	assert_eq!(format!("{:?}",F64_32::TWO),"2.00000000");
+	assert_eq!(format!("{:?}",F64_32::MAX),"7fffffff.ffffffff");
+	assert_eq!(format!("{:?}",F64_32::try_from(core::f64::consts::PI).unwrap()),"3.243f6a88");
+	assert_eq!(format!("{:?}",F64_32::NEG_EPSILON),"-0.00000001");
+	assert_eq!(format!("{:?}",F64_32::NEG_ONE),"-1.00000000");
+	assert_eq!(format!("{:?}",F64_32::NEG_TWO),"-2.00000000");
+	assert_eq!(format!("{:?}",F64_32::MIN),"-80000000.00000000");
 }

lib/fixed_wide/src/types.rs

@@ -1,4 +1,7 @@
-pub type I32F32=crate::fixed::Fixed<1,32>;
-pub type I64F64=crate::fixed::Fixed<2,64>;
-pub type I128F128=crate::fixed::Fixed<4,128>;
-pub type I256F256=crate::fixed::Fixed<8,256>;
+use crate::fixed::BNUM_DIGIT_WIDTH;
+pub type F64_32=crate::fixed::Fixed<{64/BNUM_DIGIT_WIDTH},32>;
+pub type F128_64=crate::fixed::Fixed<{128/BNUM_DIGIT_WIDTH},64>;
+pub type F192_96=crate::fixed::Fixed<{192/BNUM_DIGIT_WIDTH},96>;
+pub type F256_128=crate::fixed::Fixed<{256/BNUM_DIGIT_WIDTH},128>;
+pub type F320_160=crate::fixed::Fixed<{320/BNUM_DIGIT_WIDTH},160>;
+pub type F512_256=crate::fixed::Fixed<{512/BNUM_DIGIT_WIDTH},256>;

lib/fixed_wide/src/zeroes.rs

@@ -1,18 +1,19 @@
 use crate::fixed::Fixed;
+use crate::fixed::BNUM_DIGIT_WIDTH;
 
 use arrayvec::ArrayVec;
 use std::cmp::Ordering;
 macro_rules! impl_zeroes{
 	($n:expr)=>{
-		impl Fixed<$n,{$n*32}>{
+		impl Fixed<{$n/BNUM_DIGIT_WIDTH},{$n>>1}>{
 			#[inline]
 			pub fn zeroes2(a0:Self,a1:Self,a2:Self)->ArrayVec<<Self as core::ops::Div>::Output,2>{
 				let a2pos=match a2.cmp(&Self::ZERO){
 					Ordering::Greater=>true,
-					Ordering::Equal=>return ArrayVec::from_iter(Self::zeroes1(a0,a1).into_iter()),
+					Ordering::Equal=>return ArrayVec::from_iter(Self::zeroes1(a0,a1)),
 					Ordering::Less=>false,
 				};
-				let radicand=a1*a1-a2*a0*4;
+				let radicand=a1*a1-((a2*a0)<<2);
 				match radicand.cmp(&<Self as core::ops::Mul>::Output::ZERO){
 					Ordering::Greater=>{
 						// using wrap because sqrt always halves the number of leading digits.
@@ -21,21 +22,21 @@ macro_rules! impl_zeroes{
 						let planar_radicand=radicand.sqrt().[<wrap_ $n>]();
 						}
 						//sort roots ascending and avoid taking the difference of large numbers
-						let zeroes=match (a2pos,Self::ZERO<a1){
-							(true, true )=>[(-a1-planar_radicand)/(a2*2),(a0*2)/(-a1-planar_radicand)],
-							(true, false)=>[(a0*2)/(-a1+planar_radicand),(-a1+planar_radicand)/(a2*2)],
-							(false,true )=>[(a0*2)/(-a1-planar_radicand),(-a1-planar_radicand)/(a2*2)],
-							(false,false)=>[(-a1+planar_radicand)/(a2*2),(a0*2)/(-a1+planar_radicand)],
+						let zeroes=match (a2pos,a1.is_positive()){
+							(true, true )=>[(-a1-planar_radicand)/(a2<<1),(a0<<1)/(-a1-planar_radicand)],
+							(true, false)=>[(a0<<1)/(-a1+planar_radicand),(-a1+planar_radicand)/(a2<<1)],
+							(false,true )=>[(a0<<1)/(-a1-planar_radicand),(-a1-planar_radicand)/(a2<<1)],
+							(false,false)=>[(-a1+planar_radicand)/(a2<<1),(a0<<1)/(-a1+planar_radicand)],
 						};
 						ArrayVec::from_iter(zeroes)
 					},
-					Ordering::Equal=>ArrayVec::from_iter([(a1)/(a2*-2)]),
+					Ordering::Equal=>ArrayVec::from_iter([(a1)/(-a2<<1)]),
 					Ordering::Less=>ArrayVec::new_const(),
 				}
 			}
 			#[inline]
 			pub fn zeroes1(a0:Self,a1:Self)->ArrayVec<<Self as core::ops::Div>::Output,1>{
-				if a1==Self::ZERO{
+				if a1.is_zero(){
 					ArrayVec::new_const()
 				}else{
 					ArrayVec::from_iter([(-a0)/(a1)])
@@ -44,10 +45,10 @@ macro_rules! impl_zeroes{
 		}
 	};
 }
-impl_zeroes!(1);
-impl_zeroes!(2);
-impl_zeroes!(3);
-impl_zeroes!(4);
+impl_zeroes!(64);
+impl_zeroes!(128);
+impl_zeroes!(192);
+impl_zeroes!(256);
 //sqrt doubles twice!
 //impl_zeroes!(5);
 //impl_zeroes!(6);

lib/linear_ops/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "linear_ops"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -14,12 +14,12 @@ 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.2.0", path = "../fixed_wide", registry = "strafesnet", optional = true }
+ratio_ops = { workspace = true, optional = true }
+fixed_wide = { workspace = true, optional = true }
 paste = { version = "1.0.15", optional = true }
 
 [dev-dependencies]
-fixed_wide = { path = "../fixed_wide", registry = "strafesnet", features = ["wide-mul"] }
+fixed_wide = { workspace = true, features = ["wide-mul"] }
 
 [lints]
 workspace = true

lib/linear_ops/src/macros/fixed_wide.rs

@@ -5,17 +5,17 @@ macro_rules! impl_fixed_wide_vector_not_const_generic {
 		(),
 		$n:expr
 	) => {
-		impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<$n,{$n*32}>>{
+		impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<{$n>>3},{$n>>1}>>{
 			#[inline]
-			pub fn length(self)-><fixed_wide::fixed::Fixed::<$n,{$n*32}> as core::ops::Mul>::Output{
+			pub fn length(self)-><fixed_wide::fixed::Fixed::<{$n>>3},{$n>>1}> as core::ops::Mul>::Output{
 				self.length_squared().sqrt_unchecked()
 			}
 			#[inline]
-			pub fn with_length<U,V>(self,length:U)-><Vector<N,V> as core::ops::Div<<fixed_wide::fixed::Fixed::<$n,{$n*32}> as core::ops::Mul>::Output>>::Output
+			pub fn with_length<U,V>(self,length:U)-><Vector<N,V> as core::ops::Div<<fixed_wide::fixed::Fixed::<{$n>>3},{$n>>1}> as core::ops::Mul>::Output>>::Output
 				where
-					fixed_wide::fixed::Fixed<$n,{$n*32}>:core::ops::Mul<U,Output=V>,
+					fixed_wide::fixed::Fixed<{$n>>3},{$n>>1}>:core::ops::Mul<U,Output=V>,
 					U:Copy,
-					V:core::ops::Div<<fixed_wide::fixed::Fixed::<$n,{$n*32}> as core::ops::Mul>::Output>,
+					V:core::ops::Div<<fixed_wide::fixed::Fixed::<{$n>>3},{$n>>1}> as core::ops::Mul>::Output>,
 			{
 				self*length/self.length()
 			}
@@ -27,7 +27,7 @@ macro_rules! impl_fixed_wide_vector_not_const_generic {
 #[macro_export(local_inner_macros)]
 macro_rules! macro_4 {
 	( $macro: ident, $any:tt ) => {
-		$crate::macro_repeated!($macro,$any,1,2,3,4);
+		$crate::macro_repeated!($macro,$any,64,128,192,256);
 	}
 }
 
@@ -39,40 +39,40 @@ macro_rules! impl_fixed_wide_vector {
 		// I LOVE NOT BEING ABLE TO USE CONST GENERICS
 		$crate::macro_repeated!(
 			impl_narrow_not_const_generic,(),
-			(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1),(11,1),(12,1),(13,1),(14,1),(15,1),(16,1),(17,1),
-			(3,2),(4,2),(5,2),(6,2),(7,2),(8,2),(9,2),(10,2),(11,2),(12,2),(13,2),(14,2),(15,2),(16,2),
-			(4,3),(5,3),(6,3),(7,3),(8,3),(9,3),(10,3),(11,3),(12,3),(13,3),(14,3),(15,3),(16,3),
-			(5,4),(6,4),(7,4),(8,4),(9,4),(10,4),(11,4),(12,4),(13,4),(14,4),(15,4),(16,4),
-			(6,5),(7,5),(8,5),(9,5),(10,5),(11,5),(12,5),(13,5),(14,5),(15,5),(16,5),
-			(7,6),(8,6),(9,6),(10,6),(11,6),(12,6),(13,6),(14,6),(15,6),(16,6),
-			(8,7),(9,7),(10,7),(11,7),(12,7),(13,7),(14,7),(15,7),(16,7),
-			(9,8),(10,8),(11,8),(12,8),(13,8),(14,8),(15,8),(16,8),
-			(10,9),(11,9),(12,9),(13,9),(14,9),(15,9),(16,9),
-			(11,10),(12,10),(13,10),(14,10),(15,10),(16,10),
-			(12,11),(13,11),(14,11),(15,11),(16,11),
-			(13,12),(14,12),(15,12),(16,12),
-			(14,13),(15,13),(16,13),
-			(15,14),(16,14),
-			(16,15)
+			(128,64),(192,64),(256,64),(320,64),(384,64),(448,64),(512,64),(576,64),(640,64),(704,64),(768,64),(832,64),(896,64),(960,64),(1024,64),(1088,64),
+			(192,128),(256,128),(320,128),(384,128),(448,128),(512,128),(576,128),(640,128),(704,128),(768,128),(832,128),(896,128),(960,128),(1024,128),
+			(256,192),(320,192),(384,192),(448,192),(512,192),(576,192),(640,192),(704,192),(768,192),(832,192),(896,192),(960,192),(1024,192),
+			(320,256),(384,256),(448,256),(512,256),(576,256),(640,256),(704,256),(768,256),(832,256),(896,256),(960,256),(1024,256),
+			(384,320),(448,320),(512,320),(576,320),(640,320),(704,320),(768,320),(832,320),(896,320),(960,320),(1024,320),
+			(448,384),(512,384),(576,384),(640,384),(704,384),(768,384),(832,384),(896,384),(960,384),(1024,384),
+			(512,448),(576,448),(640,448),(704,448),(768,448),(832,448),(896,448),(960,448),(1024,448),
+			(576,512),(640,512),(704,512),(768,512),(832,512),(896,512),(960,512),(1024,512),
+			(640,576),(704,576),(768,576),(832,576),(896,576),(960,576),(1024,576),
+			(704,640),(768,640),(832,640),(896,640),(960,640),(1024,640),
+			(768,704),(832,704),(896,704),(960,704),(1024,704),
+			(832,768),(896,768),(960,768),(1024,768),
+			(896,832),(960,832),(1024,832),
+			(960,896),(1024,896),
+			(1024,960)
 		);
 		$crate::macro_repeated!(
 			impl_widen_not_const_generic,(),
-			(1,2),
-			(1,3),(2,3),
-			(1,4),(2,4),(3,4),
-			(1,5),(2,5),(3,5),(4,5),
-			(1,6),(2,6),(3,6),(4,6),(5,6),
-			(1,7),(2,7),(3,7),(4,7),(5,7),(6,7),
-			(1,8),(2,8),(3,8),(4,8),(5,8),(6,8),(7,8),
-			(1,9),(2,9),(3,9),(4,9),(5,9),(6,9),(7,9),(8,9),
-			(1,10),(2,10),(3,10),(4,10),(5,10),(6,10),(7,10),(8,10),(9,10),
-			(1,11),(2,11),(3,11),(4,11),(5,11),(6,11),(7,11),(8,11),(9,11),(10,11),
-			(1,12),(2,12),(3,12),(4,12),(5,12),(6,12),(7,12),(8,12),(9,12),(10,12),(11,12),
-			(1,13),(2,13),(3,13),(4,13),(5,13),(6,13),(7,13),(8,13),(9,13),(10,13),(11,13),(12,13),
-			(1,14),(2,14),(3,14),(4,14),(5,14),(6,14),(7,14),(8,14),(9,14),(10,14),(11,14),(12,14),(13,14),
-			(1,15),(2,15),(3,15),(4,15),(5,15),(6,15),(7,15),(8,15),(9,15),(10,15),(11,15),(12,15),(13,15),(14,15),
-			(1,16),(2,16),(3,16),(4,16),(5,16),(6,16),(7,16),(8,16),(9,16),(10,16),(11,16),(12,16),(13,16),(14,16),(15,16),
-			(1,17)
+			(64,128),
+			(64,192),(128,192),
+			(64,256),(128,256),(192,256),
+			(64,320),(128,320),(192,320),(256,320),
+			(64,384),(128,384),(192,384),(256,384),(320,384),
+			(64,448),(128,448),(192,448),(256,448),(320,448),(384,448),
+			(64,512),(128,512),(192,512),(256,512),(320,512),(384,512),(448,512),
+			(64,576),(128,576),(192,576),(256,576),(320,576),(384,576),(448,576),(512,576),
+			(64,640),(128,640),(192,640),(256,640),(320,640),(384,640),(448,640),(512,640),(576,640),
+			(64,704),(128,704),(192,704),(256,704),(320,704),(384,704),(448,704),(512,704),(576,704),(640,704),
+			(64,768),(128,768),(192,768),(256,768),(320,768),(384,768),(448,768),(512,768),(576,768),(640,768),(704,768),
+			(64,832),(128,832),(192,832),(256,832),(320,832),(384,832),(448,832),(512,832),(576,832),(640,832),(704,832),(768,832),
+			(64,896),(128,896),(192,896),(256,896),(320,896),(384,896),(448,896),(512,896),(576,896),(640,896),(704,896),(768,896),(832,896),
+			(64,960),(128,960),(192,960),(256,960),(320,960),(384,960),(448,960),(512,960),(576,960),(640,960),(704,960),(768,960),(832,960),(896,960),
+			(64,1024),(128,1024),(192,1024),(256,1024),(320,1024),(384,1024),(448,1024),(512,1024),(576,1024),(640,1024),(704,1024),(768,1024),(832,1024),(896,1024),(960,1024),
+			(64,1088)
 		);
 		impl<const N:usize,T:fixed_wide::fixed::Wrap<U>,U> fixed_wide::fixed::Wrap<Vector<N,U>> for Vector<N,T>
 		{
@@ -98,17 +98,17 @@ macro_rules! impl_narrow_not_const_generic{
 		($lhs:expr,$rhs:expr)
 	)=>{
 		paste::item!{
-			impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<$lhs,{$lhs*32}>>{
+			impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<{$lhs>>3},{$lhs>>1}>>{
 				#[inline]
-				pub fn [<wrap_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
+				pub fn [<wrap_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<{$rhs>>3},{$rhs>>1}>>{
 					self.map(|t|t.[<wrap_ $rhs>]())
 				}
 				#[inline]
-				pub fn [<narrow_ $rhs>](self)->Vector<N,Result<fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>,fixed_wide::fixed::NarrowError>>{
+				pub fn [<narrow_ $rhs>](self)->Vector<N,Result<fixed_wide::fixed::Fixed<{$rhs>>3},{$rhs>>1}>,fixed_wide::fixed::NarrowError>>{
 					self.map(|t|t.[<narrow_ $rhs>]())
 				}
 				#[inline]
-				pub fn [<clamp_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
+				pub fn [<clamp_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<{$rhs>>3},{$rhs>>1}>>{
 					self.map(|t|t.[<clamp_ $rhs>]())
 				}
 			}
@@ -123,9 +123,9 @@ macro_rules! impl_widen_not_const_generic{
 		($lhs:expr,$rhs:expr)
 	)=>{
 		paste::item!{
-			impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<$lhs,{$lhs*32}>>{
+			impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<{$lhs>>3},{$lhs>>1}>>{
 				#[inline]
-				pub fn [<widen_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
+				pub fn [<widen_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<{$rhs>>3},{$rhs>>1}>>{
 					self.map(|t|t.[<widen_ $rhs>]())
 				}
 			}

lib/linear_ops/src/tests/fixed_wide.rs

@@ -1,9 +1,9 @@
 use crate::types::{Matrix3,Matrix3x2,Matrix3x4,Matrix4x2,Vector3};
 
-type Planar64=fixed_wide::types::I32F32;
-type Planar64Wide1=fixed_wide::types::I64F64;
+type Planar64=fixed_wide::types::F64_32;
+type Planar64Wide1=fixed_wide::types::F128_64;
 //type Planar64Wide2=fixed_wide::types::I128F128;
-type Planar64Wide3=fixed_wide::types::I256F256;
+type Planar64Wide3=fixed_wide::types::F512_256;
 
 #[test]
 fn wide_vec3(){
@@ -72,7 +72,7 @@ fn wide_matrix_det(){
 	]);
 	// In[2]:= Det[{{1, 2, 3}, {4, 5, 7}, {6, 8, 9}}]
 	// Out[2]= 7
-	assert_eq!(m.det(),fixed_wide::fixed::Fixed::<3,96>::from(7));
+	assert_eq!(m.det(),fixed_wide::types::F192_96::from(7));
 }
 
 #[test]

lib/ratio_ops/.gitignore

@@ -0,0 +1 @@
+/target

lib/ratio_ops/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "ratio_ops"
+version = "0.1.1"
+edition = "2024"
+repository = "https://git.itzana.me/StrafesNET/strafe-project"
+license = "MIT OR Apache-2.0"
+description = "Ratio operations using trait bounds for avoiding division like the plague."
+authors = ["Rhys Lloyd <krakow20@gmail.com>"]
+
+[dependencies]
+
+[lints]
+workspace = true

lib/ratio_ops/LICENSE-APACHE

@@ -0,0 +1,176 @@
+                              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/ratio_ops/LICENSE-MIT

@@ -0,0 +1,23 @@
+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/ratio_ops/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod ratio;
+
+#[cfg(test)]
+mod tests;

lib/ratio_ops/src/ratio.rs

@@ -0,0 +1,302 @@
+#[derive(Clone,Copy,Debug,Hash)]
+pub struct Ratio<Num,Den>{
+	pub num:Num,
+	pub den:Den,
+}
+impl<Num,Den> Ratio<Num,Den>{
+	#[inline(always)]
+	pub const fn new(num:Num,den:Den)->Self{
+		Self{num,den}
+	}
+}
+
+/// The actual divide implementation, Div is replaced with a Ratio constructor
+pub trait Divide<Rhs=Self>{
+	type Output;
+	fn divide(self,rhs:Rhs)->Self::Output;
+}
+
+impl<Num,Den> Ratio<Num,Den>
+	where
+		Num:Divide<Den>,
+{
+	#[inline]
+	pub fn divide(self)-><Num as Divide<Den>>::Output{
+		self.num.divide(self.den)
+	}
+}
+
+//take care to use the ratio methods to avoid nested ratios
+
+impl<LhsNum,LhsDen> Ratio<LhsNum,LhsDen>{
+	#[inline]
+	pub fn mul_ratio<RhsNum,RhsDen>(self,rhs:Ratio<RhsNum,RhsDen>)->Ratio<<LhsNum as core::ops::Mul<RhsNum>>::Output,<LhsDen as core::ops::Mul<RhsDen>>::Output>
+		where
+			LhsNum:core::ops::Mul<RhsNum>,
+			LhsDen:core::ops::Mul<RhsDen>,
+	{
+		Ratio::new(self.num*rhs.num,self.den*rhs.den)
+	}
+	#[inline]
+	pub fn div_ratio<RhsNum,RhsDen>(self,rhs:Ratio<RhsNum,RhsDen>)->Ratio<<LhsNum as core::ops::Mul<RhsDen>>::Output,<LhsDen as core::ops::Mul<RhsNum>>::Output>
+		where
+			LhsNum:core::ops::Mul<RhsDen>,
+			LhsDen:core::ops::Mul<RhsNum>,
+	{
+		Ratio::new(self.num*rhs.den,self.den*rhs.num)
+	}
+}
+macro_rules! impl_ratio_method {
+	($trait:ident, $method:ident, $ratio_method:ident) => {
+		impl<LhsNum,LhsDen> Ratio<LhsNum,LhsDen>{
+			#[inline]
+			pub fn $ratio_method<RhsNum,RhsDen,LhsCrossMul,RhsCrossMul>(self,rhs:Ratio<RhsNum,RhsDen>)->Ratio<<LhsCrossMul as core::ops::$trait<RhsCrossMul>>::Output,<LhsDen as core::ops::Mul<RhsDen>>::Output>
+				where
+					LhsNum:core::ops::Mul<RhsDen,Output=LhsCrossMul>,
+					LhsDen:core::ops::Mul<RhsNum,Output=RhsCrossMul>,
+					LhsDen:core::ops::Mul<RhsDen>,
+					LhsDen:Copy,
+					RhsDen:Copy,
+					LhsCrossMul:core::ops::$trait<RhsCrossMul>,
+			{
+				Ratio::new((self.num*rhs.den).$method(self.den*rhs.num),self.den*rhs.den)
+			}
+		}
+	};
+}
+impl_ratio_method!(Add,add,add_ratio);
+impl_ratio_method!(Sub,sub,sub_ratio);
+impl_ratio_method!(Rem,rem,rem_ratio);
+
+/// Comparing two ratios needs to know the parity of the denominators
+/// For signed integers this can be implemented with is_negative()
+pub trait Parity{
+	fn parity(&self)->bool;
+}
+macro_rules! impl_parity_unsigned{
+	($($type:ty),*)=>{
+		$(
+		impl Parity for $type{
+			fn parity(&self)->bool{
+				false
+			}
+		}
+		)*
+	};
+}
+macro_rules! impl_parity_signed{
+	($($type:ty),*)=>{
+		$(
+		impl Parity for $type{
+			fn parity(&self)->bool{
+				self.is_negative()
+			}
+		}
+		)*
+	};
+}
+macro_rules! impl_parity_float{
+	($($type:ty),*)=>{
+		$(
+		impl Parity for $type{
+			fn parity(&self)->bool{
+				self.is_sign_negative()
+			}
+		}
+		)*
+	};
+}
+
+impl_parity_unsigned!(u8,u16,u32,u64,u128,usize);
+impl_parity_signed!(i8,i16,i32,i64,i128,isize);
+impl_parity_float!(f32,f64);
+
+macro_rules! impl_ratio_ord_method{
+	($method:ident, $ratio_method:ident, $output:ty)=>{
+		impl<LhsNum,LhsDen:Parity> Ratio<LhsNum,LhsDen>{
+			#[inline]
+			pub fn $ratio_method<RhsNum,RhsDen:Parity,T>(self,rhs:Ratio<RhsNum,RhsDen>)->$output
+				where
+					LhsNum:core::ops::Mul<RhsDen,Output=T>,
+					LhsDen:core::ops::Mul<RhsNum,Output=T>,
+					T:Ord,
+			{
+				match self.den.parity()^rhs.den.parity(){
+					true=>(self.den*rhs.num).$method(&(self.num*rhs.den)),
+					false=>(self.num*rhs.den).$method(&(self.den*rhs.num)),
+				}
+			}
+		}
+	}
+}
+//PartialEq
+impl_ratio_ord_method!(eq,eq_ratio,bool);
+//PartialOrd
+impl_ratio_ord_method!(lt,lt_ratio,bool);
+impl_ratio_ord_method!(gt,gt_ratio,bool);
+impl_ratio_ord_method!(le,le_ratio,bool);
+impl_ratio_ord_method!(ge,ge_ratio,bool);
+impl_ratio_ord_method!(partial_cmp,partial_cmp_ratio,Option<core::cmp::Ordering>);
+//Ord
+impl_ratio_ord_method!(cmp,cmp_ratio,core::cmp::Ordering);
+
+/* generic rhs mul is not possible!
+impl<Lhs,RhsNum,RhsDen> core::ops::Mul<Ratio<RhsNum,RhsDen>> for Lhs
+	where
+		Lhs:core::ops::Mul<RhsNum>,
+{
+	type Output=Ratio<<Lhs as core::ops::Mul<RhsNum>>::Output,RhsDen>;
+	#[inline]
+	fn mul(self,rhs:Ratio<RhsNum,RhsDen>)->Self::Output{
+		Ratio::new(self*rhs.num,rhs.den)
+	}
+}
+*/
+
+//operators
+
+impl<LhsNum,LhsDen> core::ops::Neg for Ratio<LhsNum,LhsDen>
+	where
+		LhsNum:core::ops::Neg,
+{
+	type Output=Ratio<<LhsNum as core::ops::Neg>::Output,LhsDen>;
+	#[inline]
+	fn neg(self)->Self::Output{
+		Ratio::new(-self.num,self.den)
+	}
+}
+impl<LhsNum,LhsDen,Rhs> core::ops::Mul<Rhs> for Ratio<LhsNum,LhsDen>
+	where
+		LhsNum:core::ops::Mul<Rhs>,
+{
+	type Output=Ratio<<LhsNum as core::ops::Mul<Rhs>>::Output,LhsDen>;
+	#[inline]
+	fn mul(self,rhs:Rhs)->Self::Output{
+		Ratio::new(self.num*rhs,self.den)
+	}
+}
+impl<LhsNum,LhsDen,Rhs> core::ops::Div<Rhs> for Ratio<LhsNum,LhsDen>
+	where
+		LhsDen:core::ops::Mul<Rhs>,
+{
+	type Output=Ratio<LhsNum,<LhsDen as core::ops::Mul<Rhs>>::Output>;
+	#[inline]
+	fn div(self,rhs:Rhs)->Self::Output{
+		Ratio::new(self.num,self.den*rhs)
+	}
+}
+
+macro_rules! impl_ratio_operator {
+	($trait:ident, $method:ident) => {
+		impl<LhsNum,LhsDen,Rhs,Intermediate> core::ops::$trait<Rhs> for Ratio<LhsNum,LhsDen>
+			where
+				LhsNum:core::ops::$trait<Intermediate>,
+				LhsDen:Copy,
+				Rhs:core::ops::Mul<LhsDen,Output=Intermediate>,
+		{
+			type Output=Ratio<<LhsNum as core::ops::$trait<Intermediate>>::Output,LhsDen>;
+			#[inline]
+			fn $method(self,rhs:Rhs)->Self::Output{
+				Ratio::new(self.num.$method(rhs*self.den),self.den)
+			}
+		}
+	};
+}
+
+impl_ratio_operator!(Add,add);
+impl_ratio_operator!(Sub,sub);
+impl_ratio_operator!(Rem,rem);
+
+//assign operators
+
+impl<LhsNum,LhsDen,Rhs> core::ops::MulAssign<Rhs> for Ratio<LhsNum,LhsDen>
+	where
+		LhsNum:core::ops::MulAssign<Rhs>,
+{
+	#[inline]
+	fn mul_assign(&mut self,rhs:Rhs){
+		self.num*=rhs;
+	}
+}
+impl<LhsNum,LhsDen,Rhs> core::ops::DivAssign<Rhs> for Ratio<LhsNum,LhsDen>
+	where
+		LhsDen:core::ops::MulAssign<Rhs>,
+{
+	#[inline]
+	fn div_assign(&mut self,rhs:Rhs){
+		self.den*=rhs;
+	}
+}
+
+macro_rules! impl_ratio_assign_operator {
+	($trait:ident, $method:ident) => {
+		impl<LhsNum,LhsDen,Rhs> core::ops::$trait<Rhs> for Ratio<LhsNum,LhsDen>
+			where
+				LhsNum:core::ops::$trait,
+				LhsDen:Copy,
+				Rhs:core::ops::Mul<LhsDen,Output=LhsNum>,
+		{
+			#[inline]
+			fn $method(&mut self,rhs:Rhs){
+				self.num.$method(rhs*self.den)
+			}
+		}
+	};
+}
+
+impl_ratio_assign_operator!(AddAssign,add_assign);
+impl_ratio_assign_operator!(SubAssign,sub_assign);
+impl_ratio_assign_operator!(RemAssign,rem_assign);
+
+// Only implement PartialEq<Self>
+// Rust's operators aren't actually that good
+
+impl<LhsNum,LhsDen,RhsNum,RhsDen,T,U> PartialEq<Ratio<RhsNum,RhsDen>> for Ratio<LhsNum,LhsDen>
+	where
+		LhsNum:Copy,
+		LhsDen:Copy,
+		RhsNum:Copy,
+		RhsDen:Copy,
+		LhsNum:core::ops::Mul<RhsDen,Output=T>,
+		RhsNum:core::ops::Mul<LhsDen,Output=U>,
+		T:PartialEq<U>,
+{
+	#[inline]
+	fn eq(&self,other:&Ratio<RhsNum,RhsDen>)->bool{
+		(self.num*other.den).eq(&(other.num*self.den))
+	}
+}
+impl<Num,Den> Eq for Ratio<Num,Den> where Self:PartialEq{}
+
+// Wow! These were both completely wrong!
+// Idea: use a 'signed' trait instead of parity and float the sign to the numerator.
+impl<LhsNum,LhsDen,RhsNum,RhsDen,T,U> PartialOrd<Ratio<RhsNum,RhsDen>> for Ratio<LhsNum,LhsDen>
+	where
+		LhsNum:Copy,
+		LhsDen:Copy+Parity,
+		RhsNum:Copy,
+		RhsDen:Copy+Parity,
+		LhsNum:core::ops::Mul<RhsDen,Output=T>,
+		LhsDen:core::ops::Mul<RhsNum,Output=T>,
+		RhsNum:core::ops::Mul<LhsDen,Output=U>,
+		RhsDen:core::ops::Mul<LhsNum,Output=U>,
+		T:PartialOrd<U>+Ord,
+{
+	#[inline]
+	fn partial_cmp(&self,&other:&Ratio<RhsNum,RhsDen>)->Option<core::cmp::Ordering>{
+		self.partial_cmp_ratio(other)
+	}
+}
+impl<Num,Den,T> Ord for Ratio<Num,Den>
+	where
+		Num:Copy,
+		Den:Copy+Parity,
+		Num:core::ops::Mul<Den,Output=T>,
+		Den:core::ops::Mul<Num,Output=T>,
+		T:Ord,
+{
+	#[inline]
+	fn cmp(&self,&other:&Self)->std::cmp::Ordering{
+		self.cmp_ratio(other)
+	}
+}

lib/ratio_ops/src/tests.rs

@@ -0,0 +1,58 @@
+use crate::ratio::Ratio;
+
+macro_rules! test_op{
+	($ratio_op:ident,$op:ident,$a:expr,$b:expr,$c:expr,$d:expr)=>{
+		assert_eq!(
+			Ratio::new($a,$b).$ratio_op(Ratio::new($c,$d)),
+			(($a as f32)/($b as f32)).$op(&(($c as f32)/($d as f32)))
+		);
+	};
+}
+
+macro_rules! test_many_ops{
+	($ratio_op:ident,$op:ident)=>{
+		test_op!($ratio_op,$op,1,2,3,4);
+		test_op!($ratio_op,$op,1,2,-3,4);
+		test_op!($ratio_op,$op,-1,2,-3,4);
+		test_op!($ratio_op,$op,-1,-2,-3,4);
+		test_op!($ratio_op,$op,2,1,6,3);
+		test_op!($ratio_op,$op,-2,1,6,3);
+		test_op!($ratio_op,$op,2,-1,-6,3);
+		test_op!($ratio_op,$op,2,1,6,-3);
+	};
+}
+
+#[test]
+fn test_lt(){
+	test_many_ops!(lt_ratio,lt);
+}
+
+#[test]
+fn test_gt(){
+	test_many_ops!(gt_ratio,gt);
+}
+
+#[test]
+fn test_le(){
+	test_many_ops!(le_ratio,le);
+}
+
+#[test]
+fn test_ge(){
+	test_many_ops!(ge_ratio,ge);
+}
+
+#[test]
+fn test_eq(){
+	test_many_ops!(eq_ratio,eq);
+}
+
+#[test]
+fn test_partial_cmp(){
+	test_many_ops!(partial_cmp_ratio,partial_cmp);
+}
+
+// #[test]
+// fn test_cmp(){
+// 	test_many_ops!(cmp_ratio,cmp);
+// }

lib/rbx_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_rbx_loader"
-version = "0.7.0"
+version = "0.10.2"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -11,13 +11,13 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 bytemuck = "1.14.3"
-glam = "0.30.0"
+glam.workspace = true
 regex = { version = "1.11.3", default-features = false, features = ["unicode-perl"] }
-rbx_mesh = "0.5.0"
+rbx_mesh = "0.6.0"
 rbxassetid = { version = "0.1.0", path = "../rbxassetid", registry = "strafesnet" }
 roblox_emulator = { version = "0.5.1", path = "../roblox_emulator", default-features = false, registry = "strafesnet" }
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
+strafesnet_common.workspace = true
+strafesnet_deferred_loader.workspace = true
 rbx_binary = "2.0.1"
 rbx_dom_weak = "4.1.0"
 rbx_reflection = "6.1.0"

lib/rbx_loader/src/error.rs

@@ -25,6 +25,8 @@ pub struct RecoverableErrors{
 	pub unsupported_class:HashSet<String>,
 	/// A decal has an invalid / missing property.
 	pub decal_property:Vec<InstancePath>,
+	/// A SurfaceAppearance has an invalid / missing property.
+	pub surface_appearance_property:Vec<InstancePath>,
 	/// A decal has an invalid normal_id.
 	pub normal_id:Vec<NormalIdError>,
 	/// A texture has an invalid / missing property.
@@ -58,6 +60,7 @@ impl RecoverableErrors{
 		self.meshpart_content.len()+
 		self.unsupported_class.len()+
 		self.decal_property.len()+
+		self.surface_appearance_property.len()+
 		self.normal_id.len()+
 		self.texture_property.len()+
 		self.mode_id_parse_int.len()+
@@ -145,6 +148,7 @@ impl core::fmt::Display for RecoverableErrors{
 			}
 		}
 		write_instance_path_error!(f,self,decal_property,"Decal is","Decals are","missing a property");
+		write_instance_path_error!(f,self,surface_appearance_property,"SurfaceAppearance is","SurfaceAppearances are","missing a property");
 		write_bespoke_error!(f,self,normal_id,"Decal","Decals","NormalId is invalid",path,normal_id);
 		write_instance_path_error!(f,self,texture_property,"Texture is","Textures are","missing a property");
 		write_bespoke_error!(f,self,mode_id_parse_int,"ModeId","ModeIds","failed to parse",context,error);

lib/rbx_loader/src/lib.rs

@@ -1,41 +1,22 @@
-use std::io::Read;
 use rbx_dom_weak::WeakDom;
 use roblox_emulator::context::Context;
-use strafesnet_common::map::CompleteMap;
-use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
 
 pub use error::RecoverableErrors;
 pub use roblox_emulator::runner::Error as RunnerError;
 
-mod rbx;
-mod mesh;
+pub mod rbx;
+pub mod mesh;
 mod error;
-mod union;
-pub mod loader;
+pub mod union;
 pub mod primitives;
 
-pub mod data{
-	pub struct RobloxMeshBytes(Vec<u8>);
-	impl RobloxMeshBytes{
-		pub fn new(bytes:Vec<u8>)->Self{
-			Self(bytes)
-		}
-		pub(crate) fn cursor(self)->std::io::Cursor<Vec<u8>>{
-			std::io::Cursor::new(self.0)
-		}
-	}
-}
-
 pub struct Model{
 	dom:WeakDom,
 }
 impl Model{
-	fn new(dom:WeakDom)->Self{
+	pub fn new(dom:WeakDom)->Self{
 		Self{dom}
 	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<(CompleteMap,RecoverableErrors),LoadError>{
-		to_snf(self,failure_mode)
-	}
 }
 impl AsRef<WeakDom> for Model{
 	fn as_ref(&self)->&WeakDom{
@@ -66,9 +47,6 @@ impl Place{
 		}
 		Ok(errors)
 	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<(CompleteMap,RecoverableErrors),LoadError>{
-		to_snf(self,failure_mode)
-	}
 }
 impl AsRef<WeakDom> for Place{
 	fn as_ref(&self)->&WeakDom{
@@ -83,72 +61,3 @@ impl From<Model> for Place{
 		}
 	}
 }
-
-#[derive(Debug)]
-pub enum ReadError{
-	RbxBinary(rbx_binary::DecodeError),
-	RbxXml(rbx_xml::DecodeError),
-	Io(std::io::Error),
-	UnknownFileFormat,
-}
-impl std::fmt::Display for ReadError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for ReadError{}
-
-pub fn read<R:Read>(input:R)->Result<Model,ReadError>{
-	let mut buf=std::io::BufReader::new(input);
-	let peek=std::io::BufRead::fill_buf(&mut buf).map_err(ReadError::Io)?;
-	match peek.get(0..8){
-		Some(b"<roblox!")=>rbx_binary::from_reader(buf).map(Model::new).map_err(ReadError::RbxBinary),
-		Some(b"<roblox ")=>rbx_xml::from_reader_default(buf).map(Model::new).map_err(ReadError::RbxXml),
-		_=>Err(ReadError::UnknownFileFormat),
-	}
-}
-
-#[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<(CompleteMap,RecoverableErrors),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)?;
-
-	Ok(map_step2.add_render_configs_and_textures(render_configs))
-}

lib/rbx_loader/src/mesh.rs

@@ -5,11 +5,73 @@ use strafesnet_common::aabb::Aabb;
 use strafesnet_common::integer::vec3;
 use strafesnet_common::model::{self,ColorId,IndexedVertex,PolygonGroup,PolygonList,RenderConfigId,VertexId};
 
-use crate::loader::MeshWithSize;
+use crate::rbx::RobloxPartDescription;
+
+#[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:RobloxPartDescription,
+	},
+}
+#[derive(Hash,Eq,PartialEq)]
+pub struct MeshIndex<'a>{
+	pub mesh_type:MeshType<'a>,
+	pub 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: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,
+		}
+	}
+}
+
+#[derive(Clone)]
+pub struct MeshWithSize{
+	mesh:model::Mesh,
+	size:strafesnet_common::integer::Planar64Vec3,
+}
+impl MeshWithSize{
+	pub(crate) const fn new(
+		mesh:model::Mesh,
+		size:strafesnet_common::integer::Planar64Vec3,
+	)->Self{
+		Self{mesh,size}
+	}
+	pub const fn mesh(&self)->&model::Mesh{
+		&self.mesh
+	}
+	pub const fn size(&self)->strafesnet_common::integer::Planar64Vec3{
+		self.size
+	}
+}
 
 #[derive(Debug)]
 pub enum Error{
-	RbxMesh(rbx_mesh::mesh::Error)
+	NoPolygons,
+	RbxMesh(rbx_mesh::mesh::Error),
 }
 impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -60,6 +122,10 @@ fn ingest_vertices_truncated2(
 	))).collect()
 }
 
+fn new_polygon_list_checked(list:Vec<model::IndexedVertexList>)->Option<PolygonList>{
+	(!list.is_empty()).then_some(PolygonList::new(list))
+}
+
 fn ingest_faces2_lods3(
 	polygon_groups:&mut Vec<PolygonGroup>,
 	vertex_id_map:&HashMap<rbx_mesh::mesh::VertexId2,VertexId>,
@@ -67,21 +133,21 @@ fn ingest_faces2_lods3(
 	lods:&[rbx_mesh::mesh::Lod3],
 ){
 	//faces have to be split into polygon groups based on lod
-	polygon_groups.extend(lods.windows(2).map(|lod_pair|
-		PolygonGroup::PolygonList(PolygonList::new(faces[lod_pair[0].0 as usize..lod_pair[1].0 as usize].iter().filter_map(|rbx_mesh::mesh::Face2(v0,v1,v2)|
+	polygon_groups.extend(lods.windows(2).filter_map(|lod_pair|
+		Some(PolygonGroup::PolygonList(new_polygon_list_checked(faces[lod_pair[0].0 as usize..lod_pair[1].0 as usize].iter().filter_map(|rbx_mesh::mesh::Face2(v0,v1,v2)|
 			Some(vec![*vertex_id_map.get(&v0)?,*vertex_id_map.get(&v1)?,*vertex_id_map.get(&v2)?])
-		).collect()))
+		).collect())?))
 	))
 }
 
-pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithSize,Error>{
+pub fn convert(roblox_mesh_bytes:&[u8])->Result<MeshWithSize,Error>{
 	//generate that mesh boi
 	let mut polygon_groups=Vec::new();
 	let mut mb=model::MeshBuilder::new();
-	match rbx_mesh::read_versioned(roblox_mesh_bytes.cursor()).map_err(Error::RbxMesh)?{
+	match rbx_mesh::read_versioned(std::io::Cursor::new(roblox_mesh_bytes)).map_err(Error::RbxMesh)?{
 		rbx_mesh::mesh::Mesh::V1(mesh)=>{
 			let color_id=mb.acquire_color_id(glam::Vec4::ONE);
-			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.vertices.chunks_exact(3).filter_map(|trip|{
+			let polygon_list=new_polygon_list_checked(mesh.vertices.chunks_exact(3).filter_map(|trip|{
 				let mut ingest_vertex1=|vertex:&rbx_mesh::mesh::Vertex1|{
 					let vertex=IndexedVertex{
 						pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos).ok()?),
@@ -92,7 +158,10 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithS
 					Some(mb.acquire_vertex_id(vertex))
 				};
 				Some(vec![ingest_vertex1(&trip[0])?,ingest_vertex1(&trip[1])?,ingest_vertex1(&trip[2])?])
-			}).collect())));
+			}).collect());
+			if let Some(polygon_list)=polygon_list{
+				polygon_groups.push(PolygonGroup::PolygonList(polygon_list));
+			}
 		},
 		rbx_mesh::mesh::Mesh::V2(mesh)=>{
 			let vertex_id_map=match mesh.header.sizeof_vertex{
@@ -104,9 +173,12 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithS
 				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut mb),
 			};
 			//one big happy group for all the faces
-			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().filter_map(|face|
+			let polygon_list=new_polygon_list_checked(mesh.faces.into_iter().filter_map(|face|
 				Some(vec![*vertex_id_map.get(&face.0)?,*vertex_id_map.get(&face.1)?,*vertex_id_map.get(&face.2)?])
-			).collect())));
+			).collect());
+			if let Some(polygon_list)=polygon_list{
+				polygon_groups.push(PolygonGroup::PolygonList(polygon_list));
+			}
 		},
 		rbx_mesh::mesh::Mesh::V3(mesh)=>{
 			let vertex_id_map=match mesh.header.sizeof_vertex{
@@ -127,6 +199,9 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithS
 			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
 		},
 	}
+	if polygon_groups.is_empty(){
+		return Err(Error::NoPolygons);
+	}
 	let mesh=mb.build(
 		polygon_groups,
 		//these should probably be moved to the model...

lib/rbx_loader/src/primitives.rs

@@ -519,7 +519,7 @@ pub fn unit_cylinder(face_descriptions:CubeFaceDescription)->Mesh{
 						(glam::vec2(-x as f32,y as f32).normalize()+1.0)/2.0
 					)
 				);
-				let pos=mb.acquire_pos_id($end+vec3::int(0,-x,y).with_length(Planar64::ONE).divide().wrap_1());
+				let pos=mb.acquire_pos_id($end+vec3::int(0,-x,y).with_length(Planar64::ONE).divide().wrap_64());
 				mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color})
 			}).collect();
 
@@ -560,9 +560,9 @@ pub fn unit_cylinder(face_descriptions:CubeFaceDescription)->Mesh{
 			let mut polygon_list=Vec::with_capacity(CubeFaceDescription::FACES);
 			for $loop in -GON..GON{
 				// lo Z
-				let lz_dir=$lo_dir.with_length(Planar64::ONE).divide().wrap_1();
+				let lz_dir=$lo_dir.with_length(Planar64::ONE).divide().wrap_64();
 				// hi Z
-				let hz_dir=$hi_dir.with_length(Planar64::ONE).divide().wrap_1();
+				let hz_dir=$hi_dir.with_length(Planar64::ONE).divide().wrap_64();
 
 				// pos
 				let lx_lz_pos=mb.acquire_pos_id(vec3::NEG_X+lz_dir);

lib/rbx_loader/src/rbx.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use crate::error::{RecoverableErrors,CFrameError,CFrameErrorType,DuplicateStageError,InstancePath,NormalIdError,Planar64ConvertError,ParseIntContext,ShapeError};
-use crate::loader::{MeshWithSize,MeshIndex};
+use crate::mesh::{MeshWithSize,MeshIndex};
 use crate::primitives::{self,CubeFace,CubeFaceDescription,WedgeFaceDescription,CornerWedgeFaceDescription,FaceDescription,Primitives};
 use strafesnet_common::map;
 use strafesnet_common::model;
@@ -31,11 +31,11 @@ fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_we
 	Ok(Planar64Affine3::new(
 		Planar64Mat3::from_cols([
 			(vec3::try_from_f32_array([cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x])?
-			*integer::try_from_f32(size.x/2.0)?).narrow_1().unwrap(),//.map_err(Planar64ConvertError::Narrow)?
+			*integer::try_from_f32(size.x/2.0)?).narrow_64().unwrap(),//.map_err(Planar64ConvertError::Narrow)?
 			(vec3::try_from_f32_array([cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y])?
-			*integer::try_from_f32(size.y/2.0)?).narrow_1().unwrap(),//.map_err(Planar64ConvertError::Narrow)?
+			*integer::try_from_f32(size.y/2.0)?).narrow_64().unwrap(),//.map_err(Planar64ConvertError::Narrow)?
 			(vec3::try_from_f32_array([cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z])?
-			*integer::try_from_f32(size.z/2.0)?).narrow_1().unwrap(),//.map_err(Planar64ConvertError::Narrow)?
+			*integer::try_from_f32(size.z/2.0)?).narrow_64().unwrap(),//.map_err(Planar64ConvertError::Narrow)?
 		]),
 		vec3::try_from_f32_array([cf.position.x,cf.position.y,cf.position.z])?
 	))
@@ -508,6 +508,43 @@ fn get_texture_description<'a>(
 	}
 	part_texture_description
 }
+fn get_surface_appearance<'a>(
+	recoverable_errors:&mut RecoverableErrors,
+	db:&rbx_reflection::ReflectionDatabase,
+	dom:&'a rbx_dom_weak::WeakDom,
+	object:&rbx_dom_weak::Instance,
+)->Option<&'a str>{
+	//use the biggest one and cut it down later...
+	let decal=&db.classes["SurfaceAppearance"];
+	let surface_appearances=object.children().iter().filter_map(|&referent|{
+		let instance=dom.get_by_ref(referent)?;
+		db.classes.get(instance.class.as_str()).is_some_and(|class|
+			db.has_superclass(class,decal)
+		).then_some(instance)
+	});
+	for surface_appearance in surface_appearances{
+		// SurfaceAppearance should always have these properties,
+		// but it is not guaranteed by the rbx_dom_weak data structure.
+		let (
+			Some(rbx_dom_weak::types::Variant::Content(color_map)),
+			// Some(rbx_dom_weak::types::Variant::Content(_metalness_map)),
+			// Some(rbx_dom_weak::types::Variant::Content(_normal_map)),
+			// Some(rbx_dom_weak::types::Variant::Content(_roughness_map)),
+		)=(
+			surface_appearance.properties.get(&static_ustr("ColorMapContent")),
+			// surface_appearance.properties.get(&static_ustr("MetalnessMapContent")),
+			// surface_appearance.properties.get(&static_ustr("NormalMapContent")),
+			// surface_appearance.properties.get(&static_ustr("RoughnessMapContent")),
+		)else{
+			recoverable_errors.surface_appearance_property.push(InstancePath::new(dom,surface_appearance));
+			continue;
+		};
+		if let Some(texture_id)=get_content_url(color_map){
+			return Some(texture_id);
+		}
+	}
+	None
+}
 enum Shape{
 	Primitive(Primitives),
 	MeshPart,
@@ -706,7 +743,8 @@ pub fn convert<'a>(
 						""
 					}
 				};
-				let texture_asset_id=get_content_url(texture_content);
+				// load SurfaceAppearance and then fall back to mesh texture
+				let texture_asset_id=get_surface_appearance(&mut recoverable_errors,db,dom,object).or_else(||get_content_url(texture_content));
 				(
 					MeshAvailability::DeferredMesh(render_config_deferred_loader.acquire_render_config_id(texture_asset_id)),
 					mesh_deferred_loader.acquire_mesh_id(MeshIndex::file_mesh(mesh_asset_id)),
@@ -783,11 +821,11 @@ fn acquire_mesh_id_from_render_config_id(
 	render:RenderConfigId,
 )->Option<MeshIdWithSize>{
 	//ignore meshes that fail to load completely for now
-	loaded_meshes.get(&old_mesh_id).map(|&MeshWithSize{ref mesh,size}|MeshIdWithSize{
+	loaded_meshes.get(&old_mesh_id).map(|mesh_with_size|MeshIdWithSize{
 		mesh:*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.clone();
+			let mut mesh_clone=mesh_with_size.mesh().clone();
 			//set the render group lool
 			if let Some(graphics_group)=mesh_clone.graphics_groups.first_mut(){
 				graphics_group.render=render;
@@ -795,7 +833,7 @@ fn acquire_mesh_id_from_render_config_id(
 			primitive_meshes.push(mesh_clone);
 			mesh_id
 		}),
-		size,
+		size:mesh_with_size.size(),
 	})
 }
 fn acquire_union_id_from_render_config_id(
@@ -806,11 +844,11 @@ fn acquire_union_id_from_render_config_id(
 	part_texture_description:RobloxPartDescription,
 )->Option<MeshIdWithSize>{
 	//ignore uniones that fail to load completely for now
-	loaded_meshes.get(&old_union_id).map(|&MeshWithSize{ref mesh,size}|MeshIdWithSize{
+	loaded_meshes.get(&old_union_id).map(|mesh_with_size|MeshIdWithSize{
 		mesh:*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=mesh.clone();
+			let mut union_clone=mesh_with_size.mesh().clone();
 			//set the render groups
 			for (graphics_group,maybe_face_texture_description) in union_clone.graphics_groups.iter_mut().zip(part_texture_description.0){
 				if let Some(face_texture_description)=maybe_face_texture_description{
@@ -820,7 +858,7 @@ fn acquire_union_id_from_render_config_id(
 			primitive_meshes.push(union_clone);
 			union_id
 		}),
-		size,
+		size:mesh_with_size.size(),
 	})
 }
 pub struct PartialMap1<'a>{
@@ -867,19 +905,19 @@ impl PartialMap1<'_>{
 				deferred_model_deferred_attributes.model.mesh,
 				deferred_model_deferred_attributes.render
 			)?;
-			Some(ModelDeferredAttributes{
-				mesh,
-				deferred_attributes:deferred_model_deferred_attributes.model.deferred_attributes,
-				color:deferred_model_deferred_attributes.model.color,
-				transform:Planar64Affine3::new(
-					Planar64Mat3::from_cols([
-						(deferred_model_deferred_attributes.model.transform.matrix3.x_axis*2/mesh_size.x).divide().narrow_1().unwrap(),
-						(deferred_model_deferred_attributes.model.transform.matrix3.y_axis*2/mesh_size.y).divide().narrow_1().unwrap(),
-						(deferred_model_deferred_attributes.model.transform.matrix3.z_axis*2/mesh_size.z).divide().narrow_1().unwrap(),
-					]),
-					deferred_model_deferred_attributes.model.transform.translation
-				),
-			})
+			let mut model=deferred_model_deferred_attributes.model;
+			model.mesh=mesh;
+			// avoid devide by zero but introduce more edge cases.  not sure what the correct thing to do here is.
+			if mesh_size.x!=integer::Fixed::ZERO{
+				model.transform.matrix3.x_axis=(model.transform.matrix3.x_axis*2/mesh_size.x).divide().narrow_64().unwrap();
+			}
+			if mesh_size.y!=integer::Fixed::ZERO{
+				model.transform.matrix3.y_axis=(model.transform.matrix3.y_axis*2/mesh_size.y).divide().narrow_64().unwrap();
+			}
+			if mesh_size.z!=integer::Fixed::ZERO{
+				model.transform.matrix3.z_axis=(model.transform.matrix3.z_axis*2/mesh_size.z).divide().narrow_64().unwrap();
+			}
+			Some(model)
 		}).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
@@ -890,19 +928,19 @@ impl PartialMap1<'_>{
 				deferred_union_deferred_attributes.model.mesh,
 				deferred_union_deferred_attributes.render
 			)?;
-			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().narrow_1().unwrap(),
-						(deferred_union_deferred_attributes.model.transform.matrix3.y_axis*2/size.y).divide().narrow_1().unwrap(),
-						(deferred_union_deferred_attributes.model.transform.matrix3.z_axis*2/size.z).divide().narrow_1().unwrap(),
-					]),
-					deferred_union_deferred_attributes.model.transform.translation
-				),
-			})
+			let mut model=deferred_union_deferred_attributes.model;
+			model.mesh=mesh;
+			// avoid devide by zero but introduce more edge cases.  not sure what the correct thing to do here is.
+			if size.x!=integer::Fixed::ZERO{
+				model.transform.matrix3.x_axis=(model.transform.matrix3.x_axis*2/size.x).divide().narrow_64().unwrap();
+			}
+			if size.y!=integer::Fixed::ZERO{
+				model.transform.matrix3.y_axis=(model.transform.matrix3.y_axis*2/size.y).divide().narrow_64().unwrap();
+			}
+			if size.z!=integer::Fixed::ZERO{
+				model.transform.matrix3.z_axis=(model.transform.matrix3.z_axis*2/size.z).divide().narrow_64().unwrap();
+			}
+			Some(model)
 		}))
 		.chain(self.primitive_models_deferred_attributes.into_iter())
 		.filter_map(|model_deferred_attributes|{

lib/rbx_loader/src/union.rs

@@ -1,4 +1,4 @@
-use crate::loader::MeshWithSize;
+use crate::mesh::MeshWithSize;
 use crate::rbx::RobloxPartDescription;
 use crate::primitives::{CUBE_DEFAULT_VERTICES,CUBE_DEFAULT_POLYS,FaceDescription};
 
@@ -104,7 +104,7 @@ fn build_mesh2(
 		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!");
+			print!("[union] Empty face!");
 		}
 	}
 	Ok(())
@@ -158,12 +158,16 @@ fn build_mesh5(
 		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!");
+			print!("[union] Empty face!");
 		}
 	}
 	Ok(())
 }
 
+fn new_polygon_list_checked(list:Vec<model::IndexedVertexList>)->Option<PolygonList>{
+	(!list.is_empty()).then_some(PolygonList::new(list))
+}
+
 const NORMAL_FACES:usize=6;
 impl std::error::Error for Error{}
 pub fn convert(
@@ -172,12 +176,12 @@ pub fn convert(
 	size:glam::Vec3,
 	RobloxPartDescription(part_texture_description):RobloxPartDescription,
 )->Result<MeshWithSize,Error>{
-	let mut polygon_groups_normal_id:[_;NORMAL_FACES]=[vec![],vec![],vec![],vec![],vec![],vec![]];
 
 	// build graphics and physics meshes
 	let mut mb=MeshBuilder::new();
 	// graphics
-	let graphics_groups=if !roblox_mesh_data.is_empty(){
+	let (polygon_groups_normal_id,graphics_groups)=if !roblox_mesh_data.is_empty(){
+		let mut polygon_groups_normal_id:[_;NORMAL_FACES]=[vec![],vec![],vec![],vec![],vec![],vec![]];
 		// 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);
@@ -193,20 +197,26 @@ pub fn convert(
 			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V4(mesh_data4))=>build_mesh2(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data4.mesh)?,
 			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V5(mesh_data4))=>build_mesh5(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data4)?,
 		};
-		(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()
+		let graphics_groups=polygon_groups_normal_id
+			.iter()
+			.enumerate()
+			.filter(|&(_,group)|!group.is_empty())
+			.enumerate()
+			.map(|(polygon_group_id,(normal_id,_))|{
+				model::IndexedGraphicsGroup{
+					render:cube_face_description[normal_id].as_ref().map_or(RenderConfigId::new(0),|face_description|face_description.render),
+					groups:vec![PolygonGroupId::new(polygon_group_id as u32)]
+				}
+			}).collect();
+		(polygon_groups_normal_id,graphics_groups)
 	}else{
-		Vec::new()
+		([vec![],vec![],vec![],vec![],vec![],vec![]],Vec::new())
 	};
 
 	//physics
-	let polygon_groups_normal_it=polygon_groups_normal_id.into_iter().map(|faces|
+	let polygon_groups_normal_it=polygon_groups_normal_id.into_iter().filter_map(|faces|
 		// graphics polygon groups (to be rendered)
-		Ok(PolygonGroup::PolygonList(PolygonList::new(faces)))
+		Some(PolygonGroup::PolygonList(new_polygon_list_checked(faces)?))
 	);
 	let polygon_groups:Vec<PolygonGroup>=if !roblox_physics_data.is_empty(){
 		let physics_data=rbx_mesh::read_physics_data_versioned(
@@ -225,12 +235,12 @@ pub fn convert(
 			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::V7(meshes))
 			=>meshes.meshes,
 		};
-		let physics_convex_meshes_it=physics_convex_meshes.into_iter().map(|mesh|{
+		let physics_convex_meshes_it=physics_convex_meshes.into_iter().filter_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(|[PhysicsDataVertexId(vertex_id0),PhysicsDataVertexId(vertex_id1),PhysicsDataVertexId(vertex_id2)]|{
+			let polygons=mesh.faces.into_iter().map(|[PhysicsDataVertexId(vertex_id0),PhysicsDataVertexId(vertex_id1),PhysicsDataVertexId(vertex_id2)]|{
 				let face=[
 					mesh.vertices.get(vertex_id0 as usize).ok_or(Error::MissingVertexId(vertex_id0))?,
 					mesh.vertices.get(vertex_id1 as usize).ok_or(Error::MissingVertexId(vertex_id1))?,
@@ -243,9 +253,14 @@ pub fn convert(
 					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 polygon_list=match polygons{
+				Ok(polygons)=>new_polygon_list_checked(polygons)?,
+				Err(e)=>return Some(Err(e)),
+			};
+			Some(Ok(PolygonGroup::PolygonList(polygon_list)))
 		});
-		polygon_groups_normal_it.chain(physics_convex_meshes_it).collect::<Result<_,_>>()?
+		polygon_groups_normal_it.map(Ok).chain(physics_convex_meshes_it).collect::<Result<_,_>>()?
 	}else{
 		// generate a unit cube as default physics
 		let pos_list=CUBE_DEFAULT_VERTICES.map(|pos|mb.acquire_pos_id(pos>>1));
@@ -255,9 +270,9 @@ pub fn convert(
 		let polygon_group=PolygonGroup::PolygonList(PolygonList::new(CUBE_DEFAULT_POLYS.map(|poly|poly.map(|[pos_id,_]|
 			mb.acquire_vertex_id(IndexedVertex{pos:pos_list[pos_id as usize],tex,normal,color})
 		).to_vec()).to_vec()));
-		polygon_groups_normal_it.chain([Ok(polygon_group)]).collect::<Result<_,_>>()?
+		polygon_groups_normal_it.chain([polygon_group]).collect()
 	};
-	let physics_groups=(NORMAL_FACES..polygon_groups.len()).map(|id|model::IndexedPhysicsGroup{
+	let physics_groups=(graphics_groups.len()..polygon_groups.len()).map(|id|model::IndexedPhysicsGroup{
 		groups:vec![PolygonGroupId::new(id as u32)]
 	}).collect();
 	let mesh=mb.build(
@@ -265,8 +280,5 @@ pub fn convert(
 		graphics_groups,
 		physics_groups,
 	);
-	Ok(MeshWithSize{
-		mesh,
-		size:vec3::ONE,
-	})
+	Ok(MeshWithSize::new(mesh,vec3::ONE))
 }

lib/roblox_emulator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "roblox_emulator"
-version = "0.5.2"
+version = "0.5.3"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -12,7 +12,7 @@ default=["run-service"]
 run-service=[]
 
 [dependencies]
-glam = "0.30.0"
+glam.workspace = true
 mlua = { version = "0.11.3", features = ["luau"] }
 phf = { version = "0.13.1", features = ["macros"] }
 rbx_dom_weak = "4.1.0"

lib/roblox_emulator/src/runner/runner.rs

@@ -101,7 +101,19 @@ impl Runnable<'_>{
 		.set_name(name).into_function().map_err(Error::RustLua)?;
 		// TODO: set_environment without losing the ability to print from Lua
 		let thread=self.lua.create_thread(f).map_err(Error::RustLua)?;
+
+		// set timeout
+		let start=std::time::Instant::now();
+		self.lua.set_interrupt(move|lua|{
+			if std::time::Duration::from_secs(1)<start.elapsed(){
+				lua.remove_interrupt();
+				return Err(mlua::Error::runtime("timeout"));
+			}
+			Ok(mlua::VmState::Continue)
+		});
+
 		thread.resume::<mlua::MultiValue>(()).map_err(|error|Error::Lua{source,error})?;
+		self.lua.remove_interrupt();
 		// wait() is called from inside Lua and goes to a rust function that schedules the thread and then yields
 		// No need to schedule the thread here
 		Ok(())

lib/snf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_snf"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,7 +8,7 @@ edition = "2024"
 [dependencies]
 binrw = "0.15.0"
 id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

lib/snf/src/map.rs

@@ -386,7 +386,7 @@ pub fn write_map<W:BinWriterExt>(mut writer:W,map:strafesnet_common::map::Comple
 		let mesh=map.meshes.get(model.mesh.get() as usize).ok_or(Error::InvalidMeshId(model.mesh))?;
 		let mut aabb=Aabb::default();
 		for &pos in &mesh.unique_pos{
-			aabb.grow(model.transform.transform_point3(pos).narrow_1().unwrap());
+			aabb.grow(model.transform.transform_point3(pos).narrow_64().unwrap());
 		}
 		Ok(((model::ModelId::new(model_id as u32),model.into()),aabb))
 	}).collect::<Result<Vec<_>,_>>()?;

map-tool/Cargo.toml

@@ -1,35 +1,76 @@
 [package]
 name = "map-tool"
-version = "1.7.2"
+version = "3.0.1"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = ["cli","source","roblox"]
+roblox = [
+	"dep:strafesnet_rbx_loader",
+	"dep:rbx_asset",
+	"dep:rbx_binary",
+	"dep:rbx_dom_weak",
+	"dep:rbx_reflection_database",
+	"dep:rbx_xml",
+	"dep:rbxassetid",
+]
+source = [
+	"dep:strafesnet_bsp_loader",
+	"dep:vbsp",
+	"dep:vbsp-entities-css",
+	"dep:vmdl",
+	"dep:vmt-parser",
+	"dep:vpk",
+	"dep:vtf",
+	"tokio/sync",
+]
+cli = [
+	"dep:clap",
+	"dep:futures",
+	"tokio/macros",
+	"tokio/rt-multi-thread",
+	"tokio/fs",
+]
+
+[lib]
+name = "map_tool"
+
+[[bin]]
+name = "map-tool"
+required-features = ["cli"]
+
 [dependencies]
+strafesnet_deferred_loader.workspace = true
+strafesnet_snf.workspace = true
+
 anyhow = "1.0.75"
-clap = { version = "4.4.2", features = ["derive"] }
+clap = { version = "4.4.2", features = ["derive"], optional = true }
 flate2 = "1.0.27"
-futures = "0.3.31"
-image = "0.25.2"
-image_dds = "0.7.1"
-rbx_asset = { version = "0.5.0", registry = "strafesnet" }
-rbx_binary = "2.0.1"
-rbx_dom_weak = "4.1.0"
-rbx_reflection_database = "2.0.2"
-rbx_xml = "2.0.1"
-rbxassetid = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_bsp_loader = { version = "0.3.1", path = "../lib/bsp_loader", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.1", path = "../lib/deferred_loader", registry = "strafesnet" }
-strafesnet_rbx_loader = { version = "0.7.0", path = "../lib/rbx_loader", registry = "strafesnet" }
-strafesnet_snf = { version = "0.3.1", path = "../lib/snf", registry = "strafesnet" }
+futures = { version = "0.3.31", optional = true }
+image = { version = "0.25.2", features = ["png", "jpeg"], default-features = false }
+image_dds = { version = "0.7.1", features = ["ddsfile","encode"], default-features = false }
 thiserror = "2.0.11"
-tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread", "fs"] }
-vbsp = "0.9.1"
-vbsp-entities-css = "0.6.0"
-vmdl = "0.2.0"
-vmt-parser = "0.2.0"
-vpk = "0.3.0"
-vtf = "0.3.0"
+tokio = { version = "1.43.0", features = ["time"] }
+
+# roblox
+strafesnet_rbx_loader = { workspace = true, optional = true }
+rbx_asset = { version = "0.5.0", registry = "strafesnet", optional = true }
+rbx_binary = { version = "2.0.1", optional = true }
+rbx_dom_weak = { version = "4.1.0", optional = true }
+rbx_reflection_database = { version = "2.0.2", optional = true }
+rbx_xml = { version = "2.0.1", optional = true }
+rbxassetid = { version = "0.1.0", registry = "strafesnet", optional = true }
+
+# source
+strafesnet_bsp_loader = { workspace = true, optional = true }
+vbsp = { version = "0.9.1", optional = true }
+vbsp-entities-css = { version = "0.6.0", optional = true }
+vmdl = { version = "0.2.0", optional = true }
+vmt-parser = { version = "0.2.0", optional = true }
+vpk = { version = "0.3.0", optional = true }
+vtf = { version = "0.3.0", optional = true }
 
 #[profile.release]
 #lto = true

map-tool/src/lib.rs

@@ -0,0 +1,4 @@
+#[cfg(feature="roblox")]
+pub mod roblox;
+#[cfg(feature="source")]
+pub mod source;

map-tool/src/main.rs

@@ -1,30 +1,31 @@
-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(author,version,about,long_about=None)]
+#[command(propagate_version=true)]
+struct Cli{
 	#[command(subcommand)]
-	command: Commands,
+	command:Commands,
 }
 
 #[derive(Subcommand)]
 enum Commands{
 	#[command(flatten)]
-	Roblox(roblox::Commands),
+	#[cfg(feature="roblox")]
+	Roblox(map_tool::roblox::Commands),
 	#[command(flatten)]
-	Source(source::Commands),
+	#[cfg(feature="source")]
+	Source(map_tool::source::Commands),
 }
 
 #[tokio::main]
 async fn main()->AResult<()>{
 	let cli=Cli::parse();
 	match cli.command{
+		#[cfg(feature="roblox")]
 		Commands::Roblox(commands)=>commands.run().await,
+		#[cfg(feature="source")]
 		Commands::Source(commands)=>commands.run().await,
 	}
 }

map-tool/src/roblox/cli.rs

@@ -1,34 +1,29 @@
-use std::path::{Path,PathBuf};
-use std::io::{Cursor,Read,Seek};
-use std::collections::HashSet;
-use clap::{Args,Subcommand};
+use std::path::PathBuf;
+use std::io::Cursor;
 use anyhow::Result as AResult;
-use rbx_dom_weak::Instance;
-use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
 use rbxassetid::RobloxAssetId;
-use tokio::io::AsyncReadExt;
+use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
 
-// disallow non-static lifetimes
-fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
-	rbx_dom_weak::ustr(s)
-}
+use super::{convert_texture_to_dds,get_unique_assets};
+use super::{ConvertTextureError,UniqueAssets};
 
 const DOWNLOAD_LIMIT:usize=16;
 
-#[derive(Subcommand)]
+#[derive(clap::Subcommand)]
 pub enum Commands{
 	RobloxToSNF(RobloxToSNFSubcommand),
 	DownloadAssets(DownloadAssetsSubcommand),
+	ExtractUnionData(ExtractUnionData),
 }
 
-#[derive(Args)]
-pub struct RobloxToSNFSubcommand {
+#[derive(clap::Args)]
+pub struct RobloxToSNFSubcommand{
 	#[arg(long)]
 	output_folder:PathBuf,
 	#[arg(required=true)]
 	input_files:Vec<PathBuf>,
 }
-#[derive(Args)]
+#[derive(clap::Args)]
 pub struct DownloadAssetsSubcommand{
 	#[arg(required=true)]
 	roblox_files:Vec<PathBuf>,
@@ -39,6 +34,13 @@ pub struct DownloadAssetsSubcommand{
 	#[arg(long,group="cookie",required=true)]
 	cookie_file:Option<PathBuf>,
 }
+#[derive(clap::Args)]
+pub struct ExtractUnionData{
+	#[arg(long)]
+	output_folder:PathBuf,
+	#[arg(long)]
+	input_file:PathBuf,
+}
 
 impl Commands{
 	pub async fn run(self)->AResult<()>{
@@ -52,6 +54,7 @@ impl Commands{
 					subcommand.cookie_file,
 				).await?,
 			).await,
+			Commands::ExtractUnionData(subcommand)=>extract_union_data(subcommand.input_file,subcommand.output_folder).await,
 		}
 	}
 }
@@ -66,148 +69,6 @@ async fn cookie_from_args(literal:Option<String>,environment:Option<String>,file
 	Ok(rbx_asset::cookie::Cookie::new(cookie))
 }
 
-#[expect(dead_code)]
-#[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
-*/
-/* These properties now use Content
-BaseWrap.CageMeshContent
-Decal.TextureContent
-ImageButton.ImageContent
-ImageLabel.ImageContent
-MeshPart.MeshContent
-MeshPart.TextureContent
-SurfaceAppearance.ColorMapContent
-SurfaceAppearance.MetalnessMapContent
-SurfaceAppearance.NormalMapContent
-SurfaceAppearance.RoughnessMapContent
-WrapLayer.ReferenceMeshContent
-*/
-
-fn accumulate_content(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&'static str){
-	let Some(rbx_dom_weak::types::Variant::Content(content))=object.properties.get(&static_ustr(property))else{
-		println!("property={} does not exist for class={}",property,object.class.as_str());
-		return;
-	};
-	let rbx_dom_weak::types::ContentType::Uri(uri)=content.value()else{
-		println!("ContentType is not Uri");
-		return;
-	};
-	let Ok(asset_id)=uri.parse()else{
-		println!("Content failed to parse into AssetID: {:?}",content);
-		return;
-	};
-	content_list.insert(asset_id);
-}
-fn accumulate_content_id(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&'static str){
-	let Some(rbx_dom_weak::types::Variant::ContentId(content))=object.properties.get(&static_ustr(property))else{
-		println!("property={} does not exist for class={}",property,object.class.as_str());
-		return;
-	};
-	let Ok(asset_id)=content.as_str().parse()else{
-		println!("Content failed to parse into AssetID: {:?}",content);
-		return;
-	};
-	content_list.insert(asset_id);
-}
-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(&mut self.textures,object,"TextureContent"),
-			"Texture"=>accumulate_content(&mut self.textures,object,"TextureContent"),
-			"FileMesh"=>accumulate_content_id(&mut self.textures,object,"TextureId"),
-			"MeshPart"=>{
-				accumulate_content(&mut self.textures,object,"TextureContent");
-				accumulate_content(&mut self.meshes,object,"MeshContent");
-			},
-			"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"),
-			_=>(),
-		}
-	}
-}
-
-#[expect(dead_code)]
-#[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),
@@ -253,7 +114,6 @@ async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::Context,dow
 	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{
@@ -276,7 +136,7 @@ async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::Context,dow
 					}
 					println!("Hit roblox rate limit, waiting {:.0}ms...",backoff);
 					tokio::time::sleep(std::time::Duration::from_millis(backoff as u64)).await;
-					backoff*=BACKOFF_MUL;
+					backoff*=super::BACKOFF_MUL;
 					retry+=1;
 				}else{
 					stats.failed_downloads+=1;
@@ -292,47 +152,27 @@ async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::Context,dow
 		}
 	}
 }
-#[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(RobloxAssetId(asset_id):RobloxAssetId,download_result:DownloadResult)->Result<(),ConvertTextureError>{
+
+async fn cli_convert_texture(RobloxAssetId(asset_id):RobloxAssetId,download_result:DownloadResult)->Result<(),CliConvertTextureError>{
 	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 dds=convert_texture_to_dds(&data)?;
 
 	let file_name=format!("textures/{asset_id}.dds");
-	let mut file=std::fs::File::create(file_name)?;
-	dds.write(&mut file)?;
+	tokio::fs::write(file_name,&dds).await?;
 	Ok(())
 }
+#[derive(Debug,thiserror::Error)]
+enum CliConvertTextureError{
+	#[error("Io error {0:?}")]
+	Io(#[from]std::io::Error),
+	#[error("ConvertTexture error {0:?}")]
+	ConvertTexture(#[from]ConvertTextureError),
+}
+
 async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->AResult<()>{
 	tokio::try_join!(
 		tokio::fs::create_dir_all("downloaded_textures"),
@@ -356,27 +196,19 @@ async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->A
 		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;
+				let result=match tokio::fs::read(&path).await{
+					Ok(data)=>super::load_dom(&data).map(|dom|get_unique_assets(&dom)).map_err(|e|format!("{e:?}")),
+					Err(e)=>Err(format!("{e:?}")),
+				};
 				_=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::Context::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{
@@ -410,7 +242,7 @@ async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->A
 	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;
+			let result=cli_convert_texture(asset_id,download_result).await;
 			drop(permit);
 			result.unwrap();
 		});
@@ -420,51 +252,6 @@ async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->A
 	Ok(())
 }
 
-#[derive(Debug)]
-#[expect(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{}
-
-struct Errors{
-	script_errors:Vec<strafesnet_rbx_loader::RunnerError>,
-	convert_errors:strafesnet_rbx_loader::RecoverableErrors,
-}
-
-fn convert_to_snf(path:&Path,output_folder:PathBuf)->Result<Errors,ConvertError>{
-	let entire_file=std::fs::read(path).map_err(ConvertError::IO)?;
-
-	let model=strafesnet_rbx_loader::read(
-		entire_file.as_slice()
-	).map_err(ConvertError::RobloxRead)?;
-
-	let mut place=strafesnet_rbx_loader::Place::from(model);
-	let script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]);
-
-	let (map,convert_errors)=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(Errors{
-		script_errors,
-		convert_errors,
-	})
-}
-
 async fn roblox_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf)->AResult<()>{
 	let start=std::time::Instant::now();
 
@@ -477,17 +264,27 @@ async fn roblox_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf)->AResult<()>{
 	while let (Ok(permit),Some(path))=(SEM.acquire().await,it.next()){
 		let output_folder=output_folder.clone();
 		tokio::task::spawn_blocking(move||{
-			let result=convert_to_snf(path.as_path(),output_folder);
+			let result=std::fs::read(&path).and_then(|data|{
+				super::load_dom(&data).map_err(|e|std::io::Error::other(e))
+				.and_then(|dom|convert_to_snf(dom).map_err(|e|std::io::Error::other(e)))
+				.and_then(|output|{
+					let mut dest=output_folder;
+					dest.push(path.file_stem().unwrap());
+					dest.set_extension("snfm");
+					std::fs::write(dest,&output.snf)?;
+					Ok(output)
+				})
+			});
 			drop(permit);
 			match result{
-				Ok(errors)=>{
-					for error in errors.script_errors{
+				Ok(output)=>{
+					for error in output.script_errors{
 						println!("Script error: {error}");
 					}
-					let error_count=errors.convert_errors.count();
+					let error_count=output.convert_errors.count();
 					if error_count!=0{
 						println!("Error count: {error_count}");
-						println!("Errors: {}",errors.convert_errors);
+						println!("Errors: {}",output.convert_errors);
 					}
 				},
 				Err(e)=>println!("Convert error: {e:?}"),
@@ -499,3 +296,88 @@ async fn roblox_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf)->AResult<()>{
 	println!("elapsed={:?}", start.elapsed());
 	Ok(())
 }
+
+#[expect(dead_code)]
+#[derive(Debug)]
+pub enum ConvertError{
+	IO(std::io::Error),
+	SNFMap(strafesnet_snf::map::Error),
+	RobloxLoadMesh(super::loader::MeshError),
+	RobloxLoadTexture(super::loader::TextureError),
+}
+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{}
+
+pub struct ConvertOutput{
+	pub snf:Vec<u8>,
+	pub script_errors:Vec<strafesnet_rbx_loader::RunnerError>,
+	pub convert_errors:strafesnet_rbx_loader::RecoverableErrors,
+}
+
+pub fn convert_to_snf(dom:rbx_dom_weak::WeakDom)->Result<ConvertOutput,ConvertError>{
+	const FAILURE_MODE:LoadFailureMode=LoadFailureMode::DefaultToNone;
+
+	// run scripts
+	let model=strafesnet_rbx_loader::Model::new(dom);
+
+	let mut place=strafesnet_rbx_loader::Place::from(model);
+	let script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]);
+
+	// convert
+	let mut texture_deferred_loader=RenderConfigDeferredLoader::new();
+	let mut mesh_deferred_loader=MeshDeferredLoader::new();
+
+	let map_step1=strafesnet_rbx_loader::rbx::convert(
+		place.as_ref(),
+		&mut texture_deferred_loader,
+		&mut mesh_deferred_loader,
+	);
+
+	let mut mesh_loader=super::loader::MeshLoader::new();
+	let meshpart_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadMesh)?;
+
+	let map_step2=map_step1.add_meshpart_meshes_and_calculate_attributes(meshpart_meshes);
+
+	let mut texture_loader=super::loader::TextureLoader::new();
+	let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadTexture)?;
+
+	let (map,convert_errors)=map_step2.add_render_configs_and_textures(render_configs);
+
+	let mut snf_buf=Vec::new();
+	strafesnet_snf::map::write_map(Cursor::new(&mut snf_buf),map).map_err(ConvertError::SNFMap)?;
+
+	Ok(ConvertOutput{
+		snf:snf_buf,
+		script_errors,
+		convert_errors,
+	})
+}
+
+async fn extract_union_data(input_file:PathBuf,output_folder:PathBuf)->AResult<()>{
+	let data=tokio::fs::read(&input_file).await?;
+
+	let dom=rbx_binary::from_reader(Cursor::new(data))?;
+	let &[referent]=dom.root().children()else{
+		panic!("Expected one child");
+	};
+	let Some(instance)=dom.get_by_ref(referent)else{
+		panic!("Missing instance");
+	};
+	let output_file=output_folder.join(input_file.file_stem().unwrap());
+	if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&rbx_dom_weak::ustr("PhysicsData")){
+		let mut physics_data_path=output_file.clone();
+		physics_data_path.set_extension("physicsdata");
+		tokio::fs::write(physics_data_path,data).await?;
+	}
+	if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&rbx_dom_weak::ustr("MeshData")){
+		let mut mesh_data_path=output_file.clone();
+		mesh_data_path.set_extension("meshdata");
+		tokio::fs::write(mesh_data_path,data).await?;
+	}
+
+	Ok(())
+}

map-tool/src/roblox/loader.rs

@@ -1,10 +1,8 @@
 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::RobloxPartDescription;
+use strafesnet_rbx_loader::mesh::{MeshIndex,MeshType,MeshWithSize};
 
 // disallow non-static lifetimes
 fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
@@ -18,6 +16,7 @@ fn read_entire_file(path:impl AsRef<std::path::Path>)->Result<Vec<u8>,std::io::E
 	Ok(data)
 }
 
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum TextureError{
 	Io(std::io::Error),
@@ -58,12 +57,13 @@ impl Loader for TextureLoader{
 	}
 }
 
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum MeshError{
 	Io(std::io::Error),
 	RobloxAssetIdParse(RobloxAssetIdParseErr),
-	Mesh(crate::mesh::Error),
-	Union(crate::union::Error),
+	Mesh(strafesnet_rbx_loader::mesh::Error),
+	Union(strafesnet_rbx_loader::union::Error),
 	DecodeBinary(rbx_binary::DecodeError),
 	OneChildPolicy,
 	MissingInstance,
@@ -84,13 +84,13 @@ impl From<RobloxAssetIdParseErr> for MeshError{
 		Self::RobloxAssetIdParse(value)
 	}
 }
-impl From<crate::mesh::Error> for MeshError{
-	fn from(value:crate::mesh::Error)->Self{
+impl From<strafesnet_rbx_loader::mesh::Error> for MeshError{
+	fn from(value:strafesnet_rbx_loader::mesh::Error)->Self{
 		Self::Mesh(value)
 	}
 }
-impl From<crate::union::Error> for MeshError{
-	fn from(value:crate::union::Error)->Self{
+impl From<strafesnet_rbx_loader::union::Error> for MeshError{
+	fn from(value:strafesnet_rbx_loader::union::Error)->Self{
 		Self::Union(value)
 	}
 }
@@ -100,53 +100,6 @@ impl From<rbx_binary::DecodeError> for MeshError{
 	}
 }
 
-#[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:RobloxPartDescription,
-	},
-}
-#[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: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,
-		}
-	}
-}
-
-#[derive(Clone)]
-pub struct MeshWithSize{
-	pub(crate) mesh:Mesh,
-	pub(crate) size:strafesnet_common::integer::Planar64Vec3,
-}
-
 pub struct MeshLoader;
 impl MeshLoader{
 	pub fn new()->Self{
@@ -163,11 +116,11 @@ impl Loader for MeshLoader{
 				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))?
+				strafesnet_rbx_loader::mesh::convert(&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));
+				let size=size_float_bits.map(f32::from_bits).into();
 				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);
@@ -189,9 +142,9 @@ impl Loader for MeshLoader{
 							mesh_data=data.as_ref();
 						}
 					}
-					crate::union::convert(physics_data,mesh_data,size,part_texture_description)?
+					strafesnet_rbx_loader::union::convert(physics_data,mesh_data,size,part_texture_description)?
 				}else{
-					crate::union::convert(physics_data,mesh_data,size,part_texture_description)?
+					strafesnet_rbx_loader::union::convert(physics_data,mesh_data,size,part_texture_description)?
 				}
 			},
 		};

map-tool/src/roblox/mod.rs

@@ -0,0 +1,210 @@
+#[cfg(feature="cli")]
+mod cli;
+#[cfg(feature="cli")]
+pub use cli::Commands;
+#[cfg(feature="cli")]
+mod loader;
+
+use std::io::{Cursor,Read,Seek};
+use std::collections::HashSet;
+pub use rbxassetid::RobloxAssetId;
+use rbx_dom_weak::Instance;
+
+// disallow non-static lifetimes
+fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
+	rbx_dom_weak::ustr(s)
+}
+
+#[derive(Debug)]
+pub enum LoadDomError{
+	IO(std::io::Error),
+	Binary(rbx_binary::DecodeError),
+	Xml(rbx_xml::DecodeError),
+	UnknownFormat,
+}
+impl std::fmt::Display for LoadDomError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for LoadDomError{}
+pub fn load_dom(data:&[u8])->Result<rbx_dom_weak::WeakDom,LoadDomError>{
+	let mut input=Cursor::new(data);
+	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),
+	}
+}
+
+fn accumulate_content(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&'static str){
+	let Some(rbx_dom_weak::types::Variant::Content(content))=object.properties.get(&static_ustr(property))else{
+		println!("property={} does not exist for class={}",property,object.class.as_str());
+		return;
+	};
+	let rbx_dom_weak::types::ContentType::Uri(uri)=content.value()else{
+		println!("ContentType is not Uri");
+		return;
+	};
+	let Ok(asset_id)=uri.parse()else{
+		println!("Content failed to parse into AssetID: {:?}",content);
+		return;
+	};
+	content_list.insert(asset_id);
+}
+fn accumulate_content_id(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&'static str){
+	let Some(rbx_dom_weak::types::Variant::ContentId(content))=object.properties.get(&static_ustr(property))else{
+		println!("property={} does not exist for class={}",property,object.class.as_str());
+		return;
+	};
+	let Ok(asset_id)=content.as_str().parse()else{
+		println!("Content failed to parse into AssetID: {:?}",content);
+		return;
+	};
+	content_list.insert(asset_id);
+}
+
+#[derive(Default)]
+pub struct UniqueAssets{
+	pub meshes:HashSet<RobloxAssetId>,
+	pub unions:HashSet<RobloxAssetId>,
+	pub 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(&mut self.textures,object,"TextureContent"),
+			"FileMesh"=>accumulate_content_id(&mut self.textures,object,"TextureId"),
+			"MeshPart"=>{
+				accumulate_content(&mut self.textures,object,"TextureContent");
+				accumulate_content(&mut self.meshes,object,"MeshContent");
+			},
+			"ParticleEmitter"=>accumulate_content_id(&mut self.textures,object,"Texture"),
+			"SpecialMesh"=>accumulate_content_id(&mut self.meshes,object,"MeshId"),
+			"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");
+			},
+			"SurfaceAppearance"=>{
+				accumulate_content(&mut self.textures,object,"ColorMapContent");
+				accumulate_content(&mut self.textures,object,"MetalnessMapContent");
+				accumulate_content(&mut self.textures,object,"NormalMapContent");
+				accumulate_content(&mut self.textures,object,"RoughnessMapContent");
+			}
+			"Texture"=>accumulate_content(&mut self.textures,object,"TextureContent"),
+			"UnionOperation"=>accumulate_content_id(&mut self.unions,object,"AssetId"),
+			_=>(),
+		}
+	}
+}
+
+pub fn get_unique_assets(dom:&rbx_dom_weak::WeakDom)->UniqueAssets{
+	let mut assets=UniqueAssets::default();
+	for object in dom.descendants(){
+		assets.collect(object);
+	}
+	assets
+}
+
+#[derive(Debug,thiserror::Error)]
+pub enum ConvertTextureError{
+	#[error("Image error {0:?}")]
+	Image(#[from]image::ImageError),
+	#[error("DDS encode error {0:?}")]
+	DDSEncode(#[from]image_dds::error::SurfaceError),
+	#[error("DDS create error {0:?}")]
+	DDS(#[from]image_dds::CreateDdsError),
+	#[error("DDS write error {0:?}")]
+	DDSWrite(#[from]image_dds::ddsfile::Error),
+}
+pub fn convert_texture_to_dds(data:&[u8])->Result<Vec<u8>,ConvertTextureError>{
+	let image=image::load_from_memory(data)?.to_rgba8();
+
+	let format=if image.width()%4!=0||image.height()%4!=0{
+		image_dds::ImageFormat::Rgba8UnormSrgb
+	}else{
+		image_dds::ImageFormat::BC7RgbaUnormSrgb
+	};
+
+	let dds=image_dds::SurfaceRgba8{
+		width:image.width(),
+		height:image.height(),
+		depth:1,
+		layers:1,
+		mipmaps:1,
+		data:image.as_raw(),
+	}.encode(format,image_dds::Quality::Slow,image_dds::Mipmaps::GeneratedAutomatic)?.to_dds()?;
+
+	let mut buf=Vec::new();
+	dds.write(&mut Cursor::new(&mut buf))?;
+	Ok(buf)
+}
+
+#[derive(Debug)]
+pub enum DownloadAssetError{
+	Get(rbx_asset::cookie::GetError),
+	IO(std::io::Error),
+}
+impl std::fmt::Display for DownloadAssetError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for DownloadAssetError{}
+
+pub async fn download_asset(context:&rbx_asset::cookie::Context,asset_id:u64)->Result<Vec<u8>,DownloadAssetError>{
+	let data=context.get_asset(rbx_asset::cookie::GetAssetRequest{
+		asset_id,
+		version:None,
+	}).await.map_err(DownloadAssetError::Get)?;
+	Ok(data.to_vec().map_err(DownloadAssetError::IO)?)
+}
+
+pub(crate) const BACKOFF_MUL:f32=1.3956124250860895286;//exp(1/3)
+const RETRY_LIMIT:u32=12;
+
+pub enum DownloadRetryResult{
+	Ok(Vec<u8>),
+	TimedOut,
+}
+
+pub async fn download_asset_retry(context:&rbx_asset::cookie::Context,asset_id:u64)->Result<DownloadRetryResult,DownloadAssetError>{
+	let mut retry=0u32;
+	let mut backoff=1000f32;
+	loop{
+		match context.get_asset(rbx_asset::cookie::GetAssetRequest{
+			asset_id,
+			version:None,
+		}).await{
+			Ok(data)=>{
+				let bytes=data.to_vec().map_err(DownloadAssetError::IO)?;
+				break Ok(DownloadRetryResult::Ok(bytes));
+			},
+			Err(rbx_asset::cookie::GetError::Response(rbx_asset::types::ResponseError::Details{status_code,url_and_body}))=>{
+				if status_code.as_u16()==429{
+					if retry==RETRY_LIMIT{
+						break Ok(DownloadRetryResult::TimedOut);
+					}
+					tokio::time::sleep(std::time::Duration::from_millis(backoff as u64)).await;
+					backoff*=BACKOFF_MUL;
+					retry+=1;
+				}else{
+					break Err(DownloadAssetError::Get(rbx_asset::cookie::GetError::Response(rbx_asset::types::ResponseError::Details{status_code,url_and_body})));
+				}
+			},
+			Err(e)=>{
+				break Err(DownloadAssetError::Get(e));
+			},
+		}
+	}
+}

map-tool/src/source.rs

@@ -1,514 +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};
-use vbsp_entities_css::Entity;
-
-#[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 name in &bsp.static_props.dict.name{
-		mesh_deferred_loader.acquire_mesh_id(name.as_str());
-	}
-
-	for raw_ent in &bsp.entities{
-		let model=match raw_ent.parse(){
-			Ok(Entity::Cycler(brush))=>brush.model,
-			Ok(Entity::EnvSprite(brush))=>brush.model,
-			Ok(Entity::FuncBreakable(brush))=>brush.model,
-			Ok(Entity::FuncBrush(brush))=>brush.model,
-			Ok(Entity::FuncButton(brush))=>brush.model,
-			Ok(Entity::FuncDoor(brush))=>brush.model,
-			Ok(Entity::FuncDoorRotating(brush))=>brush.model,
-			Ok(Entity::FuncIllusionary(brush))=>brush.model,
-			Ok(Entity::FuncMonitor(brush))=>brush.model,
-			Ok(Entity::FuncMovelinear(brush))=>brush.model,
-			Ok(Entity::FuncPhysbox(brush))=>brush.model,
-			Ok(Entity::FuncPhysboxMultiplayer(brush))=>brush.model,
-			Ok(Entity::FuncRotButton(brush))=>brush.model,
-			Ok(Entity::FuncRotating(brush))=>brush.model,
-			Ok(Entity::FuncTracktrain(brush))=>brush.model,
-			Ok(Entity::FuncTrain(brush))=>brush.model,
-			Ok(Entity::FuncWall(brush))=>brush.model,
-			Ok(Entity::FuncWallToggle(brush))=>brush.model,
-			Ok(Entity::FuncWaterAnalog(brush))=>brush.model,
-			Ok(Entity::PropDoorRotating(brush))=>brush.model,
-			Ok(Entity::PropDynamic(brush))=>brush.model,
-			Ok(Entity::PropDynamicOverride(brush))=>brush.model,
-			Ok(Entity::PropPhysics(brush))=>brush.model,
-			Ok(Entity::PropPhysicsMultiplayer(brush))=>brush.model,
-			Ok(Entity::PropPhysicsOverride(brush))=>brush.model,
-			Ok(Entity::PropRagdoll(brush))=>brush.model,
-			Ok(Entity::TriggerGravity(brush))=>brush.model,
-			Ok(Entity::TriggerHurt(brush))=>brush.model,
-			Ok(Entity::TriggerLook(brush))=>brush.model,
-			Ok(Entity::TriggerMultiple(brush))=>brush.model.unwrap_or_default(),
-			Ok(Entity::TriggerOnce(brush))=>brush.model,
-			Ok(Entity::TriggerProximity(brush))=>brush.model,
-			Ok(Entity::TriggerPush(brush))=>brush.model,
-			Ok(Entity::TriggerSoundscape(brush))=>brush.model,
-			Ok(Entity::TriggerTeleport(brush))=>brush.model.unwrap_or_default(),
-			Ok(Entity::TriggerVphysicsMotion(brush))=>brush.model,
-			Ok(Entity::TriggerWind(brush))=>brush.model,
-			_=>continue,
-		};
-		match model.chars().next(){
-			Some('*')=>(),
-			_=>{
-				mesh_deferred_loader.acquire_mesh_id(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)]
-#[expect(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<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(())
-}

map-tool/src/source/cli.rs

@@ -0,0 +1,348 @@
+use std::borrow::Cow;
+use std::io::Cursor;
+use std::path::PathBuf;
+use strafesnet_deferred_loader::loader::Loader;
+use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
+use vbsp_entities_css::Entity;
+
+use anyhow::Result as AResult;
+use futures::StreamExt;
+
+use super::{convert_texture_to_dds,load_texture};
+use super::{BspFinder,ConvertTextureError,LoadVMTError};
+
+#[derive(clap::Subcommand)]
+pub enum Commands{
+	SourceToSNF(SourceToSNFSubcommand),
+	ExtractTextures(ExtractTexturesSubcommand),
+	VPKContents(VPKContentsSubcommand),
+	BSPContents(BSPContentsSubcommand),
+}
+
+#[derive(clap::Args)]
+pub struct SourceToSNFSubcommand{
+	#[arg(long)]
+	output_folder:PathBuf,
+	#[arg(required=true)]
+	input_files:Vec<PathBuf>,
+	#[arg(long)]
+	vpks:Vec<PathBuf>,
+}
+#[derive(clap::Args)]
+pub struct ExtractTexturesSubcommand{
+	#[arg(required=true)]
+	bsp_files:Vec<PathBuf>,
+	#[arg(long)]
+	vpks:Vec<PathBuf>,
+}
+#[derive(clap::Args)]
+pub struct VPKContentsSubcommand{
+	#[arg(long)]
+	input_file:PathBuf,
+}
+#[derive(clap::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),
+		}
+	}
+}
+
+#[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]super::loader::MeshError),
+	#[error("Load VMT error {0:?}")]
+	LoadVMT(#[from]LoadVMTError),
+}
+async fn gimme_them_textures(path:&std::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 name in &bsp.static_props.dict.name{
+		mesh_deferred_loader.acquire_mesh_id(name.as_str());
+	}
+
+	for raw_ent in &bsp.entities{
+		let model=match raw_ent.parse(){
+			Ok(Entity::Cycler(brush))=>brush.model,
+			Ok(Entity::EnvSprite(brush))=>brush.model,
+			Ok(Entity::FuncBreakable(brush))=>brush.model,
+			Ok(Entity::FuncBrush(brush))=>brush.model,
+			Ok(Entity::FuncButton(brush))=>brush.model,
+			Ok(Entity::FuncDoor(brush))=>brush.model,
+			Ok(Entity::FuncDoorRotating(brush))=>brush.model,
+			Ok(Entity::FuncIllusionary(brush))=>brush.model,
+			Ok(Entity::FuncMonitor(brush))=>brush.model,
+			Ok(Entity::FuncMovelinear(brush))=>brush.model,
+			Ok(Entity::FuncPhysbox(brush))=>brush.model,
+			Ok(Entity::FuncPhysboxMultiplayer(brush))=>brush.model,
+			Ok(Entity::FuncRotButton(brush))=>brush.model,
+			Ok(Entity::FuncRotating(brush))=>brush.model,
+			Ok(Entity::FuncTracktrain(brush))=>brush.model,
+			Ok(Entity::FuncTrain(brush))=>brush.model,
+			Ok(Entity::FuncWall(brush))=>brush.model,
+			Ok(Entity::FuncWallToggle(brush))=>brush.model,
+			Ok(Entity::FuncWaterAnalog(brush))=>brush.model,
+			Ok(Entity::PropDoorRotating(brush))=>brush.model,
+			Ok(Entity::PropDynamic(brush))=>brush.model,
+			Ok(Entity::PropDynamicOverride(brush))=>brush.model,
+			Ok(Entity::PropPhysics(brush))=>brush.model,
+			Ok(Entity::PropPhysicsMultiplayer(brush))=>brush.model,
+			Ok(Entity::PropPhysicsOverride(brush))=>brush.model,
+			Ok(Entity::PropRagdoll(brush))=>brush.model,
+			Ok(Entity::TriggerGravity(brush))=>brush.model,
+			Ok(Entity::TriggerHurt(brush))=>brush.model,
+			Ok(Entity::TriggerLook(brush))=>brush.model,
+			Ok(Entity::TriggerMultiple(brush))=>brush.model.unwrap_or_default(),
+			Ok(Entity::TriggerOnce(brush))=>brush.model,
+			Ok(Entity::TriggerProximity(brush))=>brush.model,
+			Ok(Entity::TriggerPush(brush))=>brush.model,
+			Ok(Entity::TriggerSoundscape(brush))=>brush.model,
+			Ok(Entity::TriggerTeleport(brush))=>brush.model.unwrap_or_default(),
+			Ok(Entity::TriggerVphysicsMotion(brush))=>brush.model,
+			Ok(Entity::TriggerWind(brush))=>brush.model,
+			_=>continue,
+		};
+		match model.chars().next(){
+			Some('*')=>(),
+			_=>{
+				mesh_deferred_loader.acquire_mesh_id(model);
+			},
+		}
+	}
+
+	let finder=BspFinder{
+		bsp:&loader_bsp,
+		vpks:vpk_list
+	};
+
+	let mut mesh_loader=super::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 CliConvertTextureError{
+	#[error("Io error {0:?}")]
+	Io(#[from]std::io::Error),
+	#[error("ConvertTexture error {0:?}")]
+	ConvertTexture(#[from]ConvertTextureError),
+}
+
+async fn cli_convert_texture(texture:Vec<u8>,write_file_name:impl AsRef<std::path::Path>)->Result<(),CliConvertTextureError>{
+	let dds=convert_texture_to_dds(&texture)?;
+
+	let mut dest=PathBuf::from("textures");
+	dest.push(write_file_name);
+	dest.set_extension("dds");
+	std::fs::create_dir_all(dest.parent().unwrap())?;
+	std::fs::write(&dest,&dds)?;
+
+	Ok(())
+}
+
+async fn async_read_vpks(vpk_paths:Vec<PathBuf>,thread_limit:usize)->Vec<strafesnet_bsp_loader::Vpk>{
+	futures::stream::iter(vpk_paths).map(|vpk_path|async{
+		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]=async_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=cli_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(())
+}
+
+async fn source_to_snf(paths:Vec<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]=async_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=match tokio::fs::read(&path).await{
+				Ok(data)=>convert_to_snf(&data,vpk_list).map_err(|e|anyhow::anyhow!("{e:?}")).and_then(|snf_buf|{
+					let mut dest=output_folder;
+					dest.push(path.file_stem().unwrap());
+					dest.set_extension("snfm");
+					std::fs::write(dest,&snf_buf)?;
+					Ok(())
+				}),
+				Err(e)=>Err(e.into()),
+			};
+			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(())
+}
+
+#[expect(dead_code)]
+#[derive(Debug)]
+pub enum ConvertError{
+	IO(std::io::Error),
+	SNFMap(strafesnet_snf::map::Error),
+	BspRead(strafesnet_bsp_loader::ReadError),
+	BspLoadMesh(super::loader::MeshError),
+	BspLoadTexture(super::loader::TextureError),
+}
+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{}
+
+pub fn convert_to_snf(bsp_data:&[u8],vpk_list:&[strafesnet_bsp_loader::Vpk])->Result<Vec<u8>,ConvertError>{
+	const FAILURE_MODE:LoadFailureMode=LoadFailureMode::DefaultToNone;
+	let bsp=strafesnet_bsp_loader::read(
+		Cursor::new(bsp_data)
+	).map_err(ConvertError::BspRead)?;
+
+	let mut texture_deferred_loader=RenderConfigDeferredLoader::new();
+	let mut mesh_deferred_loader=MeshDeferredLoader::new();
+
+	let map_step1=strafesnet_bsp_loader::bsp::convert(
+		&bsp,
+		&mut texture_deferred_loader,
+		&mut mesh_deferred_loader,
+	);
+
+	let mut mesh_loader=super::loader::MeshLoader::new(BspFinder{bsp:&bsp,vpks:vpk_list},&mut texture_deferred_loader);
+	let prop_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,FAILURE_MODE).map_err(ConvertError::BspLoadMesh)?;
+
+	let map_step2=map_step1.add_prop_meshes(prop_meshes);
+
+	let mut texture_loader=super::loader::TextureLoader::new();
+	let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,FAILURE_MODE).map_err(ConvertError::BspLoadTexture)?;
+
+	let map=map_step2.add_render_configs_and_textures(render_configs);
+
+	let mut snf_buf=Vec::new();
+	strafesnet_snf::map::write_map(Cursor::new(&mut snf_buf),map).map_err(ConvertError::SNFMap)?;
+
+	Ok(snf_buf)
+}

map-tool/src/source/loader.rs

@@ -1,10 +1,10 @@
 use std::{borrow::Cow, io::Read};
 
-use strafesnet_common::model::Mesh;
 use strafesnet_deferred_loader::{loader::Loader,texture::Texture};
 
-use crate::{Bsp,Vpk};
+use super::BspFinder;
 
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum TextureError{
 	Io(std::io::Error),
@@ -40,6 +40,7 @@ impl Loader for TextureLoader{
 	}
 }
 
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum MeshError{
 	Io(std::io::Error),
@@ -71,33 +72,6 @@ impl From<vbsp::BspError> for MeshError{
 	}
 }
 
-#[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>{
 	finder:BspFinder<'bsp,'vpk>,
 }
@@ -154,10 +128,10 @@ impl MeshLoader<'_,'_,'_,'_>{
 impl Loader for MeshLoader<'_,'_,'_,'_>{
 	type Error=MeshError;
 	type Index<'a>=&'a str where Self:'a;
-	type Resource=Mesh;
+	type Resource=strafesnet_bsp_loader::mesh::Mesh;
 	fn load<'a>(&'a mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
 		let model=ModelLoader::new(self.finder).load(index)?;
-		let mesh=crate::mesh::convert_mesh(model,&mut self.deferred_loader);
+		let mesh=strafesnet_bsp_loader::mesh::convert_mesh(model,&mut self.deferred_loader);
 		Ok(mesh)
 	}
 }

map-tool/src/source/mod.rs

@@ -0,0 +1,247 @@
+#[cfg(feature="cli")]
+mod cli;
+#[cfg(feature="cli")]
+pub use cli::Commands;
+#[cfg(feature="cli")]
+mod loader;
+
+use std::path::PathBuf;
+use std::borrow::Cow;
+use std::io::Cursor;
+
+use strafesnet_bsp_loader::{Bsp,Vpk};
+#[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)
+	}
+}
+
+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)]
+pub 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)?;
+	Ok(material)
+}
+
+#[derive(Debug,thiserror::Error)]
+pub 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),
+	}
+}
+pub 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)]
+pub enum ConvertTextureError{
+	#[error("Vtf error {0:?}")]
+	Vtf(#[from]vtf::Error),
+	#[error("DDS encode error {0:?}")]
+	DDSEncode(#[from]image_dds::error::SurfaceError),
+	#[error("DDS create error {0:?}")]
+	DDS(#[from]image_dds::CreateDdsError),
+	#[error("DDS write error {0:?}")]
+	DDSWrite(#[from]image_dds::ddsfile::Error),
+}
+
+pub fn convert_texture_to_dds(vtf_data:&[u8])->Result<Vec<u8>,ConvertTextureError>{
+	let vtf_vec=vtf_data.to_vec();
+	let image=vtf::from_bytes(&vtf_vec)?.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
+	};
+	let dds=image_dds::SurfaceRgba8{
+		width:image.width(),
+		height:image.height(),
+		depth:1,
+		layers:1,
+		mipmaps:1,
+		data:image.as_raw(),
+	}.encode(format,image_dds::Quality::Slow,image_dds::Mipmaps::GeneratedAutomatic)?.to_dds()?;
+
+	let mut buf=Vec::new();
+	dds.write(&mut Cursor::new(&mut buf))?;
+	Ok(buf)
+}
+
+pub fn read_vpks(vpk_paths:&[PathBuf])->Result<Vec<Vpk>,vpk::Error>{
+	vpk_paths.iter().map(|vpk_path|{
+		Ok(Vpk::new(vpk::VPK::read(vpk_path)?))
+	}).collect()
+}

strafe-client/Cargo.toml

@@ -16,19 +16,19 @@ source = ["dep:strafesnet_deferred_loader", "dep:strafesnet_bsp_loader"]
 roblox = ["dep:strafesnet_deferred_loader", "dep:strafesnet_rbx_loader"]
 
 [dependencies]
-glam = "0.30.0"
+glam.workspace = true
 parking_lot = "0.12.1"
 pollster = "0.4.0"
-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_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 = "28.0.0"
+strafesnet_bsp_loader = { workspace = true, optional = true }
+strafesnet_common.workspace = true
+strafesnet_deferred_loader = { workspace = true, optional = true }
+strafesnet_graphics.workspace = true
+strafesnet_physics.workspace = true
+strafesnet_rbx_loader = { workspace = true, optional = true }
+strafesnet_session.workspace = true
+strafesnet_settings.workspace = true
+strafesnet_snf = { workspace = true, optional = true }
+wgpu.workspace = true
 winit = "0.30.7"
 
 [profile.dev]

strafe-client/src/graphics_worker.rs

@@ -20,8 +20,7 @@ WorkerDescription{
 
 pub fn new(
 	mut graphics:graphics::GraphicsState,
-	mut config:wgpu::SurfaceConfiguration,
-	surface:wgpu::Surface<'_>,
+	mut surface:strafesnet_graphics::surface::Surface<'_>,
 	device:wgpu::Device,
 	queue:wgpu::Queue,
 )->crate::compat_worker::INWorker<'_,Instruction>{
@@ -34,29 +33,22 @@ pub fn new(
 			Instruction::Resize(size,user_settings)=>{
 				println!("Resizing to {:?}",size);
 				let t0=std::time::Instant::now();
-				config.width=size.width.max(1);
-				config.height=size.height.max(1);
-				surface.configure(&device,&config);
-				graphics.resize(&device,&config,&user_settings);
+				let size=glam::uvec2(size.width,size.height);
+				surface.configure(&device,size);
+				let size=surface.size();
+				let fov=user_settings.calculate_fov(1.0,&size).as_vec2();
+				graphics.resize(&device,size,fov);
 				println!("Resize took {:?}",t0.elapsed());
 			}
 			Instruction::Render(frame_state)=>{
 				//this has to go deeper somehow
-				let frame=match surface.get_current_texture(){
-					Ok(frame)=>frame,
-					Err(_)=>{
-						surface.configure(&device,&config);
-						surface
-							.get_current_texture()
-							.expect("Failed to acquire next surface texture!")
-					}
-				};
-				let view=frame.texture.create_view(&wgpu::TextureViewDescriptor{
-					format:Some(config.view_formats[0]),
-					..wgpu::TextureViewDescriptor::default()
-				});
+				let frame=surface.new_frame(&device).expect("Error creating new frame");
 
-				graphics.render(&view,&device,&queue,frame_state);
+				let mut encoder=device.create_command_encoder(&wgpu::CommandEncoderDescriptor{label:None});
+
+				graphics.encode_commands(&mut encoder,frame.view(),graphics::view_inv(frame_state.pos(),frame_state.angles()));
+
+				queue.submit([encoder.finish()]);
 
 				frame.present();
 			}

strafe-client/src/main.rs

@@ -9,5 +9,5 @@ mod graphics_worker;
 const TITLE:&'static str=concat!("Strafe Client v",env!("CARGO_PKG_VERSION"));
 
 fn main(){
-	setup::setup_and_start(TITLE);
+	pollster::block_on(setup::setup_and_start(TITLE));
 }

strafe-client/src/setup.rs

@@ -1,199 +1,44 @@
-fn optional_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_ASTC
-	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
-}
-fn required_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_BC
-}
-fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
-	wgpu::DownlevelCapabilities{
-		flags:wgpu::DownlevelFlags::empty(),
-		shader_model:wgpu::ShaderModel::Sm5,
-		..wgpu::DownlevelCapabilities::default()
-	}
-}
+use strafesnet_graphics::setup;
+
+const LIMITS:wgpu::Limits=wgpu::Limits::defaults();
 
-struct SetupContextPartial1{
-	backends:wgpu::Backends,
-	instance:wgpu::Instance,
-}
 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);
 	event_loop.create_window(attr)
 }
-fn create_instance()->SetupContextPartial1{
-	let backends=wgpu::Backends::from_env().unwrap_or_default();
-	SetupContextPartial1{
-		backends,
-		instance:Default::default(),
-	}
-}
-impl SetupContextPartial1{
-	fn create_surface<'a>(self,window:&'a winit::window::Window)->Result<SetupContextPartial2<'a>,wgpu::CreateSurfaceError>{
-		Ok(SetupContextPartial2{
-			backends:self.backends,
-			surface:self.instance.create_surface(window)?,
-			instance:self.instance,
-		})
-	}
-}
-struct SetupContextPartial2<'a>{
-	backends:wgpu::Backends,
-	instance:wgpu::Instance,
-	surface:wgpu::Surface<'a>,
-}
-impl<'a> SetupContextPartial2<'a>{
-	fn pick_adapter(self)->SetupContextPartial3<'a>{
-		let adapter;
 
-		//TODO: prefer adapter that implements optional features
-		//let optional_features=optional_features();
-		let required_features=required_features();
-
-		//no helper function smh gotta write it myself
-		let adapters=pollster::block_on(self.instance.enumerate_adapters(self.backends));
-
-		let mut chosen_adapter=None;
-		let mut chosen_adapter_score=0;
-		for adapter in adapters {
-			if !adapter.is_surface_supported(&self.surface) {
-				continue;
-			}
-
-			let score=match adapter.get_info().device_type{
-				wgpu::DeviceType::IntegratedGpu=>3,
-				wgpu::DeviceType::DiscreteGpu=>4,
-				wgpu::DeviceType::VirtualGpu=>2,
-				wgpu::DeviceType::Other|wgpu::DeviceType::Cpu=>1,
-			};
-
-			let adapter_features=adapter.features();
-			if chosen_adapter_score<score&&adapter_features.contains(required_features) {
-				chosen_adapter_score=score;
-				chosen_adapter=Some(adapter);
-			}
-		}
-
-		if let Some(maybe_chosen_adapter)=chosen_adapter{
-			adapter=maybe_chosen_adapter;
-		}else{
-			panic!("No suitable GPU adapters found on the system!");
-		}
-
-
-		let adapter_info=adapter.get_info();
-		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
-
-		let required_downlevel_capabilities=required_downlevel_capabilities();
-		let downlevel_capabilities=adapter.get_downlevel_capabilities();
-		assert!(
-			downlevel_capabilities.shader_model >= required_downlevel_capabilities.shader_model,
-			"Adapter does not support the minimum shader model required to run this example: {:?}",
-			required_downlevel_capabilities.shader_model
-		);
-		assert!(
-			downlevel_capabilities
-				.flags
-				.contains(required_downlevel_capabilities.flags),
-			"Adapter does not support the downlevel capabilities required to run this example: {:?}",
-			required_downlevel_capabilities.flags - downlevel_capabilities.flags
-		);
-		SetupContextPartial3{
-			surface:self.surface,
-			adapter,
-		}
-	}
-}
-struct SetupContextPartial3<'a>{
-	surface:wgpu::Surface<'a>,
-	adapter:wgpu::Adapter,
-}
-impl<'a> SetupContextPartial3<'a>{
-	fn request_device(self)->SetupContextPartial4<'a>{
-		let optional_features=optional_features();
-		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 (device, queue)=pollster::block_on(self.adapter
-			.request_device(
-				&wgpu::DeviceDescriptor{
-					label:None,
-					required_features:(optional_features&self.adapter.features())|required_features,
-					required_limits:needed_limits,
-					memory_hints:wgpu::MemoryHints::Performance,
-					trace:wgpu::Trace::Off,
-					experimental_features:wgpu::ExperimentalFeatures::disabled(),
-				},
-			))
-			.expect("Unable to find a suitable GPU adapter!");
-
-		SetupContextPartial4{
-			surface:self.surface,
-			adapter:self.adapter,
-			device,
-			queue,
-		}
-	}
-}
-struct SetupContextPartial4<'a>{
-	surface:wgpu::Surface<'a>,
-	adapter:wgpu::Adapter,
-	device:wgpu::Device,
-	queue:wgpu::Queue,
-}
-impl<'a> SetupContextPartial4<'a>{
-	fn configure_surface(self,size:&'a winit::dpi::PhysicalSize<u32>)->SetupContext<'a>{
-		let mut config=self.surface
-			.get_default_config(&self.adapter, size.width, size.height)
-			.expect("Surface isn't supported by the adapter.");
-		let surface_view_format=config.format.add_srgb_suffix();
-		config.view_formats.push(surface_view_format);
-		config.present_mode=wgpu::PresentMode::AutoNoVsync;
-		self.surface.configure(&self.device, &config);
-
-		SetupContext{
-			surface:self.surface,
-			device:self.device,
-			queue:self.queue,
-			config,
-		}
-	}
-}
-pub struct SetupContext<'a>{
-	pub surface:wgpu::Surface<'a>,
-	pub device:wgpu::Device,
-	pub queue:wgpu::Queue,
-	pub config:wgpu::SurfaceConfiguration,
-}
-
-pub fn setup_and_start(title:&str){
+pub async fn setup_and_start(title:&str){
 	let event_loop=winit::event_loop::EventLoop::new().unwrap();
 
-	println!("Initializing the surface...");
-
-	let partial_1=create_instance();
-
 	let window=create_window(title,&event_loop).unwrap();
 
-	let partial_2=partial_1.create_surface(&window).unwrap();
+	println!("Initializing the surface...");
 
-	let partial_3=partial_2.pick_adapter();
+	let desc=wgpu::InstanceDescriptor::new_with_display_handle_from_env(Box::new(event_loop.owned_display_handle()));
+	let instance=wgpu::Instance::new(desc);
 
-	let partial_4=partial_3.request_device();
+	let surface=setup::step2::create_surface(&instance,&window).unwrap();
+
+	let adapter=setup::step3::pick_adapter(&instance,&surface).await.expect("No suitable GPU adapters found on the system!");
+
+	let adapter_info=adapter.get_info();
+	println!("Using {} ({:?})",adapter_info.name,adapter_info.backend);
+
+	let (device,queue)=setup::step4::request_device(&adapter,LIMITS).await.unwrap();
 
 	let size=window.inner_size();
-
-	let setup_context=partial_4.configure_surface(&size);
+	let surface=setup::step5::configure_surface(&adapter,&device,surface,(size.width,size.height)).unwrap();
 
 	//dedicated thread to ping request redraw back and resize the window doesn't seem logical
 
 	//the thread that spawns the physics thread
 	let mut window_thread=crate::window::worker(
 		&window,
-		setup_context,
+		device,
+		queue,
+		surface,
+		LIMITS,
 	);
 
 	for arg in std::env::args().skip(1){

strafe-client/src/window.rs

@@ -239,7 +239,10 @@ impl WindowContext<'_>{
 }
 pub fn worker<'a>(
 	window:&'a winit::window::Window,
-	setup_context:crate::setup::SetupContext<'a>,
+	device:wgpu::Device,
+	queue:wgpu::Queue,
+	surface:strafesnet_graphics::surface::Surface<'a>,
+	limits:wgpu::Limits,
 )->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTime>>{
 	// WindowContextSetup::new
 	#[cfg(feature="user-install")]
@@ -249,12 +252,13 @@ pub fn worker<'a>(
 
 	let user_settings=directories.settings();
 
-	let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&setup_context.device,&setup_context.queue,&setup_context.config);
-	graphics.load_user_settings(&user_settings);
+	let screen_size=surface.size();
+	let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&device,&queue,screen_size,surface.view_format(),limits);
 
 	//WindowContextSetup::into_context
-	let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height);
-	let graphics_thread=crate::graphics_worker::new(graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue);
+	let fov=user_settings.calculate_fov(1.0,&screen_size).as_vec2();
+	graphics.resize(&device,screen_size,fov);
+	let graphics_thread=crate::graphics_worker::new(graphics,surface,device,queue);
 	let mut window_context=WindowContext{
 		manual_mouse_lock:false,
 		mouse_pos:glam::DVec2::ZERO,