derek/HansTheGatherer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert audio hans RAW files

Browse Source
This commit is contained in:
Derek Christ
2025-06-09 10:58:40 +02:00
parent f13d50a9e1
commit 6a05210aa1
8 changed files with 12 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/fonts/OpenTTD-Sans.ttf
View File

Binary file not shown.

BIN
assets/sounds/JamaicanSunrise.ogg
View File

Binary file not shown.

BIN
assets/sounds/JamaicanSunrise.wav → assets/sounds/JamaicanSunrise.raw
View File

Binary file not shown.

BIN
assets/sounds/hit.raw Normal file
View File

Binary file not shown.

BIN
assets/sounds/hit.wav
View File

Binary file not shown.

BIN
assets/sounds/pickup.raw Normal file
View File

Binary file not shown.

BIN
assets/sounds/pickup.wav
View File

Binary file not shown.

73
src/assets.cpp
View File

@@ -20,65 +20,17 @@ static constexpr uint8_t BASKET_DATA[] = {
}; };
static constexpr uint8_t BACKGROUND_MUSIC_DATA[] = { static constexpr uint8_t BACKGROUND_MUSIC_DATA[] = {
#embed "../assets/sounds/JamaicanSunrise.wav" #embed "../assets/sounds/JamaicanSunrise.raw"
}; };
static constexpr uint8_t PICKUP_SOUND_DATA[] = { static constexpr uint8_t PICKUP_SOUND_DATA[] = {
#embed "../assets/sounds/pickup.wav" #embed "../assets/sounds/pickup.raw"
}; };
static constexpr uint8_t HIT_SOUND_DATA[] = { static constexpr uint8_t HIT_SOUND_DATA[] = {
#embed "../assets/sounds/hit.wav" #embed "../assets/sounds/hit.raw"
}; };
static constexpr uint8_t DEFAULT_FONT_DATA[] = {
#embed "../assets/fonts/OpenTTD-Sans.ttf"
};
// SDL_Texture* load_texture(uint8_t const* data, size_t size, SDL_Renderer* renderer)
// {
// auto* iostream = SDL_IOFromConstMem(data, size);
// SDL_Surface* surface = SDL_LoadBMP_IO(iostream, false);
// if (surface == nullptr)
// {
// // spdlog::error("Failed to load SDL surface!\nCause: {}", SDL_GetError());
// }
// SDL_Texture* texture = SDL_CreateTextureFromSurface(renderer, surface);
// if (texture == nullptr)
// {
// // spdlog::error("Failed to create texture from surface!\nCause: {}", SDL_GetError());
// }
// return texture;
// }
// AudioAsset load_audio(uint8_t const* data, size_t size)
// {
// AudioAsset audio_asset;
// auto* iostream = SDL_IOFromConstMem(data, size);
// bool res = SDL_LoadWAV_IO(
// iostream, false, &audio_asset.spec, &audio_asset.buffer, &audio_asset.buffer_length);
// if (!res)
// {
// // spdlog::error("Failed to load audio file!\nCause: {}", SDL_GetError());
// }
// return audio_asset;
// }
// FontAsset load_font(uint8_t const* data, size_t size)
// {
// FontAsset font_asset;
// auto* iostream = SDL_IOFromConstMem(data, size);
// auto* ttf = TTF_OpenFontIO(iostream, false, 20);
// font_asset.font = ttf;
// return font_asset;
// }
AssetModule::AssetModule(entt::registry& registry) AssetModule::AssetModule(entt::registry& registry)
{ {
TextureAtlasLayout background_layout{.width = 400, .height = 240, .rows = 1, .columns = 1}; TextureAtlasLayout background_layout{.width = 400, .height = 240, .rows = 1, .columns = 1};
@@ -101,17 +53,14 @@ AssetModule::AssetModule(entt::registry& registry)
registry.ctx().emplace<TextureAssets>(TextureAssets{ registry.ctx().emplace<TextureAssets>(TextureAssets{
.background = background, .fruits = fruits, .spiders = spiders, .basket = basket}); .background = background, .fruits = fruits, .spiders = spiders, .basket = basket});
// auto background_music = load_audio(BACKGROUND_MUSIC_DATA, sizeof(BACKGROUND_MUSIC_DATA)); AudioAsset background_music{.buffer = BACKGROUND_MUSIC_DATA,
// auto pickup_sound = load_audio(PICKUP_SOUND_DATA, sizeof(PICKUP_SOUND_DATA)); .buffer_length = sizeof(BACKGROUND_MUSIC_DATA)};
// auto hit_sound = load_audio(HIT_SOUND_DATA, sizeof(HIT_SOUND_DATA)); AudioAsset pickup_sound{.buffer = PICKUP_SOUND_DATA,
registry.ctx().emplace<AudioAssets>(AudioAssets{ .buffer_length = sizeof(PICKUP_SOUND_DATA)};
.background_music = {.buffer = BACKGROUND_MUSIC_DATA, AudioAsset hit_sound{.buffer = HIT_SOUND_DATA, .buffer_length = sizeof(HIT_SOUND_DATA)};
.buffer_length = sizeof(BACKGROUND_MUSIC_DATA)}, registry.ctx().emplace<AudioAssets>(AudioAssets{.background_music = background_music,
.pickup_sound = {.buffer = PICKUP_SOUND_DATA, .buffer_length = sizeof(PICKUP_SOUND_DATA)}, .pickup_sound =.buffer = pickup_sound,
.hit_sound = {.buffer = HIT_SOUND_DATA, .buffer_length = sizeof(HIT_SOUND_DATA)}}); .hit_sound =.buffer = hit_sound});
// registry.ctx().emplace<AudioAssets>(AudioAssets{.background_music = background_music,
// .pickup_sound = pickup_sound,
// .hit_sound = hit_sound});
// auto font = load_font(DEFAULT_FONT_DATA, sizeof(DEFAULT_FONT_DATA)); // auto font = load_font(DEFAULT_FONT_DATA, sizeof(DEFAULT_FONT_DATA));
// registry.ctx().emplace<FontAssets>(FontAssets{.default_font = font}); // registry.ctx().emplace<FontAssets>(FontAssets{.default_font = font});