amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace symbol buffer logical blits with explicit pixel compositing

Browse Source 
Expansion symbol rendering relied on wxDC logical raster ops
(wxOR / wxAND_INVERT) during buffer composition. On wxGTK this
produced incorrect symbol/background inversion, likely due to
backend differences in logical-function handling.

This replaces the logical blits in combineBuffers() with explicit
per-pixel compositing that preserves the intended bitwise behavior
while producing consistent results across platforms.

Tested:
- Linux: fixes incorrect expansion symbol rendering/export
- Windows: no regression observed in rendering/export
This commit is contained in:
Valyth
2026-04-17 13:50:28 -04:00
committed by Amy Markey
parent afa5307dce
commit 68237e6d87
1 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/symbol/viewer.cpp
+68 -4
View File
@@ -78,12 +78,76 @@ MemoryDCP getTempDC(DC& dc) {
} }
// Combine the temporary DCs used in the drawing with the main dc // Combine the temporary DCs used in the drawing with the main dc
void combineBuffers(DC& dc, DC* borders, DC* interior) { //void combineBuffers(DC& dc, DC* borders, DC* interior) {
wxSize s = dc.GetSize(); // wxSize s = dc.GetSize();
if (borders) dc.Blit(0, 0, s.GetWidth(), s.GetHeight(), borders, 0, 0, wxOR); // if (borders) dc.Blit(0, 0, s.GetWidth(), s.GetHeight(), borders, 0, 0, wxOR);
if (interior) dc.Blit(0, 0, s.GetWidth(), s.GetHeight(), interior, 0, 0, wxAND_INVERT); // if (interior) dc.Blit(0, 0, s.GetWidth(), s.GetHeight(), interior, 0, 0, wxAND_INVERT);/
//}
static void bitwiseBlitOr(Image& dst, const Image& src) {
int w = dst.GetWidth();
int h = dst.GetHeight();
if (src.GetWidth() != w || src.GetHeight() != h) return;
Byte* dd = dst.GetData();
const Byte* sd = src.GetData();
size_t count = (size_t)w * (size_t)h * 3;
for (size_t i = 0; i < count; ++i) {
dd[i] = dd[i] | sd[i];
}
} }
static void bitwiseBlitAndInvert(Image& dst, const Image& src) {
int w = dst.GetWidth();
int h = dst.GetHeight();
if (src.GetWidth() != w || src.GetHeight() != h) return;
Byte* dd = dst.GetData();
const Byte* sd = src.GetData();
size_t count = (size_t)w * (size_t)h * 3;
for (size_t i = 0; i < count; ++i) {
dd[i] = dd[i] & (Byte)~sd[i];
}
}
void combineBuffers(DC& dc, DC* borders, DC* interior) {
wxSize s = dc.GetSize();
// Copy base DC into an image
Bitmap outBmp(s.GetWidth(), s.GetHeight(), 24);
wxMemoryDC outDC;
outDC.SelectObject(outBmp);
outDC.Blit(0, 0, s.GetWidth(), s.GetHeight(), &dc, 0, 0, wxCOPY);
outDC.SelectObject(wxNullBitmap);
Image out = outBmp.ConvertToImage();
if (borders) {
Bitmap borderBmp(s.GetWidth(), s.GetHeight(), 24);
wxMemoryDC borderCopy;
borderCopy.SelectObject(borderBmp);
borderCopy.Blit(0, 0, s.GetWidth(), s.GetHeight(), borders, 0, 0, wxCOPY);
borderCopy.SelectObject(wxNullBitmap);
Image borderImg = borderBmp.ConvertToImage();
bitwiseBlitOr(out, borderImg);
}
if (interior) {
Bitmap interiorBmp(s.GetWidth(), s.GetHeight(), 24);
wxMemoryDC interiorCopy;
interiorCopy.SelectObject(interiorBmp);
interiorCopy.Blit(0, 0, s.GetWidth(), s.GetHeight(), interior, 0, 0, wxCOPY);
interiorCopy.SelectObject(wxNullBitmap);
Image interiorImg = interiorBmp.ConvertToImage();
bitwiseBlitAndInvert(out, interiorImg);
}
Bitmap finalBmp(out);
dc.DrawBitmap(finalBmp, 0, 0, false);
}
void SymbolViewer::draw(DC& dc) { void SymbolViewer::draw(DC& dc) {
bool paintedSomething = false; bool paintedSomething = false;
bool buffersFilled = false; bool buffersFilled = false;