Fixed some scaling problems. And colors. I'm done for now. I swear.

rwb11001 · Nov 27, 2015 · ce379bd · ce379bd
1 parent d5b7fb6
commit ce379bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/kdtest/Camera.pde b/kdtest/Camera.pde
@@ -42,11 +42,12 @@ class Camera {
         difX /= (float)(width);
         difY /= (float)(height);
         _scale = epsilon + abs((1 - 4*(difX + difY)) * _oldScale); 
-        con.print(" " + _scale);
+        _x = _oldX * _scale;
+        _y = _oldY * _scale; 
         break;
       case 2:
-        difX *= _scale;
-        difY *= _scale;
+        difX *= 1.0/_scale;
+        difY *= 1.0/_scale;
 //        _x = cos(_angle)*difX - sin(_angle)*difY + _oldX;
 //        _y = sin(_angle)*difX + cos(_angle)*difY + _oldY;  
         _x = _oldX + difX;

diff --git a/kdtest/Properties.pde b/kdtest/Properties.pde
@@ -4,11 +4,12 @@
 color c_WHITE = color (255, 255, 255);
 color c_BLACK = color (0, 0, 0);
 color c_PROCBLUE = color (5,13,22);
+color c_LIGHTBLUE = color (0, 215, 255);
 color c_YELLOW = color (215, 255, 0);
 
 // Screen Color
-color c_background = color (50, 50, 50);
-color c_gnoman = color (255, 130, 130);
+color c_background = color (26, 26, 26);
+color c_gnoman = c_LIGHTBLUE;
 
 // Menu Colors
 color c_modeText = c_BLACK;