mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Remove noAlpha argument from LoadImage

Browse source 
This is just to simplify the function. I really don't see any point in
taking away the alpha for some images, other than to disappoint people
who mod the game assets. It just complicates loading the image with no
real gain. To reduce maintenance costs, let's remove this alternate code
path.

Also it's a default argument and I don't like default arguments.
This commit is contained in:
Misa 2021-12-25 00:57:58 -08:00
parent 3108178c53
commit a5c3bd97a0
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
desktop_version/src/GraphicsResources.cpp
View file

@ -6,13 +6,6 @@
// Used to load PNG data // Used to load PNG data
extern "C" extern "C"
{ {
extern unsigned lodepng_decode24(
unsigned char** out,
unsigned* w,
unsigned* h,
const unsigned char* in,
size_t insize
);
extern unsigned lodepng_decode32( extern unsigned lodepng_decode32(
unsigned char** out, unsigned char** out,
unsigned* w, unsigned* w,
@ -23,7 +16,7 @@ extern "C"
extern const char* lodepng_error_text(unsigned code); extern const char* lodepng_error_text(unsigned code);
} }
static SDL_Surface* LoadImage(const char *filename, bool noAlpha = false) static SDL_Surface* LoadImage(const char *filename)
{ {
//Temporary storage for the image that's loaded //Temporary storage for the image that's loaded
SDL_Surface* loadedImage = NULL; SDL_Surface* loadedImage = NULL;
@ -42,14 +35,7 @@ static SDL_Surface* LoadImage(const char *filename, bool noAlpha = false)
SDL_assert(0 && "Image file missing!"); SDL_assert(0 && "Image file missing!");
return NULL; return NULL;
} }
if (noAlpha) error = lodepng_decode32(&data, &width, &height, fileIn, length);
{
error = lodepng_decode24(&data, &width, &height, fileIn, length);
}
else
{
error = lodepng_decode32(&data, &width, &height, fileIn, length);
}
FILESYSTEM_freeMemory(&fileIn); FILESYSTEM_freeMemory(&fileIn);
if (error != 0) if (error != 0)
@ -62,9 +48,9 @@ static SDL_Surface* LoadImage(const char *filename, bool noAlpha = false)
data, data,
width, width,
height, height,
noAlpha ? 24 : 32, 32,
width * (noAlpha ? 3 : 4), width * 4,
noAlpha ? SDL_PIXELFORMAT_RGB24 : SDL_PIXELFORMAT_ABGR8888 SDL_PIXELFORMAT_ABGR8888
); );
if (loadedImage != NULL) if (loadedImage != NULL)
@ -100,8 +86,8 @@ void GraphicsResources::init(void)
im_teleporter = LoadImage("graphics/teleporter.png"); im_teleporter = LoadImage("graphics/teleporter.png");
im_image0 = LoadImage("graphics/levelcomplete.png"); im_image0 = LoadImage("graphics/levelcomplete.png");
im_image1 = LoadImage("graphics/minimap.png", true); im_image1 = LoadImage("graphics/minimap.png");
im_image2 = LoadImage("graphics/covered.png", true); im_image2 = LoadImage("graphics/covered.png");
im_image3 = LoadImage("graphics/elephant.png"); im_image3 = LoadImage("graphics/elephant.png");
im_image4 = LoadImage("graphics/gamecomplete.png"); im_image4 = LoadImage("graphics/gamecomplete.png");
im_image5 = LoadImage("graphics/fliplevelcomplete.png"); im_image5 = LoadImage("graphics/fliplevelcomplete.png");