Skip to content

Commit

Permalink
Fix some deprecation warnings
Browse files Browse the repository at this point in the history 
Namely:

 - [[deprecated("Use BlendChar")]]
 - [[deprecated("Use AddChar")]]
 - [[deprecated("Use XorPixel")]]
 - [[deprecated("Use AddPixel")]]
 - [[deprecated("Use XorLine")]]
 - [[deprecated("Use XorDottedRect")]]
 - [[deprecated("Use XorImage")]]
 - [[deprecated("Use BlendEllipse")]]
 - [[deprecated("Use BlendFilledEllipse")]]
 - [[deprecated("Use DrawFilledRect (beware off by 1)")]]
  • Loading branch information
@LBPHacker
LBPHacker committed Apr 30, 2023
1 parent f5cbc30 commit 9fbb780
Show file tree
Hide file tree
Showing 31 changed files with 201 additions and 284 deletions.
14 changes: 7 additions & 7 deletions src/debug/DebugParts.cpp
View file
Expand Up @@ -22,9 +22,9 @@ void DebugParts::Draw()
for (int i = 0; i < NPART; i++)
{
if (sim->parts[i].type)
g->addpixel(x, y, 255, 255, 255, 180);
g->AddPixel({ x, y }, RGBA<uint8_t>(255, 255, 255, 180));
else
g->addpixel(x, y, 0, 0, 0, 180);
g->AddPixel({ x, y }, RGBA<uint8_t>(0, 0, 0, 180));

if (i == sim->parts_lastActiveIndex)
{
Expand All @@ -40,12 +40,12 @@ void DebugParts::Draw()
}
g->draw_line(0, lpy, XRES, lpy, 0, 255, 120, 255);
g->draw_line(lpx, 0, lpx, YRES, 0, 255, 120, 255);
g->addpixel(lpx, lpy, 255, 50, 50, 220);
g->AddPixel({ lpx, lpy }, RGBA<uint8_t>(255, 50, 50, 220));

g->addpixel(lpx+1, lpy, 255, 50, 50, 120);
g->addpixel(lpx-1, lpy, 255, 50, 50, 120);
g->addpixel(lpx, lpy+1, 255, 50, 50, 120);
g->addpixel(lpx, lpy-1, 255, 50, 50, 120);
g->AddPixel({ lpx+1, lpy }, RGBA<uint8_t>(255, 50, 50, 120));
g->AddPixel({ lpx-1, lpy }, RGBA<uint8_t>(255, 50, 50, 120));
g->AddPixel({ lpx, lpy+1 }, RGBA<uint8_t>(255, 50, 50, 120));
g->AddPixel({ lpx, lpy-1 }, RGBA<uint8_t>(255, 50, 50, 120));

g->fillrect(7, YRES-26, g->TextSize(info).X + 4, 14, 0, 0, 0, 180);
g->BlendText({ 10, YRES-22 }, info, RGBA<uint8_t>(255, 255, 255, 255));
Expand Down
182 changes: 91 additions & 91 deletions src/graphics/Graphics.cpp
View file
Expand Up @@ -174,269 +174,269 @@ void Graphics::draw_icon(int x, int y, Icon icon, unsigned char alpha, bool inve
{
case IconOpen:
if(invert)
drawchar(x, y, 0xE001, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE001, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 0xE001, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE001, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconReload:
if(invert)
drawchar(x, y, 0xE011, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE011, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 0xE011, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE011, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconSave:
if(invert)
drawchar(x, y, 0xE002, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE002, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 0xE002, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE002, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconVoteUp:
if(invert)
{
drawchar(x-11, y+1, 0xE04B, 0, 100, 0, alpha);
BlendChar({ x-11, y+1 }, 0xE04B, RGBA<uint8_t>(0, 100, 0, alpha));
BlendText({ x+2, y+1 }, "Vote", RGBA<uint8_t>(0, 100, 0, alpha));
}
else
{
drawchar(x-11, y+1, 0xE04B, 0, 187, 18, alpha);
BlendChar({ x-11, y+1 }, 0xE04B, RGBA<uint8_t>(0, 187, 18, alpha));
BlendText({ x+2, y+1 }, "Vote", RGBA<uint8_t>(0, 187, 18, alpha));
}
break;
case IconVoteDown:
if(invert)
drawchar(x, y, 0xE04A, 100, 10, 0, alpha);
BlendChar({ x, y }, 0xE04A, RGBA<uint8_t>(100, 10, 0, alpha));
else
drawchar(x, y, 0xE04A, 187, 40, 0, alpha);
BlendChar({ x, y }, 0xE04A, RGBA<uint8_t>(187, 40, 0, alpha));
break;
case IconTag:
if(invert)
drawchar(x, y, 0xE003, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE003, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 0xE003, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE003, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconNew:
if(invert)
drawchar(x, y, 0xE012, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE012, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 0xE012, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE012, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconLogin:
if(invert)
drawchar(x, y+1, 0xE004, 0, 0, 0, alpha);
BlendChar({ x, y + 1 }, 0xE004, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y+1, 0xE004, 255, 255, 255, alpha);
BlendChar({ x, y + 1 }, 0xE004, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconSimulationSettings:
if(invert)
drawchar(x, y+1, 0xE04F, 0, 0, 0, alpha);
BlendChar({ x, y + 1 }, 0xE04F, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y+1, 0xE04F, 255, 255, 255, alpha);
BlendChar({ x, y + 1 }, 0xE04F, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconRenderSettings:
if(invert)
{
drawchar(x, y+1, 0xE058, 255, 0, 0, alpha);
drawchar(x, y+1, 0xE059, 0, 255, 0, alpha);
drawchar(x, y+1, 0xE05A, 0, 0, 255, alpha);
BlendChar({ x, y + 1 }, 0xE058, RGBA<uint8_t>(255, 0, 0, alpha));
BlendChar({ x, y + 1 }, 0xE059, RGBA<uint8_t>(0, 255, 0, alpha));
BlendChar({ x, y + 1 }, 0xE05A, RGBA<uint8_t>(0, 0, 255, alpha));
}
else
{
addchar(x, y+1, 0xE058, 255, 0, 0, alpha);
addchar(x, y+1, 0xE059, 0, 255, 0, alpha);
addchar(x, y+1, 0xE05A, 0, 0, 255, alpha);
AddChar({ x, y + 1 }, 0xE058, RGBA<uint8_t>(255, 0, 0, alpha));
AddChar({ x, y + 1 }, 0xE059, RGBA<uint8_t>(0, 255, 0, alpha));
AddChar({ x, y + 1 }, 0xE05A, RGBA<uint8_t>(0, 0, 255, alpha));
}
break;
case IconPause:
if(invert)
drawchar(x, y, 0xE010, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE010, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 0xE010, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE010, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconFavourite:
if(invert)
drawchar(x, y, 0xE04C, 100, 80, 32, alpha);
BlendChar({ x, y }, 0xE04C, RGBA<uint8_t>(100, 80, 32, alpha));
else
drawchar(x, y, 0xE04C, 192, 160, 64, alpha);
BlendChar({ x, y }, 0xE04C, RGBA<uint8_t>(192, 160, 64, alpha));
break;
case IconReport:
if(invert)
drawchar(x, y, 0xE063, 140, 140, 0, alpha);
BlendChar({ x, y }, 0xE063, RGBA<uint8_t>(140, 140, 0, alpha));
else
drawchar(x, y, 0xE063, 255, 255, 0, alpha);
BlendChar({ x, y }, 0xE063, RGBA<uint8_t>(255, 255, 0, alpha));
break;
case IconUsername:
if(invert)
{
drawchar(x, y, 0xE00B, 32, 64, 128, alpha);
drawchar(x, y, 0xE00A, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE00B, RGBA<uint8_t>(32, 64, 128, alpha));
BlendChar({ x, y }, 0xE00A, RGBA<uint8_t>(0, 0, 0, alpha));
}
else
{
drawchar(x, y, 0xE00B, 32, 64, 128, alpha);
drawchar(x, y, 0xE00A, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE00B, RGBA<uint8_t>(32, 64, 128, alpha));
BlendChar({ x, y }, 0xE00A, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconPassword:
if(invert)
{
drawchar(x, y, 0xE00C, 160, 144, 32, alpha);
drawchar(x, y, 0xE004, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE00C, RGBA<uint8_t>(160, 144, 32, alpha));
BlendChar({ x, y }, 0xE004, RGBA<uint8_t>(0, 0, 0, alpha));
}
else
{
drawchar(x, y, 0xE00C, 160, 144, 32, alpha);
drawchar(x, y, 0xE004, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE00C, RGBA<uint8_t>(160, 144, 32, alpha));
BlendChar({ x, y }, 0xE004, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconClose:
if(invert)
drawchar(x, y, 0xE02A, 20, 20, 20, alpha);
BlendChar({ x, y }, 0xE02A, RGBA<uint8_t>(20, 20, 20, alpha));
else
drawchar(x, y, 0xE02A, 230, 230, 230, alpha);
BlendChar({ x, y }, 0xE02A, RGBA<uint8_t>(230, 230, 230, alpha));
break;
case IconVoteSort:
if (invert)
{
drawchar(x, y, 0xE029, 44, 48, 32, alpha);
drawchar(x, y, 0xE028, 32, 44, 32, alpha);
drawchar(x, y, 0xE027, 128, 128, 128, alpha);
BlendChar({ x, y }, 0xE029, RGBA<uint8_t>(44, 48, 32, alpha));
BlendChar({ x, y }, 0xE028, RGBA<uint8_t>(32, 44, 32, alpha));
BlendChar({ x, y }, 0xE027, RGBA<uint8_t>(128, 128, 128, alpha));
}
else
{
drawchar(x, y, 0xE029, 144, 48, 32, alpha);
drawchar(x, y, 0xE028, 32, 144, 32, alpha);
drawchar(x, y, 0xE027, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE029, RGBA<uint8_t>(144, 48, 32, alpha));
BlendChar({ x, y }, 0xE028, RGBA<uint8_t>(32, 144, 32, alpha));
BlendChar({ x, y }, 0xE027, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconDateSort:
if (invert)
{
drawchar(x, y, 0xE026, 32, 32, 32, alpha);
BlendChar({ x, y }, 0xE026, RGBA<uint8_t>(32, 32, 32, alpha));
}
else
{
drawchar(x, y, 0xE026, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE026, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconMyOwn:
if (invert)
{
drawchar(x, y, 0xE014, 192, 160, 64, alpha);
drawchar(x, y, 0xE013, 32, 32, 32, alpha);
BlendChar({ x, y }, 0xE014, RGBA<uint8_t>(192, 160, 64, alpha));
BlendChar({ x, y }, 0xE013, RGBA<uint8_t>(32, 32, 32, alpha));
}
else
{
drawchar(x, y, 0xE014, 192, 160, 64, alpha);
drawchar(x, y, 0xE013, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE014, RGBA<uint8_t>(192, 160, 64, alpha));
BlendChar({ x, y }, 0xE013, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconSearch:
drawchar(x, y, 0xE00E, 30, 30, 180, alpha);
drawchar(x, y, 0xE00F, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE00E, RGBA<uint8_t>(30, 30, 180, alpha));
BlendChar({ x, y }, 0xE00F, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconDelete:
if(invert)
{
drawchar(x, y, 0xE006, 159, 47, 31, alpha);
drawchar(x, y, 0xE005, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE006, RGBA<uint8_t>(159, 47, 31, alpha));
BlendChar({ x, y }, 0xE005, RGBA<uint8_t>(0, 0, 0, alpha));
}
else
{
drawchar(x, y, 0xE006, 159, 47, 31, alpha);
drawchar(x, y, 0xE005, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE006, RGBA<uint8_t>(159, 47, 31, alpha));
BlendChar({ x, y }, 0xE005, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconAdd:
if(invert)
{
drawchar(x, y, 0xE006, 32, 144, 32, alpha);
drawchar(x, y, 0xE009, 0, 0, 0, alpha);
BlendChar({ x, y }, 0xE006, RGBA<uint8_t>(32, 144, 32, alpha));
BlendChar({ x, y }, 0xE009, RGBA<uint8_t>(0, 0, 0, alpha));
}
else
{
drawchar(x, y, 0xE006, 32, 144, 32, alpha);
drawchar(x, y, 0xE009, 255, 255, 255, alpha);
BlendChar({ x, y }, 0xE006, RGBA<uint8_t>(32, 144, 32, alpha));
BlendChar({ x, y }, 0xE009, RGBA<uint8_t>(255, 255, 255, alpha));
}
break;
case IconVelocity:
drawchar(x+1, y, 0xE018, 128, 160, 255, alpha);
BlendChar({ x + 1, y }, 0xE018, RGBA<uint8_t>(128, 160, 255, alpha));
break;
case IconPressure:
if(invert)
drawchar(x+1, y+1, 0xE019, 180, 160, 16, alpha);
BlendChar({ x + 1, y + 1 }, 0xE019, RGBA<uint8_t>(180, 160, 16, alpha));
else
drawchar(x+1, y+1, 0xE019, 255, 212, 32, alpha);
BlendChar({ x + 1, y + 1 }, 0xE019, RGBA<uint8_t>(255, 212, 32, alpha));
break;
case IconPersistant:
if(invert)
drawchar(x+1, y+1, 0xE01A, 20, 20, 20, alpha);
BlendChar({ x + 1, y + 1 }, 0xE01A, RGBA<uint8_t>(20, 20, 20, alpha));
else
drawchar(x+1, y+1, 0xE01A, 212, 212, 212, alpha);
BlendChar({ x + 1, y + 1 }, 0xE01A, RGBA<uint8_t>(212, 212, 212, alpha));
break;
case IconFire:
drawchar(x+1, y+1, 0xE01B, 255, 0, 0, alpha);
drawchar(x+1, y+1, 0xE01C, 255, 255, 64, alpha);
BlendChar({ x + 1, y + 1 }, 0xE01B, RGBA<uint8_t>(255, 0, 0, alpha));
BlendChar({ x + 1, y + 1 }, 0xE01C, RGBA<uint8_t>(255, 255, 64, alpha));
break;
case IconBlob:
if(invert)
drawchar(x+1, y, 0xE03F, 55, 180, 55, alpha);
BlendChar({ x + 1, y }, 0xE03F, RGBA<uint8_t>(55, 180, 55, alpha));
else
drawchar(x+1, y, 0xE03F, 55, 255, 55, alpha);
BlendChar({ x + 1, y }, 0xE03F, RGBA<uint8_t>(55, 255, 55, alpha));
break;
case IconHeat:
drawchar(x+3, y, 0xE03E, 255, 0, 0, alpha);
BlendChar({ x + 3, y }, 0xE03E, RGBA<uint8_t>(255, 0, 0, alpha));
if(invert)
drawchar(x+3, y, 0xE03D, 0, 0, 0, alpha);
BlendChar({ x + 3, y }, 0xE03D, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x+3, y, 0xE03D, 255, 255, 255, alpha);
BlendChar({ x + 3, y }, 0xE03D, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconBlur:
if(invert)
drawchar(x+1, y, 0xE044, 50, 70, 180, alpha);
BlendChar({ x + 1, y }, 0xE044, RGBA<uint8_t>(50, 70, 180, alpha));
else
drawchar(x+1, y, 0xE044, 100, 150, 255, alpha);
BlendChar({ x + 1, y }, 0xE044, RGBA<uint8_t>(100, 150, 255, alpha));
break;
case IconGradient:
if(invert)
drawchar(x+1, y+1, 0xE053, 255, 50, 255, alpha);
BlendChar({ x + 1, y + 1 }, 0xE053, RGBA<uint8_t>(255, 50, 255, alpha));
else
drawchar(x+1, y+1, 0xE053, 205, 50, 205, alpha);
BlendChar({ x + 1, y + 1 }, 0xE053, RGBA<uint8_t>(205, 50, 205, alpha));
break;
case IconLife:
if(invert)
drawchar(x, y+1, 0xE060, 0, 0, 0, alpha);
BlendChar({ x, y + 1 }, 0xE060, RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y+1, 0xE060, 255, 255, 255, alpha);
BlendChar({ x, y + 1 }, 0xE060, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconEffect:
drawchar(x+1, y, 0xE061, 255, 255, 160, alpha);
BlendChar({ x + 1, y }, 0xE061, RGBA<uint8_t>(255, 255, 160, alpha));
break;
case IconGlow:
drawchar(x+1, y, 0xE05F, 200, 255, 255, alpha);
BlendChar({ x + 1, y }, 0xE05F, RGBA<uint8_t>(200, 255, 255, alpha));
break;
case IconWarp:
drawchar(x+1, y, 0xE05E, 255, 255, 255, alpha);
BlendChar({ x + 1, y }, 0xE05E, RGBA<uint8_t>(255, 255, 255, alpha));
break;
case IconBasic:
if(invert)
drawchar(x+1, y+1, 0xE05B, 50, 50, 0, alpha);
BlendChar({ x + 1, y + 1 }, 0xE05B, RGBA<uint8_t>(50, 50, 0, alpha));
else
drawchar(x+1, y+1, 0xE05B, 255, 255, 200, alpha);
BlendChar({ x + 1, y + 1 }, 0xE05B, RGBA<uint8_t>(255, 255, 200, alpha));
break;
case IconAltAir:
if(invert) {
drawchar(x+1, y+1, 0xE054, 180, 55, 55, alpha);
drawchar(x+1, y+1, 0xE055, 55, 180, 55, alpha);
BlendChar({ x + 1, y + 1 }, 0xE054, RGBA<uint8_t>(180, 55, 55, alpha));
BlendChar({ x + 1, y + 1 }, 0xE055, RGBA<uint8_t>(55, 180, 55, alpha));
} else {
drawchar(x+1, y+1, 0xE054, 255, 55, 55, alpha);
drawchar(x+1, y+1, 0xE055, 55, 255, 55, alpha);
BlendChar({ x + 1, y + 1 }, 0xE054, RGBA<uint8_t>(255, 55, 55, alpha));
BlendChar({ x + 1, y + 1 }, 0xE055, RGBA<uint8_t>(55, 255, 55, alpha));
}
break;
default:
if(invert)
drawchar(x, y, 't', 0, 0, 0, alpha);
BlendChar({ x, y }, 't', RGBA<uint8_t>(0, 0, 0, alpha));
else
drawchar(x, y, 't', 255, 255, 255, alpha);
BlendChar({ x, y }, 't', RGBA<uint8_t>(255, 255, 255, alpha));
break;
}
}
Expand Down

0 comments on commit 9fbb780

Please sign in to comment.