mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-04 22:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow replacing raw data on animated bitmaps

Browse source
This commit is contained in:
Struma 2021-05-02 23:50:16 -04:00 • committed by Roza
parent 9c603b329e
commit 66de7c1d14
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/display/bitmap.cpp
View file

@ -1226,14 +1226,18 @@ bool Bitmap::getRaw(void *output, int output_size)
void Bitmap::replaceRaw(void *pixel_data, int size) void Bitmap::replaceRaw(void *pixel_data, int size)
{ {
guardDisposed(); guardDisposed();
int w = width();
int h = height();
if (size != w*h*4) return;
GUARD_MEGA; GUARD_MEGA;
GUARD_ANIMATED; GUARD_PLAYING;
int w = width();
int h = height();
int requiredsize = w*h*4;
if (size != w*h*4)
throw Exception(Exception::MKXPError, "Replacement bitmap data is not large enough (given %i bytes, need %i)", size, requiredsize);
TEX::bind(p->gl.tex); TEX::bind(getGLTypes().tex);
TEX::uploadImage(w, h, pixel_data, GL_RGBA); TEX::uploadImage(w, h, pixel_data, GL_RGBA);
taintArea(IntRect(0,0,w,h)); taintArea(IntRect(0,0,w,h));
@ -1914,6 +1918,7 @@ void Bitmap::removeFrame(int position) {
FBO::bind(p->gl.fbo); FBO::bind(p->gl.fbo);
gl.ReadPixels(0,0,p->gl.width, p->gl.height, GL_RGBA, GL_UNSIGNED_BYTE, p->surface->pixels); gl.ReadPixels(0,0,p->gl.width, p->gl.height, GL_RGBA, GL_UNSIGNED_BYTE, p->surface->pixels);
taintArea(rect());
} }
} }