indrajith/RCBASIC4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed convertToSDLSurface() function for SetWindowIcon() and SaveBMP()

Browse Source
This commit is contained in:
n00b87
2026-02-25 17:04:49 -06:00
parent 902f0129f1
commit aa7667c838
12 changed files with 486 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
rcbasic_runtime/rc_gfx_core.h
View File

@@ -923,10 +923,13 @@ void rc_setDriverMaterial_B(irr::video::E_BLEND_OPERATION op, irr::video::E_ANTI
}
void draw2DImage(irr::video::IVideoDriver *driver, irr::video::ITexture* texture, irr::core::rect<irr::s32> sourceRect, irr::core::position2d<irr::s32> position, irr::core::position2d<irr::s32> rotationPoint, irr::f32 rotation, irr::core::vector2df scale, bool useAlphaChannel, irr::video::SColor color, irr::core::vector2d<irr::f32> screenSize)
void draw2DImage(irr::video::IVideoDriver *driver, irr::video::ITexture* texture, irr::core::rect<irr::s32> sourceRect, irr::core::position2d<irr::s32> position, irr::core::position2d<irr::s32> rotationPoint, irr::f32 rotation, irr::core::vector2df scale, bool useAlphaChannel, irr::video::SColor color, irr::core::vector2d<irr::f32> screenSize, bool check_canvas=true)
{
if(rc_active_canvas < 0 || rc_active_canvas >= rc_canvas.size())
return;
if(check_canvas)
{
if(rc_active_canvas < 0 || rc_active_canvas >= rc_canvas.size())
return;
}
// Store and clear the projection matrix
irr::core::matrix4 oldProjMat = driver->getTransform(irr::video::ETS_PROJECTION);
@@ -1109,32 +1112,106 @@ void draw2DImage2(irr::video::IVideoDriver *driver, irr::video::ITexture* textur
}
void util_drawTexture_Flip(irr::video::ITexture* tgt_texture, irr::video::ITexture* itexture, int x, int y, bool h, bool v)
{
if(tgt_texture != NULL && itexture != NULL)
{
irr::core::dimension2d<irr::u32> src_size = itexture->getSize();
irr::core::rect<irr::s32> sourceRect(0, 0, src_size.Width, src_size.Height);
irr::core::position2d<irr::s32> rotationPoint(x + (src_size.Width/2), y + (src_size.Height/2));
irr::f32 rotation = 0;
irr::core::vector2df scale((irr::f32)(h ? -1 : 1), (irr::f32) (v ? -1 : 1));
irr::core::position2d<irr::s32> position( (h ? x+src_size.Width : x), (v ? y+src_size.Height : y));
bool useAlphaChannel = true;
irr::video::SColor color(255,0,0,0);
//irr::core::vector2df screenSize(rc_canvas[rc_active_canvas].dimension.Width, rc_canvas[rc_active_canvas].dimension.Height);
irr::core::vector2df screenSize(tgt_texture->getSize().Width, tgt_texture->getSize().Height);
draw2DImage(VideoDriver, itexture, sourceRect, position, rotationPoint, rotation, scale, useAlphaChannel, color, screenSize, false);
}
}
SDL_Surface* convertTextureToSurface(irr::video::ITexture* itexture)
{
Uint32 t_width, t_height;
t_width = itexture->getSize().Width;
t_height = itexture->getSize().Height;
Uint32 w, h;
w = itexture->getSize().Width;
h = itexture->getSize().Height;
SDL_Surface* surface = SDL_CreateRGBSurface(0, t_width, t_height, 32, 0, 0, 0, 0);
irr::video::ITexture* tgt_texture = NULL;
#ifdef RC_DRIVER_GLES2
Uint32 size_n = 2;
Uint32 dim_max = (w > h ? w : h);
while(size_n < dim_max) size_n *= 2;
//w = size_n;
//h = size_n;
tgt_texture = VideoDriver->addRenderTargetTexture(irr::core::dimension2d<u32>(size_n,size_n), "rt", ECF_A8R8G8B8);
#else
tgt_texture = VideoDriver->addRenderTargetTexture(irr::core::dimension2d<u32>(w,h), "rt", ECF_A8R8G8B8);
#endif // RC_WEB
if(!tgt_texture)
return NULL;
VideoDriver->setRenderTarget(tgt_texture, false, false);
VideoDriver->draw2DImage(itexture, irr::core::vector2d<irr::s32>(0,0));
if(rc_active_canvas >= 0 && rc_active_canvas < rc_canvas.size())
{
if(rc_canvas[rc_active_canvas].texture)
VideoDriver->setRenderTarget(rc_canvas[rc_active_canvas].texture, false, false);
rc_setDriverMaterial();
}
else
{
if(rc_canvas[0].texture)
VideoDriver->setRenderTarget(rc_canvas[0].texture, false, false);
rc_setDriverMaterial();
}
SDL_Surface* tmp_surface = SDL_CreateRGBSurface(0, w, h, 32, 0, 0, 0, 0);
SDL_Surface* surface = SDL_ConvertSurfaceFormat(tmp_surface, SDL_PIXELFORMAT_ARGB8888, 0);
SDL_FreeSurface(tmp_surface);
if(surface)
{
SDL_LockSurface(surface);
Uint32* surface_pixels = (Uint32*)surface->pixels;
Uint32* texture_pixels = (Uint32*)rc_canvas[rc_active_canvas].texture->lock();
irr::u8* texture_pixels = (irr::u8*)tgt_texture->lock(irr::video::ETLM_READ_ONLY);
int i = 0;
for(int y = 0; y < t_height; y++)
irr::video::SColor * texel;
u32 pitch = tgt_texture->getPitch();
irr::video::SColor c;
for(int y = 0; y < h; y++)
{
for(int x = 0; x < t_width; x++)
for(int x = 0; x < w; x++)
{
surface_pixels[i] = texture_pixels[i];
texel = (SColor *)(texture_pixels + ((y * pitch) + (x * sizeof(SColor))));
c = texel[0];
surface_pixels[y*w+x] = c.color;
}
}
rc_canvas[rc_active_canvas].texture->unlock();
tgt_texture->unlock();
SDL_UnlockSurface(surface);
}
VideoDriver->removeTexture(tgt_texture);
return surface;
}
@@ -1148,7 +1225,11 @@ bool rc_saveBMP(int img_id, std::string img_file)
irr::video::ITexture* img_texture = rc_image[img_id].image;
SDL_Surface* surface = convertTextureToSurface(img_texture);
SDL_SaveBMP(surface, img_file.c_str());
if(surface)
{
SDL_SaveBMP(surface, img_file.c_str());
SDL_FreeSurface(surface);
}
return true;
}