edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove alpha threshold from map_optmize

Browse source
This commit is contained in:
Jupeyy 2022-05-28 09:13:13 +02:00
parent 73a099885b
commit 23683a701e
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/shared/image_manipulation.cpp
View file

@ -2,6 +2,8 @@
#include <base/math.h>
#include <base/system.h>
#define TW_DILATE_ALPHA_THRESHOLD 10
static void Dilate(int w, int h, int BPP, unsigned char *pSrc, unsigned char *pDest, unsigned char AlphaThreshold = TW_DILATE_ALPHA_THRESHOLD)
{
int ix, iy;

2
src/engine/shared/image_manipulation.h
View file

@ -4,8 +4,6 @@
#include <stddef.h>
#include <stdint.h>
#define TW_DILATE_ALPHA_THRESHOLD 10
void DilateImage(unsigned char *pImageBuff, int w, int h, int BPP);
void DilateImageSub(unsigned char *pImageBuff, int w, int h, int BPP, int x, int y, int sw, int sh);

6
src/tools/map_optimize.cpp
View file

@ -34,7 +34,7 @@ void CopyOpaquePixels(uint8_t *pDestImg, uint8_t *pSrcImg, int Width, int Height
for(int x = 0; x < Width; ++x)
{
int Index = y * Width * 4 + x * 4;
if(pSrcImg[Index + 3] > TW_DILATE_ALPHA_THRESHOLD)
if(pSrcImg[Index + 3] > 0)
mem_copy(&pDestImg[Index], &pSrcImg[Index], sizeof(uint8_t) * 4);
else
mem_zero(&pDestImg[Index], sizeof(uint8_t) * 4);
@ -66,9 +66,7 @@ void GetImageSHA256(uint8_t *pImgBuff, int ImgSize, int Width, int Height, char
{
uint8_t *pNewImgBuff = (uint8_t *)malloc(ImgSize);
// Get all image pixels, that have a alpha threshold over the default threshold,
// all other pixels are cleared to zero.
// This is required since dilate modifies pixels under the alpha threshold, which would alter the SHA.
// Clear fully transparent pixels, so the SHA is easier to identify with the original image
CopyOpaquePixels(pNewImgBuff, pImgBuff, Width, Height);
SHA256_DIGEST SHAStr = sha256(pNewImgBuff, (size_t)ImgSize);