raylib-cpp progress

include/td/misc/Signal.h

@@ -33,7 +33,7 @@ class SignalRaw : private NonCopyable {
 
 	void operator()(Args... args) const {
 		for (const CallBack& callback : m_Callbacks) {
-			callback->operator()(args...);
+			callback->operator()(std::forward<Args>(args)...);
 		}
 	}
 };
@@ -64,9 +64,9 @@ class Signal {
 		m_Signal->Connect(std::make_shared<CallBackRaw>(a_Callback));
 	}
 
-	[[nodiscard]] std::unique_ptr<ConnectionGuard> ConnectSafe(const CallBack& a_Callback) {
+	[[nodiscard]] std::shared_ptr<ConnectionGuard> ConnectSafe(const CallBack& a_Callback) {
 		m_Signal->Connect(a_Callback);
-		return std::make_unique<ConnectionGuard>(*this, a_Callback);
+		return std::make_shared<ConnectionGuard>(*this, a_Callback);
 	}
 
 	void Disconnect(const CallBack& a_Callback) {

include/td/misc/SlotGuard.h

@@ -12,7 +12,7 @@ namespace utils {
  */
 class SlotGuard {
   private:
-	std::vector<std::unique_ptr<Connection>> m_Connections;
+	std::vector<std::shared_ptr<Connection>> m_Connections;
 
   public:
 	/**
@@ -21,7 +21,7 @@ class SlotGuard {
 	template <typename... Args>
 	void Connect(Signal<Args...> a_Signal, const typename Signal<Args...>::CallBack::element_type& a_Callback) {
 		auto ptr = std::make_shared<typename Signal<Args...>::CallBack::element_type>(a_Callback);
-		m_Connections.push_back(a_Signal.ConnectSafe(ptr));
+		m_Connections.emplace_back(a_Signal.ConnectSafe(ptr));
 	}
 
 	void Disconnect() {

include/td/render/RayGui.h

@@ -0,0 +1,11 @@
+#pragma once
+
+// extern "C" {
+// 	#include <raygui.h>
+// }
+
+extern "C" {
+	#include <rlImGui.h>
+}
+
+#include <imgui.h>

include/td/render/Renderer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include <raylib.h>
+#include <raylib-cpp/Camera3D.hpp>
 #include <td/render/loader/GLLoader.h>
 #include <td/render/shader/CameraShaderProgram.h>
 #include <td/misc/SlotGuard.h>
@@ -21,10 +21,10 @@ template <typename TShader>
 class Renderer : public BasicRenderer, private utils::SlotGuard {
   protected:
 	std::unique_ptr<TShader> m_Shader;
-	Camera& m_Camera;
+	raylib::Camera& m_Camera;
 
   public:
-	Renderer(Camera& a_Camera);
+	Renderer(raylib::Camera& a_Camera);
 	virtual ~Renderer() {}
 
 	template <typename T>
@@ -42,7 +42,7 @@ class RenderPipeline {
 	virtual ~RenderPipeline() {}
 
 	template <typename T, typename... Args>
-	T& AddRenderer(Args&&... args) {
+	T& AddRenderer(Args... args) {
 		auto ptr = std::make_unique<T>(args...);
 		auto rawPtr = ptr.get();
 		m_Renderers.push_back(std::move(ptr));
@@ -65,7 +65,7 @@ class RenderPipeline {
 
 
 template <typename TShader>
-Renderer<TShader>::Renderer(Camera& a_Camera) : m_Shader(std::make_unique<TShader>()), m_Camera(a_Camera) {
+Renderer<TShader>::Renderer(raylib::Camera& a_Camera) : m_Shader(std::make_unique<TShader>()), m_Camera(a_Camera) {
 	// Connect(a_Camera.OnPerspectiveChange, [this](){
 	// 	// m_Shader->Start();
 	// 	m_Shader->SetProjectionMatrix(m_Camera.GetProjectionMatrix());

include/td/render/loader/WorldLoader.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <td/game/World.h>
-#include <raylib.h>
+#include <raylib-cpp/Mesh.hpp>
 
 namespace td {
 namespace render {

include/td/render/renderer/EntityRenderer.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <raylib.h>
 #include <td/render/Renderer.h>
 #include <td/render/shader/EntityShader.h>
 #include <td/game/World.h>
+#include <raylib-cpp/Model.hpp>
 
 namespace td {
 namespace render {
@@ -11,11 +11,11 @@ namespace render {
 class EntityRenderer : public Renderer<shader::EntityShader> {
   private:
 	game::WorldPtr m_World;
-	Model m_ZombieModel;
+	raylib::Model m_ZombieModel;
 	Texture2D m_ZombieTexture;
 
   public:
-	EntityRenderer(Camera& a_Camera, const game::WorldPtr& a_World);
+	EntityRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World);
 	virtual ~EntityRenderer();
 
 	virtual void Render(float a_Lerp) override;

include/td/render/renderer/TowerRenderer.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include <raylib.h>
 #include <td/render/Renderer.h>
 #include <td/render/shader/EntityShader.h>
 #include <td/game/World.h>
+#include <raylib-cpp/Model.hpp>
+#include <raylib-cpp/Texture.hpp>
 
 namespace td {
 namespace render {
@@ -11,11 +12,11 @@ namespace render {
 class TowerRenderer : public Renderer<shader::EntityShader> {
   private:
 	game::WorldPtr m_World;
-	Model m_TowerModel;
-	Texture2D m_TowerTexture;
+	raylib::Model m_TowerModel;
+	raylib::Texture2D m_TowerTexture;
 
   public:
-	TowerRenderer(Camera& a_Camera, const game::WorldPtr& a_World);
+	TowerRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World);
 	virtual ~TowerRenderer();
 
 	virtual void Render(float a_Lerp) override;

include/td/render/renderer/WorldRenderer.h

@@ -4,16 +4,17 @@
 #include <td/render/Renderer.h>
 #include <td/render/loader/GLLoader.h>
 #include <td/render/shader/WorldShader.h>
+#include <raylib-cpp/Model.hpp>
 
 namespace td {
 namespace render {
 
 class WorldRenderer : public Renderer<shader::WorldShader> {
   private:
-	Model m_WorldModel;
+	std::unique_ptr<raylib::Model> m_WorldModel;
 
   public:
-	WorldRenderer(Camera& a_Camera, const game::WorldPtr& a_World);
+	WorldRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World);
 	virtual ~WorldRenderer();
 
 	virtual void Render(float a_Lerp) override;

include/td/render/shader/CameraShaderProgram.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <raylib.h>
 #include <td/Maths.h>
 
 namespace td {