diff options
-rw-r--r-- | stockton-render/Cargo.toml | 1 | ||||
-rw-r--r-- | stockton-types/Cargo.toml | 2 | ||||
-rw-r--r-- | stockton-types/src/lib.rs | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/stockton-render/Cargo.toml b/stockton-render/Cargo.toml index 4dd3e1f..9fbafb8 100644 --- a/stockton-render/Cargo.toml +++ b/stockton-render/Cargo.toml @@ -9,6 +9,7 @@ stockton-types = { path = "../stockton-types" } winit = "0.19.1" gfx-hal = "0.2.0" arrayvec = "0.4.10" +nalgebra-glm = "0.4.0" [features] default = ["vulkan"] diff --git a/stockton-types/Cargo.toml b/stockton-types/Cargo.toml index fd5336c..73cfd8a 100644 --- a/stockton-types/Cargo.toml +++ b/stockton-types/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Oscar <oscar.shrimpton.personal@gmail.com>"] edition = "2018" [dependencies] -nalgebra = "0.18.0" +nalgebra-glm = "0.4.0" stockton-bsp = "2.0.0" downcast-rs = "1.0.4"
\ No newline at end of file diff --git a/stockton-types/src/lib.rs b/stockton-types/src/lib.rs index 0adf8a5..e6a816e 100644 --- a/stockton-types/src/lib.rs +++ b/stockton-types/src/lib.rs @@ -15,7 +15,7 @@ //! Common types for all stockton crates. extern crate stockton_bsp; -extern crate nalgebra as na; +extern crate nalgebra_glm as na; #[macro_use] extern crate downcast_rs; @@ -28,12 +28,12 @@ pub use world::World; pub mod ent_map; /// Alias for convenience -pub type Vector2 = na::base::Vector2<f32>; +pub type Vector2 = na::Vec2; /// Alias for convenience -pub type Vector3 = na::base::Vector3<f32>; +pub type Vector3 = na::Vec3; /// Alias for convenience -pub type Vector2i = na::base::Vector2<i32>; +pub type Vector2i = na::IVec2; /// Alias for convenience -pub type Vector3i = na::base::Vector3<i32>;
\ No newline at end of file +pub type Vector3i = na::IVec3;
\ No newline at end of file |