a few changes

2 files changed, 11 insertions, 6 deletions

diff --git a/src/main.rs b/src/main.rs
index ea0ddb7..59923b0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,6 +27,7 @@ commit 35cbbb40298389efcd2fe87a9c6458d49c1c567e "add torus, box frame"
 commit d7f810524a30843417253f80e454f1d9173aaeb3 "more functions"
 2607779313513160780
 16956394651920792998
+3714031566539178742
 */
 
 extern crate nalgebra;
@@ -200,7 +201,7 @@ void main() {
 	for (i = 0; i < ITERATIONS; i++) {
 		float dist = sdf(p);
 		min_dist = min(min_dist, dist);
-		if (dist > 100.0) break;//little optimization
+		if (dist > 100.0) break;
 		p += dist * delta;
 	}
 
@@ -313,9 +314,7 @@ fn try_main() -> Result<(), String> {
 			let mut dy = 0.0;
 			let mut dz = 0.0;
 			let mut dl = 0.0;
-			use win::Key::{
-				Down, Left, NumPad3, NumPad9, PageDown, PageUp, Right, Up, A, D, E, M, N, Q, S, W,
-			};
+			use win::Key::*;
 			if window.any_key_down(&[W, Up]) {
 				dz -= 1.0;
 			}
@@ -334,10 +333,10 @@ fn try_main() -> Result<(), String> {
 			if window.is_key_down(E) {
 				dy -= 1.0;
 			}
-			if window.any_key_down(&[PageUp, NumPad9, M]) {
+			if window.any_key_down(&[PageUp, NumPad9, Equals]) {
 				dl += 1.0;
 			}
-			if window.any_key_down(&[PageDown, NumPad3, N]) {
+			if window.any_key_down(&[PageDown, NumPad3, Minus]) {
 				dl -= 1.0;
 			}
 			let mut speed_multiplier = if window.is_shift_down() { 10.0 } else { 1.0 };
diff --git a/src/win.rs b/src/win.rs
index 7115a43..fde3fcb 100644
--- a/src/win.rs
+++ b/src/win.rs
@@ -61,6 +61,8 @@ pub enum Key {
 	N7,
 	N8,
 	N9,
+	Minus,
+	Equals,
 	NumPad0,
 	NumPad1,
 	NumPad2,
@@ -142,6 +144,8 @@ impl Key {
 			N7 => Key::N7,
 			N8 => Key::N8,
 			N9 => Key::N9,
+			MINUS => Key::Minus,
+			EQUALS => Key::Equals,
 			UP => Key::Up,
 			LEFT => Key::Left,
 			RIGHT => Key::Right,
@@ -222,6 +226,8 @@ impl Key {
 			Key::N7 => N7,
 			Key::N8 => N8,
 			Key::N9 => N9,
+			Key::Minus => MINUS,
+			Key::Equals => EQUALS,
 			Key::Up => UP,
 			Key::Left => LEFT,
 			Key::Right => RIGHT,