comment unused type

Cargo.lock

@@ -1659,7 +1659,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafe-client"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "async-executor",
  "bytemuck",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/body.rs

@@ -4,11 +4,7 @@ use crate::{instruction::{InstructionEmitter, InstructionConsumer, TimedInstruct
 pub enum PhysicsInstruction {
 	CollisionStart(RelativeCollision),
 	CollisionEnd(RelativeCollision),
-	SetControlDir(glam::Vec3),
 	StrafeTick,
-	Jump,
-	SetWalkTargetVelocity(glam::Vec3),
-	RefreshWalkTarget,
 	ReachWalkTargetVelocity,
 	// Water,
 	// Spawn(
@@ -16,6 +12,23 @@ 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)
+	Input(InputInstruction),
+	//temp
+	SetSpawnPosition(glam::Vec3),
+}
+#[derive(Debug)]
+pub enum InputInstruction {
+	MoveMouse(glam::IVec2),
+	MoveForward(bool),
+	MoveLeft(bool),
+	MoveBack(bool),
+	MoveRight(bool),
+	MoveUp(bool),
+	MoveDown(bool),
+	Jump(bool),
+	Zoom(bool),
+	Reset,
 }
 
 pub struct Body {
@@ -51,34 +64,35 @@ pub enum MoveRestriction {
 	Ladder,//multiple ladders how
 }
 
-enum MouseInterpolation {
-	First,//just checks the last value
-	Lerp,//lerps between
-}
-
+/*
 enum InputInstruction {
-	MoveMouse(glam::IVec2),
-	Jump(bool),
 }
-
 struct InputState {
-	controls: u32,
-	mouse_interpolation: MouseInterpolation,
-	time: TIME,
 }
-
 impl InputState {
 	pub fn get_control(&self,control:u32) -> bool {
 		self.controls&control!=0
 	}
-	pub fn process_instruction(&mut self,ins:InputInstruction){
-		match ins {
-			InputInstruction::MoveMouse(m) => todo!("set mouse_interpolation"),
-			InputInstruction::Jump(b) => todo!("how does info about style modifiers get here"),
-		}
+}
+impl crate::instruction::InstructionEmitter<InputInstruction> for InputState{
+	fn next_instruction(&self, time_limit:crate::body::TIME) -> Option<TimedInstruction<InputInstruction>> {
+	    //this is polled by PhysicsState for actions like Jump
+	    //no, it has to be the other way around. physics is run up until the jump instruction, and then the jump instruction is pushed.
+	    self.queue.get(0)
 	}
 }
+impl crate::instruction::InstructionConsumer<InputInstruction> for InputState{
+	fn process_instruction(&mut self,ins:TimedInstruction<InputInstruction>){
+		//add to queue
+		self.queue.push(ins);
+	}
+}
+*/
 
+enum MouseInterpolation {
+	First,//just checks the last value
+	Lerp,//lerps between
+}
 pub struct MouseInterpolationState {
 	interpolation: MouseInterpolation,
 	time0: TIME,
@@ -88,11 +102,20 @@ pub struct MouseInterpolationState {
 }
 
 impl MouseInterpolationState {
-	pub fn move_mouse(&mut self,time:TIME,pos:glam::IVec2){
+	pub fn new() -> Self {
+		Self {
+			interpolation:MouseInterpolation::First,
+			time0:0,
+			time1:1,//ONE NANOSECOND!!!! avoid divide by zero
+			mouse0:glam::IVec2::ZERO,
+			mouse1:glam::IVec2::ZERO,
+		}
+	}
+	pub fn move_mouse(&mut self,time:TIME,delta:glam::IVec2){
 		self.time0=self.time1;
 		self.mouse0=self.mouse1;
 		self.time1=time;
-		self.mouse1=pos;
+		self.mouse1=self.mouse1+delta;
 	}
 	pub fn interpolated_position(&self,time:TIME) -> glam::IVec2 {
 		match self.interpolation {
@@ -113,7 +136,6 @@ impl MouseInterpolationState {
 pub enum WalkEnum{
 	Reached,
 	Transient,
-	Invalid,
 }
 pub struct WalkState {
 	pub target_velocity: glam::Vec3,
@@ -125,22 +147,120 @@ impl WalkState {
 		Self{
 			target_velocity:glam::Vec3::ZERO,
 			target_time:0,
-			state:WalkEnum::Invalid,
+			state:WalkEnum::Reached,
 		}
 	}
 }
 
+// Note: we use the Y=up coordinate space in this example.
+pub struct Camera {
+	offset: glam::Vec3,
+	angles: glam::DVec2,//YAW AND THEN PITCH
+	//punch: glam::Vec3,
+	//punch_velocity: glam::Vec3,
+	fov: glam::Vec2,//slope
+	sensitivity: glam::DVec2,
+	time: TIME,
+}
+
+#[inline]
+fn mat3_from_rotation_y_f64(angle: f64) -> glam::Mat3 {
+    let (sina, cosa) = angle.sin_cos();
+    glam::Mat3::from_cols(
+        glam::Vec3::new(cosa as f32, 0.0, -sina as f32),
+        glam::Vec3::Y,
+        glam::Vec3::new(sina as f32, 0.0, cosa as f32),
+    )
+}
+#[inline]
+fn perspective_rh(fov_x_slope: f32, fov_y_slope: f32, z_near: f32, z_far: f32) -> glam::Mat4 {
+	//glam_assert!(z_near > 0.0 && z_far > 0.0);
+	let r = z_far / (z_near - z_far);
+	glam::Mat4::from_cols(
+		glam::Vec4::new(1.0/fov_x_slope, 0.0, 0.0, 0.0),
+		glam::Vec4::new(0.0, 1.0/fov_y_slope, 0.0, 0.0),
+		glam::Vec4::new(0.0, 0.0, r, -1.0),
+		glam::Vec4::new(0.0, 0.0, r * z_near, 0.0),
+	)
+}
+impl Camera {
+	pub fn from_offset(offset:glam::Vec3,aspect:f32) -> Self {
+		Self{
+		    offset,
+		    angles: glam::DVec2::ZERO,
+		    fov: glam::vec2(aspect,1.0),
+		    sensitivity: glam::dvec2(1.0/4096.0,1.0/4096.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::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, 1000.0)
+	}
+	pub fn view(&self,pos:glam::Vec3)->glam::Mat4{
+		//f32 good enough for view matrix
+		glam::Mat4::from_translation(pos+self.offset) * glam::Mat4::from_euler(glam::EulerRot::YXZ, self.angles.x as f32, self.angles.y as f32, 0f32)
+	}
+	pub fn set_fov_aspect(&mut self,fov:f32,aspect:f32){
+		self.fov.x=fov*aspect;
+		self.fov.y=fov;
+	}
+}
+
+const CONTROL_MOVEFORWARD:u32 = 0b00000001;
+const CONTROL_MOVEBACK:u32 = 0b00000010;
+const CONTROL_MOVERIGHT:u32 = 0b00000100;
+const CONTROL_MOVELEFT:u32 = 0b00001000;
+const CONTROL_MOVEUP:u32 = 0b00010000;
+const CONTROL_MOVEDOWN:u32 = 0b00100000;
+const CONTROL_JUMP:u32 = 0b01000000;
+const CONTROL_ZOOM:u32 = 0b10000000;
+
+const FORWARD_DIR:glam::Vec3 = glam::Vec3::new(0.0,0.0,-1.0);
+const RIGHT_DIR:glam::Vec3 = glam::Vec3::new(1.0,0.0,0.0);
+const UP_DIR:glam::Vec3 = glam::Vec3::new(0.0,1.0,0.0);
+
+fn get_control_dir(controls: u32) -> glam::Vec3{
+	//don't get fancy just do it
+	let mut control_dir:glam::Vec3 = glam::Vec3::new(0.0,0.0,0.0);
+	if controls & CONTROL_MOVEFORWARD == CONTROL_MOVEFORWARD {
+		control_dir+=FORWARD_DIR;
+	}
+	if controls & CONTROL_MOVEBACK == CONTROL_MOVEBACK {
+		control_dir+=-FORWARD_DIR;
+	}
+	if controls & CONTROL_MOVELEFT == CONTROL_MOVELEFT {
+		control_dir+=-RIGHT_DIR;
+	}
+	if controls & CONTROL_MOVERIGHT == CONTROL_MOVERIGHT {
+		control_dir+=RIGHT_DIR;
+	}
+	if controls & CONTROL_MOVEUP == CONTROL_MOVEUP {
+		control_dir+=UP_DIR;
+	}
+	if controls & CONTROL_MOVEDOWN == CONTROL_MOVEDOWN {
+		control_dir+=-UP_DIR;
+	}
+	return control_dir
+}
+
 pub struct PhysicsState {
 	pub body: Body,
 	pub hitbox_halfsize: glam::Vec3,
 	pub contacts: std::collections::HashSet::<RelativeCollision>,
 	//pub intersections: Vec<ModelId>,
 	pub models: Vec<ModelPhysics>,
-	//temp
-	pub temp_control_dir: glam::Vec3,
 	//camera must exist in state because wormholes modify the camera, also camera punch
-	//pub camera: Camera,
-	//pub mouse_interpolation: MouseInterpolationState,
+	pub camera: Camera,
+	pub mouse_interpolation: MouseInterpolationState,
+	pub controls: u32,
 	pub time: TIME,
 	pub strafe_tick_num: TIME,
 	pub strafe_tick_den: TIME,
@@ -152,7 +272,7 @@ pub struct PhysicsState {
 	pub walk_accel:  f32,
 	pub gravity: glam::Vec3,
 	pub grounded: bool,
-	pub jump_trying: bool,
+	pub spawn_point: glam::Vec3,
 }
 
 #[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
@@ -164,7 +284,7 @@ pub enum AabbFace{
 	Bottom,
 	Front,
 }
-
+#[derive(Clone)]
 pub struct Aabb {
 	min: glam::Vec3,
 	max: glam::Vec3,
@@ -267,28 +387,30 @@ 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.
-	transform: glam::Mat4,
+	mesh: TreyMesh,
 }
 
 impl ModelPhysics {
-	pub fn new(transform:glam::Mat4) -> Self {
-		Self{transform}
+	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 unit_vertices(&self) -> [glam::Vec3;8] {
 		Aabb::unit_vertices()
 	}
-	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 mesh(&self) -> &TreyMesh {
+		return &self.mesh;
 	}
 	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();
+		let mut aabb=self.mesh.clone();
 		//in this implementation face = worldspace aabb face
 		match face {
 			AabbFace::Right => aabb.min.x=aabb.max.x,
@@ -301,7 +423,7 @@ impl ModelPhysics {
 		return aabb;
 	}
 	pub fn face_normal(&self,face:TreyMeshFace) -> glam::Vec3 {
-		glam::Vec4Swizzles::xyz(Aabb::normal(face).extend(0.0))//this is wrong for scale
+		Aabb::normal(face)//this is wrong for scale
 	}
 }
 
@@ -315,7 +437,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)
+		return models.get(self.model as usize).unwrap().face_mesh(self.face).clone()
 	}
 	pub fn normal(&self,models:&Vec<ModelPhysics>) -> glam::Vec3 {
 		return models.get(self.model as usize).unwrap().face_normal(self.face)
@@ -353,8 +475,6 @@ impl PhysicsState {
 	pub fn run(&mut self, time_limit:TIME){
 		//prepare is ommitted - everything is done via instructions.
 		while let Some(instruction) = self.next_instruction(time_limit) {//collect
-			//advance
-			//self.advance_time(instruction.time);
 			//process
 			self.process_instruction(instruction);
 			//write hash lol
@@ -366,6 +486,16 @@ impl PhysicsState {
 		self.time=time;
 	}
 
+	fn set_control(&mut self,control:u32,state:bool){
+		self.controls=if state{self.controls|control}else{self.controls&!control};
+	}
+	fn jump(&mut self){
+		self.grounded=false;//do I need this?
+		let mut v=self.body.velocity+glam::Vec3::new(0.0,0.715588/2.0*100.0,0.0);
+		self.contact_constrain_velocity(&mut v);
+		self.body.velocity=v;
+	}
+
 	fn contact_constrain_velocity(&self,velocity:&mut glam::Vec3){
 		for contact in self.contacts.iter() {
 			let n=contact.normal(&self.models);
@@ -384,7 +514,6 @@ impl PhysicsState {
 			}
 		}
 	}
-
 	fn next_strafe_instruction(&self) -> Option<TimedInstruction<PhysicsInstruction>> {
 		return Some(TimedInstruction{
 			time:(self.time*self.strafe_tick_num/self.strafe_tick_den+1)*self.strafe_tick_den/self.strafe_tick_num,
@@ -424,6 +553,31 @@ impl PhysicsState {
 	// 	});
 	// }
 
+	fn refresh_walk_target(&mut self){
+		//calculate acceleration yada yada
+		if self.grounded{
+			let mut v=self.walk.target_velocity;
+			self.contact_constrain_velocity(&mut v);
+			let mut target_diff=v-self.body.velocity;
+			target_diff.y=0f32;
+			if target_diff==glam::Vec3::ZERO{
+				let mut a=glam::Vec3::ZERO;
+				self.contact_constrain_acceleration(&mut a);
+				self.body.acceleration=a;
+				self.walk.state=WalkEnum::Reached;
+			}else{
+				let accel=self.walk_accel.min(self.gravity.length()*self.friction);
+				let time_delta=target_diff.length()/accel;
+				let mut a=target_diff/time_delta;
+				self.contact_constrain_acceleration(&mut a);
+				self.body.acceleration=a;
+				self.walk.target_time=self.body.time+((time_delta as f64)*1_000_000_000f64) as TIME;
+				self.walk.state=WalkEnum::Transient;
+			}
+		}else{
+			self.walk.state=WalkEnum::Reached;//there is no walk target while not grounded
+		}
+	}
 	fn next_walk_instruction(&self) -> Option<TimedInstruction<PhysicsInstruction>> {
 		//check if you have a valid walk state and create an instruction
 		if self.grounded{
@@ -432,10 +586,6 @@ impl PhysicsState {
 					time:self.walk.target_time,
 					instruction:PhysicsInstruction::ReachWalkTargetVelocity
 				}),
-				WalkEnum::Invalid=>Some(TimedInstruction{
-					time:self.time,
-					instruction:PhysicsInstruction::RefreshWalkTarget,
-				}),
 				WalkEnum::Reached=>None,
 			}
 		}else{
@@ -751,20 +901,23 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 	fn process_instruction(&mut self, ins:TimedInstruction<PhysicsInstruction>) {
 		match &ins.instruction {
 		    PhysicsInstruction::StrafeTick => (),
+		    PhysicsInstruction::Input(InputInstruction::MoveMouse(_)) => (),
 		    _=>println!("{:?}",ins),
 		}
 		//selectively update body
 		match &ins.instruction {
-		    PhysicsInstruction::SetWalkTargetVelocity(_)
-		    |PhysicsInstruction::SetControlDir(_) => self.time=ins.time,//TODO: queue instructions
-		    PhysicsInstruction::RefreshWalkTarget
+		    PhysicsInstruction::Input(InputInstruction::MoveMouse(_)) => (),//dodge time for mouse movement
+    		PhysicsInstruction::Input(_)
+    		|PhysicsInstruction::SetSpawnPosition(_)
 		    |PhysicsInstruction::ReachWalkTargetVelocity
 		    |PhysicsInstruction::CollisionStart(_)
 		    |PhysicsInstruction::CollisionEnd(_)
-		    |PhysicsInstruction::StrafeTick
-		    |PhysicsInstruction::Jump => self.advance_time(ins.time),
+		    |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 {
@@ -779,14 +932,16 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 				let mut v=self.body.velocity;
 				self.contact_constrain_velocity(&mut v);
 				self.body.velocity=v;
-				self.walk.state=WalkEnum::Invalid;
+				if self.grounded&&self.controls&CONTROL_JUMP!=0{
+					self.jump();
+				}
+				self.refresh_walk_target();
 			},
 			PhysicsInstruction::CollisionEnd(c) => {
 			    self.contacts.remove(&c);//remove contact before calling contact_constrain_acceleration
 				let mut a=self.gravity;
 				self.contact_constrain_acceleration(&mut a);
 				self.body.acceleration=a;
-				self.walk.state=WalkEnum::Invalid;
 				//check ground
 				match &c.face {
 			        AabbFace::Top => {
@@ -794,27 +949,18 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 			        },
 			        _ => (),
 			    }
-			},
-			PhysicsInstruction::SetControlDir(control_dir)=>{
-				self.temp_control_dir=control_dir;
-				self.walk.state=WalkEnum::Invalid;
+				self.refresh_walk_target();
 			},
 			PhysicsInstruction::StrafeTick => {
-				//let control_dir=self.get_control_dir();//this should respect your mouse interpolation settings
-				let d=self.body.velocity.dot(self.temp_control_dir);
+				let camera_mat=self.camera.simulate_move_rotation_y(self.mouse_interpolation.interpolated_position(self.time).x-self.mouse_interpolation.mouse0.x);
+				let control_dir=camera_mat*get_control_dir(self.controls);
+				let d=self.body.velocity.dot(control_dir);
 				if d<self.mv {
-					let mut v=self.body.velocity+(self.mv-d)*self.temp_control_dir;
+					let mut v=self.body.velocity+(self.mv-d)*control_dir;
 					self.contact_constrain_velocity(&mut v);
 					self.body.velocity=v;
 				}
 			}
-			PhysicsInstruction::Jump => {
-				self.grounded=false;//do I need this?
-				let mut v=self.body.velocity+glam::Vec3::new(0.0,0.715588/2.0*100.0,0.0);
-				self.contact_constrain_velocity(&mut v);
-				self.body.velocity=v;
-				self.walk.state=WalkEnum::Invalid;
-			},
 			PhysicsInstruction::ReachWalkTargetVelocity => {
 				//precisely set velocity
 				let mut a=glam::Vec3::ZERO;
@@ -825,33 +971,67 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 				self.body.velocity=v;
 				self.walk.state=WalkEnum::Reached;
 			},
-			PhysicsInstruction::RefreshWalkTarget => {
-				//calculate acceleration yada yada
-				if self.grounded{
-					let mut v=self.walk.target_velocity;
-					self.contact_constrain_velocity(&mut v);
-					let mut target_diff=v-self.body.velocity;
-					target_diff.y=0f32;
-					if target_diff==glam::Vec3::ZERO{
-						let mut a=glam::Vec3::ZERO;
-						self.contact_constrain_acceleration(&mut a);
-						self.body.acceleration=a;
+			PhysicsInstruction::Input(input_instruction) => {
+				let mut refresh_walk_target=false;
+				match input_instruction{
+					InputInstruction::MoveMouse(m) => {
+						self.camera.angles=self.camera.simulate_move_angles(self.mouse_interpolation.mouse1-self.mouse_interpolation.mouse0);
+						self.mouse_interpolation.move_mouse(self.time,m);
+						refresh_walk_target=true;
+					},
+					InputInstruction::MoveForward(s) => {
+						self.set_control(CONTROL_MOVEFORWARD,s);
+						refresh_walk_target=true;
+					},
+					InputInstruction::MoveLeft(s) => {
+						self.set_control(CONTROL_MOVELEFT,s);
+						refresh_walk_target=true;
+					},
+					InputInstruction::MoveBack(s) => {
+						self.set_control(CONTROL_MOVEBACK,s);
+						refresh_walk_target=true;
+					},
+					InputInstruction::MoveRight(s) => {
+						self.set_control(CONTROL_MOVERIGHT,s);
+						refresh_walk_target=true;
+					},
+					InputInstruction::MoveUp(s) => {
+						self.set_control(CONTROL_MOVEUP,s);
+						refresh_walk_target=true;
+					},
+					InputInstruction::MoveDown(s) => {
+						self.set_control(CONTROL_MOVEDOWN,s);
+						refresh_walk_target=true;
+					},
+					InputInstruction::Jump(s) => {
+						self.set_control(CONTROL_JUMP,s);
+						refresh_walk_target=true;
+						if self.grounded{
+							self.jump();
+						}
+					},
+					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;
-					}else{
-						let accel=self.walk_accel.min(self.gravity.length()*self.friction);
-						let time_delta=target_diff.length()/accel;
-						let mut a=target_diff/time_delta;
-						self.contact_constrain_acceleration(&mut a);
-						self.body.acceleration=a;
-						self.walk.target_time=self.body.time+((time_delta as f64)*1_000_000_000f64) as TIME;
-						self.walk.state=WalkEnum::Transient;
-					}
+						self.grounded=false;
+					},
+				}
+				//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);
+				let control_dir=camera_mat*get_control_dir(self.controls);
+				//calculate walk target velocity
+				if refresh_walk_target{
+					self.walk.target_velocity=self.walkspeed*control_dir;
+					self.refresh_walk_target();
 				}
-			},
-			PhysicsInstruction::SetWalkTargetVelocity(v) => {
-				self.walk.target_velocity=v;
-				self.walk.state=WalkEnum::Invalid;
 			},
 		}
 	}
-}
+}

src/framework.rs

@@ -1,12 +1,10 @@
 use std::future::Future;
 #[cfg(target_arch = "wasm32")]
 use std::str::FromStr;
-#[cfg(not(target_arch = "wasm32"))]
-use std::time::Instant;
 #[cfg(target_arch = "wasm32")]
 use web_sys::{ImageBitmapRenderingContext, OffscreenCanvas};
 use winit::{
-	event::{self, WindowEvent},
+	event::{self, WindowEvent, DeviceEvent},
 	event_loop::{ControlFlow, EventLoop},
 };
 
@@ -53,8 +51,8 @@ pub trait Example: 'static + Sized {
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	);
-	fn update(&mut self, device: &wgpu::Device, event: WindowEvent);
-	fn move_mouse(&mut self, delta: (f64,f64));
+	fn update(&mut self, device: &wgpu::Device, queue: &wgpu::Queue, event: WindowEvent);
+	fn device_event(&mut self, event: DeviceEvent);
 	fn render(
 		&mut self,
 		view: &wgpu::TextureView,
@@ -360,7 +358,7 @@ fn start<E: Example>(
 				WindowEvent::KeyboardInput {
 					input:
 						event::KeyboardInput {
-							virtual_keycode: Some(event::VirtualKeyCode::R),
+							virtual_keycode: Some(event::VirtualKeyCode::Scroll),
 							state: event::ElementState::Pressed,
 							..
 						},
@@ -369,17 +367,14 @@ fn start<E: Example>(
 					println!("{:#?}", instance.generate_report());
 				}
 				_ => {
-					example.update(&device,event);
+					example.update(&device,&queue,event);
 				}
 			},
 			event::Event::DeviceEvent {
-				event:
-					winit::event::DeviceEvent::MouseMotion {
-						delta,
-					},
+				event,
 				..
 			} => {
-				example.move_mouse(delta);
+				example.device_event(event);
 			},
 			event::Event::RedrawRequested(_) => {
 

src/load_roblox.rs

@@ -1,3 +1,7 @@
+use crate::model::{IndexedModelInstances,ModelInstance};
+
+use crate::primitives;
+
 fn class_is_a(class: &str, superclass: &str) -> bool {
 	if class==superclass {
 		return true
@@ -10,16 +14,249 @@ fn class_is_a(class: &str, superclass: &str) -> bool {
 	}
 	return false
 }
-
-pub fn get_objects(dom:rbx_dom_weak::WeakDom, superclass: &str) -> Result<std::vec::Vec<rbx_dom_weak::Instance>, Box<dyn std::error::Error>> {
-	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 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);
 		}
 	}
-
-	return Ok(objects)
+}
+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);
+        }
+    }
+}
+type RobloxPartDescription=[Option<RobloxFaceTextureDescription>;6];
+//type RobloxWedgeDescription=[Option<RobloxFaceTextureDescription>;5];
+#[derive(Clone,Eq,Hash,PartialEq)]
+enum RobloxBasePartDescription{
+	Part(RobloxPartDescription),
+	//Wedge(RobloxWedgeDescription),
+}
+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)),
+					Some(rbx_dom_weak::types::Variant::Enum(shape)),
+				) = (
+					object.properties.get("CFrame"),
+					object.properties.get("Size"),
+					object.properties.get("Transparency"),
+					object.properties.get("Color"),
+					object.properties.get("Shape"),//this will also skip unions
+				)
+			{
+				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||shape.to_u32()!=1 {
+					continue;
+				}
+				temp_objects.clear();
+				recursive_collect_superclass(&mut temp_objects, &dom, object,"Decal");
+
+				let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
+				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 face=normalid.to_u32();
+								if face<6{
+									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 face{
+												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 as usize]=Some(RobloxFaceTextureDescription{
+										texture:texture_id,
+										color:roblox_texture_color,
+										transform:roblox_texture_transform,
+									});
+								}else{
+									println!("goofy ahh roblox gave NormalId {}", face);
+								}
+							}
+						}
+					}
+				}
+				//TODO: generate unit Block, Wedge, etc. based on part shape lists
+				let basepart_texture_description=RobloxBasePartDescription::Part(part_texture_description);
+				//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
+					match basepart_texture_description{
+						RobloxBasePartDescription::Part(part_texture_description)=>{
+							let unit_cube_faces=part_texture_description.map(|face|{
+								match face{
+									Some(roblox_texture_transform)=>Some(
+										primitives::FaceDescription{
+											texture:Some(roblox_texture_transform.texture),
+											transform:glam::Affine2::from_translation(
+												glam::vec2(roblox_texture_transform.transform.offset_u,roblox_texture_transform.transform.offset_v)
+											)
+											*glam::Affine2::from_scale(
+												glam::vec2(roblox_texture_transform.transform.scale_u,roblox_texture_transform.transform.scale_v)
+											),
+											color:roblox_texture_transform.color,
+										}
+									),
+									None=>Some(primitives::FaceDescription::default()),
+								}
+							});
+							let indexed_model=primitives::generate_partial_unit_cube(unit_cube_faces);
+							indexed_models.push(indexed_model);
+							model_id
+						},
+					}
+				};
+				indexed_models[model_id].instances.push(ModelInstance {
+					model_transform,
+					color: glam::Vec4::ONE,//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))
 }

src/main.rs

@@ -1,11 +1,14 @@
 use std::{borrow::Cow, time::Instant};
 use wgpu::{util::DeviceExt, AstcBlock, AstcChannel};
-use model::{Vertex,ModelData,ModelInstance};
+use model::{Vertex,ModelInstance};
+use body::{InputInstruction, PhysicsInstruction};
+use instruction::{TimedInstruction, InstructionConsumer};
 
 mod body;
 mod model;
 mod zeroes;
 mod framework;
+mod primitives;
 mod instruction;
 mod load_roblox;
 
@@ -22,86 +25,6 @@ struct ModelGraphics {
 	model_buf: wgpu::Buffer,
 }
 
-// Note: we use the Y=up coordinate space in this example.
-struct Camera {
-	screen_size: (u32, u32),
-	offset: glam::Vec3,
-	fov: f32,
-	yaw: f32,
-	pitch: f32,
-	controls: u32,
-}
-
-const CONTROL_MOVEFORWARD:u32 = 0b00000001;
-const CONTROL_MOVEBACK:u32 = 0b00000010;
-const CONTROL_MOVERIGHT:u32 = 0b00000100;
-const CONTROL_MOVELEFT:u32 = 0b00001000;
-const CONTROL_MOVEUP:u32 = 0b00010000;
-const CONTROL_MOVEDOWN:u32 = 0b00100000;
-const CONTROL_JUMP:u32 = 0b01000000;
-const CONTROL_ZOOM:u32 = 0b10000000;
-
-const FORWARD_DIR:glam::Vec3 = glam::Vec3::new(0.0,0.0,-1.0);
-const RIGHT_DIR:glam::Vec3 = glam::Vec3::new(1.0,0.0,0.0);
-const UP_DIR:glam::Vec3 = glam::Vec3::new(0.0,1.0,0.0);
-
-fn get_control_dir(controls: u32) -> glam::Vec3{
-	//don't get fancy just do it
-	let mut control_dir:glam::Vec3 = glam::Vec3::new(0.0,0.0,0.0);
-	if controls & CONTROL_MOVEFORWARD == CONTROL_MOVEFORWARD {
-		control_dir+=FORWARD_DIR;
-	}
-	if controls & CONTROL_MOVEBACK == CONTROL_MOVEBACK {
-		control_dir+=-FORWARD_DIR;
-	}
-	if controls & CONTROL_MOVELEFT == CONTROL_MOVELEFT {
-		control_dir+=-RIGHT_DIR;
-	}
-	if controls & CONTROL_MOVERIGHT == CONTROL_MOVERIGHT {
-		control_dir+=RIGHT_DIR;
-	}
-	if controls & CONTROL_MOVEUP == CONTROL_MOVEUP {
-		control_dir+=UP_DIR;
-	}
-	if controls & CONTROL_MOVEDOWN == CONTROL_MOVEDOWN {
-		control_dir+=-UP_DIR;
-	}
-	return control_dir
-}
-
-	#[inline]
-	fn perspective_rh(fov_y_slope: f32, aspect_ratio: f32, z_near: f32, z_far: f32) -> glam::Mat4 {
-		//glam_assert!(z_near > 0.0 && z_far > 0.0);
-		let r = z_far / (z_near - z_far);
-		glam::Mat4::from_cols(
-			glam::Vec4::new(1.0/(fov_y_slope * aspect_ratio), 0.0, 0.0, 0.0),
-			glam::Vec4::new(0.0, 1.0/fov_y_slope, 0.0, 0.0),
-			glam::Vec4::new(0.0, 0.0, r, -1.0),
-			glam::Vec4::new(0.0, 0.0, r * z_near, 0.0),
-		)
-	}
-
-impl Camera {
-	fn to_uniform_data(&self, pos: glam::Vec3) -> [f32; 16 * 3 + 4] {
-		let aspect = self.screen_size.0 as f32 / self.screen_size.1 as f32;
-		let fov = if self.controls&CONTROL_ZOOM==0 {
-			self.fov
-		}else{
-			self.fov/5.0
-		};
-		let proj = perspective_rh(fov, aspect, 0.5, 1000.0);
-		let proj_inv = proj.inverse();
-		let view = glam::Mat4::from_translation(pos+self.offset) * glam::Mat4::from_euler(glam::EulerRot::YXZ, self.yaw, self.pitch, 0f32);
-		let view_inv = view.inverse();
-
-		let mut raw = [0f32; 16 * 3 + 4];
-		raw[..16].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj)[..]);
-		raw[16..32].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj_inv)[..]);
-		raw[32..48].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&view_inv)[..]);
-		raw[48..52].copy_from_slice(AsRef::<[f32; 4]>::as_ref(&view.col(3)));
-		raw
-	}
-}
 pub struct GraphicsSamplers{
 	repeat: wgpu::Sampler,
 }
@@ -122,7 +45,7 @@ pub struct GraphicsPipelines {
 
 pub struct GraphicsData {
 	start_time: std::time::Instant,
-	camera: Camera,
+	screen_size: (u32, u32),
 	physics: body::PhysicsState,
 	pipelines: GraphicsPipelines,
 	bind_groups: GraphicsBindGroups,
@@ -133,7 +56,6 @@ pub struct GraphicsData {
 	models: Vec<ModelGraphics>,
 	depth_view: wgpu::TextureView,
 	staging_belt: wgpu::util::StagingBelt,
-	handy_unit_cube: obj::ObjData,
 }
 
 impl GraphicsData {
@@ -161,175 +83,238 @@ impl GraphicsData {
 		depth_texture.create_view(&wgpu::TextureViewDescriptor::default())
 	}
 
-	fn generate_modeldatas_roblox(&self,dom:rbx_dom_weak::WeakDom) -> Vec<ModelData>{
-		let mut modeldatas=generate_modeldatas(self.handy_unit_cube.clone(),ModelData::COLOR_FLOATS_WHITE);
-		match load_roblox::get_objects(dom, "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)),
-							Some(rbx_dom_weak::types::Variant::Color3uint8(color3)),
-							Some(rbx_dom_weak::types::Variant::Enum(shape)),
-						) = (
-							object.properties.get("CFrame"),
-							object.properties.get("Size"),
-							object.properties.get("Transparency"),
-							object.properties.get("Color"),
-							object.properties.get("Shape"),//this will also skip unions
-						)
-					{
-						if *transparency==1.0||shape.to_u32()!=1 {
-							continue;
-						}
-						modeldatas[0].instances.push(ModelInstance {
-							transform: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
-								),
-							color: glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
-						})
-					}
-				}
-			},
-			Err(e) => println!("lmao err {:?}", e),
-		}
-		modeldatas
-	}
-	fn generate_model_physics(&mut self,modeldatas:&Vec<ModelData>){
-		self.physics.models.append(&mut modeldatas.iter().map(|m|
+	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
-			m.instances.iter().map(|t|body::ModelPhysics::new(t.transform))
-		).flatten().collect());
+			for model_instance in &model.instances{
+				self.physics.models.push(body::ModelPhysics::from_model(&model,model_instance.model_transform));
+			}
+		}
 		println!("Physics Objects: {}",self.physics.models.len());
 	}
