nanopenguin/SDL_Minigame
0
0
Fork 0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 10:13:42 +00:00
Code Actions Wiki

added ability to play music

Browse Source
This commit is contained in:
ineslelin 2024-05-27 12:04:09 +02:00
parent db44d4d619
commit 70c4d3c030
7 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/sound/background_music.mp3 Normal file
View File

Binary file not shown.

4
include/AssetManager.h
View File

@ -36,12 +36,16 @@ public:
// sound management
void addSoundEffect(std::string id, const char* path);
void addMusic(std::string id, const char* path);
SDL_Texture* getTexture(std::string id);
Mix_Chunk* getSound(std::string id);
Mix_Music* getMusic(std::string id);
private:
Manager* man;
std::map<std::string, SDL_Texture*> textures;
std::map<std::string, Mix_Chunk*> soundEffects;
std::map<std::string, Mix_Music*> music;
};

2
include/SoundManager.h
View File

@ -38,6 +38,6 @@ class SoundManager
Mix_Chunk* loadSound(const char* fileName);
static void playSound(Game* game, /*SoundTypes sound*/ std::string sound, bool canOverlap, int loops);
// static void playMusic(...);
static void playMusic(Game* game, std::string sound, int loops);
private:
};

10
src/AssetManager.cpp
View File

@ -29,6 +29,11 @@ void AssetManager::addSoundEffect(std::string id, const char* path)
soundEffects.emplace(id, this->man->getGame()->soundManager->loadSound(path));
}
void AssetManager::addMusic(std::string id, const char* path)
{
music.emplace(id, this->man->getGame()->soundManager->loadMusic(path));
}
SDL_Texture* AssetManager::getTexture(std::string id) {
return textures.at(id);
}
@ -37,6 +42,11 @@ Mix_Chunk* AssetManager::getSound(std::string id) {
return soundEffects.at(id);
}
Mix_Music* AssetManager::getMusic(std::string id)
{
return music.at(id);
}
void AssetManager::createProjectile(Vector2D pos, Vector2D velocity, int scale, int range, int speed, const char* texturePath, Entity::TeamLabel teamLabel) {
auto& projectile(man->addEntity());

3
src/Game.cpp
View File

@ -156,6 +156,9 @@ void Game::init(const char* title, int xpos, int ypos, int width, int height, bo
assets->addSoundEffect("throw_egg", "assets/sound/throw_egg.wav");
assets->addSoundEffect("steps", "assets/sound/steps.wav");
// loading music
assets->addMusic("background_music", "assets/sound/background_music.mp3");
//ecs implementation
player1.setTeam(Entity::TeamLabel::BLUE);

5
src/KeyboardController.cpp
View File

@ -22,7 +22,10 @@ void KeyboardController::init()
}
void KeyboardController::update()
{
{#
// TODO: move this, this is definitely the wrong place to put this but i wanted to put it somewhere to test it
SoundManager::playMusic(this->entity->getManager().getGame(), "background_music", PLAY_LOOPED);
transform->direction.x = 0;
transform->direction.y = 0;
sprite->playAnimation(IDLE);

13
src/SoundManager.cpp
View File

@ -47,8 +47,6 @@ Mix_Chunk* SoundManager::loadSound(const char* fileName)
return sound;
}
// void SoundManager::playMusic(...)
// TODO: using a string here is probably... a less than stellar method, figure out how to change this
void SoundManager::playSound(Game* game, /*SoundTypes sound*/ std::string sound, bool canOverlap, int loops)
{
@ -64,6 +62,17 @@ void SoundManager::playSound(Game* game, /*SoundTypes sound*/ std::string sound,
}
}
void SoundManager::playMusic(Game* game, std::string music, int loops)
{
if (Mix_PlayingMusic() != 0)
return;
if (Mix_PlayMusic(game->assets->getMusic(music), loops) == -1)
{
std::cerr << "Error playing music '" << music << "': " << Mix_GetError() << std::endl;
}
}
// TODO:
// functions to
// 1. free music and sound