cleanup and instrumentation
This commit is contained in:
@@ -2,7 +2,9 @@
|
||||
#define OPENGL_BUFFER_HPP
|
||||
|
||||
#include "renderer/buffer.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace OpenEngine {
|
||||
class OpenGLVertexBuffer : public VertexBuffer
|
||||
{
|
||||
@@ -13,8 +15,8 @@ namespace OpenEngine {
|
||||
virtual void Bind() const override;
|
||||
virtual void UnBind() const override;
|
||||
|
||||
virtual const BufferLayout& GetLayout() const override { return layout; }
|
||||
virtual void SetLayout(const BufferLayout& layout) override { this->layout = layout; }
|
||||
virtual const BufferLayout& GetLayout() const override { return layout; };
|
||||
virtual void SetLayout(const BufferLayout& layout) override { this->layout = layout; };
|
||||
|
||||
private:
|
||||
BufferLayout layout;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef OPENGL_CONTEXT_HPP
|
||||
#define OPENGL_CONTEXT_HPP
|
||||
|
||||
#include "renderer/graphics_context.hpp"
|
||||
#include "open_engine/renderer/graphics_context.hpp"
|
||||
|
||||
struct GLFWwindow;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef OPENGL_RENDERER_API_HPP
|
||||
#define OPENGL_RENDERER_API_HPP
|
||||
|
||||
#include "../renderer/renderer_api.hpp"
|
||||
#include "open_engine/renderer/renderer_api.hpp"
|
||||
|
||||
namespace OpenEngine {
|
||||
class OpenGLRendererAPI : public RendererAPI
|
||||
@@ -14,7 +14,7 @@ namespace OpenEngine {
|
||||
virtual void SetClearColor(const glm::vec4& color) override;
|
||||
virtual void Clear() override;
|
||||
|
||||
virtual void DrawIndexed(const std::shared_ptr<VertexArray>& vertex_array) override;
|
||||
virtual void DrawIndexed(const Ref<VertexArray>& vertex_array) override;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
#ifndef OPENGL_SHADER_HPP
|
||||
#define OPENGL_SHADER_HPP
|
||||
|
||||
#include "../renderer/shader.hpp"
|
||||
#include <sys/types.h>
|
||||
#include <string>
|
||||
#include <glad/glad.h>
|
||||
#include "open_engine/renderer/shader.hpp"
|
||||
|
||||
#include <unordered_map>
|
||||
#include <sys/types.h>
|
||||
#include <glad/glad.h>
|
||||
#include <string>
|
||||
|
||||
namespace OpenEngine {
|
||||
class OpenGLShader : public Shader
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
#ifndef OPENGL_TEXTURE_HPP
|
||||
#define OPENGL_TEXTURE_HPP
|
||||
|
||||
#include "open_engine/renderer/texture.hpp"
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include <renderer/texture.hpp>
|
||||
|
||||
namespace OpenEngine {
|
||||
class OpenGLTexture2D : public Texture2D
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef OPENGL_VERTEX_ARRAY_HPP
|
||||
#define OPENGL_VERTEX_ARRAY_HPP
|
||||
|
||||
#include "renderer/vertex_array.hpp"
|
||||
#include "open_engine/renderer/vertex_array.hpp"
|
||||
|
||||
namespace OpenEngine {
|
||||
class OpenGLVertexArray : public VertexArray
|
||||
@@ -13,19 +13,18 @@ namespace OpenEngine {
|
||||
virtual void Bind() const override;
|
||||
virtual void UnBind() const override;
|
||||
|
||||
virtual void AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertex_buffer) override;
|
||||
virtual void SetIndexBuffer(const std::shared_ptr<IndexBuffer>& index_buffer) override;
|
||||
virtual void AddVertexBuffer(const Ref<VertexBuffer>& vertex_buffer) override;
|
||||
virtual void SetIndexBuffer(const Ref<IndexBuffer>& index_buffer) override;
|
||||
|
||||
virtual const std::vector<std::shared_ptr<VertexBuffer>>& GetVertexBuffers() const override { return vertex_buffers; }
|
||||
virtual const std::shared_ptr<IndexBuffer>& GetIndexBuffer() const override { return index_buffer; }
|
||||
virtual const std::vector<Ref<VertexBuffer>>& GetVertexBuffers() const override { return vertex_buffers; };
|
||||
virtual const Ref<IndexBuffer>& GetIndexBuffer() const override { return index_buffer; };
|
||||
|
||||
private:
|
||||
uint32_t id;
|
||||
uint32_t index = 0;
|
||||
std::vector<std::shared_ptr<VertexBuffer>> vertex_buffers;
|
||||
std::shared_ptr<IndexBuffer> index_buffer;
|
||||
std::vector<Ref<VertexBuffer>> vertex_buffers;
|
||||
Ref<IndexBuffer> index_buffer;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // OPENGL_VERTEX_ARRAY_HPP
|
||||
|
||||
Reference in New Issue
Block a user