Mercurial > hg > forks > multipaint-js

--- a/exporters.pde	Tue Jul 03 20:56:55 2018 +0300
+++ b/exporters.pde	Tue Jul 03 20:58:46 2018 +0300
@@ -1465,82 +1465,82 @@
 void make_c64_palette()
 {
     // Pepto's murky C64 palette: http://www.pepto.de/projects/colorvic
-    int rgb[]={#000000,#FFFFFF,#68372B,#70A4B2,#6F3D86,#588D43,#352879,#B8C76F,
-                     #6F4F25,#433900,#9A6759,#444444,#6C6C6C,#9AD284,#6C5EB5,#959595};
+    int rgb[]={0xff000000,0xffFFFFFF,0xff68372B,0xff70A4B2,0xff6F3D86,0xff588D43,0xff352879,0xffB8C76F,
+                     0xff6F4F25,0xff433900,0xff9A6759,0xff444444,0xff6C6C6C,0xff9AD284,0xff6C5EB5,0xff959595};
     for(int i=0;i<g_maxcolors;i++){
       rgb[i]=rgb[i]&0xffffff;
-      g_grids[i]=rgb[i]+#282828;
-      makecolor(i,rgb[i]>>16,(rgb[i]&#00FF00)>>8,rgb[i]&#0000FF);
+      g_grids[i]=rgb[i]+0xff282828;
+      makecolor(i,rgb[i]>>16,(rgb[i]&0xff00FF00)>>8,rgb[i]&0xff0000FF);
     }
-    g_grids[1]=#d0d0d0;g_gridmode=NEW;
+    g_grids[1]=0xffd0d0d0;g_gridmode=NEW;
     g_map[13]=byte(C64);
 }

 void make_plus4_palette()
 {
   int rgb[]={
-    #000000,#2C2C2C,#621307,#00424C,#510378,#004E00,#27188E,#303E00,#582100,#463000,#244400,#630448,#004E0C,#0E2784,#33118E,#184800,
-    #3B3B3B,#702419,#00505A,#601685,#125D00,#36289B,#3F4C00,#663100,#553F00,#345200,#711656,#005C1D,#1F3691,#42229B,#285700,
-    #424242,#772C21,#055861,#661E8C,#1B6400,#3E30A2,#475400,#6D3900,#5C4700,#3B5900,#771F5D,#046325,#273E98,#492AA1,#305E00,
-    #515151,#843B31,#17656F,#742E99,#2B7100,#4C3FAF,#556200,#7A4709,#6A5500,#4A6700,#852F6B,#177135,#364CA5,#5739AE,#3F6B00,
-    #7A7A7A,#AC665C,#468E97,#9C5AC0,#57992E,#766AD5,#7E8A13,#A2713A,#927E20,#748F14,#AC5A93,#459960,#6276CB,#8064D4,#6A9419,
-    #959595,#C58178,#62A8B1,#B675D9,#73B34C,#9185ED,#99A433,#BB8C57,#AC993E,#8FAA34,#C676AD,#62B37B,#7D91E4,#9B80ED,#85AE38,
-    #AFAFAF,#DE9B93,#7DC2CA,#CF90F2,#8DCD68,#AB9FFF,#B3BE51,#D5A673,#C6B35B,#A9C351,#DF91C7,#7DCC96,#97ABFD,#B59AFF,#9FC755,
-    #E1E1E1,#FFCFC6,#B2F4FC,#FFC4FF,#C1FE9D,#DDD2FF,#E5F088,#FFD9A8,#F7E591,#DBF588,#FFC4F9,#B1FEC9,#CBDDFF,#E7CDFF,#D2F98C
+    0xff000000,0xff2C2C2C,0xff621307,0xff00424C,0xff510378,0xff004E00,0xff27188E,0xff303E00,0xff582100,0xff463000,0xff244400,0xff630448,0xff004E0C,0xff0E2784,0xff33118E,0xff184800,
+    0xff3B3B3B,0xff702419,0xff00505A,0xff601685,0xff125D00,0xff36289B,0xff3F4C00,0xff663100,0xff553F00,0xff345200,0xff711656,0xff005C1D,0xff1F3691,0xff42229B,0xff285700,
+    0xff424242,0xff772C21,0xff055861,0xff661E8C,0xff1B6400,0xff3E30A2,0xff475400,0xff6D3900,0xff5C4700,0xff3B5900,0xff771F5D,0xff046325,0xff273E98,0xff492AA1,0xff305E00,
+    0xff515151,0xff843B31,0xff17656F,0xff742E99,0xff2B7100,0xff4C3FAF,0xff556200,0xff7A4709,0xff6A5500,0xff4A6700,0xff852F6B,0xff177135,0xff364CA5,0xff5739AE,0xff3F6B00,
+    0xff7A7A7A,0xffAC665C,0xff468E97,0xff9C5AC0,0xff57992E,0xff766AD5,0xff7E8A13,0xffA2713A,0xff927E20,0xff748F14,0xffAC5A93,0xff459960,0xff6276CB,0xff8064D4,0xff6A9419,
+    0xff959595,0xffC58178,0xff62A8B1,0xffB675D9,0xff73B34C,0xff9185ED,0xff99A433,0xffBB8C57,0xffAC993E,0xff8FAA34,0xffC676AD,0xff62B37B,0xff7D91E4,0xff9B80ED,0xff85AE38,
+    0xffAFAFAF,0xffDE9B93,0xff7DC2CA,0xffCF90F2,0xff8DCD68,0xffAB9FFF,0xffB3BE51,0xffD5A673,0xffC6B35B,0xffA9C351,0xffDF91C7,0xff7DCC96,0xff97ABFD,0xffB59AFF,0xff9FC755,
+    0xffE1E1E1,0xffFFCFC6,0xffB2F4FC,0xffFFC4FF,0xffC1FE9D,0xffDDD2FF,0xffE5F088,0xffFFD9A8,0xffF7E591,0xffDBF588,0xffFFC4F9,0xffB1FEC9,0xffCBDDFF,0xffE7CDFF,0xffD2F98C
   };
     for(int i=0;i<g_maxcolors;i++){
       rgb[i]=rgb[i]&0xffffff;
-      makecolor(i,rgb[i]>>16,(rgb[i]&#00FF00)>>8,rgb[i]&#0000FF);
+      makecolor(i,rgb[i]>>16,(rgb[i]&0xff00FF00)>>8,rgb[i]&0xff0000FF);
     }
 }

 void make_msx_palette()
 {
     int rgb[]={
-    #000000,
-    #000000,
-    #3EB849,
-    #74D07D,
-    #5955E0,
-    #8076F1,
-    #B95E51,
-    #65DBEF,
-    #DB6559,
-    #FF897D,
-    #CCC35E,
-    #DED087,
-    #3AA241,
-    #B766B5,
-    #CCCCCC,
-    #FFFFFF};
+    0xff000000,
+    0xff000000,
+    0xff3EB849,
+    0xff74D07D,
+    0xff5955E0,
+    0xff8076F1,
+    0xffB95E51,
+    0xff65DBEF,
+    0xffDB6559,
+    0xffFF897D,
+    0xffCCC35E,
+    0xffDED087,
+    0xff3AA241,
+    0xffB766B5,
+    0xffCCCCCC,
+    0xffFFFFFF};

     for(int i=0;i<g_maxcolors;i++){
       rgb[i]=rgb[i]&0xffffff;
-      g_grids[i]=rgb[i]+#1f1f1f;
-      makecolor(i,(rgb[i]>>16),(rgb[i]&#00FF00)>>8,rgb[i]&#0000FF);
+      g_grids[i]=rgb[i]+0xff1f1f1f;
+      makecolor(i,(rgb[i]>>16),(rgb[i]&0xff00FF00)>>8,rgb[i]&0xff0000FF);
     }
-    g_grids[5]=#9f95Ff;
-    g_grids[7]=#84faEF;
-    g_grids[9]=#ffa99d;
-    g_grids[15]=#d8d8d8;g_gridmode=NEW;
+    g_grids[5]=0xff9f95Ff;
+    g_grids[7]=0xff84faEF;
+    g_grids[9]=0xffffa99d;
+    g_grids[15]=0xffd8d8d8;g_gridmode=NEW;
 }

 void make_spectrum_palette()
 {
-  int rgb[]={#000000,#0000C0,#C00000,#C000C0,#00C000,#00C0C0,#C0C000,#C0C0C0,
-              #000000,#0000FF,#FF0000,#FF00FF,#00FF00,#00FFFF,#FFFF00,#FFFFFF};
+  int rgb[]={0xff000000,0xff0000C0,0xffC00000,0xffC000C0,0xff00C000,0xff00C0C0,0xffC0C000,0xffC0C0C0,
+              0xff000000,0xff0000FF,0xffFF0000,0xffFF00FF,0xff00FF00,0xff00FFFF,0xffFFFF00,0xffFFFFFF};

-  g_grids[9]=#0000d8;
-  g_grids[10]=#d80000;
-  g_grids[11]=#d800d8;
-  g_grids[12]=#00d800;
-  g_grids[13]=#00d8d8;
-  g_grids[14]=#d8d800;
-  g_grids[15]=#d8d8d8;
+  g_grids[9]=0xff0000d8;
+  g_grids[10]=0xffd80000;
+  g_grids[11]=0xffd800d8;
+  g_grids[12]=0xff00d800;
+  g_grids[13]=0xff00d8d8;
+  g_grids[14]=0xffd8d800;
+  g_grids[15]=0xffd8d8d8;
     for(int i=0;i<g_maxcolors;i++){
       rgb[i]=rgb[i]&0xffffff;
-      if(i<=8){g_grids[i]=rgb[i]+#282828;}
-      makecolor(i,(rgb[i]>>16),(rgb[i]&#00FF00)>>8,rgb[i]&#0000FF);
+      if(i<=8){g_grids[i]=rgb[i]+0xff282828;}
+      makecolor(i,(rgb[i]>>16),(rgb[i]&0xff00FF00)>>8,rgb[i]&0xff0000FF);
     }
     g_gridmode=NEW;
 }