Refactor lighthouse

- Create Lighthouse class
- Add texture rendering with placeholder texture

Author: NikolaJelic

assets/images/lighthouse.png

@@ -1,17 +1,10 @@
 #include <game.hpp>
 #include <glm/gtx/norm.hpp>
 #include <le2d/context.hpp>
-#include <cmath>
+#include "lighhouse.hpp"
 
 namespace miracle {
-Game::Game(gsl::not_null<le::ServiceLocator const*> services) : m_services(services) {
-	m_triangle.vertices = {
-		le::Vertex{.position = {-50.0f, -50.0f}},
-		le::Vertex{.position = {+50.0f, -50.0f}},
-		le::Vertex{.position = {+0.0f, +75.0f}},
-	};
-	m_circle.create(50.0f);
-}
+Game::Game(gsl::not_null<le::ServiceLocator const*> services) : m_services(services), m_lighthouse(services) { m_circle.create(50.0f); }
 
 void Game::on_cursor_pos(le::event::CursorPos const& cursor_pos) {
 	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
@@ -20,20 +13,11 @@ 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;
-
-	auto const dist_sq = glm::length2(m_cursor_pos);
-	if (dist_sq > 0.1f) {
-		auto const dist = std::sqrt(dist_sq);
-		auto const normalized = m_cursor_pos / dist;
-		static constexpr auto up_v = glm::vec2{0.0f, 1.0f};
-		auto const dot = glm::dot(normalized, up_v);
-		auto const angle = glm::degrees(std::acos(dot));
-		m_triangle.transform.orientation = m_cursor_pos.x > 0.0f ? -angle : angle;
-	}
+	m_lighthouse.rotate_towards_cursor(m_cursor_pos);
 }
 
 void Game::render(le::Renderer& renderer) const {
-	m_triangle.draw(renderer);
 	m_circle.draw(renderer);
+	m_lighthouse.render(renderer);
 }
 } // namespace miracle

src/game.cpp

@@ -4,6 +4,7 @@
 #include <le2d/event.hpp>
 #include <le2d/renderer.hpp>
 #include <le2d/service_locator.hpp>
+#include "lighhouse.hpp"
 
 namespace miracle {
 class Game {
@@ -18,8 +19,8 @@ class Game {
   private:
 	gsl::not_null<le::ServiceLocator const*> m_services;
 
-	le::drawable::Triangle m_triangle{};
 	le::drawable::Circle m_circle{};
+	Lighthouse m_lighthouse;
 
 	glm::vec2 m_cursor_pos{};
 };

src/game.hpp

@@ -0,0 +1,24 @@
+#pragma once
+#include <glm/gtx/norm.hpp>
+#include <kvf/time.hpp>
+#include <le2d/context.hpp>
+#include <le2d/drawable/shape.hpp>
+#include <le2d/event.hpp>
+#include <le2d/renderer.hpp>
+#include <le2d/service_locator.hpp>
+#include "glm/ext/vector_float2.hpp"
+#include "gsl/pointers"
+#include "le2d/texture.hpp"
+namespace miracle {
+class Lighthouse {
+  public:
+	explicit Lighthouse(gsl::not_null<le::ServiceLocator const*> services);
+	void rotate_towards_cursor(glm::vec2 const& cursor_pos);
+	void render(le::Renderer& renderer) const;
+
+  private:
+	le::drawable::Circle m_sprite{};
+	std::optional<le::Texture> m_texture;
+	gsl::not_null<le::ServiceLocator const*> m_services;
+};
+} // namespace miracle

src/lighhouse.hpp

@@ -0,0 +1,29 @@
+#include <lighhouse.hpp>
+#include "le2d/asset_loader.hpp"
+#include "le2d/data_loader.hpp"
+
+namespace miracle {
+
+Lighthouse::Lighthouse(gsl::not_null<le::ServiceLocator const*> services) : m_services(services) {
+	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};
+	m_texture = asset_loader.load_texture("images/lighthouse.png");
+	m_sprite.texture = &m_texture.value();
+}
+void Lighthouse::rotate_towards_cursor(glm::vec2 const& cursor_pos) {
+	auto const dist_sq = glm::length2((cursor_pos));
+	if (dist_sq > 0.1f) {
+		auto const dist = std::sqrt(dist_sq);
+		auto const normalized = cursor_pos / dist;
+		static constexpr auto up_v = glm::vec2(0.01f, 1.0f);
+		auto const dot = glm::dot(normalized, up_v);
+		auto const angle = glm::degrees(std::acos(dot));
+		m_sprite.transform.orientation = cursor_pos.x > 0.0f ? -angle : angle;
+	}
+}
+
+void Lighthouse::render(le::Renderer& renderer) const { m_sprite.draw(renderer); }
+} // namespace miracle