MTSR/minetest
3
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-09-19 23:10:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix stability and format

Browse Source
This commit is contained in:
jingkaimori 2024-09-19 12:06:21 +08:00
parent 681b915044
commit 759b971433
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/client/imagesource.cpp
View File

@ -1825,7 +1825,7 @@ bool ImageSource::generateImagePart(std::string_view part_of_name,
Strfnd sf(part_of_name); Strfnd sf(part_of_name);
sf.next(":"); sf.next(":");
std::string textdef = sf.next(":"); std::string textdef = sf.next(":");
core::stringw textdefW = utf8_to_stringw(textdef); core::stringw textdefW = utf8_to_stringw(textdef);
unsigned int fontSize = FONT_SIZE_UNSPECIFIED; unsigned int fontSize = FONT_SIZE_UNSPECIFIED;
std::string sizeStr = sf.next(":"); std::string sizeStr = sf.next(":");
@ -1856,16 +1856,14 @@ bool ImageSource::generateImagePart(std::string_view part_of_name,
std::vector<std::string> positionStrs = str_split(positionStr, ','); std::vector<std::string> positionStrs = str_split(positionStr, ',');
if (positionStrs.size() >= 2) if (positionStrs.size() >= 2)
{ {
if (is_number(positionStrs[0])) if (is_number(positionStrs[0])) {
{ pos.X = mystoi(positionStrs[0]);
pos.X=mystoi(positionStrs[0]);
} }
if (is_number(positionStrs[1])) if (is_number(positionStrs[1])) {
{ pos.Y = mystoi(positionStrs[1]);
pos.Y=mystoi(positionStrs[1]);
} }
} }
video::SColor color(0xff,0xff,0xff,0xff); video::SColor color(0xff,0xff,0xff,0xff);
std::string colorStr = sf.next(""); std::string colorStr = sf.next("");
if (!parseColorString(colorStr,color,false)){ if (!parseColorString(colorStr,color,false)){
@ -1888,30 +1886,28 @@ bool ImageSource::generateImagePart(std::string_view part_of_name,
auto texture = auto texture =
driver->addRenderTargetTexture(size, textureName, colorFormat); driver->addRenderTargetTexture(size, textureName, colorFormat);
if (driver->setRenderTarget(texture, video::ECBF_ALL, video::SColor(0,0,0,0))) {
if(!driver->setRenderTarget(texture,irr::video::ECBF_ALL, video::SColor(0,0,0,0))){ if (baseimg) {
errorstream << "fails to set render target" << std::endl; auto baseTexture = driver->addTexture("text_renderer_base__", baseimg);
}; driver->draw2DImage(baseTexture, core::vector2di(0,0));
if (baseimg){ driver->removeTexture(baseTexture);
auto baseTexture = driver->addTexture("text_renderer_base__", baseimg);
driver->draw2DImage(baseTexture, core::vector2di(0,0));
driver->removeTexture(baseTexture);
}
font->draw(textdefW, irr::core::recti(pos, sizeText), color);
driver->setRenderTarget(NULL);
void* lockedData = texture->lock();
if (lockedData)
{
if (baseimg)
{
baseimg->drop();
} }
font->draw(textdefW, core::recti(pos, sizeText), color);
baseimg = driver->createImageFromData(colorFormat, size, lockedData, false); driver->setRenderTarget(NULL);
texture->unlock(); void* lockedData = texture->lock();
}else if (lockedData) {
{ if (baseimg) {
errorstream << "no data inside texture, internal error" << std::endl; baseimg->drop();
}
baseimg = driver->createImageFromData(colorFormat, size, lockedData, false);
texture->unlock();
} else {
errorstream << "no data inside texture, internal error" << std::endl;
}
} else {
errorstream << "fails to set render target, "
"can this driver renders to target:" <<
driver->queryFeature(video::EVDF_RENDER_TO_TARGET) << std::endl;
} }
driver->removeTexture(texture); driver->removeTexture(texture);
} }