From a691d2ff287a29b9d2bcd43f065740e3da5ce395 Mon Sep 17 00:00:00 2001 From: Diren D Bharwani Date: Sat, 4 Mar 2023 13:50:10 +0800 Subject: [PATCH] Fixed imgui error caused by merge --- .../Inspector/SHEditorComponentView.hpp | 102 +++++++++--------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp index d9090a68..04008c7b 100644 --- a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp +++ b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp @@ -338,7 +338,7 @@ namespace SHADE ImGui::PushID(SHFamilyID::GetID()); std::vector collisionTagNames(SHCollisionTag::NUM_LAYERS); //Fetch tag names - for (int i{}; i < SHCollisionTag::NUM_LAYERS; ++i) + for(int i{}; i < SHCollisionTag::NUM_LAYERS; ++i) { collisionTagNames[i] = SHCollisionTagMatrix::GetTagName(i).c_str(); } @@ -362,11 +362,11 @@ namespace SHADE SHCollisionShape* shape = component->GetCollisionShape(i); auto cursorPos = ImGui::GetCursorPos(); - + if (shape->GetType() == SHCollisionShape::Type::BOX) { SHEditorWidgets::BeginPanel(std::format("{} Box #{}", ICON_FA_CUBE, i).data(), { ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y }); - + auto* box = reinterpret_cast(shape); SHEditorWidgets::DragVec3 ( @@ -387,73 +387,71 @@ namespace SHADE else if (shape->GetType() == SHCollisionShape::Type::CAPSULE) { - //} + } + { + SHEditorWidgets::CheckBox("Is Trigger", [shape] { return shape->IsTrigger(); }, [shape](bool value) { shape->SetIsTrigger(value); }); + SHEditorWidgets::ComboBox("Tag", collisionTagNames, [shape]{return SHCollisionTagMatrix::GetTagIndex(shape->GetCollisionTag().GetName());}, [shape](int const& value){shape->SetCollisionTag(SHCollisionTagMatrix::GetTag(value));}); + + if(ImGui::CollapsingHeader("Physics Material")) { - SHEditorWidgets::CheckBox("Is Trigger", [shape] { return shape->IsTrigger(); }, [shape](bool value) { shape->SetIsTrigger(value); }); - SHEditorWidgets::ComboBox("Tag", collisionTagNames, [shape] {return SHCollisionTagMatrix::GetTagIndex(shape->GetCollisionTag().GetName()); }, [shape](int const& value) {shape->SetCollisionTag(SHCollisionTagMatrix::GetTag(value)); }); - - if (ImGui::CollapsingHeader("Physics Material")) - { - SHEditorWidgets::DragFloat("Friction", [shape] { return shape->GetFriction(); }, [shape](float value) { shape->SetFriction(value); }, "Friction", 0.05f, 0.0f, 1.0f); - SHEditorWidgets::DragFloat("Bounciness", [shape] { return shape->GetBounciness(); }, [shape](float value) { shape->SetBounciness(value); }, "Bounciness", 0.05f, 0.0f, 1.0f); - SHEditorWidgets::DragFloat("Mass Density", [shape] { return shape->GetDensity(); }, [shape](float value) { shape->SetDensity(value); }, "Mass Density", 0.1f, 0.0f); - } - - SHEditorWidgets::BeginPanel("Offsets", { ImGui::GetContentRegionAvail().x, 30.0f }); - SHEditorWidgets::DragVec3("Position", { "X", "Y", "Z" }, [&shape] {return shape->GetPositionOffset(); }, [&shape](SHVec3 const& vec) {shape->SetPositionOffset(vec); }); - SHEditorWidgets::DragVec3("Rotation", { "X", "Y", "Z" }, - [&shape] - { - auto offset = shape->GetRotationOffset(); - return offset; - }, - [&shape](SHVec3 const& vec) - { - shape->SetRotationOffset(vec); - }, true); - SHEditorWidgets::EndPanel(); + SHEditorWidgets::DragFloat("Friction", [shape] { return shape->GetFriction(); }, [shape](float value) { shape->SetFriction(value); }, "Friction", 0.05f, 0.0f, 1.0f); + SHEditorWidgets::DragFloat("Bounciness", [shape] { return shape->GetBounciness(); }, [shape](float value) { shape->SetBounciness(value); }, "Bounciness", 0.05f, 0.0f, 1.0f); + SHEditorWidgets::DragFloat("Mass Density", [shape] { return shape->GetDensity(); }, [shape](float value) { shape->SetDensity(value); }, "Mass Density", 0.1f, 0.0f); } - if (ImGui::Button(std::format("{} Remove Collider #{}", ICON_MD_REMOVE, i).data())) + SHEditorWidgets::BeginPanel("Offsets",{ ImGui::GetContentRegionAvail().x, 30.0f }); + SHEditorWidgets::DragVec3("Position", { "X", "Y", "Z" }, [&shape] {return shape->GetPositionOffset(); }, [&shape](SHVec3 const& vec) {shape->SetPositionOffset(vec); }); + SHEditorWidgets::DragVec3("Rotation", { "X", "Y", "Z" }, + [&shape] { - colliderToDelete = i; - } - + auto offset = shape->GetRotationOffset(); + return offset; + }, + [&shape](SHVec3 const& vec) + { + shape->SetRotationOffset(vec); + }, true); SHEditorWidgets::EndPanel(); - ImGui::PopID(); } - if (colliderToDelete.has_value()) + + if (ImGui::Button(std::format("{} Remove Collider #{}", ICON_MD_REMOVE, i).data())) { - component->GetCollider()->RemoveCollisionShape(colliderToDelete.value()); + colliderToDelete = i; } - ImGui::EndChild(); - // TODO: Handle differences between composite & hull collider - if (ImGui::BeginMenu("Add Collider")) + SHEditorWidgets::EndPanel(); + ImGui::PopID(); + } + if (colliderToDelete.has_value()) + { + component->GetCollider()->RemoveCollisionShape(colliderToDelete.value()); + } + ImGui::EndChild(); + + // TODO: Handle differences between composite & hull collider + if (ImGui::BeginMenu("Add Collider")) + { + int newColl = -1; + + if (ImGui::Selectable("Box Collider")) { - int newColl = -1; - - if (ImGui::Selectable("Box Collider")) - { - auto* compositeCollider = reinterpret_cast(component->GetCollider()); - compositeCollider->AddBoxCollisionShape(SHVec3::One); - } - if (ImGui::Selectable("Sphere Collider")) - { - auto* compositeCollider = reinterpret_cast(component->GetCollider()); - compositeCollider->AddSphereCollisionShape(1.0f); - } - - ImGui::EndMenu(); + auto* compositeCollider = reinterpret_cast(component->GetCollider()); + compositeCollider->AddBoxCollisionShape(SHVec3::One); } + if (ImGui::Selectable("Sphere Collider")) + { + auto* compositeCollider = reinterpret_cast(component->GetCollider()); + compositeCollider->AddSphereCollisionShape(1.0f); + } + + ImGui::EndMenu(); } } else { DrawContextMenu(component); } - ImGui::PopID(); }