zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-28 16:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

music settings work youhou

Browse Source
This commit is contained in:
arthur.jamet
2021-06-09 15:39:48 +02:00
parent e4209c3ca2
commit 6f0ecbf3bd
3 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Component/Music/MusicComponent.cpp
+13 -3
View File
@@ -39,15 +39,15 @@ namespace BBM
this->_music.pause();
}
void MusicComponent::setVolume(float &volumeUpdate)
void MusicComponent::setVolume(float volumeUpdate)
{
if (volumeUpdate >= 0) {
if (volumeUpdate >= 0 && volumeUpdate <= 1) {
this->volume = volumeUpdate;
this->_music.setVolume(this->volume);
}
}
void MusicComponent::setPitch(float &pitch)
void MusicComponent::setPitch(float pitch)
{
this->_music.setPitch(pitch);
}
@@ -62,4 +62,14 @@ namespace BBM
this->_music.updateMusicStream();
}
void MusicComponent::turnDownVolume()
{
this->setVolume(MusicComponent::volume - 0.1);
}
void MusicComponent::turnUpVolume()
{
this->setVolume(MusicComponent::volume + 0.1);
}
} // namespace WAL
sources/Component/Music/MusicComponent.hpp
+8 -2
View File
@@ -24,10 +24,16 @@ namespace BBM
void pauseMusic();
//! @brief set music volume
void setVolume(float &);
void setVolume(float);
//! @brief volume -= 0.1
void turnDownVolume();
//! @brief volume += 0.1
void turnUpVolume();
//! @brief set pitch volume
void setPitch(float &);
void setPitch(float);
//! @brief is music playing
bool isPlaying(void);
sources/Runner/Runner.cpp
+16 -2
View File
@@ -10,6 +10,8 @@
#include <Drawables/3D/Cube.hpp>
#include <Drawables/2D/Rectangle.hpp>
#include <Drawables/2D/Text.hpp>
#include <Audio/Music.hpp>
#include <Audio/Sound.hpp>
#include <TraceLog.hpp>
#include "System/Keyboard/KeyboardSystem.hpp"
#include "System/Controllable/ControllableSystem.hpp"
@@ -348,13 +350,19 @@ namespace BBM
auto &musicUp = scene->addEntity("music up button")
.addComponent<PositionComponent>(1920 / 1.5, 1080 - 540, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_plus.png")
.addComponent<OnClickComponent>()
.addComponent<MusicComponent>("assets/musics/music_title.ogg")
.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_plus.png");
})
.addComponent<OnClickComponent>([](WAL::Entity &entity, WAL::Wal &)
{
auto &component = entity.getComponent<MusicComponent>();
component.turnUpVolume();
})
.addComponent<OnHoverComponent>([](WAL::Entity &entity, WAL::Wal &)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
@@ -365,13 +373,19 @@ namespace BBM
auto &musicDown = scene->addEntity("music down button")
.addComponent<PositionComponent>(1920 / 3, 1080 - 540, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_minus.png")
.addComponent<OnClickComponent>()
.addComponent<MusicComponent>("assets/musics/music_title.ogg")
.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_minus.png");
})
.addComponent<OnClickComponent>([](WAL::Entity &entity, WAL::Wal &)
{
auto &component = entity.getComponent<MusicComponent>();
component.turnDownVolume();
})
.addComponent<OnHoverComponent>([](WAL::Entity &entity, WAL::Wal &)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());