Add Light class

- move light to separate class
- let light manage its effect on the enemies
- enemies take tick damage

Author: NikolaJelic

src/enemy.cpp

@@ -1,5 +1,6 @@
 #include <enemy.hpp>
 #include <algorithm>
+#include <utility>
 #include "enemy_params.hpp"
 #include "glm/geometric.hpp"
 #include "glm/vec2.hpp"
@@ -25,8 +26,7 @@ void Enemy::translate(kvf::Seconds const dt) {
 	m_sprite.transform.position += movement;
 }
 
-void Enemy::check_collision(glm::vec2 pos, float radius) {
-	if (glm::distance(pos, m_sprite.transform.position) < radius + m_diameter / 2) { m_health = 0; }
-}
+std::pair<glm::vec2, float> Enemy::get_pos_diameter() const { return {m_sprite.transform.position, m_diameter}; }
+void Enemy::take_damage(std::size_t dmg) { m_health = m_health = (dmg >= m_health) ? 0 : (m_health - dmg); }
 
 } // namespace miracle

src/enemy.hpp

@@ -6,6 +6,7 @@
 #include <le2d/event.hpp>
 #include <le2d/renderer.hpp>
 #include <le2d/service_locator.hpp>
+#include <cstddef>
 #include <optional>
 #include "enemy_params.hpp"
 #include "glm/vec2.hpp"
@@ -18,9 +19,9 @@ class Enemy {
 
 	void render(le::Renderer& renderer) const;
 	void translate(kvf::Seconds dt);
-	// There are temporary parameters, will take the light beam object once it is created
-	void check_collision(glm::vec2 pos, float radius);
+	void take_damage(std::size_t dmg);
 	[[nodiscard]] std::size_t get_health() const { return m_health; }
+	[[nodiscard]] std::pair<glm::vec2, float> get_pos_diameter() const;
 
   private:
 	gsl::not_null<le::ServiceLocator const*> m_services;

src/game.cpp

@@ -10,10 +10,7 @@
 #include "util/random.hpp"
 
 namespace miracle {
-Game::Game(gsl::not_null<le::ServiceLocator const*> services) : m_services(services), m_lighthouse(services) {
-	m_circle.create(70.0f);
-	spawn_wave();
-}
+Game::Game(gsl::not_null<le::ServiceLocator const*> services) : m_services(services), m_lighthouse(services), m_light(services) { spawn_wave(); }
 
 void Game::on_cursor_pos(le::event::CursorPos const& cursor_pos) {
 	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
@@ -28,16 +25,16 @@ void Game::tick([[maybe_unused]] kvf::Seconds const dt) {
 		m_time_since_last_wave_spawn = kvf::Seconds{};
 	}
 	for (auto& enemy : m_enemies) {
-		enemy.check_collision(m_circle.transform.position, 50.0f);
+		 m_light.check_enemy_collision(enemy);
 		enemy.translate(dt);
 	}
 	std::erase_if(m_enemies, [](Enemy const& enemy) { return !enemy.get_health(); });
-	m_circle.transform.position = m_cursor_pos;
+	m_light.set_position(m_cursor_pos);
 	m_lighthouse.rotate_towards_cursor(m_cursor_pos);
 }
 
 void Game::render(le::Renderer& renderer) const {
-	m_circle.draw(renderer);
+	m_light.render(renderer);
 	m_lighthouse.render(renderer);
 	for (auto const& enemy : m_enemies) { enemy.render(renderer); }
 }

src/game.hpp

@@ -7,6 +7,7 @@
 #include <cstddef>
 #include "enemy.hpp"
 #include "lighhouse.hpp"
+#include "light.hpp"
 
 namespace miracle {
 class Game {
@@ -22,7 +23,7 @@ class Game {
   private:
 	gsl::not_null<le::ServiceLocator const*> m_services;
 
-	le::drawable::Circle m_circle{};
+	Light m_light;
 	Lighthouse m_lighthouse;
 	glm::vec2 m_cursor_pos{};
 	std::size_t m_wave_count{};

src/light.cpp

@@ -0,0 +1,13 @@
+#include <light.hpp>
+#include "kvf/color.hpp"
+
+namespace miracle {
+Light::Light(gsl::not_null<le::ServiceLocator const*> services) : m_services(services), m_diameter(100) { m_sprite.create(150.0f, kvf::white_v); }
+
+void Light::check_enemy_collision(Enemy& enemy) {
+	auto [pos, diameter] = enemy.get_pos_diameter();
+	if (glm::distance(pos, m_sprite.transform.position) < (diameter + m_diameter)) { enemy.take_damage(1); }
+}
+void Light::render(le::Renderer& renderer) const { m_sprite.draw(renderer); }
+void Light::set_position(glm::vec2 cursor_pos) { m_sprite.transform.position = cursor_pos; }
+} // namespace miracle

src/light.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "enemy.hpp"
+#include "glm/vec2.hpp"
+#include "gsl/pointers"
+#include "le2d/drawable/shape.hpp"
+#include "le2d/renderer.hpp"
+#include "le2d/service_locator.hpp"
+#include "le2d/texture.hpp"
+
+namespace miracle {
+class Light {
+  public:
+	explicit Light(gsl::not_null<le::ServiceLocator const*> services);
+
+	void render(le::Renderer& renderer) const;
+	void set_position(glm::vec2 cursor_pos);
+	void check_enemy_collision(Enemy& enemy);
+
+  private:
+	gsl::not_null<le::ServiceLocator const*> m_services;
+	std::optional<le::Texture> m_texture;
+	le::drawable::Circle m_sprite{};
+	float m_diameter{};
+};
+} // namespace miracle