Mercurial > hg > forks > multipaint-js

diff multipaint.pde @ 172:e77a726a587e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename FLATRATIO/SQUARERATIO and gridmode OLD/NEW constants to something more sane. This also removes conflict from the keycode defs.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 23 Aug 2018 11:09:20 +0300
parents 1166505afd5f
children 3ddf4d799fe6
line wrap: on
line diff
--- a/multipaint.pde	Wed Aug 22 21:38:20 2018 +0300
+++ b/multipaint.pde	Thu Aug 23 11:09:20 2018 +0300
@@ -47,13 +47,13 @@
     g_exportname = "", g_keymacro = "",
     g_forcedpalette = "";
 
-final int OLD = 0;
-final int NEW = 1;
-final int FLATRATIO = 1;
-final int SQUARERATIO = 0;
-int g_gridmode = OLD;
+final int GRIDMODE_OLD = 0;
+final int GRIDMODE_NEW = 1;
+final int AR_FLAT = 1;
+final int AR_SQUARE = 0;
+int g_gridmode = GRIDMODE_OLD;
 int g_pixelw = 1;
-int g_aspect = SQUARERATIO;
+int g_aspect = AR_SQUARE;
 
 int[] g_grids = new int[16];
 
@@ -231,10 +231,10 @@
 */
 
     if (g_inhibit_aspect)
-        g_aspect = SQUARERATIO;
+        g_aspect = AR_SQUARE;
 
     int paspect = g_wzoom;
-    if (g_aspect == FLATRATIO)
+    if (g_aspect == AR_FLAT)
     {
         if (g_wzoom == 2) paspect = 1;
         if (g_wzoom == 3) paspect = 2;