Update embedded resources

This commit is contained in:
Hyper 2024-12-03 02:48:04 +00:00
parent 4c36fbcb86
commit f4359585cc
3 changed files with 7 additions and 13 deletions

View file

@ -312,6 +312,7 @@ generate_aggregate_header(
set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources")
set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res")
BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/achievements_menu/trophy.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/achievements_menu/trophy.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_trophy")
BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_game_icon")
BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_game_icon_night")

View file

@ -8,7 +8,8 @@
#include <user/config.h>
#include <app.h>
#include <exports.h>
#include "../UnleashedRecompResources/images/pause.h"
#include <res/images/achievements_menu/trophy.dds.h>
#include <res/images/pause.dds.h>
constexpr double HEADER_CONTAINER_INTRO_MOTION_START = 0;
constexpr double HEADER_CONTAINER_INTRO_MOTION_END = 15;
@ -654,16 +655,8 @@ void AchievementMenu::Init()
g_fntNewRodinDB = io.Fonts->AddFontFromFileTTF("FOT-NewRodinPro-DB.otf", 20.0f * FONT_SCALE);
g_fntNewRodinUB = io.Fonts->AddFontFromFileTTF("FOT-NewRodinPro-UB.otf", 20.0f * FONT_SCALE);
g_upSelectionCursor = LoadTexture((uint8_t*)g_res_pause, g_res_pause_size);
// TODO: embed this texture.
size_t bufferSize = 0;
auto buffer = ReadAllBytes("trophy.dds", bufferSize);
if (!bufferSize)
return;
g_upTrophyIcon = LoadTexture(buffer.get(), bufferSize);
g_upTrophyIcon = LoadTexture(g_trophy, sizeof(g_trophy));
g_upSelectionCursor = LoadTexture(g_pause, sizeof(g_pause));
}
void AchievementMenu::Draw()

View file

@ -3,7 +3,7 @@
#include <api/SWA.h>
#include <gpu/video.h>
#include <exports.h>
#include "../UnleashedRecompResources/images/pause.h"
#include <res/images/pause.dds.h>
constexpr double OVERLAY_CONTAINER_COMMON_MOTION_START = 0;
constexpr double OVERLAY_CONTAINER_COMMON_MOTION_END = 11;
@ -176,7 +176,7 @@ void MessageWindow::Init()
g_fntSeurat = io.Fonts->AddFontFromFileTTF("FOT-SeuratPro-M.otf", 28.0f * FONT_SCALE);
g_upSelectionCursor = LoadTexture((uint8_t*)g_res_pause, g_res_pause_size);
g_upSelectionCursor = LoadTexture(g_pause, sizeof(g_pause));
}
void MessageWindow::Draw()