From 120cb86c0d66fc0d123964521b4fd74c44731bda Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Thu, 4 Mar 2021 12:06:04 +0000 Subject: [PATCH] Switched back to simd repr --- voxygen/Cargo.toml | 2 +- voxygen/anim/src/vek.rs | 8 ++++---- voxygen/src/scene/math.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index beb4070daa..7002bac3f6 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -16,7 +16,7 @@ simd = ["vek/platform_intrinsics"] tracy = ["tracing-tracy", "common/tracy"] plugins = ["client/plugins"] -default = ["gl", "singleplayer", "native-dialog", "plugins"]#, "simd"] +default = ["gl", "singleplayer", "native-dialog", "plugins", "simd"] [dependencies] client = {package = "veloren-client", path = "../client"} diff --git a/voxygen/anim/src/vek.rs b/voxygen/anim/src/vek.rs index e12d02e73e..1d00e7cd4e 100644 --- a/voxygen/anim/src/vek.rs +++ b/voxygen/anim/src/vek.rs @@ -1,8 +1,8 @@ -/*pub use ::vek::{ +pub use ::vek::{ bezier::repr_simd::*, geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, quaternion::repr_simd::*, transform::repr_simd::*, transition::*, vec::repr_simd::*, -};*/ -pub use ::vek::{ +}; +/*pub use ::vek::{ bezier::repr_c::*, geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, quaternion::repr_c::*, transform::repr_c::*, transition::*, vec::repr_c::*, -}; +};*/ diff --git a/voxygen/src/scene/math.rs b/voxygen/src/scene/math.rs index 53ac8371ca..f228b33ebe 100644 --- a/voxygen/src/scene/math.rs +++ b/voxygen/src/scene/math.rs @@ -1,8 +1,8 @@ use core::{iter, mem}; use hashbrown::HashMap; use num::traits::Float; -//pub use vek::{geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, vec::repr_simd::*}; -pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, vec::repr_c::*}; +pub use vek::{geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, vec::repr_simd::*}; +//pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, vec::repr_c::*}; pub fn aabb_to_points(bounds: Aabb) -> [Vec3; 8] { [