update deps (aggressive)

wgpu 22.0.0
use strafesnet registry
2024-07-22 12:58:36 -07:00 · 2024-07-22 12:33:39 -07:00 · 2024-03-30 13:39:06 -07:00 · 2024-03-18 21:08:39 -07:00 · 2024-03-18 20:50:39 -07:00 · 2024-03-13 13:57:21 -07:00
6 changed files with 51 additions and 83 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,18 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "173901312e9850391d4d7c1318c4e099fdc037d61870fca427429830efdb4e5f"
 dependencies = [
 "array-init",
- "binrw_derive 0.13.3",
- "bytemuck",
-]
-
-[[package]]
-name = "binrw"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f36b7cb3ab9ff6a2858650d8dc360e783a5d14dc29594db48c56a3c233cc265"
-dependencies = [
- "array-init",
- "binrw_derive 0.14.0",
+ "binrw_derive",
 "bytemuck",
 ]

@@ -177,19 +166,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "binrw_derive"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ea7a8c5c8eeffffac6d54d172444e15beffac6f817fac714460a9a9aa88da3"
-dependencies = [
- "either",
- "owo-colors",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.6.0"
@@ -675,9 +651,9 @@ dependencies = [

 [[package]]
 name = "glam"
-version = "0.28.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"

 [[package]]
 name = "glow"
@@ -1594,11 +1570,11 @@ dependencies = [

 [[package]]
 name = "rbx_mesh"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864ead0e98afce28c960f653d6203483834890d07f87b60e2f01415530a2fe9d"
+checksum = "b9f5cad033f5b4e15d13176f1f15aa1c6b9f025ce6b7ae64a5ce00f97367f2d0"
 dependencies = [
- "binrw 0.14.0",
+ "binrw",
 "lazy-regex",
 ]

@@ -1877,7 +1853,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "strafe-client"
-version = "0.10.0"
+version = "0.9.5"
 dependencies = [
 "bytemuck",
 "configparser",
@@ -1896,9 +1872,9 @@ dependencies = [

 [[package]]
 name = "strafesnet_bsp_loader"
-version = "0.1.2"
+version = "0.1.1"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "c3891b86fae658a904a38dc3e746987ae480898d355daca741e7ba6b10c50094"
+checksum = "fa4f0e59adc42910a08bdfeabbe8c8fdfd9295f999d642226214a3784eacf654"
 dependencies = [
 "glam",
 "strafesnet_common",
@@ -1908,9 +1884,9 @@ dependencies = [

 [[package]]
 name = "strafesnet_common"
-version = "0.1.3"
+version = "0.1.2"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "10a7e3b69506893bbdde90ce8a9d75cd56d280c0424d2dfdf98f8520179d0c1b"
+checksum = "0704e795010e6ca97f3d3dd6c24e76bf2d23f91186e1807ad4c7cb84ba6b8239"
 dependencies = [
 "bitflags 2.6.0",
 "glam",
@@ -1930,9 +1906,9 @@ dependencies = [

 [[package]]
 name = "strafesnet_rbx_loader"
-version = "0.3.1"
+version = "0.3.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "462e941b20f0d41b6ed138a8bd7d7e17a09c62b3817074a6c935798daa786697"
+checksum = "d093481d64ce60837f8d2fbb512b935e5730932ed2aae90e94b3ba6112350176"
 dependencies = [
 "bytemuck",
 "glam",
@@ -2124,7 +2100,7 @@ checksum = "d9267540dab0c93bb5201c40ba3b2d027e2717bf355a8f9bf25377b06a5b32f6"
 dependencies = [
 "ahash",
 "arrayvec",
- "binrw 0.13.3",
+ "binrw",
 "bitflags 2.6.0",
 "bv",
 "cgmath",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.10.0"
+version = "0.9.5"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-client"
 license = "Custom"
@@ -13,14 +13,14 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 bytemuck = { version = "1.13.1", features = ["derive"] }
 configparser = "3.0.2"
 ddsfile = "0.5.1"
-glam = "0.28.0"
+glam = "0.25.0"
 id = { version = "0.1.0", registry = "strafesnet" }
 parking_lot = "0.12.1"
 pollster = "0.3.0"
-strafesnet_bsp_loader = { version = "0.1.2", registry = "strafesnet" }
-strafesnet_common = { version = "0.1.3", registry = "strafesnet" }
+strafesnet_bsp_loader = { version = "0.1.1", registry = "strafesnet" }
+strafesnet_common = { version = "0.1.2", registry = "strafesnet" }
 strafesnet_deferred_loader = { version = "0.3.0", features = ["legacy"], registry = "strafesnet" }
-strafesnet_rbx_loader = { version = "0.3.1", registry = "strafesnet" }
+strafesnet_rbx_loader = { version = "0.3.0", registry = "strafesnet" }
 wgpu = "22.0.0"
 winit = "0.30.4"

--- a/src/file.rs
+++ b/src/file.rs
@@ -4,8 +4,6 @@ use std::io::Read;
 pub enum ReadError{
 	Roblox(strafesnet_rbx_loader::ReadError),
 	Source(strafesnet_bsp_loader::ReadError),
-	StrafesNET(strafesnet_snf::Error),
-	StrafesNETMap(strafesnet_snf::map::Error),
 	Io(std::io::Error),
 	UnknownFileFormat,
 }
@@ -18,20 +16,15 @@ impl std::error::Error for ReadError{}

 pub enum DataStructure{
 	Roblox(strafesnet_rbx_loader::Dom),
-	Source(strafesnet_bsp_loader::Bsp),
-	StrafesNET(strafesnet_common::map::CompleteMap),
+	Source(strafesnet_bsp_loader::Bsp)
 }

-pub fn read<R:Read+std::io::Seek>(input:R)->Result<DataStructure,ReadError>{
+pub fn read<R:Read>(input:R)->Result<DataStructure,ReadError>{
 	let mut buf=std::io::BufReader::new(input);
 	let peek=std::io::BufRead::fill_buf(&mut buf).map_err(ReadError::Io)?;
 	match &peek[0..4]{
 		b"<rob"=>Ok(DataStructure::Roblox(strafesnet_rbx_loader::read(buf).map_err(ReadError::Roblox)?)),
 		b"VBSP"=>Ok(DataStructure::Source(strafesnet_bsp_loader::read(buf).map_err(ReadError::Source)?)),
-		b"SNFM"=>Ok(DataStructure::StrafesNET(
-			strafesnet_snf::read_map(buf).map_err(ReadError::StrafesNET)?
-			.into_complete_map().map_err(ReadError::StrafesNETMap)?
-		)),
 		_=>Err(ReadError::UnknownFileFormat),
 	}
 }
@@ -53,7 +46,6 @@ pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<strafesnet_common::map::Co
 	//blocking because it's simpler...
 	let file=std::fs::File::open(path).map_err(LoadError::File)?;
 	match read(file).map_err(LoadError::ReadError)?{
-		DataStructure::StrafesNET(map)=>Ok(map),
 		DataStructure::Roblox(dom)=>{
 			let mut loader=strafesnet_deferred_loader::roblox_legacy();

@@ -125,4 +117,4 @@ pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<strafesnet_common::map::Co
 			Ok(map)
 		},
 	}
-}
+}
--- a/src/model_physics.rs
+++ b/src/model_physics.rs
@@ -137,22 +137,22 @@ impl PhysicsMesh{
 		//go go gadget debug print mesh
 		let data=PhysicsMeshData{
 			faces:vec![
-				Face{normal:Planar64Vec3::raw_xyz( 4294967296, 0, 0),dot:Planar64::raw(4294967296)},
-				Face{normal:Planar64Vec3::raw_xyz( 0, 4294967296, 0),dot:Planar64::raw(4294967296)},
-				Face{normal:Planar64Vec3::raw_xyz( 0, 0, 4294967296),dot:Planar64::raw(4294967296)},
-				Face{normal:Planar64Vec3::raw_xyz(-4294967296, 0, 0),dot:Planar64::raw(4294967296)},
-				Face{normal:Planar64Vec3::raw_xyz( 0,-4294967296, 0),dot:Planar64::raw(4294967296)},
-				Face{normal:Planar64Vec3::raw_xyz( 0, 0,-4294967296),dot:Planar64::raw(4294967296)}
+				Face{normal:Planar64Vec3::raw( 4294967296, 0, 0),dot:Planar64::raw(4294967296)},
+				Face{normal:Planar64Vec3::raw( 0, 4294967296, 0),dot:Planar64::raw(4294967296)},
+				Face{normal:Planar64Vec3::raw( 0, 0, 4294967296),dot:Planar64::raw(4294967296)},
+				Face{normal:Planar64Vec3::raw(-4294967296, 0, 0),dot:Planar64::raw(4294967296)},
+				Face{normal:Planar64Vec3::raw( 0,-4294967296, 0),dot:Planar64::raw(4294967296)},
+				Face{normal:Planar64Vec3::raw( 0, 0,-4294967296),dot:Planar64::raw(4294967296)}
 			],
 			verts:vec![
-				Vert(Planar64Vec3::raw_xyz( 4294967296,-4294967296,-4294967296)),
-				Vert(Planar64Vec3::raw_xyz( 4294967296, 4294967296,-4294967296)),
-				Vert(Planar64Vec3::raw_xyz( 4294967296, 4294967296, 4294967296)),
-				Vert(Planar64Vec3::raw_xyz( 4294967296,-4294967296, 4294967296)),
-				Vert(Planar64Vec3::raw_xyz(-4294967296, 4294967296,-4294967296)),
-				Vert(Planar64Vec3::raw_xyz(-4294967296, 4294967296, 4294967296)),
-				Vert(Planar64Vec3::raw_xyz(-4294967296,-4294967296, 4294967296)),
-				Vert(Planar64Vec3::raw_xyz(-4294967296,-4294967296,-4294967296))
+				Vert(Planar64Vec3::raw( 4294967296,-4294967296,-4294967296)),
+				Vert(Planar64Vec3::raw( 4294967296, 4294967296,-4294967296)),
+				Vert(Planar64Vec3::raw( 4294967296, 4294967296, 4294967296)),
+				Vert(Planar64Vec3::raw( 4294967296,-4294967296, 4294967296)),
+				Vert(Planar64Vec3::raw(-4294967296, 4294967296,-4294967296)),
+				Vert(Planar64Vec3::raw(-4294967296, 4294967296, 4294967296)),
+				Vert(Planar64Vec3::raw(-4294967296,-4294967296, 4294967296)),
+				Vert(Planar64Vec3::raw(-4294967296,-4294967296,-4294967296))
 			]
 		};
 		let mesh_topology=PhysicsMeshTopology{
@@ -167,17 +167,17 @@ impl PhysicsMesh{
 				FaceRefs{edges:vec![SubmeshDirectedEdgeId(4),SubmeshDirectedEdgeId(0),SubmeshDirectedEdgeId((9223372036854775819u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(9)]}
 			],
 			edge_topology:vec![
-				EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(5)],verts:[SubmeshVertId(0),SubmeshVertId(1)]},
-				EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(1)],verts:[SubmeshVertId(1),SubmeshVertId(2)]},
-				EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(2)],verts:[SubmeshVertId(2),SubmeshVertId(3)]},
-				EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(0)],verts:[SubmeshVertId(0),SubmeshVertId(3)]},
-				EdgeRefs{faces:[SubmeshFaceId(1),SubmeshFaceId(5)],verts:[SubmeshVertId(1),SubmeshVertId(4)]},
-				EdgeRefs{faces:[SubmeshFaceId(1),SubmeshFaceId(3)],verts:[SubmeshVertId(4),SubmeshVertId(5)]},
-				EdgeRefs{faces:[SubmeshFaceId(2),SubmeshFaceId(1)],verts:[SubmeshVertId(2),SubmeshVertId(5)]},
-				EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(2)],verts:[SubmeshVertId(3),SubmeshVertId(6)]},
-				EdgeRefs{faces:[SubmeshFaceId(2),SubmeshFaceId(3)],verts:[SubmeshVertId(5),SubmeshVertId(6)]},
-				EdgeRefs{faces:[SubmeshFaceId(3),SubmeshFaceId(5)],verts:[SubmeshVertId(4),SubmeshVertId(7)]},
-				EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(3)],verts:[SubmeshVertId(6),SubmeshVertId(7)]},
+				EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(5)],verts:[SubmeshVertId(0),SubmeshVertId(1)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(1)],verts:[SubmeshVertId(1),SubmeshVertId(2)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(2)],verts:[SubmeshVertId(2),SubmeshVertId(3)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(0)],verts:[SubmeshVertId(0),SubmeshVertId(3)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(1),SubmeshFaceId(5)],verts:[SubmeshVertId(1),SubmeshVertId(4)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(1),SubmeshFaceId(3)],verts:[SubmeshVertId(4),SubmeshVertId(5)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(2),SubmeshFaceId(1)],verts:[SubmeshVertId(2),SubmeshVertId(5)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(2)],verts:[SubmeshVertId(3),SubmeshVertId(6)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(2),SubmeshFaceId(3)],verts:[SubmeshVertId(5),SubmeshVertId(6)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(3),SubmeshFaceId(5)],verts:[SubmeshVertId(4),SubmeshVertId(7)]}, 
+				EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(3)],verts:[SubmeshVertId(6),SubmeshVertId(7)]}, 
 				EdgeRefs{faces:[SubmeshFaceId(5),SubmeshFaceId(4)],verts:[SubmeshVertId(0),SubmeshVertId(7)]}
 			],
 			vert_topology:vec![
@@ -961,4 +961,4 @@ fn test_is_empty_volume(){
 fn build_me_a_cube(){
 	let mesh=PhysicsMesh::unit_cube();
 	//println!("mesh={:?}",mesh);
-}
+}
--- a/src/physics.rs
+++ b/src/physics.rs
@@ -1161,7 +1161,7 @@ impl PhysicsContext{
 		aabb.inflate(data.hitbox_mesh.halfsize);
 		//common body
 		let relative_body=VirtualBody::relative(&Body::default(),&state.body).body(state.time);
-		data.bvh.the_tester(&aabb,&mut |&convex_mesh_id|{
+		data.bvh.the_tester(&aabb,&mut |convex_mesh_id|{
 			//no checks are needed because of the time limits.
 			let model_mesh=data.models.mesh(convex_mesh_id);
 			let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,data.hitbox_mesh.transformed_mesh());
@@ -1763,4 +1763,4 @@ mod test{
 			Time::ZERO
 		),None);
 	}
-}
+}
--- a/tools/textures
+++ b/tools/textures
@@ -1 +1 @@
-/run/media/quat/Files/Documents/map-files/verify-scripts/textures
+/run/media/quat/Files/Documents/map-files/verify-scripts/textures/dds/
Author	SHA1	Message	Date
Quaternions	a139b5a409	update deps (aggressive)	2024-07-22 12:58:36 -07:00
Quaternions	1b71bda9c7	wgpu 22.0.0	2024-07-22 12:33:39 -07:00
Quaternions	5f1b162775	use strafesnet registry	2024-03-30 13:39:06 -07:00
Quaternions	ed27ee060b	pretty polygon fanning from vbsp code	2024-03-18 21:08:39 -07:00
Quaternions	5c107c1e5f	print texture load error	2024-03-18 20:50:39 -07:00
Quaternions	3834194156	update deps	2024-03-13 13:57:21 -07:00
Quaternions	d0432188b5	include meshes symbolic link	2024-03-13 11:48:34 -07:00
Quaternions	9ff946c325	implement roblox mesh loading	2024-03-13 11:48:34 -07:00
Quaternions	63b2b1676c	update deps	2024-03-13 11:48:34 -07:00
Quaternions	b7fc7d2a12	update deps	2024-03-02 13:19:01 -08:00
Quaternions	f273bbf4a9	update strafesnet deps	2024-03-02 13:18:56 -08:00
Quaternions	cc19917025	note	2024-02-22 02:17:20 -08:00
Quaternions	cc58f23512	the bug	2024-02-22 01:30:17 -08:00
Quaternions	b6e7ce4e25	fixup double references	2024-02-22 01:29:29 -08:00
Quaternions	b0d8f2e09a	not-working	2024-02-22 00:57:09 -08:00
Quaternions	9b4b09798b	notes about fixes	2024-02-21 22:58:40 -08:00
Quaternions	5a55aefb4f	unused argument	2024-02-21 22:28:33 -08:00
Quaternions	8f606b7cfc	ad-hoc fixups	2024-02-21 22:07:40 -08:00
Quaternions	fad7ed393b	implicitly apply_to_body in apply_enum	2024-02-21 22:07:21 -08:00
Quaternions	d2a864e2c1	rename MoveState::changed to apply_enum	2024-02-21 22:07:05 -08:00
Quaternions	f027594ab4	before and after not needed currently	2024-02-21 05:24:12 -08:00
Quaternions	0026b92a72	hide hints	2024-02-21 05:20:40 -08:00
Quaternions	4dc706b783	notes	2024-02-21 05:20:40 -08:00
Quaternions	9bf3f55191	it works??	2024-02-21 05:17:13 -08:00
Quaternions	eb34cce746	flyin	2024-02-21 04:12:08 -08:00
Quaternions	623a2d2a4f	be pedantic about public private	2024-02-21 04:11:31 -08:00
Quaternions	aadcca91ea	Debug	2024-02-21 03:23:50 -08:00
Quaternions	04c70ba0bc	more private	2024-02-21 02:52:20 -08:00
Quaternions	865c086f14	actually implement this function	2024-02-21 02:48:49 -08:00
Quaternions	619049c11f	unneeded	2024-02-21 02:48:41 -08:00
Quaternions	2acefe9a1a	want water here	2024-02-21 02:41:19 -08:00
Quaternions	2496d71afa	compiler	2024-02-21 02:32:00 -08:00
Quaternions	8ffbca204b	wishful thinking	2024-02-21 02:31:50 -08:00
Quaternions	05e2f67e36	don't write duplicate code	2024-02-21 02:17:13 -08:00
Quaternions	b955407b06	delete get_move_state function	2024-02-21 01:32:29 -08:00
Quaternions	fb47b09925	wip	2024-02-21 01:32:03 -08:00
Quaternions	dbd08729d7	wip	2024-02-21 00:31:44 -08:00
Quaternions	c895a66ad6	wip	2024-02-20 22:27:31 -08:00
Quaternions	efdb4c97be	edit jumped_velocity garbage	2024-02-18 01:52:29 -08:00
Quaternions	9396623f0c	wip - notably remove camera interpolation for walking and rocket	2024-02-18 01:52:29 -08:00
Quaternions	c55156bb92	wip	2024-02-18 01:52:29 -08:00