andreacavalli/WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated cpu renderer, transparencies

Browse Source
This commit is contained in:
Andrea Cavalli 2018-05-05 23:06:18 +02:00
parent e211ef901f
commit bc49dfe3f3
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPURenderer.java
View File

@ -141,7 +141,7 @@ public class CPURenderer implements Renderer {
newColor = 0xFF000000 | r << 16 | g << 8 | b; newColor = 0xFF000000 | r << 16 | g << 8 | b;
} }
canvas2d[index] = newColor; canvas2d[index] = stackColors(canvas2d[index], newColor);
} }
} }
} }
@ -162,6 +162,22 @@ public class CPURenderer implements Renderer {
return (a/newColors.length) << 24 | (r/newColors.length) << 16 | (g/newColors.length) << 8 | (b/newColors.length); return (a/newColors.length) << 24 | (r/newColors.length) << 16 | (g/newColors.length) << 8 | (b/newColors.length);
} }
private int stackColors(int... color) {
double a = 0;
double r = 0;
double g = 0;
double b = 0;
for (int i = 0; i < color.length; i++) {
int newColor = color[i];
double alpha = (newColor >> 24 & 0xFF) / 255d;
a = a * (1d-alpha) + (newColor >> 24 & 0xFF) * alpha;
r = r * (1d-alpha) + (newColor >> 16 & 0xFF) * alpha;
g = g * (1d-alpha) + (newColor >> 8 & 0xFF) * alpha;
b = b * (1d-alpha) + (newColor & 0xFF) * alpha;
}
return ((int)a) << 24 | ((int)r) << 16 | ((int)g) << 8 | ((int)b);
}
private int getSkinColorAt(int[] skinData, int skinIndex) { private int getSkinColorAt(int[] skinData, int skinIndex) {
int newColor = 0; int newColor = 0;
if (skinIndex >= 0 && skinIndex < skinData.length) { if (skinIndex >= 0 && skinIndex < skinData.length) {
@ -191,13 +207,13 @@ public class CPURenderer implements Renderer {
if (iy0 == iy1) { if (iy0 == iy1) {
for (int x = 0; x <= ix1 - ix0; x++) { for (int x = 0; x <= ix1 - ix0; x++) {
if ((ix0 + x < size[0]) & (iy0 < size[1])) { if ((ix0 + x < size[0]) & (iy0 < size[1])) {
canvas2d[ix0 + x + iy0 * size[0]] = color; canvas2d[ix0 + x + iy0 * size[0]] = stackColors(canvas2d[ix0 + x + iy0 * size[0]], color);
} }
} }
} else if (ix0 == ix1) { } else if (ix0 == ix1) {
for (int y = 0; y <= iy1 - iy0; y++) { for (int y = 0; y <= iy1 - iy0; y++) {
if ((ix0 < size[0]) & (iy0 + y < size[1])) { if ((ix0 < size[0]) & (iy0 + y < size[1])) {
canvas2d[ix0 + (iy0 + y) * size[0]] = color; canvas2d[ix0 + (iy0 + y) * size[0]] = stackColors(canvas2d[ix0 + (iy0 + y) * size[0]], color);
} }
} }
} else { } else {
@ -205,7 +221,7 @@ public class CPURenderer implements Renderer {
for (int texx = 0; texx <= ix1 - ix0; texx++) { for (int texx = 0; texx <= ix1 - ix0; texx++) {
if (ix0 + texx < size[0] && iy0 + (m * texx) < size[1]) { if (ix0 + texx < size[0] && iy0 + (m * texx) < size[1]) {
if ((ix0 + texx < size[0]) & ((iy0 + (m * texx)) < size[1])) { if ((ix0 + texx < size[0]) & ((iy0 + (m * texx)) < size[1])) {
canvas2d[(ix0 + texx) + (iy0 + (m * texx)) * size[0]] = color; canvas2d[(ix0 + texx) + (iy0 + (m * texx)) * size[0]] = stackColors(canvas2d[(ix0 + texx) + (iy0 + (m * texx)) * size[0]], color);
} }
} }
} }
@ -256,7 +272,7 @@ public class CPURenderer implements Renderer {
for (int py = y0; py < y1; py++) { for (int py = y0; py < y1; py++) {
int idx = (px) + (py) * sizeW; int idx = (px) + (py) * sizeW;
if (px < sizeW && idx >= 0 && idx < canvas2d.length) if (px < sizeW && idx >= 0 && idx < canvas2d.length)
canvas2d[idx] = color; canvas2d[idx] = stackColors(canvas2d[idx], color);
} }
} }
} }
@ -296,7 +312,7 @@ public class CPURenderer implements Renderer {
bitData = (currentFont.chars32[charIdx] >> currentIntBitPosition) & 1; bitData = (currentFont.chars32[charIdx] >> currentIntBitPosition) & 1;
screenPos = ix + cpos + dx + (iy + dy) * screenSize[0]; screenPos = ix + cpos + dx + (iy + dy) * screenSize[0];
if (bitData == 1 & screenLength > screenPos & screenPos >= 0) { if (bitData == 1 & screenLength > screenPos & screenPos >= 0) {
screen[screenPos] = color; screen[screenPos] = stackColors(screen[screenPos], color);
} }
} }
} }