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

cleanup and removing nasty segv upon entity deletion

Browse Source 
+ Fixing bug where clicking an entity in the hierarchy didn't update the
stats
This commit is contained in:
Erris
2026-02-24 18:10:39 +01:00
parent 38b92611be
commit e69764e149
8 changed files with 96 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/include/editor.hpp
View File

@@ -14,7 +14,6 @@
#include <ImGuizmo.h> #include <ImGuizmo.h>
#include <cstdint> #include <cstdint>
#include <imgui.h> #include <imgui.h>
#include <vector> #include <vector>
#include <string> #include <string>
@@ -148,6 +147,7 @@ namespace OpenEngine {
clicked = true; clicked = true;
} else { } else {
clicked = false; clicked = false;
selected_entity = scene_hierarchy.GetSelectedEntity();
} }
framebuffer->Unbind(); framebuffer->Unbind();
@@ -310,7 +310,7 @@ namespace OpenEngine {
glm::mat4 camera_view = editor_camera.GetViewMatrix(); glm::mat4 camera_view = editor_camera.GetViewMatrix();
auto& transform_comp = selected_entity.GetComponents<TransformComponent>(); auto& transform_comp = selected_entity.GetComponents<TransformComponent>();
glm::mat4 transform = transform_comp.GetTransform(); glm::mat4 transform = GetTransformFromComp(transform_comp);
bool snap = Input::IsKeyPressed(KeyCode::LeftControl); bool snap = Input::IsKeyPressed(KeyCode::LeftControl);
float snap_value = 0.1f; float snap_value = 0.1f;
@@ -333,7 +333,8 @@ namespace OpenEngine {
transform_comp.rotation += delta_rotation; transform_comp.rotation += delta_rotation;
transform_comp.scale = scale; transform_comp.scale = scale;
} }
} } else
guizmo_operation = -1;
}; };
void OnImGuiRender() override void OnImGuiRender() override

7
editor/include/editor_component.hpp
View File

