mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RGBA8888 (or 32), not RGB

Browse Source
This commit is contained in:
Adubbz 2018-02-23 17:50:21 +11:00
parent 1cbe2cfbe7
commit 362b8286ec
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/menu.c
View File

@ -17,10 +17,10 @@ void launchMenuEntryTask(menuEntry_s* arg)
typedef enum typedef enum
{ {
IMAGE_MODE_RGB24, IMAGE_MODE_RGB24,
IMAGE_MODE_RGB32 IMAGE_MODE_RGBA32
} ImageMode; } ImageMode;
//Draws an RGB888 or RGB8888 image. //Draws an RGB888 or RGBA8888 image.
static void drawImage(int x, int y, int width, int height, const uint8_t *image, ImageMode mode) { static void drawImage(int x, int y, int width, int height, const uint8_t *image, ImageMode mode) {
int tmpx, tmpy; int tmpx, tmpy;
int pos; int pos;
@ -34,10 +34,9 @@ static void drawImage(int x, int y, int width, int height, const uint8_t *image,
current_color = MakeColor(image[pos+0], image[pos+1], image[pos+2], 255); current_color = MakeColor(image[pos+0], image[pos+1], image[pos+2], 255);
break; break;
case IMAGE_MODE_RGB32: case IMAGE_MODE_RGBA32:
pos = ((tmpy*width) + tmpx) * 4; pos = ((tmpy*width) + tmpx) * 4;
current_color = MakeColor(image[pos+0], image[pos+1], image[pos+2], image[pos+3]); current_color = MakeColor(image[pos+0], image[pos+1], image[pos+2], image[pos+3]);
//fprintf(stderr, "%d\n", image[pos+3]);
break; break;
} }
@ -285,13 +284,13 @@ void menuLoop() {
drawWave(timer, themeCurrent.frontWaveColor, 280.0, 4.0, -2.5); drawWave(timer, themeCurrent.frontWaveColor, 280.0, 4.0, -2.5);
timer += 0.05; timer += 0.05;
drawImage(40, 20, 140, 60, themeCurrent.hbmenuLogoImage, IMAGE_MODE_RGB32); drawImage(40, 20, 140, 60, themeCurrent.hbmenuLogoImage, IMAGE_MODE_RGBA32);
DrawText(tahoma12, 180, 47, themeCurrent.textColor, "v2.0.0"); DrawText(tahoma12, 180, 47, themeCurrent.textColor, "v2.0.0");
DrawText(tahoma12, 40, 720 - 48, themeCurrent.textColor, menu->dirname); DrawText(tahoma12, 40, 720 - 48, themeCurrent.textColor, menu->dirname);
//drawTime(); //drawTime();
drawImage(1280 - 126, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGB32); drawImage(1280 - 126, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32);
DrawText(tahoma12, 1280 - 90, 720 - 44, themeCurrent.textColor, "Launch"); DrawText(tahoma12, 1280 - 90, 720 - 44, themeCurrent.textColor, "Launch");
if (menu->nEntries==0) if (menu->nEntries==0)