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

various little fixes

Browse Source
This commit is contained in:
Erris
2026-02-22 23:18:27 +01:00
parent 577b52be28
commit 33a13dc5d8
9 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
editor/include/editor.hpp
View File

@@ -3,8 +3,12 @@
#include <open_engine.hpp>
#include "open_engine/events/mouse_event.hpp"
#include "open_engine/input/input_system.hpp"
#include "open_engine/input/mouse_codes.hpp"
#include "open_engine/renderer/render_command.hpp"
#include "open_engine/renderer/renderer2d.hpp"
#include "open_engine/scene/components.hpp"
#include "panels/scene_hierarchy.hpp"
#include <glm/ext/matrix_transform.hpp>
@@ -76,6 +80,20 @@ namespace OpenEngine {
editor_camera = EditorCamera(30.0f, 1920.0f/1080.0f, 0.1f, 1000.0f);
/*
for (float i = 0; i < 200; i++) {
for (float y = 0; y < 200; y++) {
Entity entity = scene->CreateEntity("entity");
entities.push_back(entity);
auto& tc = entity.AddComponents<TransformComponent>();
tc.translation = { i / 10, y / 10, 0.0f };
tc.scale = { 0.1f, 0.1f, 1.0f };
auto& sprite = entity.AddComponents<SpriteRendererComponent>();
sprite.color = { i / 100.0f, y / 100.0f, 1.0f, 1.0f };
}
}
*/
scene_hierarchy.SetContext(scene);
}
@@ -101,7 +119,7 @@ namespace OpenEngine {
Renderer2D::ResetStats();
RenderCommand::SetClearColor({0.11f, 0.11f, 0.15f, 1.0f});
RenderCommand::Clear();
RenderCommand::ClearBufferI(1, -1);
framebuffer->ClearBufferI(1, -1);
editor_camera.OnUpdate();
@@ -117,12 +135,20 @@ namespace OpenEngine {
int mouse_x = (int)mx;
int mouse_y = (int)my;
if (mouse_x >= 0 && mouse_y >= 0 && mouse_x < (int)viewport_size.x && (int)viewport_size.y) {
static bool clicked = false;
if (Input::IsMouseButtonPressed(MouseCode::ButtonLeft) && mouse_x >= 0 && mouse_y >= 0 && mouse_x < (int)viewport_size.x && (int)viewport_size.y) {
if (!clicked) {
int id = framebuffer->ReadPixel(1, mouse_x, mouse_y);
if (Input::IsMouseButtonPressed(Mouse::ButtonLeft) && id != -1)
if (id != -1)
scene_hierarchy.SetSelectedEntity({ (entt::entity)id, scene.get() });
}
clicked = true;
} else {
clicked = false;
}
framebuffer->Unbind();
}
@@ -223,24 +249,14 @@ namespace OpenEngine {
viewport_size = { viewport_panel_size.x, viewport_panel_size.y };
ImVec2 imgui_cursor_position = ImGui::GetCursorPos();
ImVec2 imgui_cursor_position = ImGui::GetCursorScreenPos();
uint32_t texture_id = framebuffer->GetColorAttachmentRendererID();
ImGui::Image((void*)(uint64_t)texture_id, ImVec2{ viewport_size.x, viewport_size.y }, ImVec2{ 0, 1 }, ImVec2{ 1, 0 });
int max_x = viewport_size.x + imgui_cursor_position.x;
int max_y = viewport_size.y + imgui_cursor_position.y;
auto window_size = ImGui::GetWindowSize();
ImVec2 min_bound = ImGui::GetWindowPos();
min_bound.x += imgui_cursor_position.x;
min_bound.y += imgui_cursor_position.y;
ImVec2 max_bound = { min_bound.x + window_size.x, min_bound.y + window_size.y };
viewport_bounds[0] = { min_bound.x, min_bound.y};
viewport_bounds[1] = { max_bound.x, max_bound.y};
viewport_bounds[0] = { imgui_cursor_position.x, imgui_cursor_position.y };
viewport_bounds[1] = { imgui_cursor_position.x + viewport_size.x,
imgui_cursor_position.y + viewport_size.y };
DrawGuizmos();
@@ -277,9 +293,10 @@ namespace OpenEngine {
ImGuizmo::SetDrawlist();
ImGuizmo::Enable(!editor_camera.GetMoving());
auto window_position = ImGui::GetWindowPos();
auto window_size = ImGui::GetWindowSize();
ImGuizmo::SetRect(window_position.x, window_position.y, window_size.x, window_size.y);
ImGuizmo::SetRect(viewport_bounds[0].x, viewport_bounds[0].y,
viewport_bounds[1].x - viewport_bounds[0].x,
viewport_bounds[1].y - viewport_bounds[0].y);
const glm::mat4& camera_projection = editor_camera.GetProjection();
glm::mat4 camera_view = editor_camera.GetViewMatrix();
@@ -379,7 +396,7 @@ namespace OpenEngine {
int guizmo_operation = -1;
Ref<Scene> scene;
Entity sq_entity;
std::vector<Entity> entities;
};
}

1
open_engine/include/open_engine/opengl/opengl_framebuffer.hpp
View File

@@ -21,6 +21,7 @@ namespace OpenEngine {
virtual void Resize(uint32_t width, uint32_t height) override;
virtual int ReadPixel(uint32_t index, int x, int y) override;
virtual void ClearBufferI(int index, int value) override;
virtual uint32_t GetColorAttachmentRendererID(uint32_t index = 0) const override {
OE_CORE_ASSERT(index < color_attachment_ids.size(), "Index is greater than color attachment count.");

1
open_engine/include/open_engine/opengl/opengl_renderer_api.hpp
View File

@@ -13,7 +13,6 @@ namespace OpenEngine {
virtual void SetViewport(uint32_t x, uint32_t y, uint32_t width, uint32_t height) override;
virtual void SetClearColor(const glm::vec4& color) override;
virtual void ClearBufferI(int buffer, int value) override;
virtual void Clear() override;
virtual void DrawIndexed(const Ref<VertexArray>& vertex_array, uint32_t index_count = 0) override;

1
open_engine/include/open_engine/renderer/framebuffer.hpp
View File

@@ -62,6 +62,7 @@ namespace OpenEngine {
virtual void Resize(uint32_t width, uint32_t height) = 0;
virtual int ReadPixel(uint32_t index, int x, int y) = 0;
virtual void ClearBufferI(int index, int value) = 0;
virtual uint32_t GetColorAttachmentRendererID(uint32_t index = 0) const = 0;

5
open_engine/include/open_engine/renderer/render_command.hpp
View File

@@ -24,11 +24,6 @@ namespace OpenEngine {
api->SetClearColor(color);
};
inline static void ClearBufferI(int buffer, int value)
{
api->ClearBufferI(buffer, value);
};
inline static void Clear()
{
api->Clear();

1
open_engine/include/open_engine/renderer/renderer_api.hpp
View File

@@ -21,7 +21,6 @@ namespace OpenEngine {
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 ClearBufferI(int buffer, int value) = 0;
virtual void Clear() = 0;
virtual void DrawIndexed(const Ref<VertexArray>& vertex_array, uint32_t count = 0) = 0;

4
open_engine/src/open_engine/opengl/opengl_framebuffer.cpp
View File

@@ -201,4 +201,8 @@ namespace OpenEngine {
return pixel_data;
}
void OpenGLFramebuffer::ClearBufferI(int index, int value)
{
glClearTexImage(color_attachment_ids[index], 0, GL_RED_INTEGER, GL_INT, &value);
}
}

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

@@ -57,11 +57,6 @@ namespace OpenEngine {
glClearColor(color.r, color.g, color.b, color.a);
}
void OpenGLRendererAPI::ClearBufferI(int buffer, int value)
{
glClearBufferiv(GL_COLOR, buffer, &value);
}
void OpenGLRendererAPI::Clear()
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

45
untitled_persp.oes
View File

@@ -1,5 +1,32 @@
Scene: N/A
Entities:
- Entity: 412741205
TagComponent:
Tag: square 3
TransformComponent:
Translation: [-1.49011612e-08, 0.299999774, -0.499999911]
Rotation: [-1.57079685, 0, 0]
Scale: [0.605000019, 0.60496217, 0.60496217]
SpriteRendererComponent:
Color: [1, 1, 1, 1]
- Entity: 412741205
TagComponent:
Tag: "square 2 "
TransformComponent:
Translation: [0, 0, -0.200000003]
Rotation: [0, 0, 0]
Scale: [0.600000024, 0.600000083, 0.600000024]
SpriteRendererComponent:
Color: [0.882352948, 0.745098054, 0.376470596, 1]
- Entity: 412741205
TagComponent:
Tag: square
TransformComponent:
Translation: [0.299827427, -9.68575478e-08, -0.499896437]
Rotation: [0, 1.57079637, 0]
Scale: [0.6049999, 0.604999959, 0.6049999]
SpriteRendererComponent:
Color: [0.517647088, 0.0901960805, 1, 1]
- Entity: 412741205
TagComponent:
Tag: camera
@@ -18,21 +45,3 @@ Entities:
OrthographicFar: 1
Primary: true
FixedAspectRatio: false
- Entity: 412741205
TagComponent:
Tag: square
TransformComponent:
Translation: [0, 1.79999995, 0]
Rotation: [0, 0, 0]
Scale: [1, 1, 1]
SpriteRendererComponent:
Color: [0.517647088, 0.0901960805, 1, 1]
- Entity: 412741205
TagComponent:
Tag: "square 2 "
TransformComponent:
Translation: [0, 0, 0]
Rotation: [0, 0, 0]
Scale: [1, 1, 1]
SpriteRendererComponent:
Color: [0.882352948, 0.745098054, 0.376470596, 1]