Add simple score tracking and display

Author: NikolaJelic

assets/fonts/specialElite.ttf

@@ -2,15 +2,29 @@
 #include <glm/gtx/norm.hpp>
 #include <le2d/context.hpp>
 #include <cstddef>
+#include <string>
 #include <vector>
 #include "enemy.hpp"
 #include "enemy_params.hpp"
 #include "kvf/time.hpp"
+#include "le2d/asset_loader.hpp"
+#include "le2d/data_loader.hpp"
+#include "le2d/drawable/text.hpp"
 #include "lighhouse.hpp"
 #include "util/random.hpp"
 
 namespace miracle {
-Game::Game(gsl::not_null<le::ServiceLocator const*> services) : m_services(services), m_lighthouse(services), m_light(services) { spawn_wave(); }
+Game::Game(gsl::not_null<le::ServiceLocator const*> services)
+	: m_services(services), m_lighthouse(services), m_light(services), m_score_text(le::drawable::Text()) {
+	spawn_wave();
+	auto const& data_loader = services->get<le::IDataLoader>();
+	auto const& context = services->get<le::Context>();
+	auto const asset_loader = le::AssetLoader{&data_loader, &context};
+	m_font = asset_loader.load_font("fonts/specialElite.ttf");
+	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
+
+	m_score_text.transform.position.y = static_cast<float>(framebuffer_size.y) / 2.0f - 50.0f;
+}
 
 void Game::on_cursor_pos(le::event::CursorPos const& cursor_pos) {
 	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
@@ -25,10 +39,12 @@ void Game::tick([[maybe_unused]] kvf::Seconds const dt) {
 		m_time_since_last_wave_spawn = kvf::Seconds{};
 	}
 	for (auto& enemy : m_enemies) {
-		 m_light.check_enemy_collision(enemy);
+		m_light.check_enemy_collision(enemy);
 		enemy.translate(dt);
 	}
-	std::erase_if(m_enemies, [](Enemy const& enemy) { return !enemy.get_health(); });
+	// Keep track of how many enemies were defeated and calculate score
+	auto res = std::erase_if(m_enemies, [](Enemy const& enemy) { return !enemy.get_health(); });
+	increase_score(res * 10);
 	m_light.set_position(m_cursor_pos);
 	m_lighthouse.rotate_towards_cursor(m_cursor_pos);
 }
@@ -37,6 +53,7 @@ void Game::render(le::Renderer& renderer) const {
 	m_light.render(renderer);
 	m_lighthouse.render(renderer);
 	for (auto const& enemy : m_enemies) { enemy.render(renderer); }
+	m_score_text.draw(renderer);
 }
 
 void Game::spawn_wave() {
@@ -50,4 +67,9 @@ void Game::spawn_wave() {
 	}
 	m_enemies.insert(m_enemies.end(), std::make_move_iterator(new_wave.begin()), std::make_move_iterator(new_wave.end()));
 }
+
+void Game::increase_score(std::size_t points) {
+	m_score += points;
+	m_score_text.set_string(m_font, "Score: " + std::to_string(m_score));
+}
 } // namespace miracle

src/game.cpp

@@ -6,6 +6,8 @@
 #include <le2d/service_locator.hpp>
 #include <cstddef>
 #include "enemy.hpp"
+#include "le2d/drawable/text.hpp"
+#include "le2d/font.hpp"
 #include "lighhouse.hpp"
 #include "light.hpp"
 
@@ -18,11 +20,15 @@ class Game {
 
 	void tick(kvf::Seconds dt);
 	void render(le::Renderer& renderer) const;
+	void increase_score(std::size_t points);
+	[[nodiscard]] std::string get_score_string() const;
 	void spawn_wave();
 
   private:
 	gsl::not_null<le::ServiceLocator const*> m_services;
 
+	le::Font m_font{};
+	le::drawable::Text m_score_text{};
 	Light m_light;
 	Lighthouse m_lighthouse;
 	glm::vec2 m_cursor_pos{};
@@ -31,5 +37,6 @@ class Game {
 	kvf::Seconds m_wave_interval{};
 	kvf::Seconds m_time_since_last_wave_spawn{};
 	std::vector<Enemy> m_enemies{};
+	std::size_t m_score{};
 };
 } // namespace miracle