do not step physics on mouse input, only update pos (overwriting previous pos)

.gitignore

@@ -1,2 +1 @@
 /target
-/textures

Cargo.lock

@@ -1442,20 +1442,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "rbx_xml"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc65b70827519fdc4ab47416d1085b912f087fadab9ed415471b6daba635574"
-dependencies = [
- "base64",
- "log",
- "rbx_dom_weak",
- "rbx_reflection",
- "rbx_reflection_database",
- "xml-rs",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
@@ -1467,9 +1453,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.5"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1479,9 +1465,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1659,7 +1645,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafe-client"
-version = "0.7.0"
+version = "0.4.0"
 dependencies = [
  "async-executor",
  "bytemuck",
@@ -1672,8 +1658,6 @@ dependencies = [
  "rbx_binary",
  "rbx_dom_weak",
  "rbx_reflection_database",
- "rbx_xml",
- "regex",
  "wgpu",
  "winit",
 ]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.7.0"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -17,8 +17,6 @@ pollster = "0.3.0"
 rbx_binary = "0.7.1"
 rbx_dom_weak = "2.5.0"
 rbx_reflection_database = "0.2.7"
-rbx_xml = "0.13.1"
-regex = "1.9.5"
 wgpu = "0.17.0"
 winit = "0.28.6"
 

src/body.rs

@@ -12,10 +12,8 @@ pub enum PhysicsInstruction {
 	// 	bool,//true = Trigger; false = teleport
 	// 	bool,//true = Force
 	// )
-	//InputInstructions conditionally activate RefreshWalkTarget (by doing what SetWalkTargetVelocity used to do and then flagging it)
+	//Both of these conditionally activate RefreshWalkTarget (by doing what SetWalkTargetVelocity used to do and then flagging it)
 	Input(InputInstruction),
-	//temp
-	SetSpawnPosition(glam::Vec3),
 }
 #[derive(Debug)]
 pub enum InputInstruction {
@@ -29,10 +27,6 @@ pub enum InputInstruction {
 	Jump(bool),
 	Zoom(bool),
 	Reset,
-	Idle,
-		//Idle: there were no input events, but the simulation is safe to advance to this timestep
-		//for interpolation / networking / playback reasons, most playback heads will always want
-		//to be 1 instruction ahead to generate the next state for interpolation.
 }
 
 pub struct Body {
@@ -193,20 +187,20 @@ impl Camera {
 		    offset,
 		    angles: glam::DVec2::ZERO,
 		    fov: glam::vec2(aspect,1.0),
-		    sensitivity: glam::dvec2(1.0/6144.0,1.0/6144.0),
+		    sensitivity: glam::dvec2(1.0/2048.0,1.0/2048.0),
     		time: 0,
 		}
 	}
 	fn simulate_move_angles(&self, delta: glam::IVec2) -> glam::DVec2 {
 		let mut a=self.angles-self.sensitivity*delta.as_dvec2();
-		a.y=a.y.clamp(-std::f64::consts::FRAC_PI_2, std::f64::consts::FRAC_PI_2);
+		a.y=a.y.clamp(-std::f64::consts::PI, std::f64::consts::PI);
 		return a
 	}
 	fn simulate_move_rotation_y(&self, delta_x: i32) -> glam::Mat3 {
 		mat3_from_rotation_y_f64(self.angles.x-self.sensitivity.x*(delta_x as f64))
 	}
 	pub fn proj(&self)->glam::Mat4{
-		perspective_rh(self.fov.x, self.fov.y, 0.5, 2000.0)
+		perspective_rh(self.fov.x, self.fov.y, 0.5, 1000.0)
 	}
 	pub fn view(&self,pos:glam::Vec3)->glam::Mat4{
 		//f32 good enough for view matrix
@@ -276,7 +270,6 @@ pub struct PhysicsState {
 	pub walk_accel:  f32,
 	pub gravity: glam::Vec3,
 	pub grounded: bool,
-	pub spawn_point: glam::Vec3,
 }
 
 #[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
@@ -288,7 +281,7 @@ pub enum AabbFace{
 	Bottom,
 	Front,
 }
-#[derive(Clone)]
+
 pub struct Aabb {
 	min: glam::Vec3,
 	max: glam::Vec3,
@@ -391,30 +384,28 @@ type TreyMesh = Aabb;
 pub struct ModelPhysics {
 	//A model is a thing that has a hitbox. can be represented by a list of TreyMesh-es
 	//in this iteration, all it needs is extents.
-	mesh: TreyMesh,
+	transform: glam::Mat4,
 }
 
 impl ModelPhysics {
-	pub fn from_model(model:&crate::model::IndexedModel,model_transform:glam::Affine3A) -> Self {
-		let mut aabb=Aabb::new();
-		for indexed_vertex in &model.unique_vertices {
-			aabb.grow(model_transform.transform_point3(glam::Vec3::from_array(model.unique_pos[indexed_vertex.pos as usize])));
-		}
-		Self{
-			mesh:aabb,
-		}
+	pub fn new(transform:glam::Mat4) -> Self {
+		Self{transform}
 	}
 	pub fn unit_vertices(&self) -> [glam::Vec3;8] {
 		Aabb::unit_vertices()
 	}
-	pub fn mesh(&self) -> &TreyMesh {
-		return &self.mesh;
+	pub fn mesh(&self) -> TreyMesh {
+		let mut aabb=Aabb::new();
+		for &vertex in self.unit_vertices().iter() {
+			aabb.grow(glam::Vec4Swizzles::xyz(self.transform*vertex.extend(1.0)));
+		}
+		return aabb;
 	}
 	pub fn unit_face_vertices(&self,face:TreyMeshFace) -> [glam::Vec3;4] {
 		Aabb::unit_face_vertices(face)
 	}
 	pub fn face_mesh(&self,face:TreyMeshFace) -> TreyMesh {
-		let mut aabb=self.mesh.clone();
+		let mut aabb=self.mesh();
 		//in this implementation face = worldspace aabb face
 		match face {
 			AabbFace::Right => aabb.min.x=aabb.max.x,
@@ -427,7 +418,7 @@ impl ModelPhysics {
 		return aabb;
 	}
 	pub fn face_normal(&self,face:TreyMeshFace) -> glam::Vec3 {
-		Aabb::normal(face)//this is wrong for scale
+		glam::Vec4Swizzles::xyz(Aabb::normal(face).extend(0.0))//this is wrong for scale
 	}
 }
 
@@ -441,7 +432,7 @@ pub struct RelativeCollision {
 
 impl RelativeCollision {
 	pub fn mesh(&self,models:&Vec<ModelPhysics>) -> TreyMesh {
-		return models.get(self.model as usize).unwrap().face_mesh(self.face).clone()
+		return models.get(self.model as usize).unwrap().face_mesh(self.face)
 	}
 	pub fn normal(&self,models:&Vec<ModelPhysics>) -> glam::Vec3 {
 		return models.get(self.model as usize).unwrap().face_normal(self.face)
@@ -912,16 +903,12 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 		match &ins.instruction {
 		    PhysicsInstruction::Input(InputInstruction::MoveMouse(_)) => (),//dodge time for mouse movement
     		PhysicsInstruction::Input(_)
-    		|PhysicsInstruction::SetSpawnPosition(_)
 		    |PhysicsInstruction::ReachWalkTargetVelocity
 		    |PhysicsInstruction::CollisionStart(_)
 		    |PhysicsInstruction::CollisionEnd(_)
 		    |PhysicsInstruction::StrafeTick => self.advance_time(ins.time),
 		}
 		match ins.instruction {
-			PhysicsInstruction::SetSpawnPosition(position)=>{
-				self.spawn_point=position;
-			}
 			PhysicsInstruction::CollisionStart(c) => {
 				//check ground
 				match &c.face {
@@ -1017,16 +1004,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 					InputInstruction::Zoom(s) => {
 						self.set_control(CONTROL_ZOOM,s);
 					},
-					InputInstruction::Reset => {
-						//temp
-						self.body.position=self.spawn_point;
-						//manual clear //for c in self.contacts{process_instruction(CollisionEnd(c))}
-						self.contacts.clear();
-						self.body.acceleration=self.gravity;
-						self.walk.state=WalkEnum::Reached;
-						self.grounded=false;
-					},
-					InputInstruction::Idle => (),//literally idle!
+					InputInstruction::Reset => println!("reset"),
 				}
 				//calculate control dir
 				let camera_mat=self.camera.simulate_move_rotation_y(self.mouse_interpolation.interpolated_position(self.time).x-self.mouse_interpolation.mouse0.x);

src/framework.rs

@@ -51,9 +51,8 @@ pub trait Example: 'static + Sized {
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	);
-	fn update(&mut self, window: &winit::window::Window, device: &wgpu::Device, queue: &wgpu::Queue, event: WindowEvent);
+	fn update(&mut self, device: &wgpu::Device, event: WindowEvent);
 	fn device_event(&mut self, event: DeviceEvent);
-	fn load_file(&mut self, path:std::path::PathBuf, device: &wgpu::Device, queue: &wgpu::Queue);
 	fn render(
 		&mut self,
 		view: &wgpu::TextureView,
@@ -180,41 +179,9 @@ async fn setup<E: Example>(title: &str) -> Setup {
 
 		(size, surface)
 	};
-
-	let adapter;
-
-	let optional_features = E::optional_features();
-	let required_features = E::required_features();
-
-	//no helper function smh gotta write it myself
-	let adapters = instance.enumerate_adapters(backends);
-
-	let mut chosen_adapter = None;
-	let mut chosen_adapter_score=0;
-	for adapter in adapters {
-		if !adapter.is_surface_supported(&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 = wgpu::util::initialize_adapter_from_env_or_default(&instance, Some(&surface))
+		.await
+		.expect("No suitable GPU adapters found on the system!");
 
 	#[cfg(not(target_arch = "wasm32"))]
 	{
@@ -222,6 +189,15 @@ async fn setup<E: Example>(title: &str) -> Setup {
 		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
 	}
 
+	let optional_features = E::optional_features();
+	let required_features = E::required_features();
+	let adapter_features = adapter.features();
+	assert!(
+		adapter_features.contains(required_features),
+		"Adapter does not support required features for this example: {:?}",
+		required_features - adapter_features
+	);
+
 	let required_downlevel_capabilities = E::required_downlevel_capabilities();
 	let downlevel_capabilities = adapter.get_downlevel_capabilities();
 	assert!(
@@ -245,7 +221,7 @@ async fn setup<E: Example>(title: &str) -> Setup {
 		.request_device(
 			&wgpu::DeviceDescriptor {
 				label: None,
-				features: (optional_features & adapter.features()) | required_features,
+				features: (optional_features & adapter_features) | required_features,
 				limits: needed_limits,
 			},
 			trace_dir.ok().as_ref().map(std::path::Path::new),
@@ -359,7 +335,7 @@ fn start<E: Example>(
 				WindowEvent::KeyboardInput {
 					input:
 						event::KeyboardInput {
-							virtual_keycode: Some(event::VirtualKeyCode::Scroll),
+							virtual_keycode: Some(event::VirtualKeyCode::R),
 							state: event::ElementState::Pressed,
 							..
 						},
@@ -368,7 +344,7 @@ fn start<E: Example>(
 					println!("{:#?}", instance.generate_report());
 				}
 				_ => {
-					example.update(&window,&device,&queue,event);
+					example.update(&device,event);
 				}
 			},
 			event::Event::DeviceEvent {

src/lib.rs

@@ -0,0 +1,5 @@
+pub mod framework;
+pub mod body;
+pub mod zeroes;
+pub mod instruction;
+pub mod load_roblox;

src/load_roblox.rs

@@ -1,7 +1,3 @@
-use crate::model::{IndexedModelInstances,ModelInstance};
-
-use crate::primitives;
-
 fn class_is_a(class: &str, superclass: &str) -> bool {
 	if class==superclass {
 		return true
@@ -14,371 +10,18 @@ fn class_is_a(class: &str, superclass: &str) -> bool {
 	}
 	return false
 }
-fn recursive_collect_superclass(objects: &mut std::vec::Vec<rbx_dom_weak::types::Ref>,dom: &rbx_dom_weak::WeakDom, instance: &rbx_dom_weak::Instance, superclass: &str){
-	for &referent in instance.children() {
-		if let Some(c) = dom.get_by_ref(referent) {
-			if class_is_a(c.class.as_str(), superclass) {
-				objects.push(c.referent());//copy ref
-			}
-			recursive_collect_superclass(objects,dom,c,superclass);
+pub fn get_objects<R: std::io::Read>(buf_thing: R, superclass: &str) -> Result<std::vec::Vec<rbx_dom_weak::Instance>, Box<dyn std::error::Error>> {
+	// Using buffered I/O is recommended with rbx_binary
+	let dom = rbx_binary::from_reader(buf_thing)?;
+
+	let mut objects = std::vec::Vec::<rbx_dom_weak::Instance>::new();
+	//move matching instances into objects
+	let (_,mut instances) = dom.into_raw();
+	for (_,instance) in instances.drain() {
+		if class_is_a(instance.class.as_str(), superclass) {
+			objects.push(instance);
 		}
 	}
-}
-fn get_texture_refs(dom:&rbx_dom_weak::WeakDom) -> Vec<rbx_dom_weak::types::Ref>{
-	let mut objects = std::vec::Vec::new();
-	recursive_collect_superclass(&mut objects, dom, dom.root(),"Decal");
-	//get ids
-	//clear vec
-	//next class
-	objects
-}
 
-struct RobloxAssetId(u64);
-struct RobloxAssetIdParseErr;
-impl std::str::FromStr for RobloxAssetId {
-	type Err=RobloxAssetIdParseErr;
-	fn from_str(s: &str) -> Result<Self, Self::Err>{
-		let regman=regex::Regex::new(r"(\d+)$").unwrap();
-		if let Some(captures) = regman.captures(s) {
-			if captures.len()==2{//captures[0] is all captures concatenated, and then each individual capture
-				if let Ok(id) = captures[0].parse::<u64>() {
-					return Ok(Self(id));
-				}
-			}
-		}
-		Err(RobloxAssetIdParseErr)
-	}
-}
-#[derive(Clone,Copy,PartialEq)]
-struct RobloxTextureTransform{
-	offset_u:f32,
-	offset_v:f32,
-	scale_u:f32,
-	scale_v:f32,
-}
-impl std::cmp::Eq for RobloxTextureTransform{}//????
-impl std::default::Default for RobloxTextureTransform{
-    fn default() -> Self {
-        Self{offset_u:0.0,offset_v:0.0,scale_u:1.0,scale_v:1.0}
-    }
-}
-impl std::hash::Hash for RobloxTextureTransform {
-	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-		self.offset_u.to_ne_bytes().hash(state);
-		self.offset_v.to_ne_bytes().hash(state);
-		self.scale_u.to_ne_bytes().hash(state);
-		self.scale_v.to_ne_bytes().hash(state);
-	}
-}
-#[derive(Clone,PartialEq)]
-struct RobloxFaceTextureDescription{
-	texture:u32,
-	color:glam::Vec4,
-	transform:RobloxTextureTransform,
-}
-impl std::cmp::Eq for RobloxFaceTextureDescription{}//????
-impl std::hash::Hash for RobloxFaceTextureDescription {
-	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-		self.texture.hash(state);
-		self.transform.hash(state);
-        for &el in self.color.as_ref().iter() {
-            el.to_ne_bytes().hash(state);
-        }
-    }
-}
-impl RobloxFaceTextureDescription{
-	fn to_face_description(&self)->primitives::FaceDescription{
-		primitives::FaceDescription{
-			texture:Some(self.texture),
-			transform:glam::Affine2::from_translation(
-				glam::vec2(self.transform.offset_u,self.transform.offset_v)
-			)
-			*glam::Affine2::from_scale(
-				glam::vec2(self.transform.scale_u,self.transform.scale_v)
-			),
-			color:self.color,
-		}
-	}
-}
-type RobloxPartDescription=[Option<RobloxFaceTextureDescription>;6];
-type RobloxWedgeDescription=[Option<RobloxFaceTextureDescription>;5];
-type RobloxCornerWedgeDescription=[Option<RobloxFaceTextureDescription>;4];
-#[derive(Clone,Eq,Hash,PartialEq)]
-enum RobloxBasePartDescription{
-	Sphere,
-	Part(RobloxPartDescription),
-	Cylinder,
-	Wedge(RobloxWedgeDescription),
-	CornerWedge(RobloxCornerWedgeDescription),
-}
-pub fn generate_indexed_models_roblox(dom:rbx_dom_weak::WeakDom) -> Result<(IndexedModelInstances,glam::Vec3), Box<dyn std::error::Error>>{
-	//IndexedModelInstances includes textures
-	let mut spawn_point=glam::Vec3::ZERO;
-
-	let mut indexed_models=Vec::new();
-	let mut model_id_from_description=std::collections::HashMap::<RobloxBasePartDescription,usize>::new();
-
-	let mut texture_id_from_asset_id=std::collections::HashMap::<u64,u32>::new();
-	let mut asset_id_from_texture_id=Vec::new();
-
-	let mut object_refs=Vec::new();
-	let mut temp_objects=Vec::new();
-	recursive_collect_superclass(&mut object_refs, &dom, dom.root(),"BasePart");
-	for object_ref in object_refs {
-		if let Some(object)=dom.get_by_ref(object_ref){
-			if let (
-					Some(rbx_dom_weak::types::Variant::CFrame(cf)),
-					Some(rbx_dom_weak::types::Variant::Vector3(size)),
-					Some(rbx_dom_weak::types::Variant::Float32(transparency)),
-					Some(rbx_dom_weak::types::Variant::Color3uint8(color3)),
-				) = (
-					object.properties.get("CFrame"),
-					object.properties.get("Size"),
-					object.properties.get("Transparency"),
-					object.properties.get("Color"),
-				)
-			{
-				let model_transform=glam::Affine3A::from_translation(
-					glam::Vec3::new(cf.position.x,cf.position.y,cf.position.z)
-				)
-				* glam::Affine3A::from_mat3(
-					glam::Mat3::from_cols(
-						glam::Vec3::new(cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x),
-						glam::Vec3::new(cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y),
-						glam::Vec3::new(cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z),
-					),
-				)
-				* glam::Affine3A::from_scale(
-					glam::Vec3::new(size.x,size.y,size.z)/2.0
-				);
-				if object.name=="MapStart"{
-					spawn_point=model_transform.transform_point3(glam::Vec3::Y)+glam::vec3(0.0,2.5,0.0);
-					println!("Found MapStart{:?}",spawn_point);
-				}
-				if *transparency==1.0 {
-					continue;
-				}
-
-				let shape=match &object.class[..]{
-					"Part"=>{
-						if let Some(rbx_dom_weak::types::Variant::Enum(shape))=object.properties.get("Shape"){
-							match shape.to_u32(){
-								0=>primitives::Primitives::Sphere,
-								1=>primitives::Primitives::Cube,
-								2=>primitives::Primitives::Cylinder,
-								3=>primitives::Primitives::Wedge,
-								4=>primitives::Primitives::CornerWedge,
-								_=>{
-									println!("Funky roblox PartType={}; defaulting to cube",shape.to_u32());
-									primitives::Primitives::Cube
-								},
-							}
-						}else{
-							println!("Part has no Shape! defaulting to cube");
-							primitives::Primitives::Cube
-						}
-					},
-					"WedgePart"=>primitives::Primitives::Wedge,
-					"CornerWedgePart"=>primitives::Primitives::CornerWedge,
-					_=>{
-						println!("Unsupported BasePart ClassName={}; defaulting to cube",object.class);
-						primitives::Primitives::Cube
-					}
-				};
-
-				//TODO: also detect "CylinderMesh" etc here
-				let mut face_map=std::collections::HashMap::new();
-				match shape{
-					primitives::Primitives::Cube => {
-						face_map.insert(0,0);//Right
-						face_map.insert(1,1);//Top
-						face_map.insert(2,2);//Back
-						face_map.insert(3,3);//Left
-						face_map.insert(4,4);//Bottom
-						face_map.insert(5,5);//Front
-					},
-					primitives::Primitives::Wedge => {
-						face_map.insert(0,0);//Right
-						face_map.insert(1,1);//Top -> TopFront (some surf maps put surf textures on the Top face)
-						face_map.insert(2,1);//Front -> TopFront
-						face_map.insert(3,2);//Back
-						face_map.insert(4,3);//Left
-						face_map.insert(5,4);//Bottom
-					},
-					primitives::Primitives::CornerWedge => {
-						//Right -> None
-						face_map.insert(1,0);//Top
-						//Back -> None
-						face_map.insert(3,1);//Right
-						face_map.insert(4,2);//Bottom
-						face_map.insert(5,3);//Front
-					},
-					//do not support textured spheres/cylinders imported from roblox
-					//this can be added later, there are some maps that use it
-					primitives::Primitives::Sphere
-					|primitives::Primitives::Cylinder => (),
-				}
-				//use the biggest one and cut it down later...
-				let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
-				temp_objects.clear();
-				recursive_collect_superclass(&mut temp_objects, &dom, object,"Decal");
-				for &decal_ref in &temp_objects{
-					if let Some(decal)=dom.get_by_ref(decal_ref){
-						if let (
-							Some(rbx_dom_weak::types::Variant::Content(content)),
-							Some(rbx_dom_weak::types::Variant::Enum(normalid)),
-							Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
-							Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
-						) = (
-							decal.properties.get("Texture"),
-							decal.properties.get("Face"),
-							decal.properties.get("Color3"),
-							decal.properties.get("Transparency"),
-						) {
-							if let Ok(asset_id)=content.clone().into_string().parse::<RobloxAssetId>(){
-								let texture_id=if let Some(&texture_id)=texture_id_from_asset_id.get(&asset_id.0){
-									texture_id
-								}else{
-									let texture_id=asset_id_from_texture_id.len() as u32;
-									texture_id_from_asset_id.insert(asset_id.0,texture_id);
-									asset_id_from_texture_id.push(asset_id.0);
-									texture_id
-								};
-								let normal_id=normalid.to_u32();
-								if let Some(&face)=face_map.get(&normal_id){
-									let mut roblox_texture_transform=RobloxTextureTransform::default();
-									let mut roblox_texture_color=glam::Vec4::ONE;
-									if decal.class=="Texture"{
-										//generate tranform
-										if let (
-												Some(rbx_dom_weak::types::Variant::Float32(ox)),
-												Some(rbx_dom_weak::types::Variant::Float32(oy)),
-												Some(rbx_dom_weak::types::Variant::Float32(sx)),
-												Some(rbx_dom_weak::types::Variant::Float32(sy)),
-											) = (
-												decal.properties.get("OffsetStudsU"),
-												decal.properties.get("OffsetStudsV"),
-												decal.properties.get("StudsPerTileU"),
-												decal.properties.get("StudsPerTileV"),
-											)
-										{
-											let (size_u,size_v)=match normal_id{
-												0=>(size.z,size.y),//right
-												1=>(size.x,size.z),//top
-												2=>(size.x,size.y),//back
-												3=>(size.z,size.y),//left
-												4=>(size.x,size.z),//bottom
-												5=>(size.x,size.y),//front
-												_=>(1.,1.),
-											};
-											roblox_texture_transform=RobloxTextureTransform{
-												offset_u:*ox/(*sx),offset_v:*oy/(*sy),
-												scale_u:size_u/(*sx),scale_v:size_v/(*sy),
-											};
-											roblox_texture_color=glam::vec4(decal_color3.r,decal_color3.g,decal_color3.b,1.0-*decal_transparency);
-										}
-									}
-									part_texture_description[face]=Some(RobloxFaceTextureDescription{
-										texture:texture_id,
-										color:roblox_texture_color,
-										transform:roblox_texture_transform,
-									});
-								}else{
-									println!("NormalId={} unsupported for shape={:?}",normal_id,shape);
-								}
-							}
-						}
-					}
-				}
-				//obscure rust syntax "slice pattern"
-				let [f0,f1,f2,f3,f4,f5]=part_texture_description;
-				let basepart_texture_description=match shape{
-					primitives::Primitives::Sphere=>RobloxBasePartDescription::Sphere,
-					primitives::Primitives::Cube=>RobloxBasePartDescription::Part([f0,f1,f2,f3,f4,f5]),
-					primitives::Primitives::Cylinder=>RobloxBasePartDescription::Cylinder,
-					//HAHAHA
-					primitives::Primitives::Wedge=>RobloxBasePartDescription::Wedge([f0,f1,f2,f3,f4]),
-					primitives::Primitives::CornerWedge=>RobloxBasePartDescription::CornerWedge([f0,f1,f2,f3]),
-				};
-				//make new model if unit cube has not been crated before
-				let model_id=if let Some(&model_id)=model_id_from_description.get(&basepart_texture_description){
-					//push to existing texture model
-					model_id
-				}else{
-					let model_id=indexed_models.len();
-					model_id_from_description.insert(basepart_texture_description.clone(),model_id);//borrow checker going crazy
-					indexed_models.push(match basepart_texture_description{
-						RobloxBasePartDescription::Sphere=>primitives::unit_sphere(),
-						RobloxBasePartDescription::Part(part_texture_description)=>{
-							let mut cube_face_description=primitives::CubeFaceDescription::new();
-							for (face_id,roblox_face_description) in part_texture_description.iter().enumerate(){
-								cube_face_description.insert(
-								match face_id{
-									0=>primitives::CubeFace::Right,
-									1=>primitives::CubeFace::Top,
-									2=>primitives::CubeFace::Back,
-									3=>primitives::CubeFace::Left,
-									4=>primitives::CubeFace::Bottom,
-									5=>primitives::CubeFace::Front,
-									_=>panic!("unreachable"),
-								},
-								match roblox_face_description{
-									Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
-									None=>primitives::FaceDescription::default(),
-								});
-							}
-							primitives::generate_partial_unit_cube(cube_face_description)
-						},
-						RobloxBasePartDescription::Cylinder=>primitives::unit_cylinder(),
-						RobloxBasePartDescription::Wedge(wedge_texture_description)=>{
-							let mut wedge_face_description=primitives::WedgeFaceDescription::new();
-							for (face_id,roblox_face_description) in wedge_texture_description.iter().enumerate(){
-								wedge_face_description.insert(
-								match face_id{
-									0=>primitives::WedgeFace::Right,
-									1=>primitives::WedgeFace::TopFront,
-									2=>primitives::WedgeFace::Back,
-									3=>primitives::WedgeFace::Left,
-									4=>primitives::WedgeFace::Bottom,
-									_=>panic!("unreachable"),
-								},
-								match roblox_face_description{
-									Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
-									None=>primitives::FaceDescription::default(),
-								});
-							}
-							primitives::generate_partial_unit_wedge(wedge_face_description)
-						},
-						RobloxBasePartDescription::CornerWedge(cornerwedge_texture_description)=>{
-							let mut cornerwedge_face_description=primitives::CornerWedgeFaceDescription::new();
-							for (face_id,roblox_face_description) in cornerwedge_texture_description.iter().enumerate(){
-								cornerwedge_face_description.insert(
-								match face_id{
-									0=>primitives::CornerWedgeFace::Top,
-									1=>primitives::CornerWedgeFace::Right,
-									2=>primitives::CornerWedgeFace::Bottom,
-									3=>primitives::CornerWedgeFace::Front,
-									_=>panic!("unreachable"),
-								},
-								match roblox_face_description{
-									Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
-									None=>primitives::FaceDescription::default(),
-								});
-							}
-							primitives::generate_partial_unit_cornerwedge(cornerwedge_face_description)
-						},
-					});
-					model_id
-				};
-				indexed_models[model_id].instances.push(ModelInstance {
-					transform:model_transform,
-					color:glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
-				});
-			}
-		}
-	}
-	Ok((IndexedModelInstances{
-		textures:asset_id_from_texture_id.iter().map(|t|t.to_string()).collect(),
-		models:indexed_models,
-	},spawn_point))
+	return Ok(objects)
 }

src/main.rs

@@ -1,24 +1,31 @@
+use bytemuck::{Pod, Zeroable};
+use strafe_client::{instruction::{TimedInstruction, InstructionConsumer},body::{InputInstruction, PhysicsInstruction}};
 use std::{borrow::Cow, time::Instant};
 use wgpu::{util::DeviceExt, AstcBlock, AstcChannel};
-use model::{Vertex,ModelInstance,ModelGraphicsInstance};
-use body::{InputInstruction, PhysicsInstruction};
-use instruction::{TimedInstruction, InstructionConsumer};
 
-mod body;
-mod model;
-mod zeroes;
-mod framework;
-mod primitives;
-mod instruction;
-mod load_roblox;
+const IMAGE_SIZE: u32 = 128;
+
+#[derive(Clone, Copy, Pod, Zeroable)]
+#[repr(C)]
+struct Vertex {
+	pos: [f32; 3],
+	texture: [f32; 2],
+	normal: [f32; 3],
+}
 
 struct Entity {
 	index_count: u32,
 	index_buf: wgpu::Buffer,
 }
 
+struct ModelData {
+	transforms: Vec<glam::Mat4>,
+	vertices: Vec<Vertex>,
+	entities: Vec<Vec<u16>>,
+}
+
 struct ModelGraphics {
-	instances: Vec<ModelGraphicsInstance>,
+	transforms: Vec<glam::Mat4>,
 	vertex_buf: wgpu::Buffer,
 	entities: Vec<Entity>,
 	bind_group: wgpu::BindGroup,
@@ -46,7 +53,7 @@ pub struct GraphicsPipelines {
 pub struct GraphicsData {
 	start_time: std::time::Instant,
 	screen_size: (u32, u32),
-	physics: body::PhysicsState,
+	physics: strafe_client::body::PhysicsState,
 	pipelines: GraphicsPipelines,
 	bind_groups: GraphicsBindGroups,
 	bind_group_layouts: GraphicsBindGroupLayouts,
@@ -56,6 +63,7 @@ pub struct GraphicsData {
 	models: Vec<ModelGraphics>,
 	depth_view: wgpu::TextureView,
 	staging_belt: wgpu::util::StagingBelt,
+	handy_unit_cube: obj::ObjData,
 }
 
 impl GraphicsData {
@@ -83,254 +91,153 @@ impl GraphicsData {
 		depth_texture.create_view(&wgpu::TextureViewDescriptor::default())
 	}
 
-	fn generate_model_physics(&mut self,indexed_models:&model::IndexedModelInstances){
-		for model in &indexed_models.models{
-			//make aabb and run vertices to get realistic bounds
-			for model_instance in &model.instances{
-				self.physics.models.push(body::ModelPhysics::from_model(&model,model_instance.transform));
-			}
-		}
-		println!("Physics Objects: {}",self.physics.models.len());
-	}
-	fn generate_model_graphics(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,mut indexed_models:model::IndexedModelInstances){
-		//generate texture view per texture
-
-		//idk how to do this gooder lol
-		let mut double_map=std::collections::HashMap::<u32,u32>::new();
-		let mut texture_loading_threads=Vec::new();
-		let num_textures=indexed_models.textures.len();
-		for (i,texture_id) in indexed_models.textures.into_iter().enumerate(){
-			if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",texture_id))){
-				double_map.insert(i as u32, texture_loading_threads.len() as u32);
-				texture_loading_threads.push((texture_id,std::thread::spawn(move ||{
-					ddsfile::Dds::read(&mut file).unwrap()
-				})));
-			}
-		}
-
-		let texture_views:Vec<wgpu::TextureView>=texture_loading_threads.into_iter().map(|(texture_id,thread)|{
-			let image=thread.join().unwrap();
-
-			let (mut width,mut height)=(image.get_width(),image.get_height());
-
-			let format=match image.header10.unwrap().dxgi_format{
-				ddsfile::DxgiFormat::R8G8B8A8_UNorm_sRGB => wgpu::TextureFormat::Rgba8UnormSrgb,
-				ddsfile::DxgiFormat::BC7_UNorm_sRGB => {
-					//floor(w,4), should be ceil(w,4)
-					width=width/4*4;
-					height=height/4*4;
-					wgpu::TextureFormat::Bc7RgbaUnormSrgb
-				},
-				other=>panic!("unsupported format {:?}",other),
-			};
-
-			let size = wgpu::Extent3d {
-				width,
-				height,
-				depth_or_array_layers: 1,
-			};
-
-			let layer_size = wgpu::Extent3d {
-				depth_or_array_layers: 1,
-				..size
-			};
-			let max_mips = layer_size.max_mips(wgpu::TextureDimension::D2);
-
-			let texture = device.create_texture_with_data(
-				queue,
-				&wgpu::TextureDescriptor {
-					size,
-					mip_level_count: max_mips,
-					sample_count: 1,
-					dimension: wgpu::TextureDimension::D2,
-					format,
-					usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
-					label: Some(format!("Texture{}",texture_id).as_str()),
-					view_formats: &[],
-				},
-				&image.data,
-			);
-			texture.create_view(&wgpu::TextureViewDescriptor {
-				label: Some(format!("Texture{} View",texture_id).as_str()),
-				dimension: Some(wgpu::TextureViewDimension::D2),
-				..wgpu::TextureViewDescriptor::default()
-			})
-		}).collect();
-
-		//split groups with different textures into separate models
-		//the models received here are supposed to be tightly packed, i.e. no code needs to check if two models are using the same groups.
-		let indexed_models_len=indexed_models.models.len();
-		let mut unique_texture_models=Vec::with_capacity(indexed_models_len);
-		for mut model in indexed_models.models.drain(..){
-			//convert ModelInstance into ModelGraphicsInstance
-			let instances:Vec<ModelGraphicsInstance>=model.instances.iter().map(|instance|{
-				ModelGraphicsInstance{
-					transform: glam::Mat4::from(instance.transform),
-					normal_transform: glam::Mat4::from(instance.transform.inverse()).transpose(),
-					color: instance.color,
-				}
-			}).collect();
-			//check each group, if it's using a new texture then make a new clone of the model
-			let id=unique_texture_models.len();
-			let mut unique_textures=Vec::new();
-			for group in model.groups.drain(..){
-				//ignore zero coppy optimization for now
-				let texture_index=if let Some(texture_index)=unique_textures.iter().position(|&texture|texture==group.texture){
-					texture_index
-				}else{
-					//create new texture_index
-					let texture_index=unique_textures.len();
-					unique_textures.push(group.texture);
-					unique_texture_models.push(model::IndexedModelSingleTexture{
-						unique_pos:model.unique_pos.clone(),
-						unique_tex:model.unique_tex.clone(),
-						unique_normal:model.unique_normal.clone(),
-						unique_color:model.unique_color.clone(),
-						unique_vertices:model.unique_vertices.clone(),
-						texture:group.texture,
-						groups:Vec::new(),
-						instances:instances.clone(),
-					});
-					texture_index
-				};
-				unique_texture_models[id+texture_index].groups.push(model::IndexedGroupFixedTexture{
-					polys:group.polys,
-				});
-			}
-		}
-		//de-index models
-		let mut models=Vec::with_capacity(unique_texture_models.len());
-		for model in unique_texture_models.drain(..){
-			let mut vertices = Vec::new();
-			let mut index_from_vertex = std::collections::HashMap::new();//::<IndexedVertex,usize>
-			let mut entities = Vec::new();
-			//TODO: combine groups using the same render pattern
-			for group in model.groups {
-				let mut indices = Vec::new();
-				for poly in group.polys {
-					for end_index in 2..poly.vertices.len() {
-						for &index in &[0, end_index - 1, end_index] {
-							let vertex_index = poly.vertices[index];
-							if let Some(&i)=index_from_vertex.get(&vertex_index){
-								indices.push(i);
-							}else{
-								let i=vertices.len() as u16;
-								let vertex=&model.unique_vertices[vertex_index as usize];
-								vertices.push(Vertex {
-									pos: model.unique_pos[vertex.pos as usize],
-									tex: model.unique_tex[vertex.tex as usize],
-									normal: model.unique_normal[vertex.normal as usize],
-									color:model.unique_color[vertex.color as usize],
-								});
-								index_from_vertex.insert(vertex_index,i);
-								indices.push(i);
-							}
+	fn generate_modeldatas_roblox<R: std::io::Read>(&self,input:R) -> Vec<ModelData>{
+		let mut modeldatas=generate_modeldatas(self.handy_unit_cube.clone());
+		match strafe_client::load_roblox::get_objects(input, "BasePart") {
+			Ok(objects)=>{
+				for object in objects.iter() {
+					if let (
+							Some(rbx_dom_weak::types::Variant::CFrame(cf)),
+							Some(rbx_dom_weak::types::Variant::Vector3(size)),
+							Some(rbx_dom_weak::types::Variant::Float32(transparency)),
+						) = (
+							object.properties.get("CFrame"),
+							object.properties.get("Size"),
+							object.properties.get("Transparency"),
+						)
+					{
+						if *transparency==1.0 {
+							continue;
 						}
+						modeldatas[0].transforms.push(
+							glam::Mat4::from_translation(
+								glam::Vec3::new(cf.position.x,cf.position.y,cf.position.z)
+							)
+							* glam::Mat4::from_mat3(
+								glam::Mat3::from_cols(
+									glam::Vec3::new(cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x),
+									glam::Vec3::new(cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y),
+									glam::Vec3::new(cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z),
+								),
+							)
+							* glam::Mat4::from_scale(
+								glam::Vec3::new(size.x,size.y,size.z)/2.0
+							)
+						)
 					}
 				}
-				entities.push(indices);
-			}
-			models.push(model::ModelSingleTexture{
-				instances:model.instances,
-				vertices,
-				entities,
-				texture:model.texture,
-			});
+			},
+			Err(e) => println!("lmao err {:?}", e),
 		}
+		modeldatas
+	}
+	fn generate_model_graphics(&mut self,device:&wgpu::Device,mut modeldatas:Vec<ModelData>){
 		//drain 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=<GraphicsData as framework::Example>::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.drain(..) {
-			instance_count+=model.instances.len();
-			for instances_chunk in model.instances.rchunks(chunk_size){
-				model_count+=1;
-				let model_uniforms = get_instances_buffer_data(instances_chunk);
-				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),
-					usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
-				});
-				let texture_view=match model.texture{
-					Some(texture_id)=>{
-						match double_map.get(&texture_id){
-							Some(&mapped_texture_id)=>&texture_views[mapped_texture_id as usize],
-							None=>&self.temp_squid_texture_view,
-						}
+		self.models.reserve(modeldatas.len());
+		for (i,modeldata) in modeldatas.drain(..).enumerate() {
+			let model_uniforms = get_transform_uniform_data(&modeldata.transforms);
+			let model_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+				label: Some(format!("ModelGraphics{}",i).as_str()),
+				contents: bytemuck::cast_slice(&model_uniforms),
+				usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
+			});
+			let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+				layout: &self.bind_group_layouts.model,
+				entries: &[
+					wgpu::BindGroupEntry {
+						binding: 0,
+						resource: model_buf.as_entire_binding(),
 					},
-					None=>&self.temp_squid_texture_view,
-				};
-				let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
-					layout: &self.bind_group_layouts.model,
-					entries: &[
-						wgpu::BindGroupEntry {
-							binding: 0,
-							resource: model_buf.as_entire_binding(),
-						},
-						wgpu::BindGroupEntry {
-							binding: 1,
-							resource: wgpu::BindingResource::TextureView(texture_view),
-						},
-						wgpu::BindGroupEntry {
-							binding: 2,
-							resource: wgpu::BindingResource::Sampler(&self.samplers.repeat),
-						},
-					],
-					label: Some(format!("Model{} Bind Group",model_count).as_str()),
-				});
-				let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-					label: Some("Vertex"),
-					contents: bytemuck::cast_slice(&model.vertices),
-					usage: wgpu::BufferUsages::VERTEX,
-				});
-				//all of these are being moved here
-				self.models.push(ModelGraphics{
-					instances:instances_chunk.to_vec(),
-					vertex_buf,
-					entities: model.entities.iter().map(|indices|{
-						let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-							label: Some("Index"),
-							contents: bytemuck::cast_slice(&indices),
-							usage: wgpu::BufferUsages::INDEX,
-						});
-						Entity {
-							index_buf,
-							index_count: indices.len() as u32,
-						}
-					}).collect(),
-					bind_group: model_bind_group,
-					model_buf,
-				});
-			}
+					wgpu::BindGroupEntry {
+						binding: 1,
+						resource: wgpu::BindingResource::TextureView(&self.temp_squid_texture_view),
+					},
+					wgpu::BindGroupEntry {
+						binding: 2,
+						resource: wgpu::BindingResource::Sampler(&self.samplers.repeat),
+					},
+				],
+				label: Some(format!("ModelGraphics{}",i).as_str()),
+			});
+			let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+				label: Some("Vertex"),
+				contents: bytemuck::cast_slice(&modeldata.vertices),
+				usage: wgpu::BufferUsages::VERTEX,
+			});
+			//all of these are being moved here
+			self.models.push(ModelGraphics{
+				transforms:modeldata.transforms,
+				vertex_buf,
+				entities: modeldata.entities.iter().map(|indices|{
+					let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+						label: Some("Index"),
+						contents: bytemuck::cast_slice(&indices),
+						usage: wgpu::BufferUsages::INDEX,
+					});
+					Entity {
+						index_buf,
+						index_count: indices.len() as u32,
+					}
+				}).collect(),
+				bind_group: model_bind_group,
+				model_buf,
+			})
 		}
-		println!("Texture References={}",num_textures);
-		println!("Textures Loaded={}",texture_views.len());
-		println!("Indexed Models={}",indexed_models_len);
-		println!("Graphics Objects: {}",self.models.len());
-		println!("Graphics Instances: {}",instance_count);
 	}
 }
 
-const MODEL_BUFFER_SIZE:usize=4*4 + 4*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:&[ModelGraphicsInstance]) -> Vec<f32> {
-	let mut raw = Vec::with_capacity(MODEL_BUFFER_SIZE*instances.len());
-	for (i,mi) in instances.iter().enumerate(){
-    	let mut v = raw.split_off(MODEL_BUFFER_SIZE*i);
-    	//model transform
-    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
-    	//normal transform
-    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.normal_transform)[..]);
-    	//color
-    	raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color));
+fn get_transform_uniform_data(transforms:&Vec<glam::Mat4>) -> Vec<f32> {
+	let mut raw = Vec::with_capacity(4*4*transforms.len());
+	for (i,t) in transforms.iter().enumerate(){
+    	let mut v = raw.split_off(4*4*i);
+    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(t)[..]);
     	raw.append(&mut v);
 	}
 	raw
 }
 
-fn to_uniform_data(camera: &body::Camera, pos: glam::Vec3) -> [f32; 16 * 3 + 4] {
+fn generate_modeldatas(data:obj::ObjData) -> Vec<ModelData>{
+	let mut modeldatas=Vec::new();
+	let mut vertices = Vec::new();
+	let mut vertex_index = std::collections::HashMap::<obj::IndexTuple,u16>::new();
+	for object in data.objects {
+		vertices.clear();
+		vertex_index.clear();
+		let mut entities = Vec::new();
+		for group in object.groups {
+			let mut indices = Vec::new();
+			for poly in group.polys {
+				for end_index in 2..poly.0.len() {
+					for &index in &[0, end_index - 1, end_index] {
+						let vert = poly.0[index];
+						if let Some(&i)=vertex_index.get(&vert){
+							indices.push(i);
+						}else{
+							let i=vertices.len() as u16;
+							vertices.push(Vertex {
+								pos: data.position[vert.0],
+								texture: data.texture[vert.1.unwrap()],
+								normal: data.normal[vert.2.unwrap()],
+							});
+							vertex_index.insert(vert,i);
+							indices.push(i);
+						}
+					}
+				}
+			}
+			entities.push(indices);
+		}
+		modeldatas.push(ModelData {
+			transforms: vec![],
+			vertices:vertices.clone(),
+			entities,
+		});
+	}
+	modeldatas
+}
+
+
+fn to_uniform_data(camera: &strafe_client::body::Camera, pos: glam::Vec3) -> [f32; 16 * 3 + 4] {
 	let proj=camera.proj();
 	let proj_inv = proj.inverse();
 	let view=camera.view(pos);
@@ -344,60 +251,109 @@ fn to_uniform_data(camera: &body::Camera, pos: glam::Vec3) -> [f32; 16 * 3 + 4]
 	raw
 }
 
-impl framework::Example for GraphicsData {
+impl strafe_client::framework::Example for GraphicsData {
 	fn optional_features() -> wgpu::Features {
 		wgpu::Features::TEXTURE_COMPRESSION_ASTC
 			| wgpu::Features::TEXTURE_COMPRESSION_ETC2
+			| wgpu::Features::TEXTURE_COMPRESSION_BC
 	}
-	fn required_features() -> wgpu::Features {
-		wgpu::Features::TEXTURE_COMPRESSION_BC
-	}
-	fn required_limits() -> wgpu::Limits {
-		wgpu::Limits::default() //framework.rs was using goofy limits that caused me a multi-day headache
-	}
+
 	fn init(
 		config: &wgpu::SurfaceConfiguration,
 		_adapter: &wgpu::Adapter,
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	) -> Self {
-		let mut indexed_models = Vec::new();
-		indexed_models.append(&mut model::generate_indexed_model_list_from_obj(obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap(),*glam::Vec4::ONE.as_ref()));
-		indexed_models.push(primitives::unit_sphere());
-		indexed_models.push(primitives::unit_cylinder());
-		indexed_models.push(primitives::unit_cube());
-		println!("models.len = {:?}", indexed_models.len());
-		indexed_models[0].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_translation(glam::vec3(10.,0.,-10.)),
-			color:glam::Vec4::ONE,
-		});
+		let unit_cube=obj::ObjData{
+			position: vec![
+				[-1.,-1., 1.],//left bottom back
+				[ 1.,-1., 1.],//right bottom back
+				[ 1., 1., 1.],//right top back
+				[-1., 1., 1.],//left top back
+				[-1., 1.,-1.],//left top front
+				[ 1., 1.,-1.],//right top front
+				[ 1.,-1.,-1.],//right bottom front
+				[-1.,-1.,-1.],//left bottom front
+			],
+			texture: vec![[0.0,0.0],[1.0,0.0],[1.0,1.0],[0.0,1.0]],
+			normal: vec![
+				[1.,0.,0.],//AabbFace::Right
+				[0.,1.,0.],//AabbFace::Top
+				[0.,0.,1.],//AabbFace::Back
+				[-1.,0.,0.],//AabbFace::Left
+				[0.,-1.,0.],//AabbFace::Bottom
+				[0.,0.,-1.],//AabbFace::Front
+			],
+			objects: vec![obj::Object{
+				name: "Unit Cube".to_owned(),
+				groups: vec![obj::Group{
+					name: "Cube Vertices".to_owned(),
+					index: 0,
+					material: None,
+					polys: vec![
+						// back (0, 0, 1)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(0,Some(0),Some(2)),
+							obj::IndexTuple(1,Some(1),Some(2)),
+							obj::IndexTuple(2,Some(2),Some(2)),
+							obj::IndexTuple(3,Some(3),Some(2)),
+						]),
+						// front (0, 0,-1)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(4,Some(0),Some(5)),
+							obj::IndexTuple(5,Some(1),Some(5)),
+							obj::IndexTuple(6,Some(2),Some(5)),
+							obj::IndexTuple(7,Some(3),Some(5)),
+						]),
+						// right (1, 0, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(6,Some(0),Some(0)),
+							obj::IndexTuple(5,Some(1),Some(0)),
+							obj::IndexTuple(2,Some(2),Some(0)),
+							obj::IndexTuple(1,Some(3),Some(0)),
+						]),
+						// left (-1, 0, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(0,Some(0),Some(3)),
+							obj::IndexTuple(3,Some(1),Some(3)),
+							obj::IndexTuple(4,Some(2),Some(3)),
+							obj::IndexTuple(7,Some(3),Some(3)),
+						]),
+						// top (0, 1, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(5,Some(1),Some(1)),
+							obj::IndexTuple(4,Some(0),Some(1)),
+							obj::IndexTuple(3,Some(3),Some(1)),
+							obj::IndexTuple(2,Some(2),Some(1)),
+						]),
+						// bottom (0,-1, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(1,Some(1),Some(4)),
+							obj::IndexTuple(0,Some(0),Some(4)),
+							obj::IndexTuple(7,Some(3),Some(4)),
+							obj::IndexTuple(6,Some(2),Some(4)),
+						]),
+					],
+				}]
+			}],
+			material_libs: Vec::new(),
+		};
+		let mut modeldatas = Vec::<ModelData>::new();
+		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap()));
+		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap()));
+		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap()));
+		modeldatas.append(&mut generate_modeldatas(unit_cube.clone()));
+		println!("models.len = {:?}", modeldatas.len());
+		modeldatas[0].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,0.,-10.)));
 		//quad monkeys
