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

Some comments cleaning

Browse source 
ImageDraw() code tweak
This commit is contained in:
Ray 2018-06-06 00:43:52 +02:00
parent 31cd4a1a48
commit 817ae07505
1 changed files with 3 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/textures.c
View file

@ -1075,40 +1075,10 @@ void ImageResizeCanvas(Image *image, int newWidth,int newHeight, int offsetX, in
Rectangle srcRec = { 0, 0, image->width, image->height }; Rectangle srcRec = { 0, 0, image->width, image->height };
Rectangle dstRec = { offsetX, offsetY, srcRec.width, srcRec.height }; Rectangle dstRec = { offsetX, offsetY, srcRec.width, srcRec.height };
// TODO: Review different scaling situations
if ((newWidth > image->width) && (newHeight > image->height)) if ((newWidth > image->width) && (newHeight > image->height))
{ {
// Consider anchor properly
/*
switch (anchor)
{
case 0: break; // TOP-LEFT corner --> dstRec = srcRec
case 1: dstRec.x = (newWidth - image->width)/2; break; // TOP side
case 2: dstRec.x = newWidth - image->width; break; // TOP-RIGHT corner
case 3: dstRec.y = (newHeight - image->height)/2; break; // LEFT side
case 4: // CENTER
{
dstRec.x = (newWidth - image->width)/2;
dstRec.y = (newHeight - image->height)/2;
} break;
case 5: // RIGHT side
{
dstRec.x = newWidth - image->width;
dstRec.y = (newHeight - image->height)/2;
} break;
case 6: dstRec.y = newHeight - image->height; break; // BOTTOM-LEFT corner
case 7: // BOTTOM side
{
dstRec.x = (newWidth - image->width)/2;
dstRec.y = newHeight - image->height;
} break;
case 8: // BOTTOM-RIGHT side
{
dstRec.x = newWidth - image->width;
dstRec.y = newHeight - image->height;
} break;
default: break;
}
*/
ImageDraw(&imTemp, *image, srcRec, dstRec); ImageDraw(&imTemp, *image, srcRec, dstRec);
ImageFormat(&imTemp, image->format); ImageFormat(&imTemp, image->format);
UnloadImage(*image); UnloadImage(*image);
@ -1325,7 +1295,6 @@ void ImageDraw(Image *dst, Image src, Rectangle srcRec, Rectangle dstRec)
{ {
srcRec.height = src.height - srcRec.y; srcRec.height = src.height - srcRec.y;
TraceLog(LOG_WARNING, "Source rectangle height out of bounds, rescaled height: %i", srcRec.height); TraceLog(LOG_WARNING, "Source rectangle height out of bounds, rescaled height: %i", srcRec.height);
cropRequired = true;
} }
Image srcCopy = ImageCopy(src); // Make a copy of source image to work with it Image srcCopy = ImageCopy(src); // Make a copy of source image to work with it
@ -1337,10 +1306,7 @@ void ImageDraw(Image *dst, Image src, Rectangle srcRec, Rectangle dstRec)
if (dstRec.y < 0) dstRec.y = 0; if (dstRec.y < 0) dstRec.y = 0;
// Scale source image in case destination rec size is different than source rec size // Scale source image in case destination rec size is different than source rec size
if ((dstRec.width != srcRec.width) || (dstRec.height != srcRec.height)) if ((dstRec.width != srcRec.width) || (dstRec.height != srcRec.height)) ImageResize(&srcCopy, dstRec.width, dstRec.height);
{
ImageResize(&srcCopy, dstRec.width, dstRec.height);
}
if ((dstRec.x + dstRec.width) > dst->width) if ((dstRec.x + dstRec.width) > dst->width)
{ {