nalgebra -> cgmath

Cargo.toml

@@ -23,7 +23,7 @@ ui = { path = "ggwp-zgui", package = "ggwp-zgui" }
 scene = { path = "ggwp-zscene", package = "ggwp-zscene" }
 zcomponents = { path = "zcomponents" }
 rand = { version = "0.7", features = [] }
-nalgebra = { version = "0.18", features = ["mint"] }  # TODO: update (or replace with cgmath)
+cgmath = { version = "0.17", features = ["mint"] }
 qrand = { git = "https://github.com/not-fl3/quad-rand", package = "quad-rand", features = ['rand'] }
 gwg = { git = "https://github.com/not-fl3/good-web-game", package = "good-web-game" }
 

ggwp-zgui/Cargo.toml

@@ -9,5 +9,5 @@ keywords = ["gamedev", "gui"]
 
 [dependencies]
 log = "0.4"
-nalgebra = { version = "0.18", features = ["mint"] }
+cgmath = { version = "0.17", features = ["mint"] }
 gwg = { git = "https://github.com/not-fl3/good-web-game", package = "good-web-game" }

ggwp-zgui/examples/absolute_coordinates.rs

@@ -1,10 +1,10 @@
+use cgmath::Point2;
 use ggwp_zgui as ui;
 use gwg::{
     conf, event,
     graphics::{self, Font, Rect, Text},
     Context, GameResult,
 };
-use nalgebra::Point2;
 
 #[derive(Clone, Copy, Debug)]
 enum Message {
@@ -90,7 +90,7 @@ impl event::EventHandler for State {
         let window_pos = Point2::new(x, y);
         let pos = ui::window_to_screen(context, window_pos);
         let message = self.gui.click(pos);
-        println!("[{},{}] -> {}: {:?}", x, y, pos, message);
+        println!("[{},{}] -> {:?}: {:?}", x, y, pos, message);
     }
 }
 

ggwp-zgui/examples/layers_layout.rs

@@ -1,10 +1,10 @@
+use cgmath::Point2;
 use ggwp_zgui as ui;
 use gwg::{
     conf, event,
     graphics::{self, Font, Image, Text},
     Context, GameResult,
 };
-use nalgebra::Point2;
 
 #[derive(Clone, Copy, Debug)]
 enum Message {
@@ -65,7 +65,7 @@ impl event::EventHandler for State {
         let window_pos = Point2::new(x, y);
         let pos = ui::window_to_screen(context, window_pos);
         let message = self.gui.click(pos);
-        println!("[{},{}] -> {}: {:?}", x, y, pos, message);
+        println!("[{},{}] -> {:?}: {:?}", x, y, pos, message);
     }
 
     fn resize_event(&mut self, context: &mut Context, w: f32, h: f32) {

ggwp-zgui/examples/nested.rs

@@ -1,10 +1,10 @@
+use cgmath::Point2;
 use ggwp_zgui as ui;
 use gwg::{
     conf, event,
     graphics::{self, Font, Image, Rect, Text},
     Context, GameResult,
 };
-use nalgebra::Point2;
 
 #[derive(Clone, Copy, Debug)]
 enum Message {
@@ -127,7 +127,7 @@ impl event::EventHandler for State {
         let window_pos = Point2::new(x, y);
         let pos = ui::window_to_screen(context, window_pos);
         let message = self.gui.click(pos);
-        println!("[{},{}] -> {}: {:?}", x, y, pos, message);
+        println!("[{},{}] -> {:?}: {:?}", x, y, pos, message);
     }
 }
 

ggwp-zgui/examples/pixel_coordinates.rs

@@ -1,10 +1,10 @@
+use cgmath::Point2;
 use ggwp_zgui as ui;
 use gwg::{
     conf, event,
     graphics::{self, Font, Text},
     Context, GameResult,
 };
-use nalgebra::Point2;
 
 #[derive(Clone, Copy, Debug)]
 enum Message {
@@ -90,7 +90,7 @@ impl event::EventHandler for State {
         let window_pos = Point2::new(x, y);
         let pos = ui::window_to_screen(context, window_pos);
         let message = self.gui.click(pos);
-        println!("[{},{}] -> {}: {:?}", x, y, pos, message);
+        println!("[{},{}] -> {:?}: {:?}", x, y, pos, message);
     }
 }
 

ggwp-zgui/examples/remove.rs

@@ -1,10 +1,10 @@
+use cgmath::Point2;
 use ggwp_zgui as ui;
 use gwg::{
     conf, event,
     graphics::{self, Font, Image, Text},
     Context, GameResult,
 };
-use nalgebra::Point2;
 
 #[derive(Clone, Copy, Debug)]
 enum Message {
@@ -89,7 +89,7 @@ impl event::EventHandler for State {
         let window_pos = Point2::new(x, y);
         let pos = ui::window_to_screen(context, window_pos);
         let message = self.gui.click(pos);
-        println!("[{},{}] -> {}: {:?}", x, y, pos, message);
+        println!("[{},{}] -> {:?}: {:?}", x, y, pos, message);
         if let Some(Message::AddOrRemove) = message {
             if self.label.is_some() {
                 self.remove_label();

ggwp-zgui/examples/text_button.rs

@@ -1,10 +1,10 @@
+use cgmath::Point2;
 use ggwp_zgui as ui;
 use gwg::{
     conf, event,
     graphics::{self, Font, Text},
     Context, GameResult,
 };
-use nalgebra::Point2;
 
 #[derive(Clone, Copy, Debug)]
 enum Message {
@@ -64,7 +64,7 @@ impl event::EventHandler for State {
         let window_pos = Point2::new(x, y);
         let pos = ui::window_to_screen(context, window_pos);
         let message = self.gui.click(pos);
-        println!("[{},{}] -> {}: {:?}", x, y, pos, message);
+        println!("[{},{}] -> {:?}: {:?}", x, y, pos, message);
     }
 }