diff multipaint.pde @ 150:d7c13f427178

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 14 Aug 2018 15:50:15 +0300
parents d80871032cdd
children 9f4e6f888120
line wrap: on
line diff
--- a/multipaint.pde	Tue Aug 14 14:58:32 2018 +0300
+++ b/multipaint.pde	Tue Aug 14 15:50:15 2018 +0300
@@ -207,16 +207,18 @@
     g_multic = 0;
     g_repanel = -2;
 
-    //UI colors
+    // UI colors
     makecolor(256, 0xff, 0, 0xff);
     makecolor(257, 180, 180, 180);
     g_rgb[257] = 0xff808080;
     makecolor(258, 0, 0, 0);
     makecolor(259, 48, 48, 48);
-    //R,G,B
+
+    // R,G and B for the palette sliders
     makecolor(260, 255, 0, 0);
     makecolor(261, 0, 255, 0);
     makecolor(262, 0, 0, 255);
+    makecolor(263, 48, 48, 48); //backest UI background
 
     mpSetupMachine(machine);
     g_windowx = width - (g_hedge) - (g_wzoom * X);
@@ -239,7 +241,7 @@
 
     switcher(2);
     noStroke();
-    background(g_r[259], g_g[259], g_b[259]);
+    background(g_r[263], g_g[263], g_b[263]);
     sussborder();
     setup_raster();
 
@@ -540,9 +542,9 @@
     else
         storecoords(g_mx, g_my);
 
-    if (tool() == 6) doline(g_rx, g_ry, g_rx2, g_ry2, 0);
-    if (tool() == 7) docircle(g_rx, g_ry, g_rx2, g_ry2);
-    if (tool() == 8) rectangle(g_rx, g_ry, g_rx2, g_ry2);
+    if (tool() == 6) do_line(g_rx, g_ry, g_rx2, g_ry2, 0);
+    if (tool() == 7) do_circle(g_rx, g_ry, g_rx2, g_ry2);
+    if (tool() == 8) do_rectangle(g_rx, g_ry, g_rx2, g_ry2);
     g_button = savebut;
 
     // Screen update stuff