From 8a0b2a59c9809d5fc8e6a30c2abc4d5af21aa39e Mon Sep 17 00:00:00 2001 From: hachem Date: Wed, 13 Aug 2025 18:39:13 +0200 Subject: [fix]: More consistent formatting --- src/Rendering/IndexBuffer.cpp | 1 + src/Rendering/IndexBuffer.h | 4 ++-- src/Rendering/Renderer.cpp | 6 +++--- src/Rendering/Renderer.h | 20 ++++++++++---------- src/Rendering/Shader.h | 17 ++++++++--------- src/Rendering/Texture.h | 13 +++++++------ src/Rendering/VertexArray.h | 6 +++--- src/Rendering/VertexBuffer.h | 6 +++--- 8 files changed, 37 insertions(+), 36 deletions(-) (limited to 'src/Rendering') diff --git a/src/Rendering/IndexBuffer.cpp b/src/Rendering/IndexBuffer.cpp index d8854d3..de9cb87 100644 --- a/src/Rendering/IndexBuffer.cpp +++ b/src/Rendering/IndexBuffer.cpp @@ -1,5 +1,6 @@ #include "IndexBuffer.h" #include "Renderer.h" + #include "Platform/OpenGL/OpenGLIndexBuffer.h" namespace Donut diff --git a/src/Rendering/IndexBuffer.h b/src/Rendering/IndexBuffer.h index 0729d95..a58cc6c 100644 --- a/src/Rendering/IndexBuffer.h +++ b/src/Rendering/IndexBuffer.h @@ -9,8 +9,8 @@ namespace Donut public: virtual ~IndexBuffer() = default; - virtual void Bind() const = 0; - virtual void Unbind() const = 0; + virtual void Bind() const = 0; + virtual void Unbind() const = 0; virtual uint32_t GetCount() const = 0; static IndexBuffer* Create(const uint32_t* indices, uint32_t count); diff --git a/src/Rendering/Renderer.cpp b/src/Rendering/Renderer.cpp index 3f50a7c..9aa3dd3 100644 --- a/src/Rendering/Renderer.cpp +++ b/src/Rendering/Renderer.cpp @@ -34,9 +34,9 @@ namespace Donut } void Renderer::Submit(const std::shared_ptr& shader, - const std::shared_ptr& vertexArray, - const glm::mat4& transform, - const glm::mat4& viewProjection) + const std::shared_ptr& vertexArray, + const glm::mat4& transform, + const glm::mat4& viewProjection) { shader->Bind(); shader->SetMat4("u_ViewProjection", viewProjection); diff --git a/src/Rendering/Renderer.h b/src/Rendering/Renderer.h index 82c156e..3083c4c 100644 --- a/src/Rendering/Renderer.h +++ b/src/Rendering/Renderer.h @@ -21,26 +21,26 @@ namespace Donut public: enum class API { - None = 0, + None = 0, OpenGL = 1, Vulkan = 2, }; - public: virtual ~RendererAPI() = default; - virtual void Init() = 0; - virtual void SetViewport(uint32_t x, uint32_t y, uint32_t width, uint32_t height) = 0; - virtual void SetClearColor(const glm::vec4& color) = 0; - virtual void Clear() = 0; - virtual void EnableDepthTest() = 0; - virtual void SetFaceCulling(bool enabled) = 0; + virtual void Init() = 0; + virtual void SetViewport(uint32_t x, uint32_t y, + uint32_t width, uint32_t height) = 0; + virtual void SetClearColor(const glm::vec4& color) = 0; + virtual void Clear() = 0; + virtual void EnableDepthTest() = 0; + virtual void SetFaceCulling(bool enabled) = 0; - virtual void DrawIndexed(const std::shared_ptr& vertexArray, uint32_t indexCount = 0) = 0; + virtual void DrawIndexed(const std::shared_ptr& vertexArray, + uint32_t indexCount = 0) = 0; inline static API GetAPI() { return s_API; } static Scope Create(); - private: static API s_API; }; diff --git a/src/Rendering/Shader.h b/src/Rendering/Shader.h index aa46f07..ef0bdb1 100644 --- a/src/Rendering/Shader.h +++ b/src/Rendering/Shader.h @@ -20,17 +20,17 @@ namespace Donut virtual void Bind() const = 0; virtual void Unbind() const = 0; - virtual void SetInt(const std::string& name, int value) = 0; + virtual void SetInt( const std::string& name, int value) = 0; virtual void SetIntArray(const std::string& name, int* values, uint32_t count) = 0; - virtual void SetFloat(const std::string& name, float value) = 0; - virtual void SetFloat2(const std::string& name, const glm::vec2& value) = 0; - virtual void SetFloat3(const std::string& name, const glm::vec3& value) = 0; - virtual void SetFloat4(const std::string& name, const glm::vec4& value) = 0; - virtual void SetMat4(const std::string& name, const glm::mat4& value) = 0; + virtual void SetFloat( const std::string& name, float value) = 0; + virtual void SetFloat2( const std::string& name, const glm::vec2& value) = 0; + virtual void SetFloat3( const std::string& name, const glm::vec3& value) = 0; + virtual void SetFloat4( const std::string& name, const glm::vec4& value) = 0; + virtual void SetMat4( const std::string& name, const glm::mat4& value) = 0; virtual void Dispatch(uint32_t x, uint32_t y = 1, uint32_t z = 1) = 0; - virtual void DispatchIndirect(uint32_t offset = 0) = 0; - virtual void MemoryBarrier(uint32_t barriers) = 0; + virtual void DispatchIndirect(uint32_t offset = 0) = 0; + virtual void MemoryBarrier(uint32_t barriers) = 0; virtual const std::string& GetName() const = 0; @@ -50,7 +50,6 @@ namespace Donut std::shared_ptr Get(const std::string& name); bool Exists(const std::string& name) const; - private: std::unordered_map> m_Shaders; }; diff --git a/src/Rendering/Texture.h b/src/Rendering/Texture.h index f17bb1d..4d150c0 100644 --- a/src/Rendering/Texture.h +++ b/src/Rendering/Texture.h @@ -11,15 +11,16 @@ namespace Donut public: virtual ~Texture() = default; - virtual uint32_t GetWidth() const = 0; - virtual uint32_t GetHeight() const = 0; + virtual uint32_t GetWidth() const = 0; + virtual uint32_t GetHeight() const = 0; virtual uint32_t GetRendererID() const = 0; - virtual void SetData(void* data, uint32_t size) = 0; - virtual void Bind(uint32_t slot = 0) const = 0; - virtual void BindAsImage(uint32_t slot = 0, bool readOnly = false) const = 0; + virtual void SetData(void* data, uint32_t size) = 0; + virtual void Bind(uint32_t slot = 0) const = 0; + virtual void BindAsImage(uint32_t slot = 0, + bool readOnly = false) const = 0; - virtual bool operator==(const Texture& other) const = 0; + virtual bool operator==(const Texture& other) const = 0; }; class Texture2D diff --git a/src/Rendering/VertexArray.h b/src/Rendering/VertexArray.h index 3c8254e..8ae61a7 100644 --- a/src/Rendering/VertexArray.h +++ b/src/Rendering/VertexArray.h @@ -12,14 +12,14 @@ namespace Donut public: virtual ~VertexArray() = default; - virtual void Bind() const = 0; + virtual void Bind() const = 0; virtual void Unbind() const = 0; virtual void AddVertexBuffer(const std::shared_ptr& vertexBuffer) = 0; - virtual void SetIndexBuffer(const std::shared_ptr& indexBuffer) = 0; + virtual void SetIndexBuffer(const std::shared_ptr& indexBuffer) = 0; virtual const std::vector>& GetVertexBuffers() const = 0; - virtual const std::shared_ptr& GetIndexBuffer() const = 0; + virtual const std::shared_ptr& GetIndexBuffer() const = 0; static VertexArray* Create(); }; diff --git a/src/Rendering/VertexBuffer.h b/src/Rendering/VertexBuffer.h index 807e1be..35b9a84 100644 --- a/src/Rendering/VertexBuffer.h +++ b/src/Rendering/VertexBuffer.h @@ -61,11 +61,11 @@ namespace Donut public: virtual ~VertexBuffer() = default; - virtual void Bind() const = 0; - virtual void Unbind() const = 0; + virtual void Bind() const = 0; + virtual void Unbind() const = 0; virtual void SetData(const void* data, uint32_t size) = 0; - virtual const VertexBufferLayout& GetLayout() const = 0; + virtual const VertexBufferLayout& GetLayout() const = 0; virtual void SetLayout(const VertexBufferLayout& layout) = 0; static VertexBuffer* Create(const void* data, uint32_t size); -- cgit v1.3