-	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 instance_count=0;
-		self.models.reserve(modeldatas.len());
-		for (i,modeldata) in modeldatas.drain(..).enumerate() {
-			let model_uniforms = get_instances_buffer_data(&modeldata.instances);
-			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(),
+	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_views:Vec<wgpu::TextureView>=Vec::with_capacity(indexed_models.textures.len());
+		for (i,t) in indexed_models.textures.iter().enumerate(){
+			if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",t))){
+				let image = ddsfile::Dds::read(&mut file).unwrap();
+
+				let size = wgpu::Extent3d {
+					width: image.get_width()/4*4,//floor(w,4), should be ceil(w,4)
+					height: image.get_height()/4*4,
+					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: wgpu::TextureFormat::Bc7RgbaUnorm,
+						usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+						label: Some(format!("Texture{}",i).as_str()),
+						view_formats: &[],
 					},
-					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
-			instance_count+=modeldata.instances.len();
-			self.models.push(ModelGraphics{
-				instances:modeldata.instances,
-				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,
+					&image.data,
+				);
+
+				double_map.insert(i as u32, texture_views.len() as u32);
+				texture_views.push(texture.create_view(&wgpu::TextureViewDescriptor {
+					label: Some(format!("Texture{} View",i).as_str()),
+					dimension: Some(wgpu::TextureViewDimension::D2),
+					..wgpu::TextureViewDescriptor::default()
+				}));
+			}
+		}
+		//de-index models and 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 mut unique_texture_models=Vec::with_capacity(indexed_models.models.len());
+		for mut model in indexed_models.models.drain(..){
+			//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:model.instances.clone(),
 					});
