Mercurial > hg > forks > multipaint-js
changeset 8:f97ee354db2a
Various minor code cleanups.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 04 Jul 2018 08:51:19 +0300 |
| parents | c848a6133cfc |
| children | dfdc18b62fab |
| files | Interface.pde draw_outputs.pde events.pde exporters.pde |
| diffstat | 4 files changed, 41 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/Interface.pde Tue Jul 03 22:17:48 2018 +0300 +++ b/Interface.pde Wed Jul 04 08:51:19 2018 +0300 @@ -283,10 +283,8 @@ g_r[c] = rr; g_g[c] = gg; g_b[c] = bb; - g_rgb[c] = 0xff000000; - g_rgb[c] = g_rgb[c] + rr * 0x00010000; - g_rgb[c] = g_rgb[c] + gg * 0x00000100; - g_rgb[c] = g_rgb[c] + bb * 0x00000001; + + g_rgb[c] = 0xff000000 | ((rr & 0xff) << 16) | ((gg & 0xff) << 8) | (bb & 0xff); } int fylli() { @@ -308,7 +306,7 @@ for (int xx = 0; xx < w; xx++) { pixels[ad + xx] = rgb; } - ad = ad + width; + ad += width; } } @@ -319,7 +317,7 @@ for (int xx = 0; xx < w; xx++) { if (xx == 0 || yy == 0 || xx == w - 1 || yy == h - 1) pixels[ad + xx] = rgb; } - ad = ad + width; + ad += width; } } @@ -362,11 +360,11 @@ for (int yy = 0; yy < h; yy++) { for (int xx = 0; xx < w; xx++) { s = pixels[ad + xx]; - r = s & 0x00ff0000; - r = r >> 16; - g = s & 0x0000ff00; - g = g >> 8; - b = s & 0x000000ff; + + r = (s >> 16) & 0xff; + g = (s >> 8) & 0xff; + b = (s) & 0xff; + g = g + 64; r = int((r * 2) / 3); @@ -408,17 +406,17 @@ yy = int(t / 16); xx = t - yy * 16; - xx = xx * 2; - yy = yy * 2; + + xx *= 2; + yy *= 2; + ad = 1024 + xx * 8 + yy * 2048; - for (int y = 0; y <= 15; y++) { - for (int x = 0; x <= 15; x++) { + + for (int y = 0; y < 16; y++) { + for (int x = 0; x < 16; x++) { metal = 0xffa0a0a0; far = 0xff000000; - if (t == 18) { - if (x < 15 && y < 15) far = int(g_rgb[g_farge]); - } - if (t == 19 && g_backmode == 1) { + if (t == 18 || (t == 19 && g_backmode == 1)) { if (x < 15 && y < 15) far = int(g_rgb[g_farge]); } if (g_depressed[t] > 0) metal = 0xff606060; @@ -458,11 +456,12 @@ yy = int(t / 32); xx = t - yy * 32; yy = yy + 18; - for (y = 0; y <= 7; y++) { - cad = 65536 + xx + yy * 256 + y * 32; + + for (y = 0; y < 8; y++) { ad = 1024 + xx * 8 + yy * 2048 + y * 256; - for (x = 0; x <= 7; x++) { - if (int(g_icons[ad + x]) == 1) { + + for (x = 0; x < 8; x++) { + if (int(g_icons[ad + x]) != 0) { far = 0xffb0b0b0; if (g_bsize < 4) { if (g_bsize + (g_btype * 4) + 96 == t) far = 0xffffff80; @@ -593,9 +592,6 @@ float av = getangel(g_rx2 - g_rx, g_ry2 - g_ry); printat(0, 3, nf((av), 0, 2)); } - byt = a / 8; - ad = 1024 + byt * 8 + b * X; - valu = g_map[ad + 0] * 128 + g_map[ad + 1] * 64 + g_map[ad + 2] * 32 + g_map[ad + 3] * 16 + g_map[ad + 4] * 8 + g_map[ad + 5] * 4 + g_map[ad + 6] * 2 + g_map[ad + 7] * 1; } return; } @@ -1309,7 +1305,7 @@ fill(32, 32, 32); } - for (ywin = 0; ywin <= mayy; ywin++) { + for (ywin = 0; ywin <= mayy; ywin++) for (xwin = 0; xwin <= maxx; xwin++) { // source coords: is 0,0 if not magged @@ -1600,5 +1596,4 @@ g_redo[xx + yy * MX] = byte(1); } //dirty char? } //x char - } //y char }
--- a/draw_outputs.pde Tue Jul 03 22:17:48 2018 +0300 +++ b/draw_outputs.pde Wed Jul 04 08:51:19 2018 +0300 @@ -19,18 +19,15 @@ void doborx(int xf, int yf, int xt, int yt) { //rectangle for brush drawing - for (int ii = xf; ii <= xt; ii++) { - for (int jj = yf; jj <= yt; jj++) { + for (int ii = xf; ii <= xt; ii++) + for (int jj = yf; jj <= yt; jj++) createpoint(ii, jj, g_button); } - } -} void docircx(int xf, int yf, int hh, int vv) { //circle for brush drawing - float prop, fh, fv; - fh = hh; - fv = vv; + float prop, fh = hh, fv = vv; + if (vv > 0) { prop = fh / fv; } else { @@ -498,16 +495,17 @@ mirriy = 1; mirrix = 1; } - if (xx < 0) return; - if (yy < 0) return; - if (xx >= X) return; - if (yy >= Y) return; + + if (xx < 0 || yy < 0 || xx >= X || yy >= Y) return; // adaptive color unless with floodfill (which has its own system) if (int(g_map[12]) != 5) { - if (g_multic == 2) skaveri(xx, yy, g_farge, 0); - - if (g_multic != 2) { + if (g_multic == 2) + { + skaveri(xx, yy, g_farge, 0); + } + else + { if (g_data[int('b')] == 0) { if (g_multic == 1) { mkaveri(xx, yy, g_farge, 0);
--- a/events.pde Tue Jul 03 22:17:48 2018 +0300 +++ b/events.pde Wed Jul 04 08:51:19 2018 +0300 @@ -124,8 +124,7 @@ if (tool() == 4) { //cut brush results in undo if (g_button == RIGHT) store_undo(); } - } - if (g_button == CENTER) { + } else { g_button = 255; g_repanel = -2; if (g_shift) g_button = 254;
--- a/exporters.pde Tue Jul 03 22:17:48 2018 +0300 +++ b/exporters.pde Wed Jul 04 08:51:19 2018 +0300 @@ -558,22 +558,22 @@ for (y = 0; y < 25; y++) { for (x = 0; x < 40; x++) { for (y2 = 0; y2 < 8; y2++) { + ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320; + head = 2 + x * 8 + y * (40 * 8) + y2; - ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320; pushbyte(ad, head); p1 = g_template[0x1f42 + x + y * 40] & 0x0f; - p2 = g_template[0x1f42 + x + y * 40] & 0xf0; - p2 = p2 >> 4; + p2 = (g_template[0x1f42 + x + y * 40] >> 4) & 0x0f; p3 = g_template[0x233a + x + y * 40] & 0x0f; g_map[65536 + x + y * 40] = byte(p1); g_map[65536 + x + y * 40 + 1000] = byte(p2); g_map[65536 + x + y * 40 + 2000] = byte(p3); - g_map[0] = byte(g_template[0x232a] & 0x0f); //bord - g_map[1] = byte(g_template[0x232b] & 0x0f); //baku } } } + g_map[0] = byte(g_template[0x232a] & 15); //bord + g_map[1] = byte(g_template[0x232b] & 15); //baku } if (machine == MSX) { // sc2