UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified some code

Browse source
This commit is contained in:
Ray 2018-04-05 19:18:44 +02:00
parent 931b672c92
commit 005f2ffb75
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/textures.c
View file

@ -575,14 +575,10 @@ void UpdateTexture(Texture2D texture, const void *pixels)
// Export image as a PNG file // Export image as a PNG file
void ExportImage(const char *fileName, Image image) void ExportImage(const char *fileName, Image image)
{ {
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
// NOTE: Getting Color array as RGBA unsigned char values // NOTE: Getting Color array as RGBA unsigned char values
unsigned char *imgData = (unsigned char *)GetImageData(image); unsigned char *imgData = (unsigned char *)GetImageData(image);
SavePNG(fileName, imgData, image.width, image.height, 4); SavePNG(fileName, imgData, image.width, image.height, 4);
free(imgData); free(imgData);
TraceLog(LOG_INFO, "Image saved: %s", fileName);
#endif
} }
// Copy an image to a new image // Copy an image to a new image
@ -1930,12 +1926,8 @@ Image GenImageCellular(int width, int height, int tileSize)
void GenTextureMipmaps(Texture2D *texture) void GenTextureMipmaps(Texture2D *texture)
{ {
#if defined(PLATFORM_WEB) #if defined(PLATFORM_WEB)
// Calculate next power-of-two values
int potWidth = (int)powf(2, ceilf(logf((float)texture->width)/logf(2)));
int potHeight = (int)powf(2, ceilf(logf((float)texture->height)/logf(2)));
// Check if texture is POT // Check if texture is POT
if ((potWidth != texture->width) || (potHeight != texture->height)) if (((texture->width & (texture->width - 1)) != 0) || ((texture->height & (texture->height - 1)) != 0))
{ {
TraceLog(LOG_WARNING, "Limited NPOT support, no mipmaps available for NPOT textures"); TraceLog(LOG_WARNING, "Limited NPOT support, no mipmaps available for NPOT textures");
} }

9
src/utils.c
View file

@ -141,13 +141,14 @@ void TraceLog(int msgType, const char *text, ...)
#endif // SUPPORT_TRACELOG #endif // SUPPORT_TRACELOG
} }
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
#if defined(SUPPORT_SAVE_BMP) #if defined(SUPPORT_SAVE_BMP)
// Creates a BMP image file from an array of pixel data // Creates a BMP image file from an array of pixel data
void SaveBMP(const char *fileName, unsigned char *imgData, int width, int height, int compSize) void SaveBMP(const char *fileName, unsigned char *imgData, int width, int height, int compSize)
{ {
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
stbi_write_bmp(fileName, width, height, compSize, imgData); stbi_write_bmp(fileName, width, height, compSize, imgData);
TraceLog(LOG_INFO, "BMP Image saved: %s", fileName);
#endif
} }
#endif #endif
@ -155,9 +156,11 @@ void SaveBMP(const char *fileName, unsigned char *imgData, int width, int height
// Creates a PNG image file from an array of pixel data // Creates a PNG image file from an array of pixel data
void SavePNG(const char *fileName, unsigned char *imgData, int width, int height, int compSize) void SavePNG(const char *fileName, unsigned char *imgData, int width, int height, int compSize)
{ {
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
stbi_write_png(fileName, width, height, compSize, imgData, width*compSize); stbi_write_png(fileName, width, height, compSize, imgData, width*compSize);
} TraceLog(LOG_INFO, "PNG Image saved: %s", fileName);
#endif #endif
}
#endif #endif
// Keep track of memory allocated // Keep track of memory allocated