Mercurial > hg > forks > multipaint-js
changeset 158:c9515fd7d897
Cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 16 Aug 2018 15:43:35 +0300 |
parents | cdfda0354332 |
children | fec2088cdd31 |
files | exporters.pde |
diffstat | 1 files changed, 26 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/exporters.pde Thu Aug 16 15:29:01 2018 +0300 +++ b/exporters.pde Thu Aug 16 15:43:35 2018 +0300 @@ -219,17 +219,13 @@ { ad = 65536 + x + y * (32 * 8); valu = fdata[head]; - int ink = valu & 7; - int pap = valu & 56; - pap = pap >> 3; - int bri = valu & 64; - bri = bri >> 6; - ink = ink + bri * 8; - pap = pap + bri * 8; - if (pap == 8) { + int bri = (valu >> 6) & 1; + int ink = (valu & 7) + bri * 8; + int pap = ((valu >> 3) & 7) + bri * 8; + if (pap == 8) pap = 0; - } - for (y2 = 0; y2 <= 7; y2++) + + for (y2 = 0; y2 < 8; y2++) { g_map[ad + y2 * 32] = byte(ink); g_map[ad + y2 * 32 + MX * MY * 8] = byte(pap); @@ -250,14 +246,14 @@ } for (y = 0; y < 25; y++) for (x = 0; x < 40; x++) - for (y2 = 0; y2 <= 7; y2++) + for (y2 = 0; y2 < 8; y2++) { head = 2 + x * 8 + y * (40 * 8) + y2; ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320; mpCopyByte(fdata, ad, head); p1 = fdata[0x1f42 + x + y * 40] & 0x0f; - p2 = fdata[0x1f42 + x + y * 40] & 0xf0; - p2 = p2 >> 4; + p2 = (fdata[0x1f42 + x + y * 40] >> 4) & 0x0f; + g_map[65536 + x + y * 40 * 8 + y2 * 40] = byte(p2); g_map[65536 + MX * MY * 8 + x + y * 40 * 8 + y2 * 40] = byte(p1); } @@ -274,18 +270,17 @@ int l1, l2; for (y = 0; y < 25; y++) for (x = 0; x < 40; x++) - for (y2 = 0; y2 <= 7; y2++) + for (y2 = 0; y2 < 8; y2++) { head = 2050 + x * 8 + y * (40 * 8) + y2; ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320; mpCopyByte(fdata, ad, head); p1 = fdata[1026 + x + y * 40] & 0x0f; - p2 = fdata[1026 + x + y * 40] & 0xf0; - p2 = p2 >> 4; + p2 = (fdata[1026 + x + y * 40] >> 4) & 0x0f; l1 = fdata[2 + x + y * 40] & 0x0f; - l2 = fdata[2 + x + y * 40] & 0xf0; - l2 = l2 >> 4; + l2 = (fdata[2 + x + y * 40] >> 4) & 0x0f; + g_map[65536 + x + y * 40 * 8 + y2 * 40] = byte(convertluminance(l1, p2)); g_map[65536 + MX * MY * 8 + x + y * 40 * 8 + y2 * 40] = byte(convertluminance(l2, p1)); } @@ -304,29 +299,27 @@ int l1, l2; for (y = 0; y < 25; y++) for (x = 0; x < 40; x++) - for (y2 = 0; y2 <= 7; y2++) + for (y2 = 0; y2 < 8; y2++) { head = 2050 + x * 8 + y * (40 * 8) + y2; ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320; mpCopyByte(fdata, ad, head); p1 = fdata[1026 + x + y * 40] & 0x0f; - p2 = fdata[1026 + x + y * 40] & 0xf0; - p2 = p2 >> 4; + p2 = (fdata[1026 + x + y * 40] >> 4) & 0x0f; l1 = fdata[2 + x + y * 40] & 0x0f; - l2 = fdata[2 + x + y * 40] & 0xf0; - l2 = l2 >> 4; + l2 = (fdata[2 + x + y * 40] >> 4) & 0x0f; + g_map[65536 + x + y * 40 + 1000] = byte(convertluminance(l1, p2)); g_map[65536 + x + y * 40 + 0000] = byte(convertluminance(l2, p1)); } - p1 = int(fdata[1025]) & 0xf0; + p1 = (int(fdata[1025]) >> 4) & 0x0f; l1 = int(fdata[1025]) & 0x0f; - p1 = p1 >> 4; g_map[1] = byte(convertluminance(l1, p1)); - p1 = int(fdata[1024]) & 0xf0; + + p1 = (int(fdata[1024]) >> 4) & 0x0f; l1 = int(fdata[1024]) & 0x0f; - p1 = p1 >> 4; g_map[2] = byte(convertluminance(l1, p1)); } else @@ -345,7 +338,6 @@ for (y2 = 0; y2 < 8; y2++) { ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320; - head = 2 + x * 8 + y * (40 * 8) + y2; mpCopyByte(fdata, ad, head); @@ -369,20 +361,19 @@ } for (y = 0; y < 24; y++) for (x = 0; x < 32; x++) - for (y2 = 0; y2 <= 7; y2++) + for (y2 = 0; y2 < 8; y2++) { head = 7 + x * 8 + y * (32 * 8) + y2; ad = 1024 + x * 8 + y * (256 * 8) + y2 * 256; mpCopyByte(fdata, ad, head); p1 = fdata[(8199) + x * 8 + ((y * 8 * 32) + y2)] & 0x0f; - p2 = fdata[(8199) + x * 8 + ((y * 8 * 32) + y2)] & 0xf0; - p2 = p2 >> 4; - if (p1 == 0) { + p2 = (fdata[(8199) + x * 8 + ((y * 8 * 32) + y2)] >> 4) & 0x0f; + + if (p1 == 0) p1 = 1; - } - if (p2 == 0) { + if (p2 == 0) p2 = 1; - } + g_map[65536 + x + y * 32 * 8 + y2 * 32] = byte(p2); g_map[65536 + MX * MY * 8 + x + y * 32 * 8 + y2 * 32] = byte(p1); }