@@ -1,18 +1,16 @@
#ifndef EDITOR_COMPONENT_HPP #ifndef EDITOR_COMPONENT_HPP
#define EDITOR_COMPONENT_HPP #define EDITOR_COMPONENT_HPP
#include "open_engine/scene/components.hpp" #include <array>
#include <entt/entity/fwd.hpp> #include <entt/entity/fwd.hpp>
#include <glm/fwd.hpp>
#include <imgui.h> #include <imgui.h>
namespace OpenEngine { namespace OpenEngine {
/*
void DrawVec3Control(const char* label, glm::vec3& values, void DrawVec3Control(const char* label, glm::vec3& values,
float reset_value = 0.0f, float column_width = 100.0f, float reset_value = 0.0f, float column_width = 100.0f,
const std::array<const char*, 3> labels = {"x", "y", "z"}); const std::array<const char*, 3> labels = {"x", "y", "z"});
*/
void TagOnImGuiRender(entt::registry& registry, entt::entity entity); void TagOnImGuiRender(entt::registry& registry, entt::entity entity);
@@ -21,7 +19,6 @@ namespace OpenEngine {
void SpriteOnImGuiRender(entt::registry& registry, entt::entity entity); void SpriteOnImGuiRender(entt::registry& registry, entt::entity entity);
void CameraOnImGuiRender(entt::registry& registry, entt::entity entity); void CameraOnImGuiRender(entt::registry& registry, entt::entity entity);
} }
#endif // EDITOR_COMPONENT_HPP #endif // EDITOR_COMPONENT_HPP

43
editor/include/panels/scene_hierarchy.hpp
View File

@@ -32,49 +32,6 @@ namespace OpenEngine {
void DrawEntityNode(Entity& entity); void DrawEntityNode(Entity& entity);
void DrawComponents(Entity& entity); void DrawComponents(Entity& entity);
/*
template <typename T>
void DrawComponentDrawer(Entity& entity, const char* header)
{
bool component_marked_deletion = false;
ImVec2 region_available = ImGui::GetContentRegionAvail();
ImGuiTreeNodeFlags tree_node_flags = ImGuiTreeNodeFlags_DefaultOpen
| ImGuiTreeNodeFlags_Framed
| ImGuiTreeNodeFlags_AllowOverlap;
if (entity.HasComponent<T>()) {
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{ 4, 4 });
float line_height = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
bool opened = ImGui::TreeNodeEx((void*)typeid(T).hash_code(), tree_node_flags, "%s", header);
ImGui::SameLine(region_available.x - line_height * 0.5f);
ImGui::PushStyleColor(ImGuiCol_Button, { 0.290f, 0.301f, 0.388f, 1.0f });
if (ImGui::Button("...", ImVec2{ line_height, line_height }))
ImGui::OpenPopup("component_settings");
ImGui::PopStyleColor();
ImGui::PopStyleVar();
if (ImGui::BeginPopup("component_settings")) {
if (ImGui::MenuItem("Remove component"))
component_marked_deletion = true;
ImGui::EndPopup();
}
if (opened) {
entity.GetComponents<T>().OnImGuiRender(entity);
ImGui::TreePop();
}
ImGui::Separator();
}
if (component_marked_deletion)
entity.RemoveComponents<T>();
}
*/
private: private:
template<typename T> template<typename T>
static void RegisterDrawer(const std::string& name, std::function<void(entt::registry&, entt::entity)> func) { static void RegisterDrawer(const std::string& name, std::function<void(entt::registry&, entt::entity)> func) {

76
editor/src/editor_component.cpp
View File

@@ -3,6 +3,82 @@
namespace OpenEngine { namespace OpenEngine {
void DrawVec3Control(const char* label, glm::vec3& values,
float reset_value, float column_width,
const std::array<const char*, 3> labels)
{
ImGuiIO& io = ImGui::GetIO();
auto bold_font = io.Fonts->Fonts[0];
ImGui::PushID(label);
ImVec2 item_spacing = { 15.0f, 0.0f };
ImGui::Columns(2);
ImGui::SetColumnWidth(0, column_width);
ImGui::Text("%s", label);
if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left) && ImGui::IsItemHovered())
values = glm::vec3(reset_value);
ImGui::NextColumn();
ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2{ 0, 0 });
float line_height = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
ImVec2 button_size = { line_height + 3.0f, line_height };
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{ 0.953f, 0.545f, 0.659f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4{ 1.0f, 0.8f, 0.9f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4{ 0.953f, 0.545f, 0.659f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4{ 0.0f, 0.0f, 0.0f, 1.0f });
ImGui::PushFont(bold_font);
if (ImGui::Button(labels[0], button_size))
values.x = reset_value;
ImGui::PopFont();
ImGui::PopStyleColor(4);
ImGui::SameLine();
ImGui::DragFloat("##X", &values.x, 0.1f, 0.0f, 0.0f, "%.2f");
ImGui::PopItemWidth();
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, item_spacing);
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{ 0.650f, 0.890f, 0.631f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4{ 0.9f, 1.0f, 0.9f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4{ 0.650f, 0.890f, 0.631f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4{ 0.0f, 0.0f, 0.0f, 1.0f });
ImGui::PushFont(bold_font);
if (ImGui::Button(labels[1], button_size))
values.y = reset_value;
ImGui::PopFont();
ImGui::PopStyleColor(4);
ImGui::PopStyleVar();
ImGui::SameLine();
ImGui::DragFloat("##Y", &values.y, 0.1f, 0.0f, 0.0f, "%.2f");
ImGui::PopItemWidth();
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, item_spacing);
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{ 0.533f, 0.698f, 0.976f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4{ 0.7f, 0.9f, 1.0f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4{ 0.533f, 0.698f, 0.976f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4{ 0.0f, 0.0f, 0.0f, 1.0f });
ImGui::PushFont(bold_font);
if (ImGui::Button(labels[2], button_size))
values.z = reset_value;
ImGui::PopFont();
ImGui::PopStyleColor(4);
ImGui::PopStyleVar(1);
ImGui::SameLine();
ImGui::DragFloat("##Z", &values.z, 0.1f, 0.0f, 0.0f, "%.2f");
ImGui::PopItemWidth();
ImGui::PopStyleVar();
ImGui::Columns(1);
ImGui::PopID();
}
void TagOnImGuiRender(entt::registry& registry, entt::entity entity) void TagOnImGuiRender(entt::registry& registry, entt::entity entity)
{ {
char buffer[256]; char buffer[256];

3
editor/src/panels/scene_hierarchy.cpp
View File

@@ -196,7 +196,7 @@ namespace OpenEngine {
auto& reg = scene->GetRegistry(); auto& reg = scene->GetRegistry();
entt::entity handle = selected_context; entt::entity handle = selected_context;
if (!selected_context) if (!selected_context || !entity)
return; return;
entity.GetComponents<TagComponent>(); entity.GetComponents<TagComponent>();
@@ -222,7 +222,6 @@ namespace OpenEngine {
if (ImGui::Button("...", ImVec2{ line_height, line_height })) if (ImGui::Button("...", ImVec2{ line_height, line_height }))
ImGui::OpenPopup("component_settings"); ImGui::OpenPopup("component_settings");
ImGui::PopStyleColor(); ImGui::PopStyleColor();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
if (ImGui::BeginPopup("component_settings")) { if (ImGui::BeginPopup("component_settings")) {

17
open_engine/include/open_engine/scene/components.hpp
View File

@@ -4,7 +4,6 @@
#include "open_engine/scene/native_scriptable_entity.hpp" #include "open_engine/scene/native_scriptable_entity.hpp"
#include "open_engine/scene/scene_camera.hpp" #include "open_engine/scene/scene_camera.hpp"
#include <cstring>
#include <glm/ext/matrix_transform.hpp> #include <glm/ext/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <glm/fwd.hpp> #include <glm/fwd.hpp>
@@ -19,10 +18,6 @@
namespace OpenEngine { namespace OpenEngine {
void DrawVec3Control(const char* label, glm::vec3& values,
float reset_value = 0.0f, float column_width = 100.0f,
const std::array<const char*, 3> labels = {"x", "y", "z"});
struct TagComponent struct TagComponent
{ {
std::string tag; std::string tag;
@@ -43,18 +38,10 @@ namespace OpenEngine {
TransformComponent(const TransformComponent&) = default; TransformComponent(const TransformComponent&) = default;
TransformComponent(const glm::vec3& position) TransformComponent(const glm::vec3& position)
: translation(position) {} : translation(position) {}
glm::mat4 GetTransform() const
{
glm::mat4 transform = glm::translate(glm::mat4(1.0f), translation);
transform *= glm::toMat4(glm::quat(rotation));
transform *= glm::scale(glm::mat4(1.0f), scale);
return transform;
};
}; };
glm::mat4 GetTransformFromComp(TransformComponent& transform_comp);
struct SpriteRendererComponent struct SpriteRendererComponent
{ {
glm::vec4 color{ 1.0f, 1.0f, 1.0f, 1.0f }; glm::vec4 color{ 1.0f, 1.0f, 1.0f, 1.0f };

79
open_engine/src/open_engine/scene/components.cpp
View File

@@ -1,83 +1,16 @@
#include "imgui.h"
#include <pch.hpp> #include <pch.hpp>
#include <scene/components.hpp> #include <scene/components.hpp>
namespace OpenEngine { namespace OpenEngine {
void DrawVec3Control(const char* label, glm::vec3& values, glm::mat4 GetTransformFromComp(TransformComponent& transform_comp)
float reset_value, float column_width,
const std::array<const char*, 3> labels)
{ {
ImGuiIO& io = ImGui::GetIO(); glm::mat4 transform = glm::translate(glm::mat4(1.0f), transform_comp.translation);
auto bold_font = io.Fonts->Fonts[0];
ImGui::PushID(label); transform *= glm::toMat4(glm::quat(transform_comp.rotation));
ImVec2 item_spacing = { 15.0f, 0.0f }; transform *= glm::scale(glm::mat4(1.0f), transform_comp.scale);
ImGui::Columns(2);
ImGui::SetColumnWidth(0, column_width);
ImGui::Text("%s", label);
if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left) && ImGui::IsItemHovered())
values = glm::vec3(reset_value);
ImGui::NextColumn();
ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth()); return transform;
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2{ 0, 0 }); };
float line_height = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
ImVec2 button_size = { line_height + 3.0f, line_height };
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{ 0.953f, 0.545f, 0.659f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4{ 1.0f, 0.8f, 0.9f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4{ 0.953f, 0.545f, 0.659f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4{ 0.0f, 0.0f, 0.0f, 1.0f });
ImGui::PushFont(bold_font);
if (ImGui::Button(labels[0], button_size))
values.x = reset_value;
ImGui::PopFont();
ImGui::PopStyleColor(4);
ImGui::SameLine();
ImGui::DragFloat("##X", &values.x, 0.1f, 0.0f, 0.0f, "%.2f");
ImGui::PopItemWidth();
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, item_spacing);
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{ 0.650f, 0.890f, 0.631f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4{ 0.9f, 1.0f, 0.9f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4{ 0.650f, 0.890f, 0.631f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4{ 0.0f, 0.0f, 0.0f, 1.0f });
ImGui::PushFont(bold_font);
if (ImGui::Button(labels[1], button_size))
values.y = reset_value;
ImGui::PopFont();
ImGui::PopStyleColor(4);
ImGui::PopStyleVar();
ImGui::SameLine();
ImGui::DragFloat("##Y", &values.y, 0.1f, 0.0f, 0.0f, "%.2f");
ImGui::PopItemWidth();
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, item_spacing);
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{ 0.533f, 0.698f, 0.976f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4{ 0.7f, 0.9f, 1.0f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4{ 0.533f, 0.698f, 0.976f, 1.0f });
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4{ 0.0f, 0.0f, 0.0f, 1.0f });
ImGui::PushFont(bold_font);
if (ImGui::Button(labels[2], button_size))
values.z = reset_value;
ImGui::PopFont();
ImGui::PopStyleColor(4);
ImGui::PopStyleVar(1);
ImGui::SameLine();
ImGui::DragFloat("##Z", &values.z, 0.1f, 0.0f, 0.0f, "%.2f");
ImGui::PopItemWidth();
ImGui::PopStyleVar();
ImGui::Columns(1);
ImGui::PopID();
}
} }

12
open_engine/src/open_engine/scene/scene.cpp
View File

@@ -1,11 +1,9 @@
#include "logging.hpp"
#include <pch.hpp> #include <pch.hpp>
#include <scene/scene.hpp>
#include <renderer/renderer2d.hpp> #include <renderer/renderer2d.hpp>
#include <scene/entity.hpp>
#include <scene/components.hpp> #include <scene/components.hpp>
#include <scene/entity.hpp>
#include <scene/scene.hpp>
namespace OpenEngine { namespace OpenEngine {
Entity Scene::CreateEntity(const std::string& name) Entity Scene::CreateEntity(const std::string& name)
@@ -49,7 +47,7 @@ namespace OpenEngine {
if (camera_component.primary) { if (camera_component.primary) {
main_camera = &camera_component.camera; main_camera = &camera_component.camera;
main_transform = transform.GetTransform(); main_transform = GetTransformFromComp(transform);
break; break;
} }
} }
@@ -61,7 +59,7 @@ namespace OpenEngine {
for (const auto& entity : view) { for (const auto& entity : view) {
auto [transform, sprite] = view.get<TransformComponent, SpriteRendererComponent>(entity); auto [transform, sprite] = view.get<TransformComponent, SpriteRendererComponent>(entity);
Renderer2D::DrawQuad(transform.GetTransform(), sprite.color, (int)entity); Renderer2D::DrawQuad(GetTransformFromComp(transform), sprite.color, (int)entity);
} }
Renderer2D::EndScene(); Renderer2D::EndScene();
@@ -78,7 +76,7 @@ namespace OpenEngine {
{ {
auto [transform, sprite] = group.get<TransformComponent, SpriteRendererComponent>(entity); auto [transform, sprite] = group.get<TransformComponent, SpriteRendererComponent>(entity);
Renderer2D::DrawQuad(transform.GetTransform(), sprite.color, (int)entity); Renderer2D::DrawQuad(GetTransformFromComp(transform), sprite.color, (int)entity);
} }
Renderer2D::EndScene(); Renderer2D::EndScene();