From 6ac006c3f7e418d312f88abd5c5f7988c674866b Mon Sep 17 00:00:00 2001 From: ThermalSpan Date: Thu, 26 Nov 2015 23:05:02 -0500 Subject: [PATCH] Done prettifying for now --- kdtest/Mode.pde | 15 +++++++++++---- kdtest/Properties.pde | 11 +++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/kdtest/Mode.pde b/kdtest/Mode.pde index 519d757..37a9fee 100644 --- a/kdtest/Mode.pde +++ b/kdtest/Mode.pde @@ -9,9 +9,11 @@ class Mode { void draw() { pushStyle(); - fill(c); - rect(0,height,_w,height-_h); - fill(0); + fill(c_statusBackground); + rect(0, height - 35, width, 35); + fill(c_statusMode); + rect(-10,height -35, 140, 35, 10); + fill(c_statusBackground); textSize(30); String s = new String(); switch(G_mode) { @@ -27,8 +29,13 @@ class Mode { case 4: s = "PLACE"; break; + case 5: + s = "SELECT"; + break; } - text(s,10, height-_h); + text(s, 5, height - 5); + fill(c_statusText); + text("Point Count: " + pointList.size(), 150, height - 5); popStyle(); } } diff --git a/kdtest/Properties.pde b/kdtest/Properties.pde index 836635a..47adea7 100644 --- a/kdtest/Properties.pde +++ b/kdtest/Properties.pde @@ -3,6 +3,8 @@ // Pallete color c_WHITE = color (255, 255, 255); color c_BLACK = color (0, 0, 0); +color c_PROCBLUE = color (5,13,22); +color c_YELLOW = color (215, 255, 0); // Screen Color color c_background = color (50, 50, 50); @@ -13,11 +15,16 @@ color c_modeText = c_BLACK; color c_modeBackground = color (200,200,200,200); // Help Colors -color c_helpBackground = color (5,13,22); +color c_helpBackground = c_PROCBLUE; color c_helpStroke = c_BLACK; color c_helpText = c_WHITE; int i_helpStrokeWidth = 2; +// Status Colors +color c_statusMode = c_YELLOW; +color c_statusBackground = c_PROCBLUE; +color c_statusText = c_WHITE; + // Point color c_pointStroke = c_BLACK; color c_pointDefault = c_WHITE; @@ -31,7 +38,7 @@ String[] s_helpStrings = { "f: Scale", "d: Pan", "s: Rotate", - "a: Place Points", + "a: Place Point", "g: Select Point", "c: Clear Points" };