From ab01c46ef76d69885d247256478300ab08a0bd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Sat, 10 Feb 2024 11:43:59 +0100
Subject: [PATCH] update vek to newest version, we somehow had a patch we no
 longer need anymore

---
 Cargo.lock | 28 ++++++++++++++--------------
 Cargo.toml |  3 +--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1c480ec7a9..fabf0e4993 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6869,15 +6869,15 @@ dependencies = [
 
 [[package]]
 name = "vek"
-version = "0.15.8"
-source = "git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26#84d5cb65841d46599a986c5477341bea4456be26"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85158043f3bc1fac596d59a77e07948da340b9951b451ed4cb4a8c480aa2157"
 dependencies = [
  "approx 0.5.1",
  "num-integer",
  "num-traits",
  "rustc_version 0.4.0",
  "serde",
- "static_assertions",
 ]
 
 [[package]]
@@ -6901,7 +6901,7 @@ dependencies = [
  "specs",
  "tokio",
  "tracing",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-client-i18n",
  "veloren-common",
  "veloren-common-base",
@@ -6972,7 +6972,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "uuid",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common-assets",
  "veloren-common-base",
  "veloren-common-i18n",
@@ -7057,7 +7057,7 @@ dependencies = [
  "specs",
  "sum_type",
  "tracing",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
 ]
 
@@ -7079,7 +7079,7 @@ dependencies = [
  "timer-queue",
  "toml 0.8.10",
  "tracing",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-common-assets",
  "veloren-common-base",
@@ -7099,7 +7099,7 @@ dependencies = [
  "rayon",
  "specs",
  "tracing",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-common-base",
  "veloren-common-ecs",
@@ -7171,7 +7171,7 @@ dependencies = [
  "serde",
  "slotmap",
  "tracing",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-world",
 ]
@@ -7214,7 +7214,7 @@ dependencies = [
  "strum 0.24.1",
  "tokio",
  "tracing",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-common-base",
  "veloren-common-ecs",
@@ -7235,7 +7235,7 @@ dependencies = [
  "lazy_static",
  "rand 0.8.5",
  "specs",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-common-dynlib",
  "veloren-rtsim",
@@ -7327,7 +7327,7 @@ dependencies = [
  "tokio",
  "tracing",
  "treeculler",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-client",
  "veloren-client-i18n",
  "veloren-common",
@@ -7355,7 +7355,7 @@ version = "0.10.0"
 dependencies = [
  "bytemuck",
  "lazy_static",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-common-dynlib",
 ]
@@ -7423,7 +7423,7 @@ dependencies = [
  "svg_fmt",
  "tracing",
  "tracing-subscriber",
- "vek 0.15.8",
+ "vek 0.16.1",
  "veloren-common",
  "veloren-common-base",
  "veloren-common-dynlib",
diff --git a/Cargo.toml b/Cargo.toml
index c8b1ff29fb..e8d8062b7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,7 +141,7 @@ crossbeam-channel = { version = "0.5"}
 ordered-float = { version = "3", default-features = true }
 num = { version = "0.4" }
 num-traits = { version = "0.2" }
-vek = { version = "0.15.8", features = ["serde"] }
+vek = { version = "0.16.1", features = ["serde"] }
 itertools = { version = "0.10" }
 
 serde = { version = "1.0.118", features = ["derive"] }
@@ -156,7 +156,6 @@ clap = { version = "4.2",  features = ["derive"]}
 async-trait = "0.1.42"
 
 [patch.crates-io]
-vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
 # This is needed because of an issue with spirv & naga in wgpu 0.18, and there's an issue
 # with uint in uniforms for gl.