-					Entity {
-						index_buf,
-						index_count: indices.len() as u32,
+					texture_index
+				};
+				unique_texture_models[id+texture_index].groups.push(model::IndexedGroupFixedTexture{
+					polys:group.polys,
+				});
+			}
+		}
+		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();
+			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);
+							}
+						}
 					}
-				}).collect(),
-				bind_group: model_bind_group,
-				model_buf,
-			})
+				}
+				entities.push(indices);
+			}
+			models.push(model::ModelSingleTexture{
+				instances:model.instances,
+				vertices,
+				entities,
+				texture:model.texture,
+			});
+		}
+		//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,
+						}
+					},
+					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,
+				});
+			}
 		}
 		println!("Graphics Objects: {}",self.models.len());
 		println!("Graphics Instances: {}",instance_count);
 	}
 }
 
-fn get_instances_buffer_data(instances:&Vec<ModelInstance>) -> Vec<f32> {
-	const SIZE: usize=4*4+4;//let size=std::mem::size_of::<ModelInstance>();
-	let mut raw = Vec::with_capacity(SIZE*instances.len());
+const MODEL_BUFFER_SIZE:usize=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:&[ModelInstance]) -> 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(SIZE*i);
-    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
+    	let mut v = raw.split_off(MODEL_BUFFER_SIZE*i);
+    	//model_transform
+    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&glam::Mat4::from(mi.model_transform))[..]);
+    	//color
     	raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color));
     	raw.append(&mut v);
 	}
 	raw
 }
 
