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

76
editor/src/editor_component.cpp
View File

@@ -3,6 +3,82 @@
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)
{
char buffer[256];

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

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