2 Commits

Author SHA1 Message Date
550ff3aeec add basic camera controls 2026-01-01 20:58:28 +01:00
127fa1fcb8 add vec operations 2026-01-01 20:57:57 +01:00
6 changed files with 67 additions and 2 deletions

View File

@@ -183,6 +183,51 @@ T Lerp(T v0, T v1, T t) {
} // namespace maths } // namespace maths
template<typename T>
Vec2<T> operator+(const Vec2<T>& vect, const Vec2<T>& other) {
return {vect.x + other.x, vect.y + other.y};
}
template<typename T>
Vec2<T> operator- (const Vec2<T>& vect) {
return { -vect.x, -vect.y };
}
template<typename T>
Vec2<T> operator- (const Vec2<T>& vect, const Vec2<T>& other) {
return vect + (-other);
}
template<typename T>
Vec3<T> operator- (const Vec3<T>& vect) {
return { -vect.x, -vect.y, -vect.z };
}
template<typename T>
Vec3<T> operator+ (const Vec3<T>& vect, const Vec3<T>& other) {
return { vect.x + other.x, vect.y + other.y, vect.z + other.z };
}
template<typename T>
Vec3<T> operator- (const Vec3<T>& vect, const Vec3<T>& other) {
return vect + (-other);
}
template<typename T>
Vec4<T> operator- (const Vec4<T>& vect) {
return { -vect.x, -vect.y, -vect.z, -vect.w };
}
template<typename T>
Vec4<T> operator+ (const Vec4<T>& vect, const Vec4<T>& other) {
return { vect.x + other.x, vect.y + other.y, vect.z + other.z, vect.w + other.w };
}
template<typename T>
Vec4<T> operator- (const Vec4<T>& vect, const Vec4<T>& other) {
return vect + (-other);
}
template <typename T> template <typename T>
sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const Vec2<T>& a_Vec) { sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const Vec2<T>& a_Vec) {
return a_Buffer << a_Vec.x << a_Vec.y; return a_Buffer << a_Vec.x << a_Vec.y;

View File

@@ -35,6 +35,7 @@ class Camera {
void UpdatePerspective(float a_AspectRatio); void UpdatePerspective(float a_AspectRatio);
void SetCamPos(const Vec3f& a_NewPos); void SetCamPos(const Vec3f& a_NewPos);
const Vec3f& GetCamPos() const;
}; };
} // namespace render } // namespace render

View File

@@ -17,6 +17,9 @@ class WorldRenderer : public Renderer<shader::WorldShader> {
virtual ~WorldRenderer(); virtual ~WorldRenderer();
virtual void Render(float a_Lerp) override; virtual void Render(float a_Lerp) override;
private:
void UpdateControls();
}; };
} // namespace render } // namespace render

View File

@@ -1,3 +1,4 @@
#include "td/Maths.h"
#include <td/render/Camera.h> #include <td/render/Camera.h>
#include <cmath> #include <cmath>
@@ -24,5 +25,9 @@ void Camera::SetCamPos(const Vec3f& a_NewPos) {
OnViewChange(); OnViewChange();
} }
const Vec3f& Camera::GetCamPos() const {
return m_CamPos;
}
} // namespace render } // namespace render
} // namespace td } // namespace td

View File

@@ -1,3 +1,4 @@
#include <td/Maths.h>
#include <td/render/renderer/WorldRenderer.h> #include <td/render/renderer/WorldRenderer.h>
#include <td/render/loader/WorldLoader.h> #include <td/render/loader/WorldLoader.h>
@@ -13,7 +14,17 @@ WorldRenderer::WorldRenderer(Camera& a_Camera, const game::WorldPtr& a_World) :
WorldRenderer::~WorldRenderer() {} WorldRenderer::~WorldRenderer() {}
void WorldRenderer::UpdateControls() {
if (ImGui::IsMouseDown(ImGuiMouseButton_Left)) {
constexpr float sensitivity = 1.0f;
float delta = ImGui::GetIO().DeltaTime;
auto mouseDelta = ImGui::GetIO().MouseDelta;
m_Camera.SetCamPos(m_Camera.GetCamPos() + Vec3f{-mouseDelta.x * delta * sensitivity, 0, -mouseDelta.y * delta * sensitivity});
}
}
void WorldRenderer::Render(float a_Lerp) { void WorldRenderer::Render(float a_Lerp) {
UpdateControls();
m_Shader->Start(); m_Shader->Start();
Renderer::Render(*m_WorldVao); Renderer::Render(*m_WorldVao);
} }

View File

@@ -3,7 +3,7 @@ add_rules("mode.debug", "mode.release")
add_repositories("persson-repo https://git.ale-pri.com/Persson-dev/xmake-repo.git") add_repositories("persson-repo https://git.ale-pri.com/Persson-dev/xmake-repo.git")
add_requires("imgui 1.92.0", {configs = {sdl3 = true, opengl3 = true}}) add_requires("imgui 1.92.0", {configs = {sdl3 = true, opengl3 = true}})
add_requires("libsdl3 3.2.16", "splib 2.3.2", "zlib", "glew", "fpm", "enet6", "imguizmo") add_requires("libsdl3 3.2.16", "splib 2.3.2", "zlib", "glew", "fpm", "enet6")
set_languages("c++20") set_languages("c++20")
@@ -21,7 +21,7 @@ target("Tower-Defense2")
add_includedirs("include", {public = true}) add_includedirs("include", {public = true})
set_kind("binary") set_kind("binary")
add_files("src/**.cpp") add_files("src/**.cpp")
add_packages("libsdl3", "imgui", "imguizmo", "glew", "splib", "zlib", "fpm", "enet6", {public = true}) add_packages("libsdl3", "imgui", "glew", "splib", "zlib", "fpm", "enet6", {public = true})
set_rundir(".") set_rundir(".")
add_defines("TD_GL_LOADER_GLEW") add_defines("TD_GL_LOADER_GLEW")