- Update: Sound Manager, Score Manager, Levels, Backgrounds

Author: rasikhq

CApplication.cpp

@@ -3,17 +3,16 @@
 // Main functions
 
 bool CApplication::LoadTextures() {
-	m_Textures["Player"] = sf::Texture();
-	m_Textures["Missile"] = sf::Texture();
-	m_Textures["Env_BG"] = sf::Texture();
-	m_Textures["Rock"] = sf::Texture();
-
 	if(!m_Textures["Player"].loadFromFile("data/textures/player.png"))
 		return false;
 	if(!m_Textures["Missile"].loadFromFile("data/textures/missile.png"))
 		return false;
-	if(!m_Textures["Env_BG"].loadFromFile("data/textures/env_bg.png"))
+	// Levels
+	if(!m_Textures["level_1"].loadFromFile("data/textures/levels/level_1.png"))
+		return false;
+	if(!m_Textures["level_2"].loadFromFile("data/textures/levels/level_2.png"))
 		return false;
+	// Items
 	if(!m_Textures["Rock"].loadFromFile("data/textures/meteor.png"))
 		return false;
 	if(!m_Textures["Health"].loadFromFile("data/textures/health.png"))
@@ -186,13 +185,14 @@ void CApplication::Game_movePlayer(float& dt, signed short int direction) {
 }
 
 // Game - Environment
-void CApplication::Game_createEnvironment() {
+void CApplication::Game_createEnvironment(std::string envTexture, bool setSmooth, bool setRepeated) {
 	// Texture settings
-	m_Textures["Env_BG"].setSmooth(true);
-	m_Textures["Env_BG"].setRepeated(true);
+	m_Textures[envTexture].setSmooth(setSmooth);
+	m_Textures[envTexture].setRepeated(setRepeated);
 
-	m_EnvironmentBackground.setTexture(m_Textures["Env_BG"]);
-	m_EnvironmentBackground.setTextureRect(sf::IntRect(sf::Vector2i(0, 0), sf::Vector2i(m_Textures["Env_BG"].getSize().x * 2, m_Textures["Env_BG"].getSize().y)));
+	m_EnvironmentBackground.setTexture(m_Textures[envTexture]);
+	//m_EnvironmentBackground.setScale(m_Window->getView().getSize().x / m_EnvironmentBackground.getLocalBounds().width, m_Window->getView().getSize().y / m_EnvironmentBackground.getLocalBounds().height);
+	m_EnvironmentBackground.setTextureRect(sf::IntRect(sf::Vector2i(0, 0), sf::Vector2i(m_Window->getSize().x*2, m_Window->getSize().y)));
 	m_EnvironmentBackground.setPosition(0, 0);
 }
 
@@ -209,8 +209,7 @@ void CApplication::Game_drawEnvironment(float& dt) {
 
 // Game - Rocks Manager
 void CApplication::Game_createItemsManager() {
-	for(std::unordered_map<std::string, sf::Texture>::iterator it = m_Textures.begin(); it != m_Textures.end(); it++) {
-		it->second.setSmooth(true);
-	}
+	m_Textures["Rock"].setSmooth(true);
+	m_Textures["Health"].setSmooth(true);
 	m_Items = new CItemsManager();
 }

CPlayer.cpp

@@ -11,11 +11,11 @@ CPlayer::CPlayer(sf::Texture& playerTexture, sf::Texture& missileTexture)
 	m_Missile.setTexture(missileTexture);
 
 	m_Health.setFillColor(sf::Color::Green);
-	m_Health.setPosition(Game.m_Window->getSize().x * 0.5f, Game.m_Window->getSize().y * 0.02f);
+	m_Health.setPosition(Game.m_Window->getSize().x * 0.725f, Game.m_Window->getSize().y * 0.02f);
 
 	m_HealthBackground.setFillColor(sf::Color::Color(50, 50, 50, 200));
 	m_HealthBackground.setSize({200.0f + 2.0f, 15.0f + 2.0f});
-	m_HealthBackground.setPosition(Game.m_Window->getSize().x * 0.5f - 1, Game.m_Window->getSize().y * 0.02f - 1);
+	m_HealthBackground.setPosition(m_Health.getPosition().x- 1, m_Health.getPosition().y - 1);
 }
 
 CPlayer::~CPlayer()

CScoreManager.cpp

@@ -24,6 +24,10 @@ void CScoreManager::update() {
 	m_Score.setString("Score: " + std::to_string(m_Points));
 	m_Best.setString("Best Score: " + std::to_string(m_BestPoints));
 	m_Best.setPosition(m_Score.getGlobalBounds().width + m_Score.getCharacterSize(), 5);
+
+	if(m_Points == 50) {
+		Game.Game_createEnvironment("level_2");
+	}
 }
 
 void CScoreManager::reset() {

CSoundManager.cpp

@@ -28,7 +28,7 @@ void CSoundManager::playSound(std::string fileName, bool loop) {
 	m_Sounds.push_back(sound);
 }
 
-void CSoundManager::playMusic(std::string fileName, bool loop) {
+void CSoundManager::playMusic(std::string fileName, bool loop, std::string soundID) {
 	sf::Music* music = new sf::Music();
 	if(!music->openFromFile("data/sounds/" + fileName)) {
 		std::cout << "[CSoundManager] Unable to load music: " << fileName << std::endl;
@@ -37,7 +37,15 @@ void CSoundManager::playMusic(std::string fileName, bool loop) {
 	}
 	music->setLoop(loop);
 	music->play();
-	m_Musics.push_back(music);
+	m_Musics[soundID] = music;
+}
+
+void CSoundManager::stopMusic(std::string soundID) {
+	if(m_Musics.find(soundID) == m_Musics.end())
+		return;
+
+	delete m_Musics[soundID];
+	m_Musics.erase(soundID);
 }
 
 void CSoundManager::update() {
@@ -50,4 +58,14 @@ void CSoundManager::update() {
 			sound_it++;
 		}
 	}
+
+	std::unordered_map<std::string, sf::Music*>::const_iterator music_it;
+	for(music_it = m_Musics.begin(); music_it != m_Musics.end();) {
+		if(music_it->second->getStatus() == sf::Music::Stopped) {
+			delete (music_it->second);
+			music_it = m_Musics.erase(music_it);
+		} else {
+			music_it++;
+		}
+	}
 }

data/textures/env_bg.png data/textures/levels/level_1.png

@@ -1,6 +1,7 @@
 #pragma once
 #include <SFML/Graphics.hpp>
 #include <iostream>
+#include <sstream>
 #include <unordered_map>
 
 #include "CPlayer.h"
@@ -44,14 +45,14 @@ struct CApplication {
 		m_EndMenu.m_Buttons.at(1).m_Colors["hover"] = sf::Color::Yellow;
 
 		// Set up game
-		Game_createEnvironment();
+		Game_createEnvironment("level_1");
 		Game_createPlayer();
 		Game_createItemsManager();
 
 		m_SoundManager->createAudio("death.ogg");
 		m_SoundManager->createAudio("hit.ogg");
 
-		//m_SoundManager->playMusic("bg.ogg", true);
+		m_SoundManager->playMusic("bg.ogg", true, "Background Music");
 
 		// Title screen
 		m_GameTitleScreen.setFont(*m_Font);
@@ -115,7 +116,7 @@ struct CApplication {
 	void Game_destroyPlayer(bool = false);
 	void Game_movePlayer(float&, signed short int = 0);
 
-	void Game_createEnvironment();
+	void Game_createEnvironment(std::string, bool = true, bool = true);
 	void Game_drawEnvironment(float&);
 
 	void Game_createItemsManager();

data/textures/levels/level_2.png

@@ -15,13 +15,19 @@ class CScoreManager
 		return *this;
 	}
 
+	inline void setLevel(signed short int lvl) { m_Level = lvl; }
+	inline signed short int getLevel() { return m_Level; }
+
+	inline signed short int getPoints() { return m_Points; }
+
 	void update();
 	void reset();
 	void draw();
 private:
 	sf::Text m_Score;
 	sf::Text m_Best;
 
+	signed short int m_Level = 1;
 	signed short int m_Points;
 	signed short int m_BestPoints;
 };

include/CApplication.h

@@ -14,13 +14,15 @@ class CSoundManager
 	void createAudio(std::string);
 
 	void playSound(std::string, bool = false);
-	void playMusic(std::string, bool = false);
+	void playMusic(std::string, bool, std::string);
+
+	void stopMusic(std::string);
 
 	void update();
 private:
 	std::unordered_map<std::string, sf::SoundBuffer> m_Buffers;
 
 	std::vector<sf::Sound*> m_Sounds;
-	std::vector<sf::Music*> m_Musics;
+	std::unordered_map<std::string, sf::Music*> m_Musics;
 };
 

include/CScoreManager.h

@@ -21,7 +21,7 @@ int main(int argsc, char** args)
 		Game.m_Window->setTitle(ss.str());
 	}
 
-	//ShowWindow(GetConsoleWindow(), SW_HIDE);
+	ShowWindow(GetConsoleWindow(), SW_HIDE);
 
 	srand((unsigned int)time(NULL));