released vpk

Cargo.lock

@@ -39,17 +39,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
-[[package]]
-name = "ahash"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.6"
@@ -189,26 +178,6 @@ dependencies = [
  "backtrace",
 ]
 
-[[package]]
-name = "binread"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258d2d861723c05ad02956cae4878ceddb5e05b0dc2841ca73a3479ab7a46f4d"
-dependencies = [
- "binread_derive",
-]
-
-[[package]]
-name = "binread_derive"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d63ec80ac459fd10ae68854c26ee1c5ab5ac93866dba8f8a95cabbfeaa79b284"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "binrw"
 version = "0.13.3"
@@ -240,7 +209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "525586993a118417512a49bada2d143319310891f48b0b116c8f64fbb6486c87"
 dependencies = [
  "bitbuffer_derive",
- "err-derive 0.3.1",
+ "err-derive",
  "memchr",
  "num-traits 0.2.17",
  "serde",
@@ -717,17 +686,6 @@ dependencies = [
  "robust",
 ]
 
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -799,7 +757,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9fcd393c3daaaf5909008a1d948319d538b79c51871e4df0993260260a94e4"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "epaint",
  "nohash-hasher",
 ]
@@ -871,7 +829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ba04741be7f6602b1a1b28f1082cce45948a7032961c52814f8946b28493300"
 dependencies = [
  "ab_glyph",
- "ahash 0.8.6",
+ "ahash",
  "atomic_refcell",
  "bytemuck",
  "emath",
@@ -885,20 +843,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
-[[package]]
-name = "err-derive"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
- "synstructure",
-]
-
 [[package]]
 name = "err-derive"
 version = "0.3.1"
@@ -1771,16 +1715,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
-dependencies = [
- "derivative",
- "num_enum_derive 0.4.3",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.5.11"
@@ -1799,18 +1733,6 @@ dependencies = [
  "num_enum_derive 0.7.1",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
-dependencies = [
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num_enum_derive"
 version = "0.5.11"
@@ -1912,17 +1834,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "parse-display"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd87725635cbae7fe960f91f55a114ed104e637790317cc8d9197ea16b058010"
-dependencies = [
- "lazy_static",
- "parse-display-derive 0.1.2",
- "regex",
-]
-
 [[package]]
 name = "parse-display"
 version = "0.8.2"
@@ -1930,24 +1841,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c"
 dependencies = [
  "once_cell",
- "parse-display-derive 0.8.2",
+ "parse-display-derive",
  "regex",
 ]
 
-[[package]]
-name = "parse-display-derive"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc52b391380aa8550348736a356bf028f5469391d580533a566e97543f55e813"
-dependencies = [
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex",
- "regex-syntax 0.6.29",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "parse-display-derive"
 version = "0.8.2"
@@ -2057,15 +1954,6 @@ dependencies = [
  "miniz_oxide 0.7.1",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -2654,13 +2542,13 @@ source = "git+https://github.com/demostf/parser#5f6600cfdb39c572cc70a744aa1dc317
 dependencies = [
  "bitbuffer",
  "enumflags2",
- "err-derive 0.3.1",
+ "err-derive",
  "fnv",
  "itertools 0.10.5",
  "main_error",
  "num-traits 0.2.17",
  "num_enum 0.5.11",
- "parse-display 0.8.2",
+ "parse-display",
  "serde",
  "serde_json",
  "serde_repr",
@@ -2768,15 +2656,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.3"
@@ -2946,9 +2825,8 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 [[package]]
 name = "vbsp"
 version = "0.2.0"
-source = "git+https://github.com/icewind1991/vbsp#f1ead50800446f8764a3a68d18acb08af1f282c7"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "arrayvec 0.7.4",
  "binrw",
  "bitflags 2.4.1",
@@ -2966,7 +2844,6 @@ dependencies = [
 [[package]]
 name = "vbsp-derive"
 version = "0.1.0"
-source = "git+https://github.com/icewind1991/vbsp#f1ead50800446f8764a3a68d18acb08af1f282c7"
 dependencies = [
  "merge",
  "proc-macro2",
@@ -3028,24 +2905,26 @@ dependencies = [
 
 [[package]]
 name = "vpk"
-version = "0.1.4"
+version = "0.2.0"
-source = "git+https://github.com/icewind1991/vpk-rs?branch=perf#38e69cf684494f4505e111ffdcd82468af8192e9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60ec10e731515f58d5494d472f027d9c6fc8500fcb790ff55751031bcad87b6b"
 dependencies = [
- "ahash 0.7.7",
+ "ahash",
- "binread",
+ "binrw",
  "thiserror",
 ]
 
 [[package]]
 name = "vtf"
-version = "0.1.5"
+version = "0.1.6"
-source = "git+https://github.com/roman901/vtf-rs?rev=55670df#55670df9acd8463d9e8a78d1217d1570385f3582"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc3592bc888a6a3df8543143370f0617339b6c336f9691b2437307256ecdb0a"
 dependencies = [
  "byteorder 1.5.0",
- "err-derive 0.2.4",
+ "err-derive",
  "image",
- "num_enum 0.4.3",
+ "num_enum 0.7.1",
- "parse-display 0.1.2",
+ "parse-display",
  "texpresso",
 ]
 

Cargo.toml

@@ -7,14 +7,14 @@ license = "MIT"
 
 [dependencies]
 three-d = { version = "0.14.0", features = ["egui-gui"] }
-vbsp = { version = "0.2.0", git = "https://github.com/icewind1991/vbsp" }
+#vbsp = { version = "0.2.0", git = "https://github.com/icewind1991/vbsp" }
-#vbsp = { version = "0.2.0", path = "../bsp" }
+vbsp = { version = "0.2.0", path = "../bsp" }
 miette = { version = "5.5.0", features = ["fancy"] }
 thiserror = "1.0.37"
 delaunator = "1.0.1"
 itertools = "0.10.5"
 steamlocate = "2.0.0-alpha.0"
-vpk = { version = "0.1.4", git = "https://github.com/icewind1991/vpk-rs", branch = "perf" }
+vpk = "0.2.0"
 #vmdl = { version = "*", git = "https://github.com/icewind1991/vmdl" }
 vmdl = { version = "*", path = "../vmdl" }
 tracing = "0.1.37"