-fn generate_modeldatas(data:obj::ObjData,color:[f32;4]) -> 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()],
-								color,
-							});
-							vertex_index.insert(vert,i);
-							indices.push(i);
-						}
-					}
-				}
-			}
-			entities.push(indices);
-		}
-		modeldatas.push(ModelData {
-			instances: Vec::new(),
-			vertices:vertices.clone(),
-			entities,
-		});
-	}
-	modeldatas
+fn to_uniform_data(camera: &body::Camera, pos: glam::Vec3) -> [f32; 16 * 3 + 4] {
+	let proj=camera.proj();
+	let proj_inv = proj.inverse();
+	let view=camera.view(pos);
+	let view_inv = view.inverse();
+
+	let mut raw = [0f32; 16 * 3 + 4];
+	raw[..16].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj)[..]);
+	raw[16..32].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj_inv)[..]);
+	raw[32..48].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&view_inv)[..]);
+	raw[48..52].copy_from_slice(AsRef::<[f32; 4]>::as_ref(&view.col(3)));
+	raw
 }
 
 impl 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
@@ -340,116 +325,42 @@ impl framework::Example for GraphicsData {
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	) -> Self {
-		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(),ModelData::COLOR_FLOATS_WHITE));
-		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap(),ModelData::COLOR_FLOATS_WHITE));
-		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap(),ModelData::COLOR_FLOATS_WHITE));
-		modeldatas.append(&mut generate_modeldatas(unit_cube.clone(),ModelData::COLOR_FLOATS_WHITE));
-		println!("models.len = {:?}", modeldatas.len());
-		modeldatas[0].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(10.,0.,-10.)),
-			color:ModelData::COLOR_VEC4_WHITE,
+		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.append(&mut model::generate_indexed_model_list_from_obj(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap(),*glam::Vec4::ONE.as_ref()));
+		indexed_models.append(&mut model::generate_indexed_model_list_from_obj(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap(),*glam::Vec4::ONE.as_ref()));
+		indexed_models.push(primitives::the_unit_cube_lol());
+		println!("models.len = {:?}", indexed_models.len());
+		indexed_models[0].instances.push(ModelInstance{
+			model_transform:glam::Affine3A::from_translation(glam::vec3(10.,0.,-10.)),
+			color:glam::Vec4::ONE,
 		});
 		//quad monkeys
-		modeldatas[1].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(10.,5.,10.)),
-			color:ModelData::COLOR_VEC4_WHITE,
+		indexed_models[1].instances.push(ModelInstance{
+			model_transform:glam::Affine3A::from_translation(glam::vec3(10.,5.,10.)),
+			color:glam::Vec4::ONE,
 		});
-		modeldatas[1].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(20.,5.,10.)),
+		indexed_models[1].instances.push(ModelInstance{
+			model_transform:glam::Affine3A::from_translation(glam::vec3(20.,5.,10.)),
 			color:glam::vec4(1.0,0.0,0.0,1.0),
 		});
-		modeldatas[1].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(10.,5.,20.)),
+		indexed_models[1].instances.push(ModelInstance{
+			model_transform:glam::Affine3A::from_translation(glam::vec3(10.,5.,20.)),
 			color:glam::vec4(0.0,1.0,0.0,1.0),
 		});
-		modeldatas[1].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(20.,5.,20.)),
+		indexed_models[1].instances.push(ModelInstance{
+			model_transform:glam::Affine3A::from_translation(glam::vec3(20.,5.,20.)),
 			color:glam::vec4(0.0,0.0,1.0,1.0),
 		});
 		//teapot
-		modeldatas[2].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(-10.,5.,10.)),
-			color:ModelData::COLOR_VEC4_WHITE,
+		indexed_models[2].instances.push(ModelInstance{
+			model_transform:glam::Affine3A::from_translation(glam::vec3(-10.,5.,10.)),
+			color:glam::Vec4::ONE,
 		});
 		//ground
-		modeldatas[3].instances.push(ModelInstance{
-			transform:glam::Mat4::from_translation(glam::vec3(0.,0.,0.))*glam::Mat4::from_scale(glam::vec3(160.0, 1.0, 160.0)),
-			color:ModelData::COLOR_VEC4_WHITE,
+		indexed_models[3].instances.push(ModelInstance{
+			model_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,
 		});
 
 		let camera_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -547,15 +458,8 @@ impl framework::Example for GraphicsData {
 			source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
 		});
 
-		let camera = Camera {
-			screen_size: (config.width, config.height),
-			offset: glam::Vec3::new(0.0,4.5-2.5,0.0),
-			fov: 1.0, //fov_slope = tan(fov_y/2)
-			pitch: 0.0,
-			yaw: 0.0,
-			controls:0,
-		};
 		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)),
 			time: 0,
 			tick: 0,
@@ -566,13 +470,14 @@ impl framework::Example for GraphicsData {
 			walk_accel: 90.0,
 			mv: 2.7,
 			grounded: false,
-			jump_trying: false,
-			temp_control_dir: glam::Vec3::ZERO,
 			walkspeed: 18.0,
 			contacts: std::collections::HashSet::new(),
-    		models: Vec::new(),
-    		walk: body::WalkState::new(),
-    		hitbox_halfsize: glam::vec3(1.0,2.5,1.0),
+			models: Vec::new(),
+			walk: 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(),
+			controls: 0,
 		};
 
 		//load textures
@@ -691,11 +596,19 @@ impl framework::Example for GraphicsData {
 			})
 		};
 
-		let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+		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,
+			],
+			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: &[],
@@ -704,7 +617,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(&pipeline_layout),
+			layout: Some(&sky_pipeline_layout),
 			vertex: wgpu::VertexState {
 				module: &shader,
 				entry_point: "vs_sky",
@@ -731,7 +644,7 @@ impl framework::Example for GraphicsData {
 		});
 		let model_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
 			label: Some("Model Pipeline"),
-			layout: Some(&pipeline_layout),
+			layout: Some(&model_pipeline_layout),
 			vertex: wgpu::VertexState {
 				module: &shader,
 				entry_point: "vs_entity_texture",
@@ -761,7 +674,7 @@ impl framework::Example for GraphicsData {
 			multiview: None,
 		});
 
-		let camera_uniforms = camera.to_uniform_data(physics.body.extrapolated_position(0));
+		let camera_uniforms = to_uniform_data(&physics.camera,physics.body.extrapolated_position(0));
 		let camera_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
 			label: Some("Camera"),
 			contents: bytemuck::cast_slice(&camera_uniforms),
@@ -795,9 +708,8 @@ 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(),
-			camera,
+			screen_size: (config.width,config.height),
 			physics,
 			pipelines:GraphicsPipelines{
 				skybox:sky_pipeline,
@@ -816,14 +728,18 @@ impl framework::Example for GraphicsData {
 			temp_squid_texture_view: squid_texture_view,
 		};
 
-		graphics.generate_model_physics(&modeldatas);
-		graphics.generate_model_graphics(&device,modeldatas);
+		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);
 
 		return graphics;
 	}
 
 	#[allow(clippy::single_match)]
-	fn update(&mut self, device: &wgpu::Device, event: winit::event::WindowEvent) {
+	fn update(&mut self, device: &wgpu::Device, queue: &wgpu::Queue, event: winit::event::WindowEvent) {
 		//nothing atm
 		match event {
 			winit::event::WindowEvent::DroppedFile(path) => {
@@ -840,30 +756,40 @@ impl framework::Example for GraphicsData {
 					//.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(modeldatas)={
+						if let Some(Ok((indexed_model_instances,spawn_point)))={
 							if &first_8==b"<roblox!"{
 								if let Ok(dom) = rbx_binary::from_reader(input){
-									Some(self.generate_modeldatas_roblox(dom))
+									Some(load_roblox::generate_indexed_models_roblox(dom))
 								}else{
 									None
 								}
 							}else if &first_8==b"<roblox "{
 								if let Ok(dom) = rbx_xml::from_reader(input,rbx_xml::DecodeOptions::default()){
-									Some(self.generate_modeldatas_roblox(dom))
+									Some(load_roblox::generate_indexed_models_roblox(dom))
 								}else{
 									None
 								}
 							//}else if &first_8[0..4]==b"VBSP"{
-							//	self.generate_modeldatas_valve(input)
+							//	self.generate_indexed_models_valve(input)
 							}else{
 								None
 							}
 						}{
-							//if generate_modeldatas succeeds, clear the previous ones
+							//if generate_indexed_models succeeds, clear the previous ones
 							self.models.clear();
 							self.physics.models.clear();
-							self.generate_model_physics(&modeldatas);
-							self.generate_model_graphics(device,modeldatas);
+							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");
 						}
@@ -874,58 +800,68 @@ impl framework::Example for GraphicsData {
 					println!("Could not open file");
 				}
 			},
-			winit::event::WindowEvent::KeyboardInput {
-				input:
-					winit::event::KeyboardInput {
-						state,
-						virtual_keycode: Some(keycode),
-						..
-					},
-				..
-			} => {
-				match (state,keycode) {
-					(k,winit::event::VirtualKeyCode::W) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEFORWARD,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEFORWARD,
-					}
-					(k,winit::event::VirtualKeyCode::A) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVELEFT,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVELEFT,
-					}
-					(k,winit::event::VirtualKeyCode::S) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEBACK,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEBACK,
-					}
-					(k,winit::event::VirtualKeyCode::D) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVERIGHT,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVERIGHT,
-					}
-					(k,winit::event::VirtualKeyCode::E) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEUP,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEUP,
-					}
-					(k,winit::event::VirtualKeyCode::Q) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEDOWN,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEDOWN,
-					}
-					(k,winit::event::VirtualKeyCode::Space) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_JUMP,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_JUMP,
-					}
-					(k,winit::event::VirtualKeyCode::Z) => match k {
-						winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_ZOOM,
-						winit::event::ElementState::Released => self.camera.controls&=!CONTROL_ZOOM,
-					}
-					_ => (),
-				}
-			}
-			_ => {}
+			_=>(),
 		}
 	}
 
-	fn move_mouse(&mut self, delta: (f64,f64)) {
-		self.camera.pitch=(self.camera.pitch as f64+delta.1/-2048.) as f32;
-		self.camera.yaw=(self.camera.yaw as f64+delta.0/-2048.) as f32;
+	fn device_event(&mut self, event: winit::event::DeviceEvent) {
+		//there's no way this is the best way get a timestamp.
+		let time=self.start_time.elapsed().as_nanos() as i64;
+		match event {
+			winit::event::DeviceEvent::Key(winit::event::KeyboardInput {
+				state,
+				scancode: keycode,
+				..
+			}) => {
+				let s=match state {
+					winit::event::ElementState::Pressed => true,
+					winit::event::ElementState::Released => false,
+				};
+				if let Some(input_instruction)=match keycode {
+					17 => Some(InputInstruction::MoveForward(s)),//W
+					30 => Some(InputInstruction::MoveLeft(s)),//A
+					31 => Some(InputInstruction::MoveBack(s)),//S
+					32 => Some(InputInstruction::MoveRight(s)),//D
+					18 => Some(InputInstruction::MoveUp(s)),//E
+					16 => Some(InputInstruction::MoveDown(s)),//Q
+					57 => Some(InputInstruction::Jump(s)),//Space
+					44 => Some(InputInstruction::Zoom(s)),//Z
+					19 => if s{Some(InputInstruction::Reset)}else{None},//R
+					_ => None,
+				}
+				{
+					self.physics.run(time);
+					self.physics.process_instruction(TimedInstruction{
+						time,
+						instruction:PhysicsInstruction::Input(input_instruction),
+					})
+				}
+			},
+			winit::event::DeviceEvent::MouseMotion {
+			    delta,//these (f64,f64) are integers on my machine
+			} => {
+				//do not step the physics because the mouse polling rate is higher than the physics can run.
+				//essentially the previous input will be overwritten until a true step runs
+				//which is fine because they run all the time.
+				self.physics.process_instruction(TimedInstruction{
+					time,
+					instruction:PhysicsInstruction::Input(InputInstruction::MoveMouse(glam::ivec2(delta.0 as i32,delta.1 as i32))),
+				})
+			},
+			winit::event::DeviceEvent::MouseWheel {
+			    delta,
+			} => {
+				println!("mousewheel{:?}",delta);
+				if true{//self.physics.use_scroll
+					self.physics.run(time);
+					self.physics.process_instruction(TimedInstruction{
+						time,
+						instruction:PhysicsInstruction::Input(InputInstruction::Jump(true)),//activates the immediate jump path, but the style modifier prevents controls&CONTROL_JUMP bit from being set to auto jump
+					})
+				}
+			}
+			_=>(),
+		}
 	}
 
 	fn resize(
@@ -935,7 +871,8 @@ impl framework::Example for GraphicsData {
 		_queue: &wgpu::Queue,
 	) {
 		self.depth_view = Self::create_depth_texture(config, device);
-		self.camera.screen_size = (config.width, config.height);
+		self.screen_size = (config.width, config.height);
+		self.physics.camera.set_fov_aspect(1.0,(config.width as f32)/(config.height as f32));
 	}
 
 	fn render(
@@ -945,45 +882,15 @@ impl framework::Example for GraphicsData {
 		queue: &wgpu::Queue,
 		_spawner: &framework::Spawner,
 	) {
-		let camera_mat=glam::Mat3::from_rotation_y(self.camera.yaw);
-		let control_dir=camera_mat*get_control_dir(self.camera.controls&(CONTROL_MOVELEFT|CONTROL_MOVERIGHT|CONTROL_MOVEFORWARD|CONTROL_MOVEBACK)).normalize_or_zero();
-
 		let time=self.start_time.elapsed().as_nanos() as i64;
 
 		self.physics.run(time);
 
-		//ALL OF THIS IS TOTALLY WRONG!!!
-		let walk_target_velocity=self.physics.walkspeed*control_dir;
-		//autohop (already pressing spacebar; the signal to begin trying to jump is different)
-		if self.physics.grounded&&walk_target_velocity!=self.physics.walk.target_velocity {
-			instruction::InstructionConsumer::process_instruction(&mut self.physics, instruction::TimedInstruction{
-				time,
-				instruction:body::PhysicsInstruction::SetWalkTargetVelocity(walk_target_velocity)
-			});
-		}
-
-		if control_dir!=self.physics.temp_control_dir {
-			instruction::InstructionConsumer::process_instruction(&mut self.physics, instruction::TimedInstruction{
-				time,
-				instruction:body::PhysicsInstruction::SetControlDir(control_dir)
-			});
-		}
-
-		self.physics.jump_trying=self.camera.controls&CONTROL_JUMP!=0;
-		//autohop (already pressing spacebar; the signal to begin trying to jump is different)
-		if self.physics.grounded&&self.physics.jump_trying {
-			//scroll will be implemented with InputInstruction::Jump(true) but it blocks setting self.jump_trying=true
-			instruction::InstructionConsumer::process_instruction(&mut self.physics, instruction::TimedInstruction{
-				time,
-				instruction:body::PhysicsInstruction::Jump
-			});
-		}
-
 		let mut encoder =
 			device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
 
 		// update rotation
-		let camera_uniforms = self.camera.to_uniform_data(self.physics.body.extrapolated_position(time));
+		let camera_uniforms = to_uniform_data(&self.physics.camera,self.physics.body.extrapolated_position(time));
 		self.staging_belt
 			.write_buffer(
 				&mut encoder,
@@ -1035,11 +942,11 @@ impl framework::Example for GraphicsData {
 			});
 
 			rpass.set_bind_group(0, &self.bind_groups.camera, &[]);
-			rpass.set_bind_group(2, &self.bind_groups.skybox_texture, &[]);
+			rpass.set_bind_group(1, &self.bind_groups.skybox_texture, &[]);
 
 			rpass.set_pipeline(&self.pipelines.model);
 			for model in self.models.iter() {
-				rpass.set_bind_group(1, &model.bind_group, &[]);
+				rpass.set_bind_group(2, &model.bind_group, &[]);
 				rpass.set_vertex_buffer(0, model.vertex_buf.slice(..));
 
 				for entity in model.entities.iter() {

src/model.rs

@@ -3,23 +3,100 @@ use bytemuck::{Pod, Zeroable};
 #[repr(C)]
 pub struct Vertex {
 	pub pos: [f32; 3],
-	pub texture: [f32; 2],
+	pub tex: [f32; 2],
 	pub normal: [f32; 3],
 	pub color: [f32; 4],
 }
-
-pub struct ModelInstance {
-	pub transform: glam::Mat4,
-	pub color: glam::Vec4,
+#[derive(Clone,Hash,PartialEq,Eq)]
+pub struct IndexedVertex{
+	pub pos:u32,
+	pub tex:u32,
+	pub normal:u32,
+	pub color:u32,
 }
-
-pub struct ModelData {
+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<ModelInstance>,
+}
+pub struct ModelSingleTexture{
 	pub instances: Vec<ModelInstance>,
 	pub vertices: Vec<Vertex>,
 	pub entities: Vec<Vec<u16>>,
+	pub texture: Option<u32>,
+}
+#[derive(Clone)]
+pub struct ModelInstance{
+	pub model_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?
 }
 
-impl ModelData {
-	pub const COLOR_FLOATS_WHITE: [f32;4] = [1.0,1.0,1.0,1.0];
-	pub const COLOR_VEC4_WHITE: glam::Vec4 = glam::vec4(1.0,1.0,1.0,1.0);
+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

@@ -0,0 +1,170 @@
+use crate::model::{IndexedModel, IndexedPolygon, IndexedGroup, IndexedVertex};
+
+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.],//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
+];
+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],
+	],
+];
+pub fn the_unit_cube_lol() -> crate::model::IndexedModel{
+	generate_partial_unit_cube([Some(FaceDescription::default());6])
+}
+
+#[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::ONE,
+		}
+	}
+}
+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.
+pub fn generate_partial_unit_cube(face_descriptions:[Option<FaceDescription>;6]) -> 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 (i,maybe_face_description) in face_descriptions.iter().enumerate(){
+		if let Some(face_description)=maybe_face_description{
+			//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;
+			//always push normal
+			let normal_index=generated_normal.len() as u32;
+			generated_normal.push(CUBE_DEFAULT_NORMALS[i]);
+			//push vertices as they are needed
+			groups.push(IndexedGroup{
+				texture:face_description.texture,
+				polys:vec![IndexedPolygon{
+					vertices:CUBE_DEFAULT_POLYS[i].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(),
+	}
+}

src/shader.wgsl

@@ -42,21 +42,20 @@ fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
 }
 
 struct ModelInstance{
-	transform:mat4x4<f32>,
-	//texture_transform:mat3x3<f32>,
+	model_transform:mat4x4<f32>,
 	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=4096;
-@group(1)
+@group(2)
 @binding(0)
 var<uniform> model_instances: array<ModelInstance, MAX_MODEL_INSTANCES>;
-@group(1)
+@group(2)
 @binding(1)
 var model_texture: texture_2d<f32>;
-@group(1)
+@group(2)
 @binding(2)
 var model_sampler: sampler;
 
@@ -75,27 +74,27 @@ fn vs_entity_texture(
 	@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> = model_instances[instance].model_transform * vec4<f32>(pos, 1.0);
 	var result: EntityOutputTexture;
-	result.normal = (model_instances[instance].transform * vec4<f32>(normal, 0.0)).xyz;
-	result.texture=texture;//(model_instances[instance].texture_transform * vec3<f32>(texture, 1.0)).xy;
-	result.color=model_instances[instance].color * color;
+	result.normal = (model_instances[instance].model_transform * vec4<f32>(normal, 0.0)).xyz;
+	result.texture = texture;
+	result.color = model_instances[instance].color * color;
 	result.view = position.xyz - camera.cam_pos.xyz;
 	result.position = camera.proj * camera.view * position;
 	return result;
 }
 
 //group 2 is the skybox texture
-@group(2)
+@group(1)
 @binding(0)
 var cube_texture: texture_cube<f32>;
-@group(2)
+@group(1)
 @binding(1)
 var cube_sampler: sampler;
 
 @fragment
 fn fs_sky(vertex: SkyOutput) -> @location(0) vec4<f32> {
-	return textureSample(cube_texture, model_sampler, vertex.sampledir);
+	return textureSample(cube_texture, cube_sampler, vertex.sampledir);
 }
 
 @fragment