mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/GraphicsUtil.cpp

496 lines
13 KiB
C++
Raw Normal View History

Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Graphics.h"
void setRect( SDL_Rect& _r, int x, int y, int w, int h )
{
_r.x = x;
_r.y = y;
_r.w = w;
_r.h = h;
}
SDL_Surface* GetSubSurface( SDL_Surface* metaSurface, int x, int y, int width, int height )
{
// Create an SDL_Rect with the area of the _surface
SDL_Rect area;
area.x = x;
area.y = y;
area.w = width;
area.h = height;
//Convert to the correct display format after nabbing the new _surface or we will slow things down.
Don't hardcode SDL_CreateRGBSurface BitsPerPixel/mask args For some reason, GetSubSurface() and ApplyFilter() were hardcoding the bits-per-pixel and/or mask arguments to SDL_CreateRGBSurface(). I've made them simply re-use the bits-per-pixel and masks of the input surfaces they operate on, but the bits-per-pixel should always be 32 and masks should always go first-byte alpha, second-byte red, third-byte green, fourth-byte blue.
2020-08-23 03:52:42 +02:00
SDL_Surface* preSurface = SDL_CreateRGBSurface(
SDL_SWSURFACE,
width,
height,
metaSurface->format->BitsPerPixel,
metaSurface->format->Rmask,
metaSurface->format->Gmask,
metaSurface->format->Bmask,
metaSurface->format->Amask
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//SDL_Surface* subSurface = SDL_DisplayFormatAlpha(preSurface);
//SDL_FreeSurface(preSurface);
// Lastly, apply the area from the meta _surface onto the whole of the sub _surface.
SDL_BlitSurface(metaSurface, &area, preSurface, 0);
// Return the new Bitmap _surface
return preSurface;
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static void DrawPixel( SDL_Surface *_surface, int x, int y, Uint32 pixel )
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
int bpp = _surface->format->BytesPerPixel;
/* Here p is the address to the pixel we want to set */
Uint8 *p = (Uint8 *)_surface->pixels + y * _surface->pitch + x * bpp;
switch(bpp)
{
case 1:
*p = pixel;
break;
case 2:
*(Uint16 *)p = pixel;
break;
case 3:
Axe SDL_BYTEORDER checks The game usually runs on little-endian anyways, but even if it did run on big-endian, it doesn't check endianness everywhere so these checks are useless. Furthermore, the code should be written so that endianness doesn't matter in the first place.
2020-08-22 20:19:12 +02:00
p[0] = (pixel >> 16) & 0xff;
p[1] = (pixel >> 8) & 0xff;
p[2] = pixel & 0xff;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
*(Uint32 *)p = pixel;
break;
}
}
Uint32 ReadPixel( SDL_Surface *_surface, int x, int y )
{
int bpp = _surface->format->BytesPerPixel;
/* Here p is the address to the pixel we want to retrieve */
Uint8 *p = (Uint8 *)_surface->pixels + y * _surface->pitch + x * bpp;
switch(bpp)
{
case 1:
return *p;
break;
case 2:
return *(Uint16 *)p;
break;
case 3:
Axe SDL_BYTEORDER checks The game usually runs on little-endian anyways, but even if it did run on big-endian, it doesn't check endianness everywhere so these checks are useless. Furthermore, the code should be written so that endianness doesn't matter in the first place.
2020-08-22 20:19:12 +02:00
return p[0] | p[1] << 8 | p[2] << 16;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
case 4:
return *(Uint32 *)p;
break;
default:
return 0; /* shouldn't happen, but avoids warnings */
}
}
SDL_Surface * ScaleSurface( SDL_Surface *_surface, int Width, int Height, SDL_Surface * Dest )
{
if(!_surface || !Width || !Height)
return 0;
SDL_Surface *_ret;
if(Dest == NULL)
{
_ret = SDL_CreateRGBSurface(_surface->flags, Width, Height, _surface->format->BitsPerPixel,
_surface->format->Rmask, _surface->format->Gmask, _surface->format->Bmask, _surface->format->Amask);
if(_ret == NULL)
{
return NULL;
}
}
else
{
_ret = Dest;
}
float _stretch_factor_x = (static_cast<double>(Width) / static_cast<double>(_surface->w)), _stretch_factor_y = (static_cast<double>(Height) / static_cast<double>(_surface->h));
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_Rect gigantoPixel;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for(Sint32 y = 0; y < _surface->h; y++)
for(Sint32 x = 0; x < _surface->w; x++)
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
{
Remove -1,-1 offset from ScaleSurface() For some reason, ScaleSurface() was drawing each pixel one pixel up and to the left from its actual position. I have no idea why. But this was causing an issue where pixels would just be dropped, because they would be drawn outside of the temporary SDL_Surface from which the scaled surface would be drawn onto. Also, the offset just creates a visual one-pixel offset in the result for no reason. So I'm just removing it. Big Viridian also suffered from this one-pixel offset, so now they will no longer look like they're floating above the ground when standing on the floor.
2020-08-04 22:10:50 +02:00
setRect(gigantoPixel, static_cast<Sint32>(float(x)*_stretch_factor_x), static_cast<Sint32>(float(y) *_stretch_factor_y), static_cast<Sint32>(_stretch_factor_x),static_cast<Sint32>( _stretch_factor_y)) ;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_FillRect(_ret, &gigantoPixel, ReadPixel(_surface, x, y));
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
// DrawPixel(_ret, static_cast<Sint32>(_stretch_factor_x * x) + o_x,
//static_cast<Sint32>(_stretch_factor_y * y) + o_y, ReadPixel(_surface, x, y));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
return _ret;
}
SDL_Surface * FlipSurfaceVerticle(SDL_Surface* _src)
{
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_Surface * ret = SDL_CreateRGBSurface(_src->flags, _src->w, _src->h, _src->format->BitsPerPixel,
_src->format->Rmask, _src->format->Gmask, _src->format->Bmask, _src->format->Amask);
if(ret == NULL)
{
return NULL;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
for(Sint32 y = 0; y < _src->h; y++)
{
for(Sint32 x = 0; x < _src->w; x++)
{
DrawPixel(ret, x ,(_src->h-1) - y ,ReadPixel(_src, x, y));
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
return ret;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void BlitSurfaceStandard( SDL_Surface* _src, SDL_Rect* _srcRect, SDL_Surface* _dest, SDL_Rect* _destRect )
{
//SDL_Rect tempRect = *_destRect;
//tempRect.w ;
//tempRect.h ;
//tempRect.x *=globalScale;
//tempRect.y *=globalScale;
//if(globalScale != 1)
//{
// SDL_Surface* tempScaled = ScaleSurface(_src, tempRect.w, tempRect.h);
// SDL_BlitSurface( tempScaled, _srcRect, _dest, &tempRect );
// SDL_FreeSurface(tempScaled);
//}
//else
//{
SDL_BlitSurface( _src, _srcRect, _dest, _destRect );
//}
}
void BlitSurfaceColoured(
SDL_Surface* _src,
SDL_Rect* _srcRect,
SDL_Surface* _dest,
SDL_Rect* _destRect,
colourTransform& ct
) {
SDL_Rect *tempRect = _destRect;
const SDL_PixelFormat& fmt = *(_src->format);
// const SDL_PixelFormat& destfmt = *(_dest->format);
SDL_Surface* tempsurface = SDL_CreateRGBSurface(
SDL_SWSURFACE,
_src->w,
_src->h,
fmt.BitsPerPixel,
fmt.Rmask,
fmt.Gmask,
fmt.Bmask,
fmt.Amask
);
for(int x = 0; x < tempsurface->w; x++)
{
for(int y = 0; y < tempsurface->h; y++)
{
Uint32 pixel = ReadPixel(_src, x, y);
Uint32 Alpha = pixel & fmt.Amask;
Uint32 result = ct.colour & 0x00FFFFFF;
Make "[Press ENTER to return to editor]" fade out after a bit This makes the "[Press ENTER to return to editor]" fade out after a few frames, allowing screenshots of custom levels to be cleaner and to make sure nothing is obscured while the user is editing their level. This commit also adds alpha support in BlitSurfaceColoured, where it takes into account the alpha of the pixel *and* the alpha of the color. `graphics::getRGBA(r,g,b,a)` was added to help with this.
2020-02-10 03:23:12 +01:00
Uint32 CTAlpha = ct.colour & fmt.Amask;
float div1 = ((Alpha >> 24) / 255.0f);
float div2 = ((CTAlpha >> 24) / 255.0f);
Uint32 UseAlpha = (div1 * div2) * 255.0f;
DrawPixel(tempsurface, x, y, result | (UseAlpha << 24));
Add BlitSurfaceTinted() This will be used to change the color of existing textures while preserving their lightness values.
2020-06-30 00:05:57 +02:00
}
}
SDL_BlitSurface(tempsurface, _srcRect, _dest, tempRect);
SDL_FreeSurface(tempsurface);
}
void BlitSurfaceTinted(
SDL_Surface* _src,
SDL_Rect* _srcRect,
SDL_Surface* _dest,
SDL_Rect* _destRect,
colourTransform& ct
) {
SDL_Rect *tempRect = _destRect;
const SDL_PixelFormat& fmt = *(_src->format);
SDL_Surface* tempsurface = SDL_CreateRGBSurface(
SDL_SWSURFACE,
_src->w,
_src->h,
fmt.BitsPerPixel,
fmt.Rmask,
fmt.Gmask,
fmt.Bmask,
fmt.Amask
);
for (int x = 0; x < tempsurface->w; x++) {
for (int y = 0; y < tempsurface->h; y++) {
Uint32 pixel = ReadPixel(_src, x, y);
Uint8 pixred = (pixel & _src->format->Rmask) >> 16;
Uint8 pixgreen = (pixel & _src->format->Gmask) >> 8;
Uint8 pixblue = (pixel & _src->format->Bmask) >> 0;
double temp_pixred = pixred * 0.299;
double temp_pixgreen = pixgreen * 0.587;
double temp_pixblue = pixblue * 0.114;
double gray = floor((temp_pixred + temp_pixgreen + temp_pixblue + 0.5));
Uint8 ctred = (ct.colour & graphics.backBuffer->format->Rmask) >> 16;
Uint8 ctgreen = (ct.colour & graphics.backBuffer->format->Gmask) >> 8;
Uint8 ctblue = (ct.colour & graphics.backBuffer->format->Bmask) >> 0;
temp_pixred = gray * ctred / 255.0;
temp_pixgreen = gray * ctgreen / 255.0;
temp_pixblue = gray * ctblue / 255.0;
if (temp_pixred > 255)
temp_pixred = 255;
if (temp_pixgreen > 255)
temp_pixgreen = 255;
if (temp_pixblue > 255)
temp_pixblue = 255;
pixred = temp_pixred;
pixgreen = temp_pixgreen;
pixblue = temp_pixblue;
Uint32 Alpha = pixel & fmt.Amask;
Uint32 result = (pixred << 16) + (pixgreen << 8) + (pixblue << 0);
Uint32 CTAlpha = ct.colour & fmt.Amask;
float div1 = ((Alpha >> 24) / 255.0f);
float div2 = ((CTAlpha >> 24) / 255.0f);
Uint32 UseAlpha = (div1 * div2) * 255.0f;
DrawPixel(tempsurface, x, y, result | (UseAlpha << 24));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
SDL_BlitSurface(tempsurface, _srcRect, _dest, tempRect);
SDL_FreeSurface(tempsurface);
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static int oldscrollamount = 0;
static int scrollamount = 0;
static bool isscrolling = 0;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
Move analogue mode filter update logic to fixed-timestep loop Otherwise if the analogue filter is scrolling, it'll scroll by REALLY fast.
2020-05-03 05:27:47 +02:00
void UpdateFilter()
{
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
if (rand() % 4000 < 8)
{
isscrolling = true;
}
Interpolate scrolling in Analogue Mode filter I can't really make the filter update only every timestep, because it's per-pixel and operates on deltaframes too, so it TECHNICALLY runs faster in over-30-FPS mode than not. That said, it's not really noticeable, the filter doesn't look bad for updating more often or anything. However, I can at least interpolate the scrolling, so it's smooth in over-30-FPS mode.
2020-11-08 01:21:30 +01:00
oldscrollamount = scrollamount;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
if(isscrolling == true)
{
scrollamount += 20;
if(scrollamount > 240)
{
scrollamount = 0;
Interpolate scrolling in Analogue Mode filter I can't really make the filter update only every timestep, because it's per-pixel and operates on deltaframes too, so it TECHNICALLY runs faster in over-30-FPS mode than not. That said, it's not really noticeable, the filter doesn't look bad for updating more often or anything. However, I can at least interpolate the scrolling, so it's smooth in over-30-FPS mode.
2020-11-08 01:21:30 +01:00
oldscrollamount = 0;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
isscrolling = false;
}
}
Move analogue mode filter update logic to fixed-timestep loop Otherwise if the analogue filter is scrolling, it'll scroll by REALLY fast.
2020-05-03 05:27:47 +02:00
}
SDL_Surface* ApplyFilter( SDL_Surface* _src )
{
Don't hardcode SDL_CreateRGBSurface BitsPerPixel/mask args For some reason, GetSubSurface() and ApplyFilter() were hardcoding the bits-per-pixel and/or mask arguments to SDL_CreateRGBSurface(). I've made them simply re-use the bits-per-pixel and masks of the input surfaces they operate on, but the bits-per-pixel should always be 32 and masks should always go first-byte alpha, second-byte red, third-byte green, fourth-byte blue.
2020-08-23 03:52:42 +02:00
SDL_Surface* _ret = SDL_CreateRGBSurface(_src->flags, _src->w, _src->h, _src->format->BitsPerPixel,
Move analogue mode filter update logic to fixed-timestep loop Otherwise if the analogue filter is scrolling, it'll scroll by REALLY fast.
2020-05-03 05:27:47 +02:00
_src->format->Rmask, _src->format->Gmask, _src->format->Bmask, _src->format->Amask);
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
int redOffset = rand() % 4;
for(int x = 0; x < _src->w; x++)
{
for(int y = 0; y < _src->h; y++)
{
Interpolate scrolling in Analogue Mode filter I can't really make the filter update only every timestep, because it's per-pixel and operates on deltaframes too, so it TECHNICALLY runs faster in over-30-FPS mode than not. That said, it's not really noticeable, the filter doesn't look bad for updating more often or anything. However, I can at least interpolate the scrolling, so it's smooth in over-30-FPS mode.
2020-11-08 01:21:30 +01:00
int sampley = (y + (int) graphics.lerp(oldscrollamount, scrollamount) )% 240;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
Uint32 pixel = ReadPixel(_src, x,sampley);
Uint8 green = (pixel & _src->format->Gmask) >> 8;
Uint8 blue = (pixel & _src->format->Bmask) >> 0;
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
Uint32 pixelOffset = ReadPixel(_src, VVV_min(x+redOffset, 319), sampley) ;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
Uint8 red = (pixelOffset & _src->format->Rmask) >> 16 ;
if(isscrolling && sampley > 220 && ((rand() %10) < 4))
{
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
red = VVV_min(int(red+(fRandom() * 0.6) * 254) , 255);
green = VVV_min(int(green+(fRandom() * 0.6) * 254) , 255);
blue = VVV_min(int(blue+(fRandom() * 0.6) * 254) , 255);
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
}
else
{
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
red = VVV_min(int(red+(fRandom() * 0.2) * 254) , 255);
green = VVV_min(int(green+(fRandom() * 0.2) * 254) , 255);
blue = VVV_min(int(blue+(fRandom() * 0.2) * 254) , 255);
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
}
if(y % 2 == 0)
{
red = static_cast<Uint8>(red / 1.2f);
green = static_cast<Uint8>(green / 1.2f);
blue = static_cast<Uint8>(blue / 1.2f);
}
Use SDL_abs() instead of libc abs() in ApplyFilter() Always good to use the SDL stdlib where possible.
2020-11-08 01:23:48 +01:00
int distX = static_cast<int>((SDL_abs (160.0f -x ) / 160.0f) *16);
int distY = static_cast<int>((SDL_abs (120.0f -y ) / 120.0f)*32);
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
red = VVV_max(red - ( distX +distY), 0);
green = VVV_max(green - ( distX +distY), 0);
blue = VVV_max(blue - ( distX +distY), 0);
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
Uint32 finalPixel = ((red<<16) + (green<<8) + (blue<<0)) | (pixel &_src->format->Amask);
DrawPixel(_ret,x,y, finalPixel);
}
}
return _ret;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void FillRect( SDL_Surface* _surface, const int _x, const int _y, const int _w, const int _h, const int r, int g, int b )
{
SDL_Rect rect = {Sint16(_x),Sint16(_y),Sint16(_w),Sint16(_h)};
Uint32 color;
color = SDL_MapRGB(_surface->format, r, g, b);
SDL_FillRect(_surface, &rect, color);
}
void FillRect( SDL_Surface* _surface, const int r, int g, int b )
{
SDL_Rect rect = {0,0,Uint16(_surface->w) ,Uint16(_surface->h) };
Uint32 color;
color = SDL_MapRGB(_surface->format, r, g, b);
SDL_FillRect(_surface, &rect, color);
}
void FillRect( SDL_Surface* _surface, const int color )
{
SDL_Rect rect = {0,0,Uint16(_surface->w) ,Uint16(_surface->h) };
SDL_FillRect(_surface, &rect, color);
}
void FillRect( SDL_Surface* _surface, const int x, const int y, const int w, const int h, int rgba )
{
SDL_Rect rect = {Sint16(x) ,Sint16(y) ,Sint16(w) ,Sint16(h) };
SDL_FillRect(_surface, &rect, rgba);
}
void FillRect( SDL_Surface* _surface, SDL_Rect& _rect, const int r, int g, int b )
{
Uint32 color;
color = SDL_MapRGB(_surface->format, r, g, b);
SDL_FillRect(_surface, &_rect, color);
}
void FillRect( SDL_Surface* _surface, SDL_Rect rect, int rgba )
{
SDL_FillRect(_surface, &rect, rgba);
}
void ScrollSurface( SDL_Surface* _src, int _pX, int _pY )
{
SDL_Surface* part1 = NULL;
SDL_Rect rect1;
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_Rect rect2;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//scrolling up;
if(_pY < 0)
{
setRect(rect2, 0, 0, _src->w, _src->h - _pY);
part1 = GetSubSurface(_src, rect2.x, rect2.y, rect2.w, rect2.h);
SDL_Rect destrect1;
SDL_SetSurfaceBlendMode(part1, SDL_BLENDMODE_NONE);
setRect(destrect1, 0, _pY, _pX, _src->h);
SDL_BlitSurface (part1, NULL, _src, &destrect1);
}
else if(_pY > 0)
{
setRect(rect1, 0, 0, _src->w, _src->h - _pY);
part1 = GetSubSurface(_src, rect1.x, rect1.y, rect1.w, rect1.h);
SDL_Rect destrect1;
SDL_SetSurfaceBlendMode(part1, SDL_BLENDMODE_NONE);
setRect(destrect1, _pX, _pY, _src->w, _src->h - _pY);
SDL_BlitSurface (part1, NULL, _src, &destrect1);
}
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
//Right
else if(_pX <= 0)
{
setRect(rect2, 0, 0, _src->w - _pX, _src->h );
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
part1 = GetSubSurface(_src, rect2.x, rect2.y, rect2.w, rect2.h);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_Rect destrect1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_SetSurfaceBlendMode(part1, SDL_BLENDMODE_NONE);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
setRect(destrect1, _pX, 0, _src->w - _pX, _src->h);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_BlitSurface (part1, NULL, _src, &destrect1);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
else if(_pX > 0)
{
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
setRect(rect1, _pX, 0, _src->w - _pX, _src->h );
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
part1 = GetSubSurface(_src, rect1.x, rect1.y, rect1.w, rect1.h);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_Rect destrect1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_SetSurfaceBlendMode(part1, SDL_BLENDMODE_NONE);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
setRect(destrect1, 0, 0, _src->w - _pX, _src->h);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
SDL_BlitSurface (part1, NULL, _src, &destrect1);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix mixed indentation in GraphicsUtil.cpp To be fair, it was more on the level of entire functions using different indentation than the surrounding code, but it's not consistent enough for me to justify leaving it alone.
2020-04-02 22:35:43 +02:00
}
//Cleanup temp surface
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (part1)
{
SDL_FreeSurface(part1);
}
}