diff multipaint.pde @ 39:5e0306ac3575

Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Jul 2018 12:10:35 +0300
parents a39b3c9e5c3b
children 8d2362b6ac12
line wrap: on
line diff
--- a/multipaint.pde	Wed Jul 04 11:55:02 2018 +0300
+++ b/multipaint.pde	Wed Jul 04 12:10:35 2018 +0300
@@ -401,40 +401,38 @@
     if (moicon(width - 32 * g_uizoom, 0, 32 * g_uizoom, 16 * g_uizoom)) help(int('.'));
 
     if (g_data[int('m')] == 0 && g_data[int('M')] == 0) {
-        msx = mouseX - g_windowx;
-        msy = mouseY - g_windowy;
-        msx = g_msx - g_windowx;
-        msy = g_msy - g_windowy;
+        g_mx = g_msx - g_windowx;
+        g_my = g_msy - g_windowy;
     } else {
-        msx = mouseX;
-        msy = mouseY;
-        //msx=g_msx;msy=g_msy;
-    }
-    g_mx = msx;
-    g_my = msy;
-
-    //actual tool drawing
-    if (g_tooltrigger == 1) { // comes from mousepressed, or mousedragged
-        if (g_mx <= width - g_hedge && g_my <= height - g_vedge) do_tool(msx, msy, g_button);
+        g_mx = mouseX;
+        g_my = mouseY;
     }
 
     g_msx = mouseX;
     g_msy = mouseY;
+
+    //actual tool drawing
+    if (g_tooltrigger == 1) { // comes from mousepressed, or mousedragged
+        if (g_mx <= width - g_hedge && g_my <= height - g_vedge) do_tool(g_mx, g_my, g_button);
+    }
+
     switcher(0);
 
     for (int i = 0; i < 1024; i++) {
         g_remdo[i] = 0;
     }
+
     int lipo = g_button;
     //tool drawing for shows
     if (tool() != 5) {
         if (g_phase == 0) g_button = LEFT;
-        do_tool(msx, msy, LEFT);
+        do_tool(g_mx, g_my, LEFT);
     }
     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);
     g_button = lipo;
+
     loadPixels();
     viewport();
     //magport();