anfer/OpenEngine
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and framebuffer creation

Browse Source
This commit is contained in:
Erris
2026-02-05 17:06:20 +01:00
parent 40152fafff
commit 6ba709bf4f
20 changed files with 13996 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
open_engine/include/open_engine.hpp
View File

@@ -1,22 +1,26 @@
#ifndef OPEN_ENGINE_HPP
#define OPEN_ENGINE_HPP
#include "open_engine/core.hpp"
#include "open_engine/ref_scope.hpp"
#include "open_engine/application.hpp"
#include "open_engine/logging.hpp"
#include "open_engine/events/key_event.hpp"
#include "open_engine/orthographic_camera_controller.hpp"
#include "open_engine/imgui/imgui_layer.hpp"
#include "open_engine/renderer/render_command.hpp"
#include "open_engine/renderer/renderer.hpp"
#include "open_engine/events/key_event.hpp"
#include "open_engine/application.hpp"
#include "open_engine/ref_scope.hpp"
#include "open_engine/logging.hpp"
#include "open_engine/core/time.hpp"
#include "open_engine/core.hpp"
#include "open_engine/input/input_system.hpp"
#include "open_engine/input/mouse_codes.hpp"
#include "open_engine/input/keycodes.hpp"
#include "open_engine/renderer/render_command.hpp"
#include "open_engine/renderer/framebuffer.hpp"
#include "open_engine/renderer/renderer2d.hpp"
#include "open_engine/renderer/renderer.hpp"
#include "open_engine/renderer/texture.hpp"
#include "open_engine/renderer/buffer.hpp"
#include "open_engine/renderer/shader.hpp"
#include "open_engine/renderer/texture.hpp"
#include "open_engine/orthographic_camera_controller.hpp"
#include "open_engine/renderer/renderer2d.hpp"
#endif // OPEN_ENGINE_HPP

2
open_engine/include/open_engine/imgui/imgui_layer.hpp
View File

