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" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed" checksum = "0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed"
dependencies = [ dependencies = [
"vek", "vek 0.14.1",
] ]
[[package]] [[package]]
@ -6277,7 +6277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226" checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226"
dependencies = [ dependencies = [
"num-traits", "num-traits",
"vek", "vek 0.14.1",
] ]
[[package]] [[package]]
@ -6445,7 +6445,8 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]] [[package]]
name = "vek" name = "vek"
version = "0.14.1" 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 = [ dependencies = [
"approx 0.4.0", "approx 0.4.0",
"num-integer", "num-integer",
@ -6455,6 +6456,19 @@ dependencies = [
"static_assertions", "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]] [[package]]
name = "veloren-client" name = "veloren-client"
version = "0.12.0" version = "0.12.0"
@ -6476,7 +6490,7 @@ dependencies = [
"termcolor", "termcolor",
"tokio", "tokio",
"tracing", "tracing",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-ecs", "veloren-common-ecs",
@ -6529,7 +6543,7 @@ dependencies = [
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid", "uuid",
"vek", "vek 0.15.8",
"veloren-common-assets", "veloren-common-assets",
"veloren-common-base", "veloren-common-base",
] ]
@ -6594,7 +6608,7 @@ dependencies = [
"specs-idvs", "specs-idvs",
"sum_type", "sum_type",
"tracing", "tracing",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
] ]
@ -6612,7 +6626,7 @@ dependencies = [
"tar", "tar",
"toml", "toml",
"tracing", "tracing",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-ecs", "veloren-common-ecs",
@ -6633,7 +6647,7 @@ dependencies = [
"slab", "slab",
"specs", "specs",
"tracing", "tracing",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-ecs", "veloren-common-ecs",
@ -6754,7 +6768,7 @@ dependencies = [
"strum", "strum",
"tokio", "tokio",
"tracing", "tracing",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-ecs", "veloren-common-ecs",
@ -6846,7 +6860,7 @@ dependencies = [
"tokio", "tokio",
"tracing", "tracing",
"treeculler", "treeculler",
"vek", "vek 0.15.8",
"veloren-client", "veloren-client",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
@ -6873,7 +6887,7 @@ version = "0.10.0"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"lazy_static", "lazy_static",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
"veloren-voxygen-dynlib", "veloren-voxygen-dynlib",
] ]
@ -6967,7 +6981,7 @@ dependencies = [
"svg_fmt", "svg_fmt",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"vek", "vek 0.15.8",
"veloren-common", "veloren-common",
"veloren-common-base", "veloren-common-base",
"veloren-common-frontend", "veloren-common-frontend",

2
Cargo.toml
View File

@ -121,7 +121,7 @@ buildInputs = ["openssl"]
nativeBuildInputs = ["pkg-config"] nativeBuildInputs = ["pkg-config"]
[patch.crates-io] [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 # patch wgpu so we can use wgpu-profiler crate
wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" } 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 } tracing = { version = "0.1", default-features = false }
rayon = "1.5" rayon = "1.5"
specs = { git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" } 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"] } hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" } 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 # Util
enum-iterator = "0.7" enum-iterator = "0.7"
vek = { version = "=0.14.1", features = ["serde"] } vek = { version = "0.15.8", features = ["serde"] }
chrono = "0.4" chrono = "0.4"
chrono-tz = "0.6" chrono-tz = "0.6"
sha2 = "0.10" 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"] } image = { version = "0.23.12", default-features = false, features = ["png", "jpeg"] }
num-traits = "0.2" num-traits = "0.2"
sum_type = "0.2.0" 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 } tracing = { version = "0.1", default-features = false }
# Data structures # Data structures

2
common/state/Cargo.toml
View File

@ -19,7 +19,7 @@ common-base = { package = "veloren-common-base", path = "../base" }
rayon = "1.5" rayon = "1.5"
num_cpus = "1.0" num_cpus = "1.0"
tracing = { version = "0.1", default-features = false } tracing = { version = "0.1", default-features = false }
vek = { version = "=0.14.1", features = ["serde"] } vek = { version = "0.15.8", features = ["serde"] }
# Data structures # Data structures
hashbrown = { version = "0.11", features = ["rayon", "serde", "nightly"] } 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" rand = "0.8"
rayon = "1.5" rayon = "1.5"
tracing = { version = "0.1", default-features = false } 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 } ordered-float = { version = "2.0.1", default-features = false }
# Data structures # Data structures

2
server/Cargo.toml
View File

@ -32,7 +32,7 @@ strum = { version = "0.24", features = ["derive"] }
bincode = "1.3.2" bincode = "1.3.2"
num_cpus = "1.0" num_cpus = "1.0"
tracing = "0.1" tracing = "0.1"
vek = { version = "0.14.1", features = ["serde"] } vek = { version = "0.15.8", features = ["serde"] }
futures-util = "0.3.7" futures-util = "0.3.7"
tokio = { version = "1.14", default-features = false, features = ["rt"] } tokio = { version = "1.14", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.4" 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" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
# Mathematics # Mathematics
vek = {version = "=0.14.1", features = ["serde"]} vek = {version = "0.15.8", features = ["serde"]}
# Controller # Controller
gilrs = {version = "0.8.0", features = ["serde-serialize"]} 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"} common = {package = "veloren-common", path = "../../common"}
# inline_tweak = "1.0.2" # inline_tweak = "1.0.2"
bytemuck = { version = "1.4", features=["derive"] } 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} voxygen-dynlib = {package = "veloren-voxygen-dynlib", path = "../dynlib", optional = true}
# Hot Reloading # Hot Reloading

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

@ -397,7 +397,9 @@ impl Camera {
.zip(FRUSTUM_PADDING.iter()) .zip(FRUSTUM_PADDING.iter())
.map(|(pos, padding)| { .map(|(pos, padding)| {
let fwd = self.forward(); 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 .chain([(self.focus - self.forward() * (self.dist + 0.5))]) // Padding to behind
.map(|pos| { .map(|pos| {

2
world/Cargo.toml
View File

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