Add simple collision detection

and enemy removal

Author: NikolaJelic

src/enemy.cpp

@@ -7,8 +7,8 @@
 
 namespace miracle {
 Enemy::Enemy(gsl::not_null<le::ServiceLocator const*> services, glm::vec2 target_pos, float move_speed)
-	: m_services(services), m_target_pos(target_pos), m_move_speed(move_speed) {
-	m_sprite.create(50.0f, kvf::red_v);
+	: m_services(services), m_target_pos(target_pos), m_move_speed(move_speed), m_diameter(util::random_range(40.0f, 60.0f)) {
+	m_sprite.create(m_diameter, kvf::red_v);
 	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
 	auto const radius = static_cast<float>(std::max(framebuffer_size.x, framebuffer_size.y)) / 2.0f;
 
@@ -24,4 +24,8 @@ 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; }
+}
+
 } // namespace miracle

src/enemy.hpp

@@ -17,12 +17,17 @@ 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);
+	[[nodiscard]] std::size_t get_health() const { return m_health; }
 
   private:
 	gsl::not_null<le::ServiceLocator const*> m_services;
 	std::optional<le::Texture> m_texture;
 	le::drawable::Circle m_sprite{};
 	glm::vec2 m_target_pos{};
 	float m_move_speed{};
+	float m_diameter{};
+	std::size_t m_health{100};
 };
 } // namespace miracle

src/game.cpp

@@ -1,6 +1,7 @@
 #include <game.hpp>
 #include <glm/gtx/norm.hpp>
 #include <le2d/context.hpp>
+#include <algorithm>
 #include <cstddef>
 #include <vector>
 #include "enemy.hpp"
@@ -26,7 +27,11 @@ void Game::tick([[maybe_unused]] kvf::Seconds const dt) {
 		spawn_wave();
 		m_time_since_last_wave_spawn = kvf::Seconds{};
 	}
-	for (auto& enemy : m_enemies) { enemy.translate(dt); }
+	for (auto& enemy : m_enemies) {
+		enemy.check_collision(m_circle.transform.position, 50.0f);
+		enemy.translate(dt);
+	}
+	std::erase_if(m_enemies, [](Enemy const& enemy) { return !enemy.get_health(); });
 	m_circle.transform.position = m_cursor_pos;
 	m_lighthouse.rotate_towards_cursor(m_cursor_pos);
 }