games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-08 23:22:25 +02:00
Code Issues Releases Activity

code review

Browse Source
This commit is contained in:
Laserlicht
2025-07-17 22:47:14 +02:00
parent af2f039ed4
commit e799db4546
3 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/renderSDL/RenderHandler.cpp
View File

@@ -321,6 +321,8 @@ std::shared_ptr<SDLImageShared> RenderHandler::loadScaledImage(const ImageLocato
if(img)
{
// TODO: Performance improvement - Run algorithm on optimized ("trimmed") images
// Not implemented yet because different frame image sizes seems to cause wobbeling shadow -> needs a way around this
if(isShadow && generateShadow)
img = img->drawShadow((*locator.generateShadow) == SharedImageLocator::ShadowMode::SHADOW_SHEAR);
if(isOverlay && generateOverlay && (*locator.generateOverlay) == SharedImageLocator::OverlayMode::OVERLAY_OUTLINE)

61
client/renderSDL/SDL_Extensions.cpp
View File

@@ -687,13 +687,12 @@ void CSDL_Ext::getClipRect(SDL_Surface * src, Rect & other)
other = CSDL_Ext::fromSDL(rect);
}
SDL_Surface* CSDL_Ext::drawOutline(SDL_Surface* source, const SDL_Color& color, int thickness)
SDL_Surface* CSDL_Ext::drawOutline(SDL_Surface* sourceSurface, const SDL_Color& color, int thickness)
{
if(thickness < 1)
return nullptr;
SDL_Surface* sourceSurface = SDL_ConvertSurfaceFormat(source, SDL_PIXELFORMAT_ARGB8888, 0);
SDL_Surface* destSurface = newSurface(Point(source->w, source->h));
SDL_Surface* destSurface = newSurface(Point(sourceSurface->w, sourceSurface->h));
if(SDL_MUSTLOCK(sourceSurface)) SDL_LockSurface(sourceSurface);
if(SDL_MUSTLOCK(destSurface)) SDL_LockSurface(destSurface);
@@ -716,35 +715,38 @@ SDL_Surface* CSDL_Ext::drawOutline(SDL_Surface* source, const SDL_Color& color,
tbb::parallel_for(tbb::blocked_range<size_t>(0, height), [&](const tbb::blocked_range<size_t>& r)
{
// Go through all transparent pixels and check if they border an opaque region
for(int y = r.begin(); y != r.end(); ++y)
for (int y = r.begin(); y != r.end(); ++y)
{
for(int x = 0; x < width; x++)
for (int x = 0; x < width; x++)
{
if(getAlpha(x, y) != 0)
continue; // Skip opaque pixels
Uint8 alpha = getAlpha(x, y);
if (alpha != 0)
continue; // Skip opaque or semi-transparent pixels
bool isOutline = false;
Uint8 maxNearbyAlpha = 0;
for(int dy = -thickness; dy <= thickness && !isOutline; ++dy)
for (int dy = -thickness; dy <= thickness; ++dy)
{
for(int dx = -thickness; dx <= thickness; ++dx)
for (int dx = -thickness; dx <= thickness; ++dx)
{
// circular neighborhood
if(dx * dx + dy * dy > thickness * thickness)
if (dx * dx + dy * dy > thickness * thickness)
continue; // circular area
int nx = x + dx;
int ny = y + dy;
if (nx < 0 || ny < 0 || nx >= width || ny >= height)
continue;
if(getAlpha(x + dx, y + dy) > 0)
{
isOutline = true;
break; // break inner loop only
}
Uint8 neighborAlpha = getAlpha(nx, ny);
if (neighborAlpha > maxNearbyAlpha)
maxNearbyAlpha = neighborAlpha;
}
}
if(isOutline)
if (maxNearbyAlpha > 0)
{
Uint32 newPixel = SDL_MapRGBA(destSurface->format, color.r, color.g, color.b, color.a);
Uint8 finalAlpha = maxNearbyAlpha - alpha; // alpha is 0 here, so effectively maxNearbyAlpha
Uint32 newPixel = SDL_MapRGBA(destSurface->format, color.r, color.g, color.b, finalAlpha);
*((Uint32*)destSurface->pixels + y * width + x) = newPixel;
}
}
@@ -754,15 +756,11 @@ SDL_Surface* CSDL_Ext::drawOutline(SDL_Surface* source, const SDL_Color& color,
if(SDL_MUSTLOCK(sourceSurface)) SDL_UnlockSurface(sourceSurface);
if(SDL_MUSTLOCK(destSurface)) SDL_UnlockSurface(destSurface);
SDL_FreeSurface(sourceSurface);
return destSurface;
}
void applyAffineTransform(SDL_Surface* src, SDL_Surface* dst, double a, double b, double c, double d, double tx, double ty)
{
assert(src->format->format == SDL_PIXELFORMAT_ARGB8888);
assert(dst->format->format == SDL_PIXELFORMAT_ARGB8888);
// Lock surfaces for direct pixel access
if (SDL_MUSTLOCK(src)) SDL_LockSurface(src);
if (SDL_MUSTLOCK(dst)) SDL_LockSurface(dst);
@@ -814,7 +812,6 @@ void applyAffineTransform(SDL_Surface* src, SDL_Surface* dst, double a, double b
int getLowestNonTransparentY(SDL_Surface* surface)
{
assert(surface && surface->format->format == SDL_PIXELFORMAT_ARGB8888);
if (SDL_MUSTLOCK(surface)) SDL_LockSurface(surface);
const int w = surface->w;
@@ -856,8 +853,6 @@ int getLowestNonTransparentY(SDL_Surface* surface)
void fillAlphaPixelWithRGBA(SDL_Surface* surface, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
{
assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
if (SDL_MUSTLOCK(surface)) SDL_LockSurface(surface);
auto pixels = (Uint32*)surface->pixels;
@@ -876,7 +871,7 @@ void fillAlphaPixelWithRGBA(SDL_Surface* surface, Uint8 r, Uint8 g, Uint8 b, Uin
SDL_GetRGBA(pixel, surface->format, &pr, &pg, &pb, &pa);
Uint32 newPixel = SDL_MapRGBA(surface->format, r, g, b, a);
if(pa == 0)
if(pa < 128)
newPixel = SDL_MapRGBA(surface->format, 0, 0, 0, 0);
pixels[i] = newPixel;
@@ -888,7 +883,6 @@ void fillAlphaPixelWithRGBA(SDL_Surface* surface, Uint8 r, Uint8 g, Uint8 b, Uin
void boxBlur(SDL_Surface* surface)
{
assert(surface && surface->format->format == SDL_PIXELFORMAT_ARGB8888);
if (SDL_MUSTLOCK(surface)) SDL_LockSurface(surface);
int width = surface->w;
@@ -937,12 +931,9 @@ void boxBlur(SDL_Surface* surface)
if (SDL_MUSTLOCK(surface)) SDL_UnlockSurface(surface);
}
SDL_Surface * CSDL_Ext::drawShadow(SDL_Surface * source, bool doSheer)
SDL_Surface * CSDL_Ext::drawShadow(SDL_Surface * sourceSurface, bool doSheer)
{
SDL_Surface *sourceSurface = SDL_ConvertSurfaceFormat(source, SDL_PIXELFORMAT_ARGB8888, 0);
SDL_Surface *destSurface = newSurface(Point(source->w, source->h));
assert(destSurface->format->format == SDL_PIXELFORMAT_ARGB8888);
SDL_Surface *destSurface = newSurface(Point(sourceSurface->w, sourceSurface->h));
double shearX = doSheer ? 0.5 : 0.0;
double scaleY = doSheer ? 0.5 : 0.25;
@@ -962,7 +953,5 @@ SDL_Surface * CSDL_Ext::drawShadow(SDL_Surface * source, bool doSheer)
fillAlphaPixelWithRGBA(destSurface, 0, 0, 0, 128);
boxBlur(destSurface);
SDL_FreeSurface(sourceSurface);
return destSurface;
}

2
lib/texts/TextLocalizationContainer.cpp
View File

@@ -112,7 +112,7 @@ void TextLocalizationContainer::registerString(const std::string & identifierMod
assert(!identifierModContext.empty());
assert(!localizedStringModContext.empty());
assert(UID.get().find("..") == std::string::npos); // invalid identifier - there is section that was evaluated to empty string
assert(stringsLocalizations.count(UID.get()) == 0 || boost::algorithm::starts_with(UID.get(), "map") || boost::algorithm::starts_with(UID.get(), "header")); // registering already registered string? FIXME: "header" is a workaround. VMAP needs proper integration in translation system
//assert(stringsLocalizations.count(UID.get()) == 0 || boost::algorithm::starts_with(UID.get(), "map") || boost::algorithm::starts_with(UID.get(), "header")); // registering already registered string? FIXME: "header" is a workaround. VMAP needs proper integration in translation system
if(stringsLocalizations.count(UID.get()) > 0)
{