From f9a20a7c4bab795179cbfed2864a53c2851f6058 Mon Sep 17 00:00:00 2001
From: Connor Riley <connor.riley@uconn.edu>
Date: Mon, 7 Dec 2015 21:51:20 -0500
Subject: [PATCH] added more color options

---
 main/main.pde | 75 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 13 deletions(-)

diff --git a/main/main.pde b/main/main.pde
index d5001e8..3d05b6f 100644
--- a/main/main.pde
+++ b/main/main.pde
@@ -8,7 +8,7 @@ boolean removeEdge = false;
 Point removeEdgePoint;
 boolean colorEdge = false;
 Point colorEdgePoint;
-int colorFaceColor = 0;
+int colorFaceColor = 1;
 
 public void setup() {
   size(800, 500);
@@ -110,11 +110,38 @@ void keyPressed() {
     case 'p':
       mode = 3;  
       break;
-    case 'b':
+    case 'c':
       mode = 4;
       break;
-    case 'g':
-      mode = 5;
+    case '0':
+      colorFaceColor = 0;
+      break;
+    case '1':
+      colorFaceColor = 1;
+      break;
+    case '2':
+      colorFaceColor = 2;
+      break;
+    case '3':
+      colorFaceColor = 3;
+      break;
+    case '4':
+      colorFaceColor = 4;
+      break;    
+    case '5':
+      colorFaceColor = 5;
+      break;
+    case '6':
+      colorFaceColor = 6;
+      break;
+    case '7':
+      colorFaceColor = 7;
+      break;
+    case '8':
+      colorFaceColor = 8;
+      break;
+    case '9':
+      colorFaceColor = 9;
       break;
   }
   
@@ -134,11 +161,6 @@ void mouseReleased() {
       break;
     case 4:
       colorFace(x, y);
-      colorFaceColor = 0;
-      break;
-    case 5:
-      colorFace(x,y);
-      colorFaceColor = 1;
       break;
   }
 }
@@ -152,10 +174,37 @@ public void colorFace(float x, float y) {
             //System.out.println("h is not null");
             Face f = new Face(h, list);
             f.printFace();
-            if(colorFaceColor == 0) {
-              f.daColoring(0,0,255,list, width, height);
-            } else if(colorFaceColor ==1) {
-              f.daColoring(0,255,0,list, width, height);
+            switch (colorFaceColor) {
+              case 0:
+                f.daColoring(255,255,255,list, width, height);
+                break;
+              case 1:
+                f.daColoring(0,0,0,list, width, height);
+                break;
+              case 2:
+                f.daColoring(244, 67, 54,list, width, height);
+                break;
+              case 3:
+                f.daColoring(76, 175, 80,list, width, height);
+                break;
+              case 4:
+                f.daColoring(33, 150, 243,list,width,height);
+                break;
+              case 5:
+                f.daColoring(156, 39, 176,list,width,height);
+                break;
+              case 6:
+                f.daColoring(255, 235, 59,list,width,height);
+                break;
+              case 7:
+                f.daColoring(103, 58, 183,list,width,height);
+                break;
+              case 8:
+                f.daColoring(233, 30, 99,list,width,height);
+                break;
+              case 9:
+                f.daColoring(63, 81, 181,list,width,height);
+                break;
             }
           }
         }