Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to upstream vek again

Browse Source
This commit is contained in:
Marcel Märtens 2022-04-25 08:37:24 +02:00
parent a45791dda5
commit fa49248c31
12 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Cargo.lock generated
View File

@ -1762,7 +1762,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed"
dependencies = [
"vek",
"vek 0.14.1",
]
[[package]]
@ -6277,7 +6277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226"
dependencies = [
"num-traits",
"vek",
"vek 0.14.1",
]
[[package]]
@ -6445,7 +6445,8 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "vek"
version = "0.14.1"
source = "git+https://gitlab.com/veloren/vek.git?branch=fix_intrinsics2#df6842cc874a697dec8896c66851817e744af7e8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04d6626f32b226e2c5b35f23ea87eaf683f3d93eaeb16b4084d0683479616f0f"
dependencies = [
"approx 0.4.0",
"num-integer",
@ -6455,6 +6456,19 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "vek"
version = "0.15.8"
source = "git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26#84d5cb65841d46599a986c5477341bea4456be26"
dependencies = [
"approx 0.5.1",
"num-integer",
"num-traits",
"rustc_version 0.4.0",
"serde",
"static_assertions",
]
[[package]]
name = "veloren-client"
version = "0.12.0"
@ -6476,7 +6490,7 @@ dependencies = [
"termcolor",
"tokio",
"tracing",
"vek",
"vek 0.15.8",
"veloren-common",
"veloren-common-base",
"veloren-common-ecs",
@ -6529,7 +6543,7 @@ dependencies = [
"tracing",
"tracing-subscriber",
"uuid",
"vek",
"vek 0.15.8",
"veloren-common-assets",
"veloren-common-base",
]
@ -6594,7 +6608,7 @@ dependencies = [
"specs-idvs",
"sum_type",
"tracing",
"vek",
"vek 0.15.8",
"veloren-common",
]
@ -6612,7 +6626,7 @@ dependencies = [
"tar",
"toml",
"tracing",
"vek",
"vek 0.15.8",
"veloren-common",
"veloren-common-base",
"veloren-common-ecs",
@ -6633,7 +6647,7 @@ dependencies = [
"slab",
"specs",
"tracing",
"vek",
"vek 0.15.8",
"veloren-common",
"veloren-common-base",
"veloren-common-ecs",
@ -6754,7 +6768,7 @@ dependencies = [
"strum",
"tokio",
"tracing",
"vek",
"vek 0.15.8",
"veloren-common",
"veloren-common-base",
"veloren-common-ecs",
@ -6846,7 +6860,7 @@ dependencies = [
"tokio",
"tracing",
"treeculler",
"vek",
"vek 0.15.8",
"veloren-client",
"veloren-common",
"veloren-common-base",
@ -6873,7 +6887,7 @@ version = "0.10.0"
dependencies = [
"bytemuck",
"lazy_static",
"vek",
"vek 0.15.8",
"veloren-common",
"veloren-voxygen-dynlib",
]
@ -6967,7 +6981,7 @@ dependencies = [
"svg_fmt",
"tracing",
"tracing-subscriber",
"vek",
"vek 0.15.8",
"veloren-common",
"veloren-common-base",
"veloren-common-frontend",

2
Cargo.toml
View File

@ -121,7 +121,7 @@ buildInputs = ["openssl"]
nativeBuildInputs = ["pkg-config"]
[patch.crates-io]
vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics2" }
vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
# patch wgpu so we can use wgpu-profiler crate
wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }

2
client/Cargo.toml
View File

@ -29,7 +29,7 @@ num = "0.4"
tracing = { version = "0.1", default-features = false }
rayon = "1.5"
specs = { git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
vek = { version = "=0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }

2
common/Cargo.toml
View File

@ -27,7 +27,7 @@ serde = { version = "1.0.110", features = ["derive", "rc"] }
# Util
enum-iterator = "0.7"
vek = { version = "=0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
chrono = "0.4"
chrono-tz = "0.6"
sha2 = "0.10"

2
common/net/Cargo.toml
View File

@ -18,7 +18,7 @@ flate2 = "1.0.20"
image = { version = "0.23.12", default-features = false, features = ["png", "jpeg"] }
num-traits = "0.2"
sum_type = "0.2.0"
vek = { version = "=0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
tracing = { version = "0.1", default-features = false }
# Data structures

2
common/state/Cargo.toml
View File

@ -19,7 +19,7 @@ common-base = { package = "veloren-common-base", path = "../base" }
rayon = "1.5"
num_cpus = "1.0"
tracing = { version = "0.1", default-features = false }
vek = { version = "=0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
# Data structures
hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }

2
common/systems/Cargo.toml
View File

@ -18,7 +18,7 @@ common-base = { package = "veloren-common-base", path = "../base" }
rand = "0.8"
rayon = "1.5"
tracing = { version = "0.1", default-features = false }
vek = { version = "=0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
ordered-float = { version = "2.0.1", default-features = false }
# Data structures

2
server/Cargo.toml
View File

@ -32,7 +32,7 @@ strum = { version = "0.24", features = ["derive"] }
bincode = "1.3.2"
num_cpus = "1.0"
tracing = "0.1"
vek = { version = "0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
futures-util = "0.3.7"
tokio = { version = "1.14", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.4"

2
voxygen/Cargo.toml
View File

@ -81,7 +81,7 @@ specs = {git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0d
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
# Mathematics
vek = {version = "=0.14.1", features = ["serde"]}
vek = {version = "0.15.8", features = ["serde"]}
# Controller
gilrs = {version = "0.8.0", features = ["serde-serialize"]}

2
voxygen/anim/Cargo.toml
View File

@ -15,7 +15,7 @@ default = ["simd"]
common = {package = "veloren-common", path = "../../common"}
# inline_tweak = "1.0.2"
bytemuck = { version = "1.4", features=["derive"] }
vek = {version = "=0.14.1", features = ["serde"]}
vek = {version = "0.15.8", features = ["serde"]}
voxygen-dynlib = {package = "veloren-voxygen-dynlib", path = "../dynlib", optional = true}
# Hot Reloading

4
voxygen/src/scene/camera.rs
View File

@ -397,7 +397,9 @@ impl Camera {
.zip(FRUSTUM_PADDING.iter())
.map(|(pos, padding)| {
let fwd = self.forward();
pos + 0.6 * (fwd.cross(*padding) + fwd.cross(*padding).cross(fwd))
// TODO: undo once treeculler is vek15.7
let transformed = Vec3::new(pos.x, pos.y, pos.z);
transformed + 0.6 * (fwd.cross(*padding) + fwd.cross(*padding).cross(fwd))
})
.chain([(self.focus - self.forward() * (self.dist + 0.5))]) // Padding to behind
.map(|pos| {

2
world/Cargo.toml
View File

@ -21,7 +21,7 @@ enum-iterator = "0.7"
fxhash = "0.2.1"
image = { version = "0.23.12", default-features = false, features = ["png"] }
itertools = "0.10"
vek = { version = "0.14.1", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
noise = { version = "0.7", default-features = false }
num = "0.4"
ordered-float = "2.0.1"