-		indexed_models[1].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_translation(glam::vec3(10.,5.,10.)),
-			color:glam::Vec4::ONE,
-		});
-		indexed_models[1].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_translation(glam::vec3(20.,5.,10.)),
-			color:glam::vec4(1.0,0.0,0.0,1.0),
-		});
-		indexed_models[1].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_translation(glam::vec3(10.,5.,20.)),
-			color:glam::vec4(0.0,1.0,0.0,1.0),
-		});
-		indexed_models[1].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_translation(glam::vec3(20.,5.,20.)),
-			color:glam::vec4(0.0,0.0,1.0,1.0),
-		});
+		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,5.,10.)));
+		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(20.,5.,10.)));
+		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,5.,20.)));
+		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(20.,5.,20.)));
 		//teapot
-		indexed_models[2].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_scale_rotation_translation(glam::vec3(0.5, 1.0, 0.2),glam::quat(-0.22248298016985793,-0.839457167990537,-0.05603504040830783,-0.49261857546227916),glam::vec3(-10.,7.,10.)),
-			color:glam::Vec4::ONE,
-		});
+		modeldatas[2].transforms.push(glam::Mat4::from_translation(glam::vec3(-10.,5.,10.)));
 		//ground
-		indexed_models[3].instances.push(ModelInstance{
-			transform:glam::Affine3A::from_translation(glam::vec3(0.,0.,0.))*glam::Affine3A::from_scale(glam::vec3(160.0, 1.0, 160.0)),
-			color:glam::Vec4::ONE,
-		});
+		modeldatas[3].transforms.push(glam::Mat4::from_translation(glam::vec3(0.,0.,0.))*glam::Mat4::from_scale(glam::vec3(160.0, 1.0, 160.0)));
 
 		let camera_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
 			label: None,
