feature: DJ drop the beat

TheSwiftKnight · Jun 23, 2024 · 6bbf703 · 6bbf703
1 parent fbbaae9
commit 6bbf703
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 16 deletions.
diff --git a/Engine/AudioHelper.cpp b/Engine/AudioHelper.cpp
@@ -5,8 +5,8 @@
 #include "LOG.hpp"
 #include "Resources.hpp"
 
-float AudioHelper::BGMVolume = 0;
-float AudioHelper::SFXVolume = 0;
+float AudioHelper::BGMVolume = 1.0;
+float AudioHelper::SFXVolume = 1.0;
 ALLEGRO_SAMPLE_ID AudioHelper::PlayAudio(const std::string& audio) {
 	ALLEGRO_SAMPLE* sample = Engine::Resources::GetInstance().GetSample(audio).get();
 	ALLEGRO_SAMPLE_ID id;

diff --git a/Resource/audios/win.wav → Resource/audios/_win.wav b/Resource/audios/win.wav → Resource/audios/_win.wav
diff --git a/Resource/audios/astronomia.ogg b/Resource/audios/astronomia.ogg
diff --git a/Resource/audios/lose.ogg b/Resource/audios/lose.ogg
diff --git a/Resource/audios/play.ogg b/Resource/audios/play.ogg
diff --git a/Resource/audios/start.ogg b/Resource/audios/start.ogg
diff --git a/Resource/audios/win.ogg b/Resource/audios/win.ogg
diff --git a/Scene/LoseScene.cpp b/Scene/LoseScene.cpp
@@ -34,8 +34,8 @@ void LoseScene::Initialize() {
 	btn->SetOnClickCallback(std::bind(&LoseScene::BackOnClick, this, 2));
 	AddNewControlObject(btn);
 	AddNewObject(new Engine::Label("Back", "pirulen.ttf", 48, halfW, halfH * 7 / 4, 0, 0, 0, 255, 0.5, 0.5));
-    bgmInstance = AudioHelper::PlaySample("astronomia.ogg", false, AudioHelper::BGMVolume, PlayScene::DangerTime);
-
+    // bgmInstance = AudioHelper::PlaySample("lose.ogg", false, AudioHelper::BGMVolume, PlayScene::DangerTime);
+	bgmId = AudioHelper::PlayAudio("lose.ogg");
 //name input
 	playerName = "";
 	playerNameLabel = new Engine::Label("Name: "+ playerName, "pirulen.ttf", 48, halfW, halfH / 4 +50, 255, 255, 255, 255, 0.5, 0.5);
@@ -44,8 +44,8 @@ void LoseScene::Initialize() {
 
 }
 void LoseScene::Terminate() {
-	AudioHelper::StopSample(bgmInstance);
-	bgmInstance = std::shared_ptr<ALLEGRO_SAMPLE_INSTANCE>();
+	AudioHelper::StopBGM(bgmId);
+	// bgmInstance = std::shared_ptr<ALLEGRO_SAMPLE_INSTANCE>();
 	IScene::Terminate();
 }
 void LoseScene::BackOnClick(int stage) {

diff --git a/Scene/LoseScene.hpp b/Scene/LoseScene.hpp
@@ -10,6 +10,7 @@
 
 class LoseScene final : public Engine::IScene {
 private:
+	ALLEGRO_SAMPLE_ID bgmId;
 	std::shared_ptr<ALLEGRO_SAMPLE_INSTANCE> bgmInstance;
 public:
 	std::string playerName;

diff --git a/Scene/PlayScene.cpp b/Scene/PlayScene.cpp
@@ -93,7 +93,7 @@ void PlayScene::Initialize() {
 	preview = nullptr;
 	UIGroup->AddNewObject(imgTarget);
 	// Preload Lose Scene
-	deathBGMInstance = Engine::Resources::GetInstance().GetSampleInstance("astronomia.ogg");
+	deathBGMInstance = Engine::Resources::GetInstance().GetSampleInstance("lose.ogg");
 	Engine::Resources::GetInstance().GetBitmap("lose/benjamin-happy.png");
 	// Start BGM.
 	bgmId = AudioHelper::PlayBGM("play.ogg");

diff --git a/Scene/SettingsScene.cpp b/Scene/SettingsScene.cpp
@@ -51,7 +51,7 @@ void SettingsScene::Initialize() {
             new Engine::Label("SFX: ", "pirulen.ttf", 28, 40 + halfW - 60 - 95, halfH + 50, 255, 255, 255, 255, 0.5,
                               0.5));
     // Not safe if release resource while playing, however we only free while change scene, so it's fine.
-    bgmInstance = AudioHelper::PlaySample("select.ogg", true, AudioHelper::BGMVolume);
+    bgmInstance = AudioHelper::PlaySample("start.ogg", true, AudioHelper::BGMVolume);
     sliderBGM->SetValue(AudioHelper::BGMVolume);
     sliderSFX->SetValue(AudioHelper::SFXVolume);
 }

diff --git a/Scene/StageSelectScene.cpp b/Scene/StageSelectScene.cpp
@@ -39,7 +39,7 @@ void StageSelectScene::Initialize() {
     AddNewObject(new Engine::Label("Scoreboard", "pirulen.ttf", 36, halfW, halfH / 2 + 300, 0, 0, 0, 255, 0.5, 0.5));
 
     // Not safe if release resource while playing, however we only free while change scene, so it's fine.
-	bgmInstance = AudioHelper::PlaySample("select.ogg", true, AudioHelper::BGMVolume);
+	bgmInstance = AudioHelper::PlaySample("start.ogg", true, AudioHelper::BGMVolume);
 }
 void StageSelectScene::Terminate() {
 	AudioHelper::StopSample(bgmInstance);

diff --git a/Scene/StartScene.cpp b/Scene/StartScene.cpp
@@ -38,7 +38,7 @@ void StartScene::Initialize() {
     btn->SetOnClickCallback(std::bind(&StartScene::SettingsOnClick, this, 2));
     AddNewControlObject(btn);
     AddNewObject(new Engine::Label("Settings", "pirulen.ttf", 48, halfW, halfH * 3 / 2, 0, 0, 0, 255, 0.5, 0.5));
-    bgmInstance = AudioHelper::PlaySample("select.ogg", true, AudioHelper::BGMVolume);
+    bgmInstance = AudioHelper::PlaySample("start.ogg", true, AudioHelper::BGMVolume);
 }
 void StartScene::Terminate() {
     AudioHelper::StopSample(bgmInstance);

diff --git a/Scene/WinScene.cpp b/Scene/WinScene.cpp
@@ -29,7 +29,7 @@ void WinScene::Initialize() {
 	AddNewObject(new Engine::Image("win/benjamin-sad.png", halfW, halfH +50, 0, 0, 0.5, 0.5));
 	AddNewObject(new Engine::Label("You Win!", "pirulen.ttf", 48, halfW, halfH / 4 -10, 255, 255, 255, 255, 0.5, 0.5));
 	Engine::ImageButton* btn;
-	bgmId = AudioHelper::PlayAudio("win.wav");
+	bgmId = AudioHelper::PlayAudio("win.ogg");
 
 	//name input
 	playerName = "";
@@ -48,11 +48,11 @@ void WinScene::Terminate() {
 }
 void WinScene::Update(float deltaTime) {
 	ticks += deltaTime;
-	if (ticks > 4 && ticks < 100 &&
-		dynamic_cast<PlayScene*>(Engine::GameEngine::GetInstance().GetScene("play"))->MapId == 2) {
-		ticks = 100;
-		bgmId = AudioHelper::PlayBGM("happy.ogg");
-	}
+	// if (ticks > 4 && ticks < 100 &&
+	// 	dynamic_cast<PlayScene*>(Engine::GameEngine::GetInstance().GetScene("play"))->MapId == 2) {
+	// 	ticks = 100;
+	// 	bgmId = AudioHelper::PlayBGM("happy.ogg");
+	// }
 }
 void WinScene::BackOnClick(int stage) {
 	// Change to select scene.