Refactor small issues

- move spawn point position generation to the 'util::random' namespace
- add default initialization to primitives
- remove redudant includes
- add 'const' to local variables where appropriate
- rename 'move' function to avoid naming conflicts

Author: NikolaJelic

src/enemy.cpp

@@ -1,6 +1,5 @@
 #include <enemy.hpp>
 #include <algorithm>
-#include <numbers>
 #include "glm/ext/vector_float2.hpp"
 #include "glm/geometric.hpp"
 #include "kvf/color.hpp"
@@ -11,21 +10,18 @@ Enemy::Enemy(gsl::not_null<le::ServiceLocator const*> services, glm::vec2 target
 	: m_services(services), m_target_pos(target_pos), m_move_speed(move_speed) {
 	m_sprite.create(50.0f, kvf::red_v);
 	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
-	m_sprite.transform.position = generate_spawn_pos(framebuffer_size);
+	auto const radius = static_cast<float>(std::max(framebuffer_size.x, framebuffer_size.y)) / 2.0f;
+
+	m_sprite.transform.position = util::get_random_location_on_radius(radius);
 	// TODO: add proper textures
 }
 
 void Enemy::render(le::Renderer& renderer) const { m_sprite.draw(renderer); }
 
-void Enemy::move(kvf::Seconds const dt) {
-	glm::vec2 direction = glm::normalize(m_target_pos - m_sprite.transform.position);
-	glm::vec2 movement = direction * m_move_speed * dt.count();
+void Enemy::translate(kvf::Seconds const dt) {
+	glm::vec2 const direction = glm::normalize(m_target_pos - m_sprite.transform.position);
+	glm::vec2 const movement = direction * m_move_speed * dt.count();
 	m_sprite.transform.position += movement;
 }
 
-glm::vec2 Enemy::generate_spawn_pos(glm::vec2 screen_size) {
-	float radius = std::max(screen_size.x, screen_size.y) / 2.0f;
-	float angle = util::random_range(0.0f, 2.0f * std::numbers::pi_v<float>);
-	return {radius * std::cos(angle), radius * std::sin(angle)};
-}
 } // namespace miracle

src/enemy.hpp

@@ -16,15 +16,13 @@ class Enemy {
 	explicit Enemy(gsl::not_null<le::ServiceLocator const*> services, glm::vec2 target_pos, float move_speed);
 
 	void render(le::Renderer& renderer) const;
-	void move(kvf::Seconds dt);
+	void translate(kvf::Seconds dt);
 
   private:
-	static glm::vec2 generate_spawn_pos(glm::vec2 screen_size);
-
 	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;
+	glm::vec2 m_target_pos{};
+	float m_move_speed{};
 };
 } // namespace miracle

src/game.cpp

@@ -1,7 +1,6 @@
 #include <game.hpp>
 #include <glm/gtx/norm.hpp>
 #include <le2d/context.hpp>
-#include "glm/ext/vector_float2.hpp"
 #include "lighhouse.hpp"
 
 namespace miracle {
@@ -17,7 +16,7 @@ void Game::on_cursor_pos(le::event::CursorPos const& cursor_pos) {
 void Game::tick([[maybe_unused]] kvf::Seconds const dt) {
 	m_circle.transform.position = m_cursor_pos;
 	m_lighthouse.rotate_towards_cursor(m_cursor_pos);
-	m_enemy.move(dt);
+	m_enemy.translate(dt);
 }
 
 void Game::render(le::Renderer& renderer) const {

src/lighthouse.cpp

@@ -7,7 +7,7 @@ Lighthouse::Lighthouse(gsl::not_null<le::ServiceLocator const*> services) : m_se
 	m_sprite.create(200.0f);
 	auto const& data_loader = services->get<le::IDataLoader>();
 	auto const& context = services->get<le::Context>();
-	auto asset_loader = le::AssetLoader{&data_loader, &context};
+	auto const asset_loader = le::AssetLoader{&data_loader, &context};
 	m_texture = asset_loader.load_texture("images/lighthouse.png");
 	m_sprite.texture = &m_texture.value();
 }

src/util/random.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <glm/ext/vector_float2.hpp>
 #include <klib/assert.hpp>
 #include <klib/concepts.hpp>
 #include <random>
@@ -34,4 +35,9 @@ template <klib::NumberT Type>
 	KLIB_ASSERT(size > 0);
 	return Random::in_range(0uz, size - 1);
 }
+// Returns a random coordinate on the specified radius
+[[nodiscard]] static auto get_random_location_on_radius(float radius) -> glm::vec2 {
+	float const angle = random_range(0.0f, 2.0f * std::numbers::pi_v<float>);
+	return {radius * std::cos(angle), radius * std::sin(angle)};
+}
 } // namespace miracle::util