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

better outline matching H3

Browse Source
This commit is contained in:
Laserlicht
2025-07-12 14:29:11 +02:00
parent f0c24c0ffa
commit e43df04ae1
2 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/renderSDL/RenderHandler.cpp
View File

@@ -324,7 +324,7 @@ std::shared_ptr<SDLImageShared> RenderHandler::loadScaledImage(const ImageLocato
if(isShadow && generateShadow) if(isShadow && generateShadow)
img = img->drawShadow((*locator.generateShadow) == SharedImageLocator::ShadowMode::SHADOW_SHEAR); img = img->drawShadow((*locator.generateShadow) == SharedImageLocator::ShadowMode::SHADOW_SHEAR);
if(isOverlay && generateOverlay && (*locator.generateOverlay) == SharedImageLocator::OverlayMode::OVERLAY_OUTLINE) if(isOverlay && generateOverlay && (*locator.generateOverlay) == SharedImageLocator::OverlayMode::OVERLAY_OUTLINE)
img = img->drawOutline(Colors::WHITE, getScalingFactor()); img = img->drawOutline(Colors::WHITE, 1);
} }
return img; return img;

86
client/renderSDL/SDL_Extensions.cpp
View File

@@ -686,70 +686,68 @@ void CSDL_Ext::getClipRect(SDL_Surface * src, Rect & other)
other = CSDL_Ext::fromSDL(rect); 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* source, const SDL_Color& color, int thickness)
{ {
// ensure format if(thickness < 1)
SDL_Surface *sourceSurface = SDL_ConvertSurfaceFormat(source, SDL_PIXELFORMAT_ARGB8888, 0); return nullptr;
SDL_Surface *destSurface = newSurface(Point(source->w, source->h));
// Lock surfaces for direct pixel access SDL_Surface* sourceSurface = SDL_ConvertSurfaceFormat(source, SDL_PIXELFORMAT_ARGB8888, 0);
if (SDL_MUSTLOCK(sourceSurface)) SDL_LockSurface(sourceSurface); SDL_Surface* destSurface = newSurface(Point(source->w, source->h));
if (SDL_MUSTLOCK(destSurface)) SDL_LockSurface(destSurface);
if(SDL_MUSTLOCK(sourceSurface)) SDL_LockSurface(sourceSurface);
if(SDL_MUSTLOCK(destSurface)) SDL_LockSurface(destSurface);
int width = sourceSurface->w; int width = sourceSurface->w;
int height = sourceSurface->h; int height = sourceSurface->h;
// Iterate through the pixels of the image // Helper lambda to get alpha
for (int y = 0; y < height; y++) auto getAlpha = [&](int x, int y) -> Uint8 {
{ if (x < 0 || x >= width || y < 0 || y >= height)
for (int x = 0; x < width; x++) return 0;
{ Uint32 pixel = *((Uint32*)sourceSurface->pixels + y * width + x);
Uint8 maxPixel = 0; Uint8 r, g, b, a;
Uint8 minPixel = 255; SDL_GetRGBA(pixel, sourceSurface->format, &r, &g, &b, &a);
int halfThickness = (thickness + 1) / 2; return a;
};
// Loop over the neighborhood around (x, y) // Go through all transparent pixels and check if they border an opaque region
for(int offsetY = -halfThickness; offsetY <= halfThickness; offsetY++) for(int y = 0; y < height; y++)
{
for(int x = 0; x < width; x++)
{
if(getAlpha(x, y) != 0)
continue; // Skip opaque pixels
bool isOutline = false;
for(int dy = -thickness; dy <= thickness && !isOutline; ++dy)
{ {
for(int offsetX = -halfThickness; offsetX <= halfThickness; offsetX++) for(int dx = -thickness; dx <= thickness; ++dx)
{ {
// Circle instead of rectangle // circular neighborhood
if(offsetX * offsetX + offsetY * offsetY > halfThickness * halfThickness) if(dx * dx + dy * dy > thickness * thickness)
continue; continue;
int neighborX = x + offsetX; if(getAlpha(x + dx, y + dy) > 0)
int neighborY = y + offsetY;
// Check image bounds
if(neighborX >= 0 && neighborX < destSurface->w && neighborY >= 0 && neighborY < destSurface->h)
{ {
// Get the pixel at the neighbor position isOutline = true;
Uint32 pixel = *((Uint32*)sourceSurface->pixels + neighborY * width + neighborX); break; // break inner loop only
Uint8 r;
Uint8 g;
Uint8 b;
Uint8 a;
SDL_GetRGBA(pixel, sourceSurface->format, &r, &g, &b, &a);
// Compare the pixel alpha value to find the maximum and maximum
if(a > maxPixel)
maxPixel = a;
if(a < minPixel)
minPixel = a;
} }
} }
} }
Uint32 newPixel = SDL_MapRGBA(destSurface->format, color.r, color.g, color.b, maxPixel - minPixel); if(isOutline)
*((Uint32*)destSurface->pixels + y * width + x) = newPixel; {
Uint32 newPixel = SDL_MapRGBA(destSurface->format, color.r, color.g, color.b, color.a);
*((Uint32*)destSurface->pixels + y * width + x) = newPixel;
}
} }
} }
if (SDL_MUSTLOCK(sourceSurface)) SDL_UnlockSurface(sourceSurface); if(SDL_MUSTLOCK(sourceSurface)) SDL_UnlockSurface(sourceSurface);
if (SDL_MUSTLOCK(destSurface)) SDL_UnlockSurface(destSurface); if(SDL_MUSTLOCK(destSurface)) SDL_UnlockSurface(destSurface);
SDL_FreeSurface(sourceSurface); SDL_FreeSurface(sourceSurface);
return destSurface; return destSurface;
} }
@@ -764,7 +762,7 @@ void applyAffineTransform(SDL_Surface* src, SDL_Surface* dst, double a, double b
// Calculate inverse matrix M_inv for mapping dst -> src // Calculate inverse matrix M_inv for mapping dst -> src
double det = a * d - b * c; double det = a * d - b * c;
if (static_cast<int>(det) == 0) if (std::abs(det) < 1e-10)
throw std::runtime_error("Singular transform matrix!"); throw std::runtime_error("Singular transform matrix!");
double invDet = 1.0 / det; double invDet = 1.0 / det;
double ia = d * invDet; double ia = d * invDet;