From 23086a5d33acc66414f1169bf22abe78b3383f94 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/index_buffer.cpp | 1 + src/rendering/index_buffer.h | 4 ++-- src/rendering/renderer.cpp | 6 +++--- src/rendering/renderer.h | 20 ++++++++++---------- src/rendering/shader.h | 17 ++++++++--------- src/rendering/texture.h | 13 +++++++------ src/rendering/vertex_array.h | 6 +++--- src/rendering/vertex_buffer.h | 6 +++--- 8 files changed, 37 insertions(+), 36 deletions(-) (limited to 'src/rendering') diff --git a/src/rendering/index_buffer.cpp b/src/rendering/index_buffer.cpp index d4bd9c0..4e38b36 100644 --- a/src/rendering/index_buffer.cpp +++ b/src/rendering/index_buffer.cpp @@ -1,5 +1,6 @@ #include "index_buffer.h" #include "renderer.h" + #include "platform/opengl/opengl_index_buffer.h" namespace Donut diff --git a/src/rendering/index_buffer.h b/src/rendering/index_buffer.h index 3003676..856559a 100644 --- a/src/rendering/index_buffer.h +++ b/src/rendering/index_buffer.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 get_count() 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 19917a6..bd921eb 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& vertex_array, - const glm::mat4& transform, - const glm::mat4& view_projection) + const std::shared_ptr& vertex_array, + const glm::mat4& transform, + const glm::mat4& view_projection) { shader->bind(); shader->set_mat4("u_ViewProjection", view_projection); diff --git a/src/rendering/renderer.h b/src/rendering/renderer.h index 7bbdd4b..c7ace3c 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 set_viewport(uint32_t x, uint32_t y, uint32_t width, uint32_t height) = 0; - virtual void set_clear_color(const glm::vec4& color) = 0; - virtual void clear() = 0; - virtual void enable_depth_test() = 0; - virtual void set_face_culling(bool enabled) = 0; + virtual void init() = 0; + virtual void set_viewport(uint32_t x, uint32_t y, + uint32_t width, uint32_t height) = 0; + virtual void set_clear_color(const glm::vec4& color) = 0; + virtual void clear() = 0; + virtual void enable_depth_test() = 0; + virtual void set_face_culling(bool enabled) = 0; - virtual void draw_indexed(const std::shared_ptr& vertex_array, uint32_t index_count = 0) = 0; + virtual void draw_indexed(const std::shared_ptr& vertex_array, + uint32_t index_count = 0) = 0; inline static API get_api() { return s_api; } static Scope create(); - private: static API s_api; }; diff --git a/src/rendering/shader.h b/src/rendering/shader.h index fe869ba..f490f3c 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 set_int(const std::string& name, int value) = 0; + virtual void set_int( const std::string& name, int value) = 0; virtual void set_int_array(const std::string& name, int* values, uint32_t count) = 0; - virtual void set_float(const std::string& name, float value) = 0; - virtual void set_float2(const std::string& name, const glm::vec2& value) = 0; - virtual void set_float3(const std::string& name, const glm::vec3& value) = 0; - virtual void set_float4(const std::string& name, const glm::vec4& value) = 0; - virtual void set_mat4(const std::string& name, const glm::mat4& value) = 0; + virtual void set_float( const std::string& name, float value) = 0; + virtual void set_float2( const std::string& name, const glm::vec2& value) = 0; + virtual void set_float3( const std::string& name, const glm::vec3& value) = 0; + virtual void set_float4( const std::string& name, const glm::vec4& value) = 0; + virtual void set_mat4( 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 dispatch_indirect(uint32_t offset = 0) = 0; - virtual void memory_barrier(uint32_t barriers) = 0; + virtual void dispatch_indirect(uint32_t offset = 0) = 0; + virtual void memory_barrier(uint32_t barriers) = 0; virtual const std::string& get_name() 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 68866b5..e9f369f 100644 --- a/src/rendering/texture.h +++ b/src/rendering/texture.h @@ -11,15 +11,16 @@ namespace Donut public: virtual ~Texture() = default; - virtual uint32_t get_width() const = 0; - virtual uint32_t get_height() const = 0; + virtual uint32_t get_width() const = 0; + virtual uint32_t get_height() const = 0; virtual uint32_t get_renderer_id() const = 0; - virtual void set_data(void* data, uint32_t size) = 0; - virtual void bind(uint32_t slot = 0) const = 0; - virtual void bind_as_image(uint32_t slot = 0, bool read_only = false) const = 0; + virtual void set_data(void* data, uint32_t size) = 0; + virtual void bind(uint32_t slot = 0) const = 0; + virtual void bind_as_image(uint32_t slot = 0, + bool read_only = 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/vertex_array.h b/src/rendering/vertex_array.h index b51db84..946f273 100644 --- a/src/rendering/vertex_array.h +++ b/src/rendering/vertex_array.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 add_vertex_buffer(const std::shared_ptr& vertex_buffer) = 0; - virtual void set_index_buffer(const std::shared_ptr& index_buffer) = 0; + virtual void set_index_buffer(const std::shared_ptr& index_buffer) = 0; virtual const std::vector>& get_vertex_buffers() const = 0; - virtual const std::shared_ptr& get_index_buffer() const = 0; + virtual const std::shared_ptr& get_index_buffer() const = 0; static VertexArray* create(); }; diff --git a/src/rendering/vertex_buffer.h b/src/rendering/vertex_buffer.h index 1d0b621..77a76c9 100644 --- a/src/rendering/vertex_buffer.h +++ b/src/rendering/vertex_buffer.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 set_data(const void* data, uint32_t size) = 0; - virtual const VertexBufferLayout& get_layout() const = 0; + virtual const VertexBufferLayout& get_layout() const = 0; virtual void set_layout(const VertexBufferLayout& layout) = 0; static VertexBuffer* create(const void* data, uint32_t size); -- cgit v1.3