Fix the image manipulation config flag
This commit is contained in:
Jens Pitkanen
parent
f9963d4ed4
commit
eed69d4127
234
src/textures.c
234
src/textures.c
@ -402,90 +402,6 @@ Texture2D LoadTextureFromImage(Image image)
|
|||||||
return texture;
|
return texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load cubemap from image, multiple image cubemap layouts supported
|
|
||||||
TextureCubemap LoadTextureCubemap(Image image, int layoutType)
|
|
||||||
{
|
|
||||||
TextureCubemap cubemap = { 0 };
|
|
||||||
|
|
||||||
if (layoutType == CUBEMAP_AUTO_DETECT) // Try to automatically guess layout type
|
|
||||||
{
|
|
||||||
// Check image width/height to determine the type of cubemap provided
|
|
||||||
if (image.width > image.height)
|
|
||||||
{
|
|
||||||
if ((image.width/6) == image.height) { layoutType = CUBEMAP_LINE_HORIZONTAL; cubemap.width = image.width/6; }
|
|
||||||
else if ((image.width/4) == (image.height/3)) { layoutType = CUBEMAP_CROSS_FOUR_BY_THREE; cubemap.width = image.width/4; }
|
|
||||||
else if (image.width >= (int)((float)image.height*1.85f)) { layoutType = CUBEMAP_PANORAMA; cubemap.width = image.width/4; }
|
|
||||||
}
|
|
||||||
else if (image.height > image.width)
|
|
||||||
{
|
|
||||||
if ((image.height/6) == image.width) { layoutType = CUBEMAP_LINE_VERTICAL; cubemap.width = image.height/6; }
|
|
||||||
else if ((image.width/3) == (image.height/4)) { layoutType = CUBEMAP_CROSS_THREE_BY_FOUR; cubemap.width = image.width/3; }
|
|
||||||
}
|
|
||||||
|
|
||||||
cubemap.height = cubemap.width;
|
|
||||||
}
|
|
||||||
|
|
||||||
int size = cubemap.width;
|
|
||||||
|
|
||||||
if (layoutType != CUBEMAP_AUTO_DETECT)
|
|
||||||
{
|
|
||||||
//unsigned int dataSize = GetPixelDataSize(size, size, format);
|
|
||||||
//void *facesData = malloc(size*size*dataSize*6); // Get memory for 6 faces in a column
|
|
||||||
|
|
||||||
Image faces = { 0 }; // Vertical column image
|
|
||||||
Rectangle faceRecs[6] = { 0 }; // Face source rectangles
|
|
||||||
for (int i = 0; i < 6; i++) faceRecs[i] = (Rectangle){ 0, 0, size, size };
|
|
||||||
|
|
||||||
if (layoutType == CUBEMAP_LINE_VERTICAL)
|
|
||||||
{
|
|
||||||
faces = image;
|
|
||||||
for (int i = 0; i < 6; i++) faceRecs[i].y = size*i;
|
|
||||||
}
|
|
||||||
else if (layoutType == CUBEMAP_PANORAMA)
|
|
||||||
{
|
|
||||||
// TODO: Convert panorama image to square faces...
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (layoutType == CUBEMAP_LINE_HORIZONTAL) for (int i = 0; i < 6; i++) faceRecs[i].x = size*i;
|
|
||||||
else if (layoutType == CUBEMAP_CROSS_THREE_BY_FOUR)
|
|
||||||
{
|
|
||||||
faceRecs[0].x = size; faceRecs[0].y = size;
|
|
||||||
faceRecs[1].x = size; faceRecs[1].y = 3*size;
|
|
||||||
faceRecs[2].x = size; faceRecs[2].y = 0;
|
|
||||||
faceRecs[3].x = size; faceRecs[3].y = 2*size;
|
|
||||||
faceRecs[4].x = 0; faceRecs[4].y = size;
|
|
||||||
faceRecs[5].x = 2*size; faceRecs[5].y = size;
|
|
||||||
}
|
|
||||||
else if (layoutType == CUBEMAP_CROSS_FOUR_BY_THREE)
|
|
||||||
{
|
|
||||||
faceRecs[0].x = 2*size; faceRecs[0].y = size;
|
|
||||||
faceRecs[1].x = 0; faceRecs[1].y = size;
|
|
||||||
faceRecs[2].x = size; faceRecs[2].y = 0;
|
|
||||||
faceRecs[3].x = size; faceRecs[3].y = 2*size;
|
|
||||||
faceRecs[4].x = size; faceRecs[4].y = size;
|
|
||||||
faceRecs[5].x = 3*size; faceRecs[5].y = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert image data to 6 faces in a vertical column, that's the optimum layout for loading
|
|
||||||
faces = GenImageColor(size, size*6, MAGENTA);
|
|
||||||
ImageFormat(&faces, image.format);
|
|
||||||
|
|
||||||
// TODO: Image formating does not work with compressed textures!
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < 6; i++) ImageDraw(&faces, image, faceRecs[i], (Rectangle){ 0, size*i, size, size });
|
|
||||||
|
|
||||||
cubemap.id = rlLoadTextureCubemap(faces.data, size, faces.format);
|
|
||||||
if (cubemap.id == 0) TraceLog(LOG_WARNING, "Cubemap image could not be loaded.");
|
|
||||||
|
|
||||||
UnloadImage(faces);
|
|
||||||
}
|
|
||||||
else TraceLog(LOG_WARNING, "Cubemap image layout can not be detected.");
|
|
||||||
|
|
||||||
return cubemap;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load texture for rendering (framebuffer)
|
// Load texture for rendering (framebuffer)
|
||||||
// NOTE: Render texture is loaded by default with RGBA color attachment and depth RenderBuffer
|
// NOTE: Render texture is loaded by default with RGBA color attachment and depth RenderBuffer
|
||||||
RenderTexture2D LoadRenderTexture(int width, int height)
|
RenderTexture2D LoadRenderTexture(int width, int height)
|
||||||
@ -1151,7 +1067,9 @@ void ImageFormat(Image *image, int newFormat)
|
|||||||
if (image->mipmaps > 1)
|
if (image->mipmaps > 1)
|
||||||
{
|
{
|
||||||
image->mipmaps = 1;
|
image->mipmaps = 1;
|
||||||
|
#if defined(SUPPORT_IMAGE_MANIPULATION)
|
||||||
if (image->data != NULL) ImageMipmaps(image);
|
if (image->data != NULL) ImageMipmaps(image);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else TraceLog(LOG_WARNING, "Image data format is compressed, can not be converted");
|
else TraceLog(LOG_WARNING, "Image data format is compressed, can not be converted");
|
||||||
@ -1220,38 +1138,6 @@ void ImageAlphaClear(Image *image, Color color, float threshold)
|
|||||||
ImageFormat(image, prevFormat);
|
ImageFormat(image, prevFormat);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Crop image depending on alpha value
|
|
||||||
void ImageAlphaCrop(Image *image, float threshold)
|
|
||||||
{
|
|
||||||
Color *pixels = GetImageData(*image);
|
|
||||||
|
|
||||||
int xMin = 65536; // Define a big enough number
|
|
||||||
int xMax = 0;
|
|
||||||
int yMin = 65536;
|
|
||||||
int yMax = 0;
|
|
||||||
|
|
||||||
for (int y = 0; y < image->height; y++)
|
|
||||||
{
|
|
||||||
for (int x = 0; x < image->width; x++)
|
|
||||||
{
|
|
||||||
if (pixels[y*image->width + x].a > (unsigned char)(threshold*255.0f))
|
|
||||||
{
|
|
||||||
if (x < xMin) xMin = x;
|
|
||||||
if (x > xMax) xMax = x;
|
|
||||||
if (y < yMin) yMin = y;
|
|
||||||
if (y > yMax) yMax = y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle crop = { xMin, yMin, (xMax + 1) - xMin, (yMax + 1) - yMin };
|
|
||||||
|
|
||||||
free(pixels);
|
|
||||||
|
|
||||||
// Check for not empty image brefore cropping
|
|
||||||
if (!((xMax < xMin) || (yMax < yMin))) ImageCrop(image, crop);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Premultiply alpha channel
|
// Premultiply alpha channel
|
||||||
void ImageAlphaPremultiply(Image *image)
|
void ImageAlphaPremultiply(Image *image)
|
||||||
{
|
{
|
||||||
@ -1277,6 +1163,90 @@ void ImageAlphaPremultiply(Image *image)
|
|||||||
|
|
||||||
|
|
||||||
#if defined(SUPPORT_IMAGE_MANIPULATION)
|
#if defined(SUPPORT_IMAGE_MANIPULATION)
|
||||||
|
// Load cubemap from image, multiple image cubemap layouts supported
|
||||||
|
TextureCubemap LoadTextureCubemap(Image image, int layoutType)
|
||||||
|
{
|
||||||
|
TextureCubemap cubemap = { 0 };
|
||||||
|
|
||||||
|
if (layoutType == CUBEMAP_AUTO_DETECT) // Try to automatically guess layout type
|
||||||
|
{
|
||||||
|
// Check image width/height to determine the type of cubemap provided
|
||||||
|
if (image.width > image.height)
|
||||||
|
{
|
||||||
|
if ((image.width/6) == image.height) { layoutType = CUBEMAP_LINE_HORIZONTAL; cubemap.width = image.width/6; }
|
||||||
|
else if ((image.width/4) == (image.height/3)) { layoutType = CUBEMAP_CROSS_FOUR_BY_THREE; cubemap.width = image.width/4; }
|
||||||
|
else if (image.width >= (int)((float)image.height*1.85f)) { layoutType = CUBEMAP_PANORAMA; cubemap.width = image.width/4; }
|
||||||
|
}
|
||||||
|
else if (image.height > image.width)
|
||||||
|
{
|
||||||
|
if ((image.height/6) == image.width) { layoutType = CUBEMAP_LINE_VERTICAL; cubemap.width = image.height/6; }
|
||||||
|
else if ((image.width/3) == (image.height/4)) { layoutType = CUBEMAP_CROSS_THREE_BY_FOUR; cubemap.width = image.width/3; }
|
||||||
|
}
|
||||||
|
|
||||||
|
cubemap.height = cubemap.width;
|
||||||
|
}
|
||||||
|
|
||||||
|
int size = cubemap.width;
|
||||||
|
|
||||||
|
if (layoutType != CUBEMAP_AUTO_DETECT)
|
||||||
|
{
|
||||||
|
//unsigned int dataSize = GetPixelDataSize(size, size, format);
|
||||||
|
//void *facesData = malloc(size*size*dataSize*6); // Get memory for 6 faces in a column
|
||||||
|
|
||||||
|
Image faces = { 0 }; // Vertical column image
|
||||||
|
Rectangle faceRecs[6] = { 0 }; // Face source rectangles
|
||||||
|
for (int i = 0; i < 6; i++) faceRecs[i] = (Rectangle){ 0, 0, size, size };
|
||||||
|
|
||||||
|
if (layoutType == CUBEMAP_LINE_VERTICAL)
|
||||||
|
{
|
||||||
|
faces = image;
|
||||||
|
for (int i = 0; i < 6; i++) faceRecs[i].y = size*i;
|
||||||
|
}
|
||||||
|
else if (layoutType == CUBEMAP_PANORAMA)
|
||||||
|
{
|
||||||
|
// TODO: Convert panorama image to square faces...
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (layoutType == CUBEMAP_LINE_HORIZONTAL) for (int i = 0; i < 6; i++) faceRecs[i].x = size*i;
|
||||||
|
else if (layoutType == CUBEMAP_CROSS_THREE_BY_FOUR)
|
||||||
|
{
|
||||||
|
faceRecs[0].x = size; faceRecs[0].y = size;
|
||||||
|
faceRecs[1].x = size; faceRecs[1].y = 3*size;
|
||||||
|
faceRecs[2].x = size; faceRecs[2].y = 0;
|
||||||
|
faceRecs[3].x = size; faceRecs[3].y = 2*size;
|
||||||
|
faceRecs[4].x = 0; faceRecs[4].y = size;
|
||||||
|
faceRecs[5].x = 2*size; faceRecs[5].y = size;
|
||||||
|
}
|
||||||
|
else if (layoutType == CUBEMAP_CROSS_FOUR_BY_THREE)
|
||||||
|
{
|
||||||
|
faceRecs[0].x = 2*size; faceRecs[0].y = size;
|
||||||
|
faceRecs[1].x = 0; faceRecs[1].y = size;
|
||||||
|
faceRecs[2].x = size; faceRecs[2].y = 0;
|
||||||
|
faceRecs[3].x = size; faceRecs[3].y = 2*size;
|
||||||
|
faceRecs[4].x = size; faceRecs[4].y = size;
|
||||||
|
faceRecs[5].x = 3*size; faceRecs[5].y = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert image data to 6 faces in a vertical column, that's the optimum layout for loading
|
||||||
|
faces = GenImageColor(size, size*6, MAGENTA);
|
||||||
|
ImageFormat(&faces, image.format);
|
||||||
|
|
||||||
|
// TODO: Image formating does not work with compressed textures!
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 6; i++) ImageDraw(&faces, image, faceRecs[i], (Rectangle){ 0, size*i, size, size });
|
||||||
|
|
||||||
|
cubemap.id = rlLoadTextureCubemap(faces.data, size, faces.format);
|
||||||
|
if (cubemap.id == 0) TraceLog(LOG_WARNING, "Cubemap image could not be loaded.");
|
||||||
|
|
||||||
|
UnloadImage(faces);
|
||||||
|
}
|
||||||
|
else TraceLog(LOG_WARNING, "Cubemap image layout can not be detected.");
|
||||||
|
|
||||||
|
return cubemap;
|
||||||
|
}
|
||||||
|
|
||||||
// Crop an image to area defined by a rectangle
|
// Crop an image to area defined by a rectangle
|
||||||
// NOTE: Security checks are performed in case rectangle goes out of bounds
|
// NOTE: Security checks are performed in case rectangle goes out of bounds
|
||||||
void ImageCrop(Image *image, Rectangle crop)
|
void ImageCrop(Image *image, Rectangle crop)
|
||||||
@ -1327,6 +1297,38 @@ void ImageCrop(Image *image, Rectangle crop)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Crop image depending on alpha value
|
||||||
|
void ImageAlphaCrop(Image *image, float threshold)
|
||||||
|
{
|
||||||
|
Color *pixels = GetImageData(*image);
|
||||||
|
|
||||||
|
int xMin = 65536; // Define a big enough number
|
||||||
|
int xMax = 0;
|
||||||
|
int yMin = 65536;
|
||||||
|
int yMax = 0;
|
||||||
|
|
||||||
|
for (int y = 0; y < image->height; y++)
|
||||||
|
{
|
||||||
|
for (int x = 0; x < image->width; x++)
|
||||||
|
{
|
||||||
|
if (pixels[y*image->width + x].a > (unsigned char)(threshold*255.0f))
|
||||||
|
{
|
||||||
|
if (x < xMin) xMin = x;
|
||||||
|
if (x > xMax) xMax = x;
|
||||||
|
if (y < yMin) yMin = y;
|
||||||
|
if (y > yMax) yMax = y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle crop = { xMin, yMin, (xMax + 1) - xMin, (yMax + 1) - yMin };
|
||||||
|
|
||||||
|
free(pixels);
|
||||||
|
|
||||||
|
// Check for not empty image brefore cropping
|
||||||
|
if (!((xMax < xMin) || (yMax < yMin))) ImageCrop(image, crop);
|
||||||
|
}
|
||||||
|
|
||||||
// Resize and image to new size
|
// Resize and image to new size
|
||||||
// NOTE: Uses stb default scaling filters (both bicubic):
|
// NOTE: Uses stb default scaling filters (both bicubic):
|
||||||
// STBIR_DEFAULT_FILTER_UPSAMPLE STBIR_FILTER_CATMULLROM
|
// STBIR_DEFAULT_FILTER_UPSAMPLE STBIR_FILTER_CATMULLROM
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user