@@ -494,9 +450,8 @@ impl framework::Example for GraphicsData {
 			source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
 		});
 
-		let physics = body::PhysicsState {
-			spawn_point:glam::vec3(0.0,50.0,0.0),
-			body: body::Body::with_pva(glam::vec3(0.0,50.0,0.0),glam::vec3(0.0,0.0,0.0),glam::vec3(0.0,-100.0,0.0)),
+		let physics = strafe_client::body::PhysicsState {
+			body: strafe_client::body::Body::with_pva(glam::vec3(0.0,50.0,0.0),glam::vec3(0.0,0.0,0.0),glam::vec3(0.0,-100.0,0.0)),
 			time: 0,
 			tick: 0,
 			strafe_tick_num: 100,//100t
@@ -508,11 +463,17 @@ impl framework::Example for GraphicsData {
 			grounded: false,
 			walkspeed: 18.0,
 			contacts: std::collections::HashSet::new(),
-			models: Vec::new(),
-			walk: body::WalkState::new(),
+			models: modeldatas.iter().map(|m|
+    			//make aabb and run vertices to get realistic bounds
+    			//this needs to be a function generate_model_physics
+    			m.transforms.iter().map(|t|
+    				strafe_client::body::ModelPhysics::new(*t)
+				)
+			).flatten().collect(),
+			walk: strafe_client::body::WalkState::new(),
 			hitbox_halfsize: glam::vec3(1.0,2.5,1.0),
-			camera: body::Camera::from_offset(glam::vec3(0.0,4.5-2.5,0.0),(config.width as f32)/(config.height as f32)),
-			mouse_interpolation: body::MouseInterpolationState::new(),
+			camera: strafe_client::body::Camera::from_offset(glam::vec3(0.0,4.5-2.5,0.0),(config.width as f32)/(config.height as f32)),
+			mouse_interpolation: strafe_client::body::MouseInterpolationState::new(),
 			controls: 0,
 		};
 
@@ -537,22 +498,9 @@ impl framework::Example for GraphicsData {
 				wgpu::TextureFormat::Bgra8UnormSrgb
 			};
 
-			let bytes = match skybox_format {
-				wgpu::TextureFormat::Astc {
-					block: AstcBlock::B4x4,
-					channel: AstcChannel::UnormSrgb,
-				} => &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!(),
-			};
-
-			let skybox_image = ddsfile::Dds::read(&mut std::io::Cursor::new(bytes)).unwrap();
-
 			let size = wgpu::Extent3d {
-				width: skybox_image.get_width(),
-				height: skybox_image.get_height(),
+				width: IMAGE_SIZE,
+				height: IMAGE_SIZE,
 				depth_or_array_layers: 6,
 			};
 
@@ -565,11 +513,24 @@ impl framework::Example for GraphicsData {
 			log::debug!(
 				"Copying {:?} skybox images of size {}, {}, 6 with {} mips to gpu",
 				skybox_format,
-				size.width,
-				size.height,
+				IMAGE_SIZE,
+				IMAGE_SIZE,
 				max_mips,
 			);
 
+			let bytes = match skybox_format {
+				wgpu::TextureFormat::Astc {
+					block: AstcBlock::B4x4,
+					channel: AstcChannel::UnormSrgb,
+				} => &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!(),
+			};
+
+			let skybox_image = ddsfile::Dds::read(&mut std::io::Cursor::new(&bytes)).unwrap();
+
 			let skybox_texture = device.create_texture_with_data(
 				queue,
 				&wgpu::TextureDescriptor {
@@ -594,13 +555,9 @@ impl framework::Example for GraphicsData {
 
 		//squid
 		let squid_texture_view={
-			let bytes = include_bytes!("../images/squid.dds");
-
-			let image = ddsfile::Dds::read(&mut std::io::Cursor::new(bytes)).unwrap();
-
 			let size = wgpu::Extent3d {
-				width: image.get_width(),
-				height: image.get_height(),
+				width: 1076,
+				height: 1076,
 				depth_or_array_layers: 1,
 			};
 
@@ -610,6 +567,10 @@ impl framework::Example for GraphicsData {
 			};
 			let max_mips = layer_size.max_mips(wgpu::TextureDimension::D2);
 
+			let bytes = &include_bytes!("../images/squid.dds")[..];
+
+			let image = ddsfile::Dds::read(&mut std::io::Cursor::new(&bytes)).unwrap();
+
 			let texture = device.create_texture_with_data(
 				queue,
 				&wgpu::TextureDescriptor {
@@ -632,19 +593,11 @@ impl framework::Example for GraphicsData {
 			})
 		};
 
-		let model_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+		let 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,
-			],
-			push_constant_ranges: &[],
-		});
-		let sky_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-			label: None,
-			bind_group_layouts: &[
-				&camera_bind_group_layout,
 				&skybox_texture_bind_group_layout,
 			],
 			push_constant_ranges: &[],
@@ -653,7 +606,7 @@ impl framework::Example for GraphicsData {
 		// Create the render pipelines
 		let sky_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
 			label: Some("Sky Pipeline"),
-			layout: Some(&sky_pipeline_layout),
+			layout: Some(&pipeline_layout),
 			vertex: wgpu::VertexState {
 				module: &shader,
 				entry_point: "vs_sky",
@@ -680,14 +633,14 @@ impl framework::Example for GraphicsData {
 		});
 		let model_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
 			label: Some("Model Pipeline"),
-			layout: Some(&model_pipeline_layout),
+			layout: Some(&pipeline_layout),
 			vertex: wgpu::VertexState {
 				module: &shader,
 				entry_point: "vs_entity_texture",
 				buffers: &[wgpu::VertexBufferLayout {
 					array_stride: std::mem::size_of::<Vertex>() as wgpu::BufferAddress,
 					step_mode: wgpu::VertexStepMode::Vertex,
-					attributes: &wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x2, 2 => Float32x3, 3 => Float32x4],
+					attributes: &wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x2, 2 => Float32x3],
 				}],
 			},
 			fragment: Some(wgpu::FragmentState {
@@ -744,6 +697,7 @@ impl framework::Example for GraphicsData {
 		let depth_view = Self::create_depth_texture(config, device);
 
 		let mut graphics=GraphicsData {
+			handy_unit_cube:unit_cube,
 			start_time: Instant::now(),
 			screen_size: (config.width,config.height),
 			physics,
@@ -764,129 +718,24 @@ impl framework::Example for GraphicsData {
 			temp_squid_texture_view: squid_texture_view,
 		};
 
-		let indexed_model_instances=model::IndexedModelInstances{
-			textures:Vec::new(),
-			models:indexed_models,
-		};
-		graphics.generate_model_physics(&indexed_model_instances);
-		graphics.generate_model_graphics(&device,&queue,indexed_model_instances);
-
-		let args:Vec<String>=std::env::args().collect();
-		if args.len()==2{
-			graphics.load_file(std::path::PathBuf::from(&args[1]), device, queue);
-		}
+		graphics.generate_model_graphics(&device,modeldatas);
 
 		return graphics;
 	}
 
-	fn load_file(&mut self,path: std::path::PathBuf, device: &wgpu::Device, queue: &wgpu::Queue){
-		println!("Loading file: {:?}", &path);
-		//oh boy! let's load the map!
-		if let Ok(file)=std::fs::File::open(path){
-			let mut input = std::io::BufReader::new(file);
-			let mut first_8=[0u8;8];
-			//.rbxm roblox binary = "<roblox!"
-			//.rbxmx roblox xml = "<roblox "
-			//.bsp = "VBSP"
-			//.vmf = 
-			//.snf = "SNMF"
-			//.snf = "SNBF"
-			if let (Ok(()),Ok(()))=(std::io::Read::read_exact(&mut input, &mut first_8),std::io::Seek::rewind(&mut input)){
-				//
-				if let Some(Ok((indexed_model_instances,spawn_point)))={
-					match &first_8[0..4]{
-						b"<rob"=>{
-							match match &first_8[4..8]{
-								b"lox!"=>rbx_binary::from_reader(input).map_err(|e|format!("{:?}",e)),
-								b"lox "=>rbx_xml::from_reader(input,rbx_xml::DecodeOptions::default()).map_err(|e|format!("{:?}",e)),
-								other=>Err(format!("Unknown Roblox file type {:?}",other)),
-							}{
-								Ok(dom)=>Some(load_roblox::generate_indexed_models_roblox(dom)),
-								Err(e)=>{
-									println!("Error loading roblox file:{:?}",e);
-									None
-								},
-							}
-						},
-						//b"VBSP"=>load_valve::generate_indexed_models_valve(input),
-						//b"SNFM"=>sniffer::generate_indexed_models(input),
-						//b"SNFB"=>sniffer::load_bot(input),
-						_=>None,
-					}
-				}{
-					//if generate_indexed_models succeeds, clear the previous ones
-					self.models.clear();
-					self.physics.models.clear();
-					self.generate_model_physics(&indexed_model_instances);
-					self.generate_model_graphics(device,queue,indexed_model_instances);
-					//manual reset
-					let time=self.physics.time;
-					instruction::InstructionConsumer::process_instruction(&mut self.physics, instruction::TimedInstruction{
-						time,
-						instruction: body::PhysicsInstruction::SetSpawnPosition(spawn_point),
-					});
-					instruction::InstructionConsumer::process_instruction(&mut self.physics, instruction::TimedInstruction{
-						time,
-						instruction: body::PhysicsInstruction::Input(body::InputInstruction::Reset),
-					});
-				}else{
-					println!("No modeldatas were generated");
-				}
-			}else{
-				println!("Failed to read first 8 bytes and seek back to beginning of file.");
-			}
-		}else{
-			println!("Could not open file");
-		}
-	}
-
 	#[allow(clippy::single_match)]
-	fn update(&mut self, window: &winit::window::Window, device: &wgpu::Device, queue: &wgpu::Queue, event: winit::event::WindowEvent) {
-		let time=self.start_time.elapsed().as_nanos() as i64;
+	fn update(&mut self, device: &wgpu::Device, event: winit::event::WindowEvent) {
 		match event {
-			winit::event::WindowEvent::DroppedFile(path) => self.load_file(path,device,queue),
-			winit::event::WindowEvent::KeyboardInput {
-				input:winit::event::KeyboardInput{state, virtual_keycode,..},
-				..
-			}=>{
-				let s=match state {
-					winit::event::ElementState::Pressed => true,
-					winit::event::ElementState::Released => false,
-				};
-				match virtual_keycode{
-					Some(winit::event::VirtualKeyCode::Tab)=>{
-						if s{
-							if let Ok(())=window.set_cursor_grab(winit::window::CursorGrabMode::None){
-								window.set_cursor_visible(true);
-							}
-						}else{
-							if let Ok(())=window.set_cursor_grab(winit::window::CursorGrabMode::Locked){
-								window.set_cursor_visible(false);
-							}
-						}
-					},
-					Some(keycode)=>{
-						if let Some(input_instruction)=match keycode {
-							winit::event::VirtualKeyCode::W => Some(InputInstruction::MoveForward(s)),
-							winit::event::VirtualKeyCode::A => Some(InputInstruction::MoveLeft(s)),
-							winit::event::VirtualKeyCode::S => Some(InputInstruction::MoveBack(s)),
-							winit::event::VirtualKeyCode::D => Some(InputInstruction::MoveRight(s)),
-							winit::event::VirtualKeyCode::E => Some(InputInstruction::MoveUp(s)),
-							winit::event::VirtualKeyCode::Q => Some(InputInstruction::MoveDown(s)),
-							winit::event::VirtualKeyCode::Space => Some(InputInstruction::Jump(s)),
-							winit::event::VirtualKeyCode::Z => Some(InputInstruction::Zoom(s)),
-							winit::event::VirtualKeyCode::R => if s{Some(InputInstruction::Reset)}else{None},
-							_ => None,
-						}
-						{
-							self.physics.run(time);
-							self.physics.process_instruction(TimedInstruction{
-								time,
-								instruction:PhysicsInstruction::Input(input_instruction),
-							})
-						}
-					},
-					_=>(),
+			winit::event::WindowEvent::DroppedFile(path) => {
+				println!("opening file: {:?}", &path);
+				//oh boy! let's load the map!
+				if let Ok(file)=std::fs::File::open(path){
+					let input = std::io::BufReader::new(file);
+					let modeldatas=self.generate_modeldatas_roblox(input);
+					self.generate_model_graphics(device,modeldatas);
+					//also physics
+				}else{
+					println!("Could not open file");
 				}
 			},
 			_=>(),
@@ -897,7 +746,6 @@ impl framework::Example for GraphicsData {
 		//there's no way this is the best way get a timestamp.
 		let time=self.start_time.elapsed().as_nanos() as i64;
 		match event {
-			/* use WindowEvent for input for now because DeviceEvent doesn't work on wayland
 			winit::event::DeviceEvent::Key(winit::event::KeyboardInput {
 				state,
 				scancode: keycode,
@@ -927,7 +775,6 @@ impl framework::Example for GraphicsData {
 					})
 				}
 			},
-			*/
 			winit::event::DeviceEvent::MouseMotion {
 			    delta,//these (f64,f64) are integers on my machine
 			} => {
@@ -943,7 +790,7 @@ impl framework::Example for GraphicsData {
 			    delta,
 			} => {
 				println!("mousewheel{:?}",delta);
-				if false{//self.physics.style.use_scroll{
+				if true{//self.physics.use_scroll
 					self.physics.run(time);
 					self.physics.process_instruction(TimedInstruction{
 						time,
@@ -971,7 +818,7 @@ impl framework::Example for GraphicsData {
 		view: &wgpu::TextureView,
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
-		_spawner: &framework::Spawner,
+		_spawner: &strafe_client::framework::Spawner,
 	) {
 		let time=self.start_time.elapsed().as_nanos() as i64;
 
@@ -993,7 +840,7 @@ impl framework::Example for GraphicsData {
 			.copy_from_slice(bytemuck::cast_slice(&camera_uniforms));
 		//This code only needs to run when the uniforms change
 		for model in self.models.iter() {
-			let model_uniforms = get_instances_buffer_data(&model.instances);
+			let model_uniforms = get_transform_uniform_data(&model.transforms);
 			self.staging_belt
 				.write_buffer(
 					&mut encoder,
@@ -1033,16 +880,16 @@ impl framework::Example for GraphicsData {
 			});
 
 			rpass.set_bind_group(0, &self.bind_groups.camera, &[]);
-			rpass.set_bind_group(1, &self.bind_groups.skybox_texture, &[]);
+			rpass.set_bind_group(2, &self.bind_groups.skybox_texture, &[]);
 
 			rpass.set_pipeline(&self.pipelines.model);
 			for model in self.models.iter() {
-				rpass.set_bind_group(2, &model.bind_group, &[]);
+				rpass.set_bind_group(1, &model.bind_group, &[]);
 				rpass.set_vertex_buffer(0, model.vertex_buf.slice(..));
 
 				for entity in model.entities.iter() {
 					rpass.set_index_buffer(entity.index_buf.slice(..), wgpu::IndexFormat::Uint16);
-					rpass.draw_indexed(0..entity.index_count, 0, 0..model.instances.len() as u32);
+					rpass.draw_indexed(0..entity.index_count, 0, 0..model.transforms.len() as u32);
 				}
 			}
 
@@ -1057,7 +904,7 @@ impl framework::Example for GraphicsData {
 }
 
 fn main() {
-	framework::run::<GraphicsData>(
+	strafe_client::framework::run::<GraphicsData>(
 		format!("Strafe Client v{}",
 			env!("CARGO_PKG_VERSION")
 		).as_str()

src/model.rs

@@ -1,107 +0,0 @@
-use bytemuck::{Pod, Zeroable};
-#[derive(Clone, Copy, Pod, Zeroable)]
-#[repr(C)]
-pub struct Vertex {
-	pub pos: [f32; 3],
-	pub tex: [f32; 2],
-	pub normal: [f32; 3],
-	pub color: [f32; 4],
-}
-#[derive(Clone,Hash,PartialEq,Eq)]
-pub struct IndexedVertex{
-	pub pos:u32,
-	pub tex:u32,
-	pub normal:u32,
-	pub color:u32,
-}
-pub struct IndexedPolygon{
-	pub vertices:Vec<u32>,
-}
-pub struct IndexedGroup{
-	pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
-	pub polys:Vec<IndexedPolygon>,
-}
-pub struct IndexedModel{
-	pub unique_pos:Vec<[f32; 3]>,
-	pub unique_tex:Vec<[f32; 2]>,
-	pub unique_normal:Vec<[f32; 3]>,
-	pub unique_color:Vec<[f32; 4]>,
-	pub unique_vertices:Vec<IndexedVertex>,
-	pub groups: Vec<IndexedGroup>,
-	pub instances:Vec<ModelInstance>,
-}
-pub struct IndexedGroupFixedTexture{
-	pub polys:Vec<IndexedPolygon>,
-}
-pub struct IndexedModelSingleTexture{
-	pub unique_pos:Vec<[f32; 3]>,
-	pub unique_tex:Vec<[f32; 2]>,
-	pub unique_normal:Vec<[f32; 3]>,
-	pub unique_color:Vec<[f32; 4]>,
-	pub unique_vertices:Vec<IndexedVertex>,
-	pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
-	pub groups: Vec<IndexedGroupFixedTexture>,
-	pub instances:Vec<ModelGraphicsInstance>,
-}
-pub struct ModelSingleTexture{
-	pub instances: Vec<ModelGraphicsInstance>,
-	pub vertices: Vec<Vertex>,
-	pub entities: Vec<Vec<u16>>,
-	pub texture: Option<u32>,
-}
-#[derive(Clone)]
-pub struct ModelGraphicsInstance{
-	pub transform:glam::Mat4,
-	pub normal_transform:glam::Mat4,
-	pub color:glam::Vec4,
-}
-pub struct ModelInstance{
-	pub transform:glam::Affine3A,
-	pub color:glam::Vec4,
-}
-pub struct IndexedModelInstances{
-	pub textures:Vec<String>,//RenderPattern
-	pub models:Vec<IndexedModel>,
-	//object_index for spawns, triggers etc?
-}
-
-pub fn generate_indexed_model_list_from_obj(data:obj::ObjData,color:[f32;4]) -> Vec<IndexedModel>{
-	let mut unique_vertex_index = std::collections::HashMap::<obj::IndexTuple,u32>::new();
-	return data.objects.iter().map(|object|{
-		unique_vertex_index.clear();
-		let mut unique_vertices = Vec::new();
-		let groups = object.groups.iter().map(|group|{
-			IndexedGroup{
-				texture:None,
-				polys:group.polys.iter().map(|poly|{
-					IndexedPolygon{
-						vertices:poly.0.iter().map(|&tup|{
-							if let Some(&i)=unique_vertex_index.get(&tup){
-								i
-							}else{
-								let i=unique_vertices.len() as u32;
-								unique_vertices.push(IndexedVertex{
-									pos: tup.0 as u32,
-									tex: tup.1.unwrap() as u32,
-									normal: tup.2.unwrap() as u32,
-									color: 0,
-								});
-								unique_vertex_index.insert(tup,i);
-								i
-							}
-						}).collect()
-					}
-				}).collect()
-			}
-		}).collect();
-		IndexedModel{
-			unique_pos: data.position.clone(),
-			unique_tex: data.texture.clone(),
-			unique_normal: data.normal.clone(),
-			unique_color: vec![color],
-			unique_vertices,
-			groups,
-			instances:Vec::new(),
-		}
-	}).collect()
-}

src/primitives.rs

@@ -1,503 +0,0 @@
-use crate::model::{IndexedModel, IndexedPolygon, IndexedGroup, IndexedVertex};
-
-#[derive(Debug)]
-pub enum Primitives{
-	Sphere,
-	Cube,
-	Cylinder,
-	Wedge,
-	CornerWedge,
-}
-#[derive(Hash,PartialEq,Eq)]
-pub enum CubeFace{
-	Right,
-	Top,
-	Back,
-	Left,
-	Bottom,
-	Front,
-}
-const CUBE_DEFAULT_TEXTURE_COORDS:[[f32;2];4]=[[0.0,0.0],[1.0,0.0],[1.0,1.0],[0.0,1.0]];
-const CUBE_DEFAULT_VERTICES:[[f32;3];8]=[
-	[-1.,-1., 1.],//0 left bottom back
-	[ 1.,-1., 1.],//1 right bottom back
-	[ 1., 1., 1.],//2 right top back
-	[-1., 1., 1.],//3 left top back
-	[-1., 1.,-1.],//4 left top front
-	[ 1., 1.,-1.],//5 right top front
-	[ 1.,-1.,-1.],//6 right bottom front
-	[-1.,-1.,-1.],//7 left bottom front
-];
-const CUBE_DEFAULT_NORMALS:[[f32;3];6]=[
-	[ 1., 0., 0.],//CubeFace::Right
-	[ 0., 1., 0.],//CubeFace::Top
-	[ 0., 0., 1.],//CubeFace::Back
-	[-1., 0., 0.],//CubeFace::Left
-	[ 0.,-1., 0.],//CubeFace::Bottom
-	[ 0., 0.,-1.],//CubeFace::Front
-];
-const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
-	// right (1, 0, 0)
-	[
-		[6,2,0],//[vertex,tex,norm]
-		[5,1,0],
-		[2,0,0],
-		[1,3,0],
-	],
-	// top (0, 1, 0)
-	[
-		[5,3,1],
-		[4,2,1],
-		[3,1,1],
-		[2,0,1],
-	],
-	// back (0, 0, 1)
-	[
-		[0,3,2],
-		[1,2,2],
-		[2,1,2],
-		[3,0,2],
-	],
-	// left (-1, 0, 0)
-	[
-		[0,2,3],
-		[3,1,3],
-		[4,0,3],
-		[7,3,3],
-	],
-	// bottom (0,-1, 0)
-	[
-		[1,1,4],
-		[0,0,4],
-		[7,3,4],
-		[6,2,4],
-	],
-	// front (0, 0,-1)
-	[
-		[4,1,5],
-		[5,0,5],
-		[6,3,5],
-		[7,2,5],
-	],
-];
-
-#[derive(Hash,PartialEq,Eq)]
-pub enum WedgeFace{
-	Right,
-	TopFront,
-	Back,
-	Left,
-	Bottom,
-}
-const WEDGE_DEFAULT_NORMALS:[[f32;3];5]=[
-	[ 1., 0., 0.],//Wedge::Right
-	[ 0., 1.,-1.],//Wedge::TopFront
-	[ 0., 0., 1.],//Wedge::Back
-	[-1., 0., 0.],//Wedge::Left
-	[ 0.,-1., 0.],//Wedge::Bottom
-];
-/*
-local cornerWedgeVerticies = {
-	Vector3.new(-1/2,-1/2,-1/2),7
-	Vector3.new(-1/2,-1/2, 1/2),0
-	Vector3.new( 1/2,-1/2,-1/2),6
-	Vector3.new( 1/2,-1/2, 1/2),1
-	Vector3.new( 1/2, 1/2,-1/2),5
-}
-*/
-#[derive(Hash,PartialEq,Eq)]
-pub enum CornerWedgeFace{
-	Top,
-	Right,
-	Bottom,
-	Front,
-}
-const CORNERWEDGE_DEFAULT_NORMALS:[[f32;3];5]=[
-	[ 1., 0., 0.],//Wedge::Right
-	[ 0., 1., 1.],//Wedge::BackTop
-	[-1., 1., 0.],//Wedge::LeftTop
-	[ 0.,-1., 0.],//Wedge::Bottom
-	[ 0., 0.,-1.],//Wedge::Front
-];
-//HashMap fits this use case perfectly but feels like using a sledgehammer to drive a nail
-pub fn unit_sphere()->crate::model::IndexedModel{
-	let mut indexed_model=crate::model::generate_indexed_model_list_from_obj(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap(),*glam::Vec4::ONE.as_ref()).remove(0);
-	for pos in indexed_model.unique_pos.iter_mut(){
-		pos[0]=pos[0]*0.5;
-		pos[1]=pos[1]*0.5;
-		pos[2]=pos[2]*0.5;
-	}
-	indexed_model
-}
-pub type CubeFaceDescription=std::collections::HashMap::<CubeFace,FaceDescription>;
-pub fn unit_cube()->crate::model::IndexedModel{
-	let mut t=CubeFaceDescription::new();
-	t.insert(CubeFace::Right,FaceDescription::default());
-	t.insert(CubeFace::Top,FaceDescription::default());
-	t.insert(CubeFace::Back,FaceDescription::default());
-	t.insert(CubeFace::Left,FaceDescription::default());
-	t.insert(CubeFace::Bottom,FaceDescription::default());
-	t.insert(CubeFace::Front,FaceDescription::default());
-	generate_partial_unit_cube(t)
-}
-const TEAPOT_TRANSFORM:glam::Mat3=glam::mat3(glam::vec3(0.0,0.1,0.0),glam::vec3(-0.1,0.0,0.0),glam::vec3(0.0,0.0,0.1));
-pub fn unit_cylinder()->crate::model::IndexedModel{
-	let mut indexed_model=crate::model::generate_indexed_model_list_from_obj(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap(),*glam::Vec4::ONE.as_ref()).remove(0);
-	for pos in indexed_model.unique_pos.iter_mut(){
-		[pos[0],pos[1],pos[2]]=*(TEAPOT_TRANSFORM*glam::Vec3::from_array(*pos)).as_ref();
-	}
-	indexed_model
-}
-pub type WedgeFaceDescription=std::collections::HashMap::<WedgeFace,FaceDescription>;
-pub fn unit_wedge()->crate::model::IndexedModel{
-	let mut t=WedgeFaceDescription::new();
-	t.insert(WedgeFace::Right,FaceDescription::default());
-	t.insert(WedgeFace::TopFront,FaceDescription::default());
-	t.insert(WedgeFace::Back,FaceDescription::default());
-	t.insert(WedgeFace::Left,FaceDescription::default());
-	t.insert(WedgeFace::Bottom,FaceDescription::default());
-	generate_partial_unit_wedge(t)
-}
-pub type CornerWedgeFaceDescription=std::collections::HashMap::<CornerWedgeFace,FaceDescription>;
-pub fn unit_cornerwedge()->crate::model::IndexedModel{
-	let mut t=CornerWedgeFaceDescription::new();
-	t.insert(CornerWedgeFace::Right,FaceDescription::default());
-	t.insert(CornerWedgeFace::Top,FaceDescription::default());
-	t.insert(CornerWedgeFace::Bottom,FaceDescription::default());
-	t.insert(CornerWedgeFace::Front,FaceDescription::default());
-	generate_partial_unit_cornerwedge(t)
-}
-
-#[derive(Copy,Clone)]
-pub struct FaceDescription{
-	pub texture:Option<u32>,
-	pub transform:glam::Affine2,
-	pub color:glam::Vec4,
-}
-impl std::default::Default for FaceDescription{
-	fn default()->Self {
-		Self{
-			texture:None,
-			transform:glam::Affine2::IDENTITY,
-			color:glam::vec4(1.0,1.0,1.0,0.0),//zero alpha to hide the default texture
-		}
-	}
-}
-impl FaceDescription{
-	pub fn new(texture:u32,transform:glam::Affine2,color:glam::Vec4)->Self{
-		Self{texture:Some(texture),transform,color}
-	}
-	pub fn from_texture(texture:u32)->Self{
-		Self{
-			texture:Some(texture),
-			transform:glam::Affine2::IDENTITY,
-			color:glam::Vec4::ONE,
-		}
-	}
-}
-//TODO: it's probably better to use a shared vertex buffer between all primitives and use indexed rendering instead of generating a unique vertex buffer for each primitive.
-//implementation: put all roblox primitives into one model.groups <- this won't work but I forget why
-pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->crate::model::IndexedModel{
-	let mut generated_pos=Vec::<[f32;3]>::new();
-	let mut generated_tex=Vec::new();
-	let mut generated_normal=Vec::new();
-	let mut generated_color=Vec::new();
-	let mut generated_vertices=Vec::new();
-	let mut groups=Vec::new();
-	let mut transforms=Vec::new();
-	//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
-	for (face,face_description) in face_descriptions.iter(){
-		//assume that scanning short lists is faster than hashing.
-		let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
-			transform_index
-		}else{
-			//create new transform_index
-			let transform_index=transforms.len();
-			transforms.push(face_description.transform);
-			for tex in CUBE_DEFAULT_TEXTURE_COORDS{
-				generated_tex.push(*face_description.transform.transform_point2(glam::Vec2::from_array(tex)).as_ref());
-			}
-			transform_index
-		} as u32;
-		let color_index=if let Some(color_index)=generated_color.iter().position(|color|color==face_description.color.as_ref()){
-			color_index
-		}else{
-			//create new color_index
-			let color_index=generated_color.len();
-			generated_color.push(*face_description.color.as_ref());
-			color_index
-		} as u32;
-		let face_id=match face{
-			CubeFace::Right => 0,
-			CubeFace::Top => 1,
-			CubeFace::Back => 2,
-			CubeFace::Left => 3,
-			CubeFace::Bottom => 4,
-			CubeFace::Front => 5,
-		};
-		//always push normal
-		let normal_index=generated_normal.len() as u32;
-		generated_normal.push(CUBE_DEFAULT_NORMALS[face_id]);
-		//push vertices as they are needed
-		groups.push(IndexedGroup{
-			texture:face_description.texture,
-			polys:vec![IndexedPolygon{
-				vertices:CUBE_DEFAULT_POLYS[face_id].map(|tup|{
-					let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
-					let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
-						pos_index
-					}else{
-						//create new pos_index
-						let pos_index=generated_pos.len();
-						generated_pos.push(pos);
-						pos_index
-					} as u32;
-					//always push vertex
-					let vertex=IndexedVertex{
-						pos:pos_index,
-						tex:tup[1]+4*transform_index,
-						normal:normal_index,
-						color:color_index,
-					};
-					let vert_index=generated_vertices.len();
-					generated_vertices.push(vertex);
-					vert_index as u32
-				}).to_vec(),
-			}],
-		});
-	}
-	IndexedModel{
-		unique_pos:generated_pos,
-		unique_tex:generated_tex,
-		unique_normal:generated_normal,
-		unique_color:generated_color,
-		unique_vertices:generated_vertices,
-		groups,
-		instances:Vec::new(),
-	}
-}
-//don't think too hard about the copy paste because this is all going into the map tool eventually...
-pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->crate::model::IndexedModel{
-	let wedge_default_polys=vec![
-		// right (1, 0, 0)
-		vec![
-			[6,2,0],//[vertex,tex,norm]
-			[2,0,0],
-			[1,3,0],
-		],
-		// FrontTop (0, 1, -1)
-		vec![
-			[3,1,1],
-			[2,0,1],
-			[6,3,1],
-			[7,2,1],
-		],
-		// back (0, 0, 1)
-		vec![
-			[0,3,2],
-			[1,2,2],
-			[2,1,2],
-			[3,0,2],
-		],
-		// left (-1, 0, 0)
-		vec![
-			[0,2,3],
-			[3,1,3],
-			[7,3,3],
-		],
-		// bottom (0,-1, 0)
-		vec![
-			[1,1,4],
-			[0,0,4],
-			[7,3,4],
-			[6,2,4],
-		],
-	];
-	let mut generated_pos=Vec::<[f32;3]>::new();
-	let mut generated_tex=Vec::new();
-	let mut generated_normal=Vec::new();
-	let mut generated_color=Vec::new();
-	let mut generated_vertices=Vec::new();
-	let mut groups=Vec::new();
-	let mut transforms=Vec::new();
-	//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
-	for (face,face_description) in face_descriptions.iter(){
-		//assume that scanning short lists is faster than hashing.
-		let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
-			transform_index
-		}else{
-			//create new transform_index
-			let transform_index=transforms.len();
-			transforms.push(face_description.transform);
-			for tex in CUBE_DEFAULT_TEXTURE_COORDS{
-				generated_tex.push(*face_description.transform.transform_point2(glam::Vec2::from_array(tex)).as_ref());
-			}
-			transform_index
-		} as u32;
-		let color_index=if let Some(color_index)=generated_color.iter().position(|color|color==face_description.color.as_ref()){
-			color_index
-		}else{
-			//create new color_index
-			let color_index=generated_color.len();
-			generated_color.push(*face_description.color.as_ref());
-			color_index
-		} as u32;
-		let face_id=match face{
-			WedgeFace::Right => 0,
-			WedgeFace::TopFront => 1,
-			WedgeFace::Back => 2,
-			WedgeFace::Left => 3,
-			WedgeFace::Bottom => 4,
-		};
-		//always push normal
-		let normal_index=generated_normal.len() as u32;
-		generated_normal.push(WEDGE_DEFAULT_NORMALS[face_id]);
-		//push vertices as they are needed
-		groups.push(IndexedGroup{
-			texture:face_description.texture,
-			polys:vec![IndexedPolygon{
-				vertices:wedge_default_polys[face_id].iter().map(|tup|{
-					let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
-					let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
-						pos_index
-					}else{
-						//create new pos_index
-						let pos_index=generated_pos.len();
-						generated_pos.push(pos);
-						pos_index
-					} as u32;
-					//always push vertex
-					let vertex=IndexedVertex{
-						pos:pos_index,
-						tex:tup[1]+4*transform_index,
-						normal:normal_index,
-						color:color_index,
-					};
-					let vert_index=generated_vertices.len();
-					generated_vertices.push(vertex);
-					vert_index as u32
-				}).collect(),
-			}],
-		});
-	}
-	IndexedModel{
-		unique_pos:generated_pos,
-		unique_tex:generated_tex,
-		unique_normal:generated_normal,
-		unique_color:generated_color,
-		unique_vertices:generated_vertices,
-		groups,
-		instances:Vec::new(),
-	}
-}
-
-pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescription)->crate::model::IndexedModel{
-	let cornerwedge_default_polys=vec![
-		// right (1, 0, 0)
-		vec![
-			[6,2,0],//[vertex,tex,norm]
-			[5,1,0],
-			[1,3,0],
-		],
-		// BackTop (0, 1, 1)
-		vec![
-			[5,3,1],
-			[0,1,1],
-			[1,0,1],
-		],
-		// LeftTop (-1, 1, 0)
-		vec![
-			[5,3,2],
-			[7,2,2],
-			[0,1,2],
-		],
-		// bottom (0,-1, 0)
-		vec![
-			[1,1,3],
-			[0,0,3],
-			[7,3,3],
-			[6,2,3],
-		],
-		// front (0, 0,-1)
-		vec![
-			[5,0,4],
-			[6,3,4],
-			[7,2,4],
-		],
-	];
-	let mut generated_pos=Vec::<[f32;3]>::new();
-	let mut generated_tex=Vec::new();
-	let mut generated_normal=Vec::new();
-	let mut generated_color=Vec::new();
-	let mut generated_vertices=Vec::new();
-	let mut groups=Vec::new();
-	let mut transforms=Vec::new();
-	//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
-	for (face,face_description) in face_descriptions.iter(){
-		//assume that scanning short lists is faster than hashing.
-		let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
-			transform_index
-		}else{
-			//create new transform_index
-			let transform_index=transforms.len();
-			transforms.push(face_description.transform);
-			for tex in CUBE_DEFAULT_TEXTURE_COORDS{
-				generated_tex.push(*face_description.transform.transform_point2(glam::Vec2::from_array(tex)).as_ref());
-			}
-			transform_index
-		} as u32;
-		let color_index=if let Some(color_index)=generated_color.iter().position(|color|color==face_description.color.as_ref()){
-			color_index
-		}else{
-			//create new color_index
-			let color_index=generated_color.len();
-			generated_color.push(*face_description.color.as_ref());
-			color_index
-		} as u32;
-		let face_id=match face{
-			CornerWedgeFace::Right => 0,
-			CornerWedgeFace::Top => 1,
-			CornerWedgeFace::Bottom => 2,
-			CornerWedgeFace::Front => 3,
-		};
-		//always push normal
-		let normal_index=generated_normal.len() as u32;
-		generated_normal.push(CORNERWEDGE_DEFAULT_NORMALS[face_id]);
-		//push vertices as they are needed
-		groups.push(IndexedGroup{
-			texture:face_description.texture,
-			polys:vec![IndexedPolygon{
-				vertices:cornerwedge_default_polys[face_id].iter().map(|tup|{
-					let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
-					let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
-						pos_index
-					}else{
-						//create new pos_index
-						let pos_index=generated_pos.len();
-						generated_pos.push(pos);
-						pos_index
-					} as u32;
-					//always push vertex
-					let vertex=IndexedVertex{
-						pos:pos_index,
-						tex:tup[1]+4*transform_index,
-						normal:normal_index,
-						color:color_index,
-					};
-					let vert_index=generated_vertices.len();
-					generated_vertices.push(vertex);
-					vert_index as u32
-				}).collect(),
-			}],
-		});
-	}
-	IndexedModel{
-		unique_pos:generated_pos,
-		unique_tex:generated_tex,
-		unique_normal:generated_normal,
-		unique_color:generated_color,
-		unique_vertices:generated_vertices,
-		groups,
-		instances:Vec::new(),
-	}
-}

src/shader.wgsl

@@ -41,22 +41,19 @@ fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
 	return result;
 }
 
-struct ModelInstance{
-	transform:mat4x4<f32>,
-	normal_transform:mat4x4<f32>,
-	color:vec4<f32>,
-}
+const MAX_ENTITY_INSTANCES=1024;
+//group 1 is the model
+@group(1)
+@binding(0)
+var<uniform> entity_transforms: array<mat4x4<f32>,MAX_ENTITY_INSTANCES>;
+//var<uniform> entity_texture_transforms: array<mat3x3<f32>,MAX_ENTITY_INSTANCES>;
 //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=4096;
-@group(2)
-@binding(0)
-var<uniform> model_instances: array<ModelInstance, MAX_MODEL_INSTANCES>;
-@group(2)
+//how to do no texture?
+@group(1)
 @binding(1)
 var model_texture: texture_2d<f32>;
-@group(2)
+@group(1)
 @binding(2)
 var model_sampler: sampler;
 
@@ -65,8 +62,6 @@ struct EntityOutputTexture {
 	@location(1) texture: vec2<f32>,
 	@location(2) normal: vec3<f32>,
 	@location(3) view: vec3<f32>,
-	@location(4) color: vec4<f32>,
-	@location(5) @interpolate(flat) model_color: vec4<f32>,
 };
 @vertex
 fn vs_entity_texture(
@@ -74,30 +69,27 @@ fn vs_entity_texture(
 	@location(0) pos: vec3<f32>,
 	@location(1) texture: vec2<f32>,
 	@location(2) normal: vec3<f32>,
-	@location(3) color: vec4<f32>,
 ) -> EntityOutputTexture {
-	var position: vec4<f32> = model_instances[instance].transform * vec4<f32>(pos, 1.0);
+	var position: vec4<f32> = entity_transforms[instance] * vec4<f32>(pos, 1.0);
 	var result: EntityOutputTexture;
-	result.normal = (model_instances[instance].normal_transform * vec4<f32>(normal, 1.0)).xyz;
-	result.texture = texture;
-	result.color = color;
-	result.model_color = model_instances[instance].color;
+	result.normal = (entity_transforms[instance] * vec4<f32>(normal, 0.0)).xyz;
+	result.texture=texture;//(entity_texture_transforms[instance] * vec3<f32>(texture, 1.0)).xy;
 	result.view = position.xyz - camera.cam_pos.xyz;
 	result.position = camera.proj * camera.view * position;
 	return result;
 }
 
 //group 2 is the skybox texture
-@group(1)
+@group(2)
 @binding(0)
 var cube_texture: texture_cube<f32>;
-@group(1)
+@group(2)
 @binding(1)
 var cube_sampler: sampler;
 
 @fragment
 fn fs_sky(vertex: SkyOutput) -> @location(0) vec4<f32> {
-	return textureSample(cube_texture, cube_sampler, vertex.sampledir);
+	return textureSample(cube_texture, model_sampler, vertex.sampledir);
 }
 
 @fragment
@@ -107,7 +99,7 @@ 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).rgb;
 	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),1.0-pow(1.0-abs(d),2.0));
+	return vec4<f32>(mix(vec3<f32>(0.1) + 0.5 * reflected_color,fragment_color,1.0-pow(1.0-abs(d),2.0)), 1.0);
 }

src/zeroes.rs

@@ -1,5 +1,4 @@
 //find roots of polynomials
-#[inline]
 pub fn zeroes2(a0:f32,a1:f32,a2:f32) -> Vec<f32>{
 	if a2==0f32{
 		return zeroes1(a0, a1);