From 5b361d81dbd2af0d0e99b9eb1adebea76ff05db0 Mon Sep 17 00:00:00 2001 From: hachem Date: Thu, 20 Aug 2026 02:27:02 +0200 Subject: [chore]: MASSIVE refactor + more vulkan bs --- src/Rendering/Shader.cpp | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'src/Rendering/Shader.cpp') diff --git a/src/Rendering/Shader.cpp b/src/Rendering/Shader.cpp index 8266e00..167b855 100644 --- a/src/Rendering/Shader.cpp +++ b/src/Rendering/Shader.cpp @@ -1,14 +1,14 @@ -#include "Shader.h" -#include "Renderer.h" +#include "shader.h" +#include "renderer.h" -#include "Platform/OpenGL/OpenGLShader.h" -#include "Platform/Vulkan/VulkanShader.h" +#include "platform/opengl/opengl_shader.h" +#include "platform/vulkan/vulkan_shader.h" namespace Donut { - Shader* Shader::Create(const std::string& filepath) + auto Shader::create(const std::string& filepath) -> Shader* { - switch (Renderer::GetAPI()) + switch (Renderer::get_api()) { case RendererAPI::API::OpenGL: return new OpenGLShader(filepath); @@ -19,66 +19,66 @@ namespace Donut } } - Shader* Shader::Create(const std::string& name, const std::string& vertexSrc, const std::string& fragmentSrc) + auto Shader::create(const std::string& name, const std::string& vertex_src, const std::string& fragment_src) -> Shader* { - switch (Renderer::GetAPI()) + switch (Renderer::get_api()) { case RendererAPI::API::OpenGL: - return new OpenGLShader(name, vertexSrc, fragmentSrc); + return new OpenGLShader(name, vertex_src, fragment_src); case RendererAPI::API::Vulkan: - return new VulkanShader(name, vertexSrc, fragmentSrc); + return new VulkanShader(name, vertex_src, fragment_src); default: return nullptr; } } - Shader* Shader::CreateCompute(const std::string& name, const std::string& computeSrc) + auto Shader::create_compute(const std::string& name, const std::string& compute_src) -> Shader* { - switch (Renderer::GetAPI()) + switch (Renderer::get_api()) { case RendererAPI::API::OpenGL: - return new OpenGLShader(name, computeSrc); + return new OpenGLShader(name, compute_src); case RendererAPI::API::Vulkan: - return new VulkanShader(name, computeSrc); + return new VulkanShader(name, compute_src); default: return nullptr; } } - void ShaderLibrary::Add(const Ref& shader) + auto ShaderLibrary::add(const Ref& shader) -> void { - auto& name = shader->GetName(); - Add(name, shader); + auto& name = shader->get_name(); + add(name, shader); } - void ShaderLibrary::Add(const std::string& name, const Ref& shader) + auto ShaderLibrary::add(const std::string& name, const Ref& shader) -> void { - m_Shaders[name] = shader; + m_shaders[name] = shader; } - Ref ShaderLibrary::Load(const std::string& filepath) + auto ShaderLibrary::load(const std::string& filepath) -> Ref { - auto shader = Ref(Shader::Create(filepath)); - Add(shader); + auto shader = Ref(Shader::create(filepath)); + add(shader); return shader; } - Ref ShaderLibrary::Load(const std::string& name, const std::string& filepath) + auto ShaderLibrary::load(const std::string& name, const std::string& filepath) -> Ref { - auto shader = Ref(Shader::Create(filepath)); - Add(name, shader); + auto shader = Ref(Shader::create(filepath)); + add(name, shader); return shader; } - Ref ShaderLibrary::Get(const std::string& name) + auto ShaderLibrary::Get(const std::string& name) -> Ref { - if (Exists(name)) - return m_Shaders[name]; + if (exists(name)) + return m_shaders[name]; return nullptr; } - bool ShaderLibrary::Exists(const std::string& name) const + auto ShaderLibrary::exists(const std::string& name) const -> bool { - return m_Shaders.find(name) != m_Shaders.end(); + return m_shaders.find(name) != m_shaders.end(); } }; -- cgit v1.3