diff --git a/Cargo.lock b/Cargo.lock index b83268b2d9..e9dcba0ffc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5551,10 +5551,10 @@ dependencies = [ [[package]] name = "vek" -version = "0.12.0" -source = "git+https://gitlab.com/veloren/vek.git?branch=fix_intrinsics#237a78528b505f34f6dde5dc77db3b642388fe4a" +version = "0.14.1" +source = "git+https://gitlab.com/veloren/vek.git?branch=fix_intrinsics2#df6842cc874a697dec8896c66851817e744af7e8" dependencies = [ - "approx 0.3.2", + "approx 0.4.0", "num-integer", "num-traits", "rustc_version", @@ -5577,7 +5577,7 @@ dependencies = [ "tokio 1.2.0", "tracing", "tracing-subscriber", - "vek 0.12.0", + "vek 0.14.1", "veloren-common", "veloren-common-net", "veloren-common-sys", @@ -5621,7 +5621,7 @@ dependencies = [ "tracing", "tracy-client", "uuid", - "vek 0.12.0", + "vek 0.14.1", ] [[package]] @@ -5635,7 +5635,7 @@ dependencies = [ "sum_type", "tracing", "tracy-client", - "vek 0.12.0", + "vek 0.14.1", "veloren-common", ] @@ -5656,7 +5656,7 @@ dependencies = [ "toml", "tracing", "tracy-client", - "vek 0.12.0", + "vek 0.14.1", "veloren-common", "veloren-common-net", "veloren-plugin-api", @@ -5763,7 +5763,7 @@ dependencies = [ "specs-idvs", "tokio 1.2.0", "tracing", - "vek 0.12.0", + "vek 0.14.1", "veloren-common", "veloren-common-net", "veloren-common-sys", @@ -5849,7 +5849,7 @@ dependencies = [ "tracing-subscriber", "tracing-tracy", "treeculler", - "vek 0.12.0", + "vek 0.14.1", "veloren-client", "veloren-common", "veloren-common-net", @@ -5872,7 +5872,7 @@ dependencies = [ "libloading 0.6.7", "notify 5.0.0-pre.5", "tracing", - "vek 0.12.0", + "vek 0.14.1", "veloren-common", ] @@ -5901,7 +5901,7 @@ dependencies = [ "serde", "tracing", "tracing-subscriber", - "vek 0.12.0", + "vek 0.14.1", "veloren-common", "veloren-common-net", ] diff --git a/Cargo.toml b/Cargo.toml index e8104a7195..ed1f6b9a39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,4 +84,4 @@ debug = 1 [patch.crates-io] # macos CI fix isn't merged yet winit = { git = "https://gitlab.com/veloren/winit.git", branch = "macos-test-spiffed" } -vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics" } +vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics2" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 19bfe35608..15bc63c5eb 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -24,7 +24,7 @@ num = "0.3.1" tracing = { version = "0.1", default-features = false } rayon = "1.5" specs = { git = "https://github.com/amethyst/specs.git", rev = "d4435bdf496cf322c74886ca09dd8795984919b4" } -vek = { version = "=0.12.0", features = ["serde"] } +vek = { version = "=0.14.1", features = ["serde"] } hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "bffb5181a35c19ddfd33ee0b4aedba741aafb68d" } diff --git a/common/Cargo.toml b/common/Cargo.toml index b0137d163f..7c5cb4c482 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -31,7 +31,7 @@ rayon = "1.5" roots = "0.0.6" spin_sleep = "1.0" tracing = { version = "0.1", default-features = false } -vek = { version = "=0.12.0", features = ["serde"] } +vek = { version = "=0.14.1", features = ["serde"] } uuid = { version = "0.8.1", default-features = false, features = ["serde", "v4"] } rand = "0.8" diff --git a/common/net/Cargo.toml b/common/net/Cargo.toml index adbfdc5b6b..05e11b7cff 100644 --- a/common/net/Cargo.toml +++ b/common/net/Cargo.toml @@ -14,7 +14,7 @@ default = ["simd"] common = {package = "veloren-common", path = "../../common"} sum_type = "0.2.0" -vek = { version = "=0.12.0", features = ["serde"] } +vek = { version = "=0.14.1", features = ["serde"] } tracing = { version = "0.1", default-features = false } # Data structures diff --git a/common/sys/Cargo.toml b/common/sys/Cargo.toml index 7742c5dc35..62a3b693b1 100644 --- a/common/sys/Cargo.toml +++ b/common/sys/Cargo.toml @@ -18,7 +18,7 @@ common-net = { package = "veloren-common-net", path = "../net" } rand = "0.8" rayon = "1.5" tracing = { version = "0.1", default-features = false } -vek = { version = "=0.12.0", features = ["serde"] } +vek = { version = "=0.14.1", features = ["serde"] } # Data structures hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index e70dfafcbd..083596abdf 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -22,7 +22,7 @@ specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-deri specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "9fab7b396acd6454585486e50ae4bfe2069858a9" } tracing = "0.1" -vek = { version = "0.12.0", features = ["serde"] } +vek = { version = "0.14.1", features = ["serde"] } futures-util = "0.3.7" tokio = { version = "1", default-features = false, features = ["rt"] } prometheus-hyper = "0.1.1" diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 8095d4f4d4..7002bac3f6 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -48,7 +48,7 @@ specs = {git = "https://github.com/amethyst/specs.git", rev = "d4435bdf496cf322c specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "9fab7b396acd6454585486e50ae4bfe2069858a9" } # Mathematics -vek = {version = "=0.12.0", features = ["serde"]} +vek = {version = "=0.14.1", features = ["serde"]} # Controller gilrs = {version = "0.8.0", features = ["serde-serialize"]} diff --git a/voxygen/anim/Cargo.toml b/voxygen/anim/Cargo.toml index 9645030fa7..6f9815d8b7 100644 --- a/voxygen/anim/Cargo.toml +++ b/voxygen/anim/Cargo.toml @@ -25,4 +25,4 @@ lazy_static = {version = "1.4.0", optional = true} libloading = {version = "0.6.2", optional = true} notify = {version = "5.0.0-pre.2", optional = true} tracing = {version = "0.1", optional = true} -vek = {version = "=0.12.0", features = ["serde"]} +vek = {version = "=0.14.1", features = ["serde"]} diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 3ccbdf2a04..1780fa7f8f 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -510,7 +510,7 @@ impl FigureMgr { // Transform (semi) world space to light space. let ray_mat: math::Mat4 = - math::Mat4::look_at_rh(cam_pos, cam_pos + ray_direction, math::Vec3::up()); + math::Mat4::look_at_rh(cam_pos, cam_pos + ray_direction, math::Vec3::unit_y()); let focus_off = math::Vec3::from(camera.get_focus_pos().map(f32::trunc)); let ray_mat = ray_mat * math::Mat4::translation_3d(-focus_off); diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs index 331537515d..5e90a7c02d 100644 --- a/voxygen/src/scene/mod.rs +++ b/voxygen/src/scene/mod.rs @@ -744,7 +744,7 @@ impl Scene { let mut directed_shadow_mats = Vec::with_capacity(6); let new_dir = math::Vec3::from(view_dir); let new_dir = new_dir.normalized(); - let up: math::Vec3 = math::Vec3::up(); + let up: math::Vec3 = math::Vec3::unit_y(); directed_shadow_mats.push(math::Mat4::look_at_rh( look_at, look_at + directed_light_dir, @@ -787,7 +787,7 @@ impl Scene { v_p.z = 0.0; v_p.normalize(); let l_r: math::Mat4 = if factor > EPSILON_UPSILON { - math::Mat4::look_at_rh(math::Vec3::zero(), math::Vec3::forward_rh(), v_p) + math::Mat4::look_at_rh(math::Vec3::zero(), -math::Vec3::unit_z(), v_p) } else { math::Mat4::identity() }; diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 8767b639cd..4b6aeb7d44 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -935,7 +935,7 @@ impl Terrain { .collect::>(); let cam_pos = math::Vec4::from(view_mat.inverted() * Vec4::unit_w()).xyz(); - let up: math::Vec3 = { math::Vec3::up() }; + let up: math::Vec3 = { math::Vec3::unit_y() }; let ray_mat = math::Mat4::look_at_rh(cam_pos, cam_pos + ray_direction, up); let visible_bounds = math::Aabr::from(math::fit_psr( diff --git a/world/Cargo.toml b/world/Cargo.toml index faf255922c..1ebf3f4866 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -17,7 +17,7 @@ bitvec = "0.21.0" fxhash = "0.2.1" image = { version = "0.23.12", default-features = false, features = ["png"] } itertools = "0.10" -vek = { version = "0.12.0", features = ["serde"] } +vek = { version = "0.14.1", features = ["serde"] } noise = { version = "0.7", default-features = false } num = "0.3.1" ordered-float = "2.0.1"