@@ -1,6 +1,7 @@
#ifndef IMGUI_LAYER_HPP
#define IMGUI_LAYER_HPP
#include "open_engine/events/event.hpp"
#include "open_engine/layer.hpp"
namespace OpenEngine {
@@ -13,6 +14,7 @@ namespace OpenEngine {
virtual void OnAttach() override;
virtual void OnDetach() override;
virtual void OnImGuiRender() override;
virtual void OnEvent(Event& event) override;
void Begin();
void End();

34
open_engine/include/open_engine/opengl/opengl_framebuffer.hpp Normal file
View File

@@ -0,0 +1,34 @@
#ifndef OPENGL_FRAMEBUFFER_HPP
#define OPENGL_FRAMEBUFFER_HPP
#include <renderer/framebuffer.hpp>
#include <cstdint>
namespace OpenEngine {
class OpenGLFramebuffer : public FrameBuffer
{
public:
OpenGLFramebuffer(const FramebufferSpecification& spec);
virtual ~OpenGLFramebuffer();
void Invalidate();
virtual void Bind() override;
virtual void Unbind() override;
virtual void Resize(uint32_t width, uint32_t height) override;
virtual uint32_t GetColorAttachmentRendererID() const override { return color_attachment; }
virtual const FramebufferSpecification& GetSpecification() const override { return specs; }
private:
uint32_t id = 0;
uint32_t color_attachment = 0, depth_attachment = 0;
FramebufferSpecification specs;
};
}
#endif // OPENGL_FRAMEBUFFER_HPP

1
open_engine/include/open_engine/orthographic_camera_controller.hpp
View File

@@ -16,6 +16,7 @@ namespace OpenEngine {
void OnUpdate();
void OnEvent(Event& e);
void OnResize(float width, float height);
const OrthographicCamera& GetCamera() const { return camera; };
OrthographicCamera& GetCamera() { return camera; };

31
open_engine/include/open_engine/renderer/framebuffer.hpp Normal file
View File

@@ -0,0 +1,31 @@
#ifndef FRAMEBUFFER_HPP
#define FRAMEBUFFER_HPP
#include <cstdint>
namespace OpenEngine {
struct FramebufferSpecification
{
uint32_t width, height;
uint32_t samples = 1;
bool swap_chain_target = false;
};
class FrameBuffer
{
public:
virtual void Bind() = 0;
virtual void Unbind() = 0;
virtual void Resize(uint32_t width, uint32_t height) = 0;
virtual uint32_t GetColorAttachmentRendererID() const = 0;
virtual const FramebufferSpecification& GetSpecification() const = 0;
static Ref<FrameBuffer> Create(const FramebufferSpecification& spec);
};
}
#endif // FRAMEBUFFER_HPP

16
open_engine/include/open_engine/renderer/renderer2d.hpp
View File

@@ -1,7 +1,6 @@
#ifndef RENDERER2D_HPP
#define RENDERER2D_HPP
#include "open_engine/logging.hpp"
#include "open_engine/orthographic_camera.hpp"
#include "open_engine/renderer/texture.hpp"
#include "open_engine/ref_scope.hpp"
@@ -16,6 +15,15 @@ namespace OpenEngine {
float rotation = 0.0f;
};
struct Statistics
{
uint32_t draw_calls = 0;
uint32_t quad_count = 0;
uint32_t GetToralVertexCount() { return quad_count * 4; };
uint32_t GetToralIndexCount() { return quad_count * 6; };
};
class Renderer2D
{
public:
@@ -28,6 +36,12 @@ namespace OpenEngine {
static void DrawQuad(const Transform& transform_data, const glm::vec4& color);
static void DrawQuad(const Transform& transform_data, const Ref<Texture2D>& texture, float tiling_factor = 1.0f);
static void ResetStats();
static const Statistics& GetStats();
private:
static void FlushAndReset();
};
}

2
open_engine/src/open_engine/application.cpp
View File

@@ -81,9 +81,9 @@ namespace OpenEngine {
{
OE_PROFILE_SCOPE("Layers OnEvent");
for (auto it = layer_stack.end(); it != layer_stack.begin();) {
(*--it)->OnEvent(event);
if (event.handled)
break;
(*--it)->OnEvent(event);
}
}
}

8
open_engine/src/open_engine/imgui/imgui_layer.cpp
View File

@@ -1,3 +1,4 @@
#include "imgui.h"
#include "instrumentor.hpp"
#include <pch.hpp>
@@ -336,4 +337,11 @@ namespace OpenEngine {
if (show)
ImGui::ShowDemoWindow(&show);
}
void ImGuiLayer::OnEvent(Event& event)
{
ImGuiIO& io = ImGui::GetIO();
event.handled |= event.IsInCategory(EventCategoryMouse) & io.WantCaptureMouse;
event.handled |= event.IsInCategory(EventCategoryKeyboard) & io.WantCaptureKeyboard;
}
}

69
open_engine/src/open_engine/opengl/opengl_framebuffer.cpp Normal file
View File

@@ -0,0 +1,69 @@
#include <pch.hpp>
#include <core.hpp>
#include <opengl/opengl_framebuffer.hpp>
#include <glad/glad.h>
namespace OpenEngine {
OpenGLFramebuffer::OpenGLFramebuffer(const FramebufferSpecification& spec)
: specs(spec)
{
Invalidate();
}
OpenGLFramebuffer::~OpenGLFramebuffer()
{
glDeleteFramebuffers(1, &id);
glDeleteTextures(1, &color_attachment);
glDeleteTextures(1, &depth_attachment);
}
void OpenGLFramebuffer::Invalidate()
{
if (id) {
glDeleteFramebuffers(1, &id);
glDeleteTextures(1, &color_attachment);
glDeleteTextures(1, &depth_attachment);
}
glCreateFramebuffers(1, &id);
glBindFramebuffer(GL_FRAMEBUFFER, id);
glCreateTextures(GL_TEXTURE_2D, 1, &color_attachment);
glBindTexture(GL_TEXTURE_2D, color_attachment);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, specs.width, specs.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, color_attachment, 0);
glCreateTextures(GL_TEXTURE_2D, 1, &depth_attachment);
glBindTexture(GL_TEXTURE_2D, depth_attachment);
glTexStorage2D(GL_TEXTURE_2D, 1, GL_DEPTH24_STENCIL8, specs.width, specs.height);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, depth_attachment, 0);
OE_CORE_ASSERT(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Framebuffer is incomplete!");
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
void OpenGLFramebuffer::Bind()
{
glBindFramebuffer(GL_FRAMEBUFFER, id);
glViewport(0, 0, specs.width, specs.height);
}
void OpenGLFramebuffer::Unbind()
{
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
void OpenGLFramebuffer::Resize(uint32_t width, uint32_t height)
{
specs.width = width;
specs.height = height;
Invalidate();
}
}

2
open_engine/src/open_engine/opengl/opengl_renderer_api.cpp
View File

@@ -66,7 +66,7 @@ namespace OpenEngine {
{
OE_PROFILE_FUNCTION();
uint32_t count = index_count? vertex_array->GetIndexBuffer()->GetCount() : index_count;
uint32_t count = index_count? index_count : vertex_array->GetIndexBuffer()->GetCount();
glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, nullptr);
glBindTexture(GL_TEXTURE_2D, 0);
}

1
open_engine/src/open_engine/opengl/opengl_texture.cpp
View File

@@ -70,7 +70,6 @@ namespace OpenEngine {
{
OE_PROFILE_FUNCTION();
OE_CORE_DEBUG("id {}", id);
glDeleteTextures(1, &id);
}

9
open_engine/src/open_engine/orthographic_camera_controller.cpp
View File

@@ -68,6 +68,12 @@ namespace OpenEngine {
dispatcher.Dispatch<WindowResizeEvent>(BIND_EVENT_FN(OrthographicCameraController::OnWindowResized));
}
void OrthographicCameraController::OnResize(float width, float height)
{
aspect_ratio = width / height;
camera.SetProjection(-aspect_ratio * zoom, aspect_ratio * zoom, -zoom, zoom);
}
bool OrthographicCameraController::OnMouseScrolled(MouseScrolledEvent& e)
{
OE_PROFILE_FUNCTION();
@@ -82,8 +88,7 @@ namespace OpenEngine {
{
OE_PROFILE_FUNCTION();
aspect_ratio = (float)e.GetWidth() / (float)e.GetHeight();
camera.SetProjection(-aspect_ratio * zoom, aspect_ratio * zoom, -zoom, zoom);
OnResize(e.GetWidth(), e.GetHeight());
return false;
}

4
open_engine/src/open_engine/renderer/buffer.cpp
View File

@@ -38,8 +38,8 @@ namespace OpenEngine {
case ShaderDataType::Float2: return 2;
case ShaderDataType::Float3: return 3;
case ShaderDataType::Float4: return 4;
case ShaderDataType::Mat3: return 3 * 3;
case ShaderDataType::Mat4: return 4 * 4;
case ShaderDataType::Mat3: return 3; // * 3 float3;
case ShaderDataType::Mat4: return 4; // * 4 float4;
case ShaderDataType::Int: return 1;
case ShaderDataType::Int2: return 2;
case ShaderDataType::Int3: return 3;

20
open_engine/src/open_engine/renderer/framebuffer.cpp Normal file
View File

@@ -0,0 +1,20 @@
#include <pch.hpp>
#include <renderer/framebuffer.hpp>
#include <renderer/renderer.hpp>
#include <open_engine/opengl/opengl_framebuffer.hpp>
namespace OpenEngine {
Ref<FrameBuffer> FrameBuffer::Create(const FramebufferSpecification& spec)
{
OE_PROFILE_FUNCTION();
switch (Renderer::GetAPI()) {
case RendererAPI::API::None : OE_CORE_ASSERT(false, "No render API selected!"); return nullptr;
case RendererAPI::API::OpenGL : return CreateRef<OpenGLFramebuffer>(spec);
}
OE_CORE_ASSERT(false, "Selected API not supported");
return nullptr;
}
}

48
open_engine/src/open_engine/renderer/renderer2d.cpp
View File

@@ -6,7 +6,6 @@
#include <renderer/texture.hpp>
#include <renderer/buffer.hpp>
#include <renderer/shader.hpp>
#include "logging.hpp"
#include <cstdint>
#include <glm/fwd.hpp>
@@ -25,9 +24,9 @@ namespace OpenEngine {
struct Renderer2DData
{
const uint32_t max_quads = 10000;
const uint32_t max_vertices = max_quads * 4;
const uint32_t max_indices = max_quads * 6;
static const uint32_t max_quads = 10000;
static const uint32_t max_vertices = max_quads * 4;
static const uint32_t max_indices = max_quads * 6;
static const uint32_t max_texture_slots = 32;
Ref<VertexArray> vertex_array;
@@ -43,6 +42,8 @@ namespace OpenEngine {
uint32_t texture_slot_index = 1; // 0 is white texture
glm::vec4 quad_vertex_positioning[4];
Statistics stats;
};
static Renderer2DData renderer_data;
@@ -113,10 +114,10 @@ namespace OpenEngine {
renderer_data.vertex_buffer.reset();
renderer_data.texture_shader.reset();
for (uint32_t i = 0; i < renderer_data.texture_slot_index; i++) {
OE_CORE_DEBUG("force cleaning {}", renderer_data.texture_slots[i]->GetID());
delete[] renderer_data.quad_vertex_base;
for (uint32_t i = 0; i < renderer_data.texture_slot_index; i++)
renderer_data.texture_slots[i].reset();
}
OE_PROFILE_FUNCTION();
}
@@ -155,12 +156,17 @@ namespace OpenEngine {
renderer_data.texture_slots[i]->Bind(i);
RenderCommand::DrawIndexed(renderer_data.vertex_array, renderer_data.quad_index_count);
renderer_data.stats.draw_calls++;
}
void Renderer2D::DrawQuad(const Transform& transform_data, const Ref<Texture2D>& texture, float tiling_factor)
{
OE_PROFILE_FUNCTION();
if (renderer_data.quad_index_count >= Renderer2DData::max_indices)
FlushAndReset();
constexpr glm::vec4 color = glm::vec4(1.0f);
glm::vec3 position = transform_data.position;
@@ -175,6 +181,9 @@ namespace OpenEngine {
}
if (texture_index == 0) {
if (renderer_data.texture_slot_index >= Renderer2DData::max_texture_slots)
FlushAndReset();
texture_index = (float)renderer_data.texture_slot_index;
renderer_data.texture_slots[renderer_data.texture_slot_index] = texture;
renderer_data.texture_slot_index++;
@@ -213,12 +222,16 @@ namespace OpenEngine {
renderer_data.quad_vertex_ptr++;
renderer_data.quad_index_count += 6;
renderer_data.stats.quad_count++;
}
void Renderer2D::DrawQuad(const Transform& transform_data, const glm::vec4& color)
{
OE_PROFILE_FUNCTION();
if (renderer_data.quad_index_count >= Renderer2DData::max_indices)
FlushAndReset();
glm::vec3 position = transform_data.position;
glm::vec3 size = transform_data.size;
@@ -255,5 +268,26 @@ namespace OpenEngine {
renderer_data.quad_vertex_ptr++;
renderer_data.quad_index_count += 6;
renderer_data.stats.quad_count++;
}
void Renderer2D::ResetStats()
{
memset(&renderer_data.stats, 0, sizeof(Statistics));
}
const Statistics& Renderer2D::GetStats()
{
return renderer_data.stats;
}
void Renderer2D::FlushAndReset()
{
EndScene();
renderer_data.quad_index_count = 0;
renderer_data.quad_vertex_ptr = renderer_data.quad_vertex_base;
renderer_data.texture_slot_index = 1;
}
}

1
open_engine/src/open_engine/window/linux_window.cpp
View File

@@ -168,7 +168,6 @@ namespace OpenEngine {
void LinuxWindow::Shutdown()
{
OE_CORE_DEBUG("context shutdown");
glfwDestroyWindow(gl_window);
glfwTerminate();
gl_window = nullptr;