ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finalize vertical draw fixes and code cleanup 

Fix shenanigans
This commit is contained in:
Eleuin 2018-04-04 09:57:00 -04:00 committed by Rafael Kitover
parent 62e8098f5b
commit d992cfa214
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wx/panel.cpp
View File

@ -1493,11 +1493,11 @@ public:
int outrb = systemColorDepth == 24 ? 0 : 4; int outrb = systemColorDepth == 24 ? 0 : 4;
int outstride = std::ceil(width * outbpp * scale) + outrb; int outstride = std::ceil(width * outbpp * scale) + outrb;
delta += instride * procy; delta += instride * procy;
if(gopts.filter == FF_NONE) { // FIXME: fugly hack
if(gopts.render_method == RND_OPENGL)
dst += (int)std::ceil(outstride * (procy + 1) * scale); dst += (int)std::ceil(outstride * (procy + 1) * scale);
} else { else
dst += (int)std::ceil(outstride * procy * scale); dst += (int)std::ceil(outstride * (procy + (1 / scale)) * scale);
}
while (nthreads == 1 || sig.Wait() == wxCOND_NO_ERROR) { while (nthreads == 1 || sig.Wait() == wxCOND_NO_ERROR) {
if (!src /* && nthreads > 1 */) { if (!src /* && nthreads > 1 */) {
@ -2016,9 +2016,6 @@ void BasicDrawingPanel::DrawImage(wxWindowDC& dc, wxImage* im)
int w, h; int w, h;
GetClientSize(&w, &h); GetClientSize(&w, &h);
sx = w / (width * scale); sx = w / (width * scale);
if(gopts.filter != FF_NONE)
sy = h / ((height * scale) - 1);
else
sy = h / (height * scale); sy = h / (height * scale);
dc.SetUserScale(sx, sy); dc.SetUserScale(sx, sy);
wxBitmap bm(*im); wxBitmap bm(*im);
@ -2216,13 +2213,8 @@ void GLDrawingPanel::DrawArea(wxWindowDC& dc)
glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_TRUE); glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_TRUE);
#endif #endif
if(gopts.filter != FF_NONE) {
glTexImage2D(GL_TEXTURE_2D, 0, int_fmt, std::ceil(width * scale), (int)std::ceil((height - 1) * scale),
0, tex_fmt, todraw + (int)std::ceil(rowlen * (out_16 ? 2 : 4) * scale));
} else {
glTexImage2D(GL_TEXTURE_2D, 0, int_fmt, std::ceil(width * scale), (int)std::ceil(height * scale), glTexImage2D(GL_TEXTURE_2D, 0, int_fmt, std::ceil(width * scale), (int)std::ceil(height * scale),
0, tex_fmt, todraw + (int)std::ceil(rowlen * (out_16 ? 2 : 4) * scale)); 0, tex_fmt, todraw + (int)std::ceil(rowlen * (out_16 ? 2 : 4) * scale));
}
glCallList(vlist); glCallList(vlist);
} else } else
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);