diff --git a/App/Src/Main.cpp b/App/Src/Main.cpp index deeb249..3c572a9 100644 --- a/App/Src/Main.cpp +++ b/App/Src/Main.cpp @@ -42,14 +42,14 @@ namespace return ret; } - void Run(const fs::path& assets_path) + void Run(const fs::path& assetsPath) { static constexpr Tkge::WindowSurface surface{.size = {1280, 720}}; Tkge::Engine engine{surface}; auto shader = Tkge::Graphics::Shader{}; - const auto vertexSpirV = LoadSpirV((assets_path / "Shaders/Default.vert").string().c_str()); - const auto fragmentSpirV = LoadSpirV((assets_path / "Shaders/Default.frag").string().c_str()); + const auto vertexSpirV = LoadSpirV((assetsPath / "Shaders/Default.vert").string().c_str()); + const auto fragmentSpirV = LoadSpirV((assetsPath / "Shaders/Default.frag").string().c_str()); const auto& renderDevice = engine.RenderDevice(); if (!shader.Load(renderDevice.get_device(), vertexSpirV, fragmentSpirV)) { throw std::runtime_error{"Failed to load shaders"}; } diff --git a/Lib/Include/Tkge/Transform.hpp b/Lib/Include/Tkge/Transform.hpp index d76fd80..1e52273 100644 --- a/Lib/Include/Tkge/Transform.hpp +++ b/Lib/Include/Tkge/Transform.hpp @@ -11,7 +11,7 @@ namespace Tkge [[nodiscard]] auto ToView() const -> glm::mat4; [[nodiscard]] auto ToInverseView() const -> glm::mat4; - [[nodiscard]] static constexpr auto Accumulate(const Transform& a, const Transform& b) -> Transform + [[nodiscard]] static constexpr Transform Accumulate(const Transform& a, const Transform& b) { return Transform{ .position = a.position + b.position,