BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Publishes some bgm sounds

Browse Source
This commit is contained in:
Stiffly
2014-06-05 03:14:45 +02:00
parent 76a9081d4b
commit 09971b2d77
6 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: d013629690...5357a0c4e1
src/GUI/GameFrame.h
+3 -3
View File
@@ -41,10 +41,10 @@ public:
m_FreeCamViewport = new Viewport(m_WorldFrame, "ViewportFreeCam", m_World); m_FreeCamViewport = new Viewport(m_WorldFrame, "ViewportFreeCam", m_World);
m_FreeCamViewport->Hide(); m_FreeCamViewport->Hide();
} }
//m_WorldFrame->Hide(); m_WorldFrame->Hide();
//m_MainMenuFrame = new MainMenuFrame(this, "MainMenu");
m_World->Initialize(); m_World->Initialize();
m_MainMenuFrame = new MainMenuFrame(this, "MainMenu");
} }
private: private:
src/GUI/MainMenuFrame.h
+10 -2
View File
@@ -5,6 +5,7 @@
#include "GUI/HealthOverlay.h" #include "GUI/HealthOverlay.h"
#include "Events/GameStart.h" #include "Events/GameStart.h"
#include "Events/PlayBGM.h"
namespace GUI namespace GUI
{ {
@@ -27,6 +28,10 @@ public:
m_TargetCoordinate = m_CurrentCoordinate; m_TargetCoordinate = m_CurrentCoordinate;
m_Buttons->X = m_CurrentCoordinate.x; m_Buttons->X = m_CurrentCoordinate.x;
m_Buttons->Y = m_CurrentCoordinate.y; m_Buttons->Y = m_CurrentCoordinate.y;
Events::PlayBGM e;
e.Resource = "Sounds/BGM/DiesIrae.mp3";
EventBroker->Publish(e);
} }
void Update(double dt) override void Update(double dt) override
@@ -74,8 +79,11 @@ protected:
if (m_CurrentSelection == 0) if (m_CurrentSelection == 0)
{ {
Hide(); Hide();
Events::GameStart e; Events::GameStart e1;
EventBroker->Publish(e); EventBroker->Publish(e1);
Events::PlayBGM e2;
e2.Resource = "Sounds/BGM/FlightOfTheBumblebee.mp3";
EventBroker->Publish(e2);
} }
// Quit // Quit
else if (m_CurrentSelection == 1) else if (m_CurrentSelection == 1)
src/Systems/GameStateSystem.cpp
+6 -3
View File
@@ -11,9 +11,12 @@ bool Systems::GameStateSystem::OnFlagCaptured(const Events::FlagCaptured &event)
{ {
m_InGame = false; m_InGame = false;
Events::GameOver e; Events::GameOver e1;
e.Winner = event.Player; e1.Winner = event.Player;
EventBroker->Publish(e); EventBroker->Publish(e1);
Events::PlayBGM e2;
e2.Resource = "Sounds/BGM/WilliamTellOverture.mp3";
EventBroker->Publish(e2);
return true; return true;
} }
src/Systems/GameStateSystem.h
+1
View File
@@ -8,6 +8,7 @@
#include "Components/Player.h" #include "Components/Player.h"
#include "Events/FlagCaptured.h" #include "Events/FlagCaptured.h"
#include "Events/GameOver.h" #include "Events/GameOver.h"
#include "Events/PlayBGM.h"
namespace Systems namespace Systems
{ {
src/Systems/SoundSystem.cpp
+7 -3
View File
@@ -166,11 +166,15 @@ bool Systems::SoundSystem::PlaySFX(const Events::PlaySFX &event)
bool Systems::SoundSystem::PlayBGM(const Events::PlayBGM &event) bool Systems::SoundSystem::PlayBGM(const Events::PlayBGM &event)
{ {
FMOD_RESULT result;
FMOD_Channel_Stop(m_BGMChannel); result = FMOD_Channel_Stop(m_BGMChannel);
if(result != FMOD_OK)
LOG_INFO("FMOD error! (%d) %s\n", result, FMOD_ErrorString(result));
Sound* sound = ResourceManager->Load<Sound>("Sound2D", event.Resource); Sound* sound = ResourceManager->Load<Sound>("Sound2D", event.Resource);
FMOD_System_PlaySound(m_System, FMOD_CHANNEL_FREE, *sound, false, &m_BGMChannel); result = FMOD_System_PlaySound(m_System, FMOD_CHANNEL_FREE, *sound, false, &m_BGMChannel);
if(result != FMOD_OK)
LOG_INFO("FMOD error! (%d) %s\n", result, FMOD_ErrorString(result));
FMOD_Channel_SetMode(m_BGMChannel, FMOD_LOOP_NORMAL); FMOD_Channel_SetMode(m_BGMChannel, FMOD_LOOP_NORMAL);
FMOD_Sound_SetLoopCount(*sound, -1); FMOD_Sound_SetLoopCount(*sound, -1);