fix rebase

engine/graphics/src/graphics.rs

@@ -223,11 +223,11 @@ impl GraphicsState{
 
 		//generate debug models, only one will be rendered at a time
 		self.debug_models=map.models.iter().enumerate().map(|(model_id,model)|{
-			let model_uniforms=get_instance_buffer_data(&GraphicsModelOwned{
+			let model_uniforms=get_instances_buffer_data(&[GraphicsModelOwned{
 				transform:model.transform.into(),
 				normal_transform:glam::Mat3::from_cols_array_2d(&model.transform.matrix3.to_array().map(|row|row.map(Into::into))).inverse().transpose(),
 				color:GraphicsModelColor4::new(glam::vec4(1.0,0.0,0.0,0.2)),
-			});
+			}]);
 			let model_buf=device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
 				label:Some(format!("Debug Model{} Buf",model_id).as_str()),
 				contents:bytemuck::cast_slice(&model_uniforms),

engine/physics/src/model.rs

@@ -526,6 +526,9 @@ impl TransformedMesh<'_>{
 	pub fn verts<'a>(&'a self)->impl Iterator<Item=Vector3<Fixed<2,64>>>+'a{
 		self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos))
 	}
+	pub fn faces(&self)->impl Iterator<Item=SubmeshFaceId>{
+		(0..self.view.topology.faces.len() as u32).map(SubmeshFaceId::new)
+	}
 }
 impl MeshQuery for TransformedMesh<'_>{
 	type Face=SubmeshFaceId;