graphics v0.0.11-depth2

Cargo.lock

@@ -4033,7 +4033,7 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_graphics"
-version = "0.0.11"
+version = "0.0.11-depth2"
 dependencies = [
  "bytemuck",
  "ddsfile",

engine/graphics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_graphics"
-version = "0.0.11"
+version = "0.0.11-depth2"
 edition = "2024"
 
 [dependencies]

engine/graphics/src/graphics.rs

@@ -134,7 +134,7 @@ pub struct GraphicsState{
 }
 
 impl GraphicsState{
-	const DEPTH_FORMAT:wgpu::TextureFormat=wgpu::TextureFormat::Depth24Plus;
+	const DEPTH_FORMAT:wgpu::TextureFormat=wgpu::TextureFormat::Depth32Float;
 	fn create_depth_texture(
 		size:glam::UVec2,
 		device:&wgpu::Device,
@@ -149,7 +149,7 @@ impl GraphicsState{
 			sample_count:1,
 			dimension:wgpu::TextureDimension::D2,
 			format:Self::DEPTH_FORMAT,
-			usage:wgpu::TextureUsages::RENDER_ATTACHMENT,
+			usage:wgpu::TextureUsages::RENDER_ATTACHMENT|wgpu::TextureUsages::COPY_SRC,
 			label:Some("Depth Texture"),
 			view_formats:&[],
 		})
@@ -976,7 +976,7 @@ impl GraphicsState{
 					view:&self.depth_view,
 					depth_ops:Some(wgpu::Operations{
 						load:wgpu::LoadOp::Clear(1.0),
-						store:wgpu::StoreOp::Discard,
+						store:wgpu::StoreOp::Store,
 					}),
 					stencil_ops:None,
 				}),

engine/physics/src/physics.rs

@@ -605,26 +605,25 @@ impl MoveState{
 		*self=move_state;
 		//this function call reads the above state that was just set
 		self.update_walk_target(body,touching,models,hitbox_mesh,style,camera,input_state);
-		// Never used? make body immutable
 		self.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state);
 	}
 	fn cull_velocity(&mut self,velocity:Planar64Vec3,body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
+		//TODO: be more precise about contacts
 		if set_velocity_cull(body,touching,models,hitbox_mesh,velocity){
-			self.update_move_state(body,touching,models,hitbox_mesh,style,camera,input_state,|contact|!touching.contains_contact(&contact.convex_mesh_id));
-		}
-	}
-	fn update_move_state(&mut self,body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState,is_contact_removed:impl Fn(&ContactCollision)->bool){
-		match self.get_walk_state(){
-			// did you stop touching the thing you were walking on?
-			Some(walk_state)=>if is_contact_removed(&walk_state.contact){
-				self.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
-			}else{
-				// stopped touching something else while walking
-				self.update_walk_target(body,touching,models,hitbox_mesh,style,camera,input_state);
-				self.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state);
-			},
-			// not walking, but stopped touching something
-			None=>self.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state),
+			// TODO do better
+			// TODO: unduplicate this code
+			match self.get_walk_state(){
+				// did you stop touching the thing you were walking on?
+				Some(walk_state)=>if !touching.contains_contact(&walk_state.contact.convex_mesh_id){
+					self.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
+				}else{
+					// stopped touching something else while walking
+					self.update_walk_target(body,touching,models,hitbox_mesh,style,camera,input_state);
+					self.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state);
+				},
+				// not walking, but stopped touching something
+				None=>self.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state),
+			}
 		}
 	}
 }
@@ -944,6 +943,9 @@ impl PhysicsState{
 	fn next_move_instruction(&self)->Option<TimedInstruction<InternalInstruction,Time>>{
 		self.move_state.next_move_instruction(&self.style.strafe,self.time)
 	}
+	fn cull_velocity(&mut self,data:&PhysicsData,velocity:Planar64Vec3){
+		self.move_state.cull_velocity(velocity,&mut self.body,&mut self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
+	}
 	fn set_move_state(&mut self,data:&PhysicsData,move_state:MoveState){
 		self.move_state.set_move_state(move_state,&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
 	}
@@ -1699,7 +1701,22 @@ fn collision_end_contact(
 ){
 	touching.remove_contact(convex_mesh_id);//remove contact before calling contact_constrain_acceleration
 	//check ground
-	move_state.update_move_state(body,touching,models,hitbox_mesh,style,camera,input_state,|contact|contact.convex_mesh_id==*convex_mesh_id);
+	//TODO do better
+	//this is inner code from move_state.cull_velocity
+	match move_state.get_walk_state(){
+		// did you stop touching the thing you were walking on?
+		// This does not check the face! Is that a bad thing? It should be
+		// impossible to stop touching a different face than you started touching...
+		Some(walk_state)=>if &walk_state.contact.convex_mesh_id==convex_mesh_id{
+			move_state.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
+		}else{
+			// stopped touching something else while walking
+			move_state.update_walk_target(body,touching,models,hitbox_mesh,style,camera,input_state);
+			move_state.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state);
+		},
+		// not walking, but stopped touching something
+		None=>move_state.update_fly_velocity(body,touching,models,hitbox_mesh,style,camera,input_state),
+	}
 }
 fn collision_end_intersect(
 	move_state:&mut MoveState,
@@ -1796,7 +1813,7 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 							state.body=extrapolated_body;
 							//this is wrong but will work ig
 							//need to note which push planes activate in push solve and keep those
-							state.move_state.cull_velocity(ticked_velocity,&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
+							state.cull_velocity(data,ticked_velocity);
 						}
 					}
 				}
@@ -1880,7 +1897,7 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
 					let jump_dir=walk_state.jump_direction.direction(&data.models,&data.hitbox_mesh,&walk_state.contact);
 					let booster_option=data.models.contact_attr(walk_state.contact.convex_mesh_id.model_id).general.booster.as_ref();
 					let jumped_velocity=jump_settings.jumped_velocity(&state.style,jump_dir,state.body.velocity,booster_option);
-					state.move_state.cull_velocity(jumped_velocity,&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
+					state.cull_velocity(data,jumped_velocity);
 				}
 			}
 			b_refresh_walk_target=false;
@@ -1953,7 +1970,7 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
 	if b_refresh_walk_target{
 		state.move_state.update_walk_target(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
 		state.move_state.update_fly_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
-		state.move_state.cull_velocity(state.body.velocity,&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
+		state.cull_velocity(data,state.body.velocity);
 		//also check if accelerating away from surface
 	}
 }