From ecf27eae7367c532e25c1e08e7fcbb654a34178d Mon Sep 17 00:00:00 2001 From: Erris Date: Thu, 5 Mar 2026 01:22:41 +0100 Subject: [PATCH] various bug fix, serialization, adding shapes --- editor/include/editor_component.hpp | 3 +- editor/src/editor_component.cpp | 86 +++++++++++----- editor/src/panels/scene_hierarchy.cpp | 14 ++- open_engine/include/open_engine/physics.hpp | 3 + .../include/open_engine/scene/components.hpp | 20 ++-- .../include/open_engine/scene/scene.hpp | 3 +- open_engine/src/open_engine/scene/scene.cpp | 99 ++++++++++--------- .../open_engine/scene/scene_serializer.cpp | 79 +++++++++++++-- 8 files changed, 215 insertions(+), 92 deletions(-) diff --git a/editor/include/editor_component.hpp b/editor/include/editor_component.hpp index 5630dfc..7a3ecc7 100644 --- a/editor/include/editor_component.hpp +++ b/editor/include/editor_component.hpp @@ -19,7 +19,8 @@ namespace OpenEngine { void MeshOnImGuiRender(entt::registry®istry, entt::entity entity); void MaterialOnImGuiRender(entt::registry& registry, entt::entity entity); void BodyOnImGuiRender(entt::registry& registry, entt::entity entity); - void ShapeOnImGuiRender(entt::registry& registry, entt::entity entity); + void SphereShapeOnImGuiRender(entt::registry& registry, entt::entity entity); + void BoxShapeOnImGuiRender(entt::registry& registry, entt::entity entity); } #endif // EDITOR_COMPONENT_HPP diff --git a/editor/src/editor_component.cpp b/editor/src/editor_component.cpp index 6b1d445..855ee08 100644 --- a/editor/src/editor_component.cpp +++ b/editor/src/editor_component.cpp @@ -1,6 +1,7 @@ #include "imgui.h" #include "open_engine/renderer/renderer3d.hpp" #include "open_engine/scene/components.hpp" +#include #include #include #include @@ -181,12 +182,11 @@ namespace OpenEngine { { auto& mesh_component = registry.get(entity); - const char* items[] = { "Quad", "Cube" }; - static int item_selected_idx = 0; + const char* items[] = { "None", "Quad", "Cube" }; + int item_selected_idx = (int)mesh_component.primitive_type; if (ImGui::BeginCombo("Mesh", items[item_selected_idx])) { - for (int n = 0; n < 2; n++) - { + for (int n = 0; n < 3; n++) { const bool is_selected = (item_selected_idx == n); if (ImGui::Selectable(items[n], is_selected)) item_selected_idx = n; @@ -196,25 +196,26 @@ namespace OpenEngine { ImGui::SetItemDefaultFocus(); } ImGui::EndCombo(); + } - if ((int)mesh_component.primitive_type == (item_selected_idx + 1)) - return; + if ((int)mesh_component.primitive_type == (item_selected_idx)) + return; - mesh_component.primitive_type = (PrimitiveType)(item_selected_idx + 1); - switch (mesh_component.primitive_type) { - case OpenEngine::PrimitiveType::Quad: - { - mesh_component.mesh = CreateQuad((uint32_t)entity); - break; - } - case OpenEngine::PrimitiveType::Cube: - { - mesh_component.mesh = CreateCube((uint32_t)entity); - break; - } - default: + mesh_component.primitive_type = (PrimitiveType)(item_selected_idx); + switch (mesh_component.primitive_type) { + case OpenEngine::PrimitiveType::Quad: + { + mesh_component.mesh = CreateQuad((uint32_t)entity); break; - } + } + case OpenEngine::PrimitiveType::Cube: + { + mesh_component.mesh = CreateCube((uint32_t)entity); + break; + } + default: + mesh_component.mesh = nullptr; + break; } } @@ -233,16 +234,53 @@ namespace OpenEngine { { auto& body_comp = registry.get(entity); + const char* items[] = { "Static", "Kinematic", "Dynamic" }; + int item_selected_idx = body_comp.type; + + if (ImGui::BeginCombo("Body type", items[item_selected_idx])) { + for (int n = 0; n < 3; n++) + { + const bool is_selected = (item_selected_idx == n); + if (ImGui::Selectable(items[n], is_selected)) + item_selected_idx = n; + + // Set the initial focus when opening the combo (scrolling + keyboard navigation focus) + if (is_selected) + ImGui::SetItemDefaultFocus(); + } + ImGui::EndCombo(); + } + + body_comp.type = item_selected_idx; + ImGui::SliderFloat("Linear damping", &body_comp.linear_damping, 0, 1); ImGui::SliderFloat("Angular damping", &body_comp.angular_damping, 0, 1); ImGui::SliderFloat("Gravity factor", &body_comp.gravity_factor, 0, 1); + ImGui::SliderFloat("Bounciness", &body_comp.restitution, 0, 1); + ImGui::SliderFloat("Friction", &body_comp.friction, 0, 1); } - void ShapeOnImGuiRender(entt::registry ®istry, entt::entity entity) + void SphereShapeOnImGuiRender(entt::registry ®istry, entt::entity entity) { - auto& shape_comp = registry.get(entity); + auto& sphere_comp = registry.get(entity); + + ImGui::DragFloat("Radius", + &sphere_comp.radius, + 0.1f, + 0.11f, FLT_MAX, + "%.2f", + ImGuiSliderFlags_AlwaysClamp); + } - ImGui::SliderFloat("Bounciness", &shape_comp.restitution, 0, 1); - ImGui::SliderFloat("Friction", &shape_comp.friction, 0, 1); + void BoxShapeOnImGuiRender(entt::registry ®istry, entt::entity entity) + { + auto& box_comp = registry.get(entity); + + ImGui::DragFloat3("Size", + glm::value_ptr(box_comp.size), + 0.1f, + 0.11f, FLT_MAX, + "%.2f", + ImGuiSliderFlags_AlwaysClamp); } } diff --git a/editor/src/panels/scene_hierarchy.cpp b/editor/src/panels/scene_hierarchy.cpp index 8b7e41c..bdcfdc6 100644 --- a/editor/src/panels/scene_hierarchy.cpp +++ b/editor/src/panels/scene_hierarchy.cpp @@ -25,7 +25,8 @@ namespace OpenEngine { RegisterDrawer("Mesh", &MeshOnImGuiRender); RegisterDrawer("Material", &MaterialOnImGuiRender); RegisterDrawer("Physics Body", &BodyOnImGuiRender); - RegisterDrawer("Physics Shape", &ShapeOnImGuiRender); + RegisterDrawer("Sphere Shape", &SphereShapeOnImGuiRender); + RegisterDrawer("Box Shape", &BoxShapeOnImGuiRender); scene = context; selected_context = {}; @@ -64,9 +65,14 @@ namespace OpenEngine { selected_context.AddComponent(); ImGui::CloseCurrentPopup(); } - if (!selected_context.HasComponent()) - if (ImGui::MenuItem("Physics shape")) { - selected_context.AddComponent(); + if (!selected_context.HasComponent()) + if (ImGui::MenuItem("Sphere shape")) { + selected_context.AddComponent(); + ImGui::CloseCurrentPopup(); + } + if (!selected_context.HasComponent()) + if (ImGui::MenuItem("Box shape")) { + selected_context.AddComponent(); ImGui::CloseCurrentPopup(); } } diff --git a/open_engine/include/open_engine/physics.hpp b/open_engine/include/open_engine/physics.hpp index 317d918..673a5d4 100644 --- a/open_engine/include/open_engine/physics.hpp +++ b/open_engine/include/open_engine/physics.hpp @@ -17,6 +17,7 @@ #include #include +#include using namespace JPH; using namespace JPH::literals; @@ -73,6 +74,8 @@ namespace BroadPhaseLayers static constexpr uint NUM_LAYERS(2); }; +inline JPH::Vec3 ToJolt(const glm::vec3& v) { return JPH::Vec3(v.x, v.y, v.z); }; + class BPLayerInterfaceImpl final : public BroadPhaseLayerInterface { public: diff --git a/open_engine/include/open_engine/scene/components.hpp b/open_engine/include/open_engine/scene/components.hpp index c99dbe9..9375e32 100644 --- a/open_engine/include/open_engine/scene/components.hpp +++ b/open_engine/include/open_engine/scene/components.hpp @@ -124,23 +124,27 @@ namespace OpenEngine { float linear_damping = 0.05f; float angular_damping = 0.05f; float gravity_factor = 1.0f; + float restitution = 0.8f; + float friction = 0.5f; - EMotionType type = EMotionType::Dynamic; - EActivation initial_activation_state = EActivation::Activate; - ObjectLayer layer = Layers::MOVING; + int type = (int)EMotionType::Static; + int initial_activation_state = (int)EActivation::Activate; + int layer = (int)Layers::MOVING; PhysicsBodyComponent() = default; PhysicsBodyComponent(const PhysicsBodyComponent&) = default; }; - struct PhysicsShapeComponent + // TODO: Let's add more shapes + struct BoxShapeComponent { - ShapeRefC shape; - - float restitution = 0.8f; - float friction = 0.5f; + glm::vec3 size = { 1.0f, 1.0f, 1.0f }; }; + struct SphereShapeComponent + { + float radius = 1.0f; + }; } #endif // COMPONENTS_HPP diff --git a/open_engine/include/open_engine/scene/scene.hpp b/open_engine/include/open_engine/scene/scene.hpp index 91dd480..c475590 100644 --- a/open_engine/include/open_engine/scene/scene.hpp +++ b/open_engine/include/open_engine/scene/scene.hpp @@ -18,6 +18,7 @@ namespace OpenEngine { public: Scene() = default; ~Scene() = default; + Scene(Scene& other) {}; void OnRuntimeStart(); void OnRuntimeStop(); @@ -52,8 +53,6 @@ namespace OpenEngine { std::vector pending_deletion; - //BodyID sphere_id; - friend class SceneSerializer; friend class Entity; }; diff --git a/open_engine/src/open_engine/scene/scene.cpp b/open_engine/src/open_engine/scene/scene.cpp index 07d26d0..dfc26fb 100755 --- a/open_engine/src/open_engine/scene/scene.cpp +++ b/open_engine/src/open_engine/scene/scene.cpp @@ -1,4 +1,9 @@ #include "logging.hpp" +#include "physics.hpp" +#include "ref_scope.hpp" +#include +#include +#include #include #include @@ -8,6 +13,7 @@ #include #include +#include #include #include #include @@ -17,37 +23,42 @@ namespace OpenEngine { + static Ref CreateShape(entt::registry& reg, entt::entity e) + { + if (reg.any_of(e)) { + auto& c = reg.get(e); + return CreateRef(ToJolt(c.size * 0.5f)); + } + if (reg.any_of(e)) { + auto& c = reg.get(e); + return CreateRef(c.radius); + } + + OE_CORE_ERROR("Entity has no shape component!"); + return nullptr; + }; + void Scene::OnRuntimeStart() { body_interface = &physics_engine.GetBodyInterface(); - - BoxShapeSettings floor_shape_settings(Vec3(100.0f, 1.0f, 100.0f)); - floor_shape_settings.SetEmbedded(); // A ref counted object on the stack (base class RefTarget) should be marked as such to prevent it from being freed when its reference count goes to 0. - - // Create the shape - ShapeSettings::ShapeResult floor_shape_result = floor_shape_settings.Create(); - ShapeRefC floor_shape = floor_shape_result.Get(); // We don't expect an error here, but you can check floor_shape_result for HasError() / GetError() - - // Create the settings for the body itself. Note that here you can also set other properties like the restitution / friction. - BodyCreationSettings floor_settings(floor_shape, RVec3(0.0_r, -1.0_r, 0.0_r), Quat::sIdentity(), EMotionType::Static, Layers::NON_MOVING); - - // Create the actual rigid body - Body *floor = body_interface->CreateBody(floor_settings); // Note that if we run out of bodies this can return nullptr - - // Add it to the world - body_interface->AddBody(floor->GetID(), EActivation::DontActivate); - // TODO: Cleanup components aquisition auto view = registry.view(); for (auto e : view) { Entity entity = { e, this }; + + auto shape_settings = CreateShape(registry, e); + if (!shape_settings) + shape_settings = CreateRef(Vec3(0.5f, 0.5f, 0.5f)); + + auto shape_result = shape_settings->Create(); + if (shape_result.HasError()) { + OE_CORE_ERROR("Shape creation failed: {}", shape_result.GetError().c_str()); + continue; + } + ShapeRefC shape = shape_result.Get(); auto& pbc = entity.GetComponents(); auto& tc = entity.GetComponents(); - - PhysicsShapeComponent* psc = nullptr; - if (entity.HasComponent()) - psc = &entity.GetComponents(); glm::vec3& pos = tc.translation; glm::vec3& scale = tc.scale; @@ -55,22 +66,21 @@ namespace OpenEngine { Quat quat = Quat::sEulerAngles(Vec3(rot.x, rot.y, rot.z)); BodyCreationSettings settings( - new BoxShape(Vec3(scale.x * 0.5, scale.y * 0.5f, scale.z * 0.5f)), + shape, + //new BoxShape(Vec3(scale.x * 0.5, scale.y * 0.5f, scale.z * 0.5f)), Vec3(pos.x, pos.y, pos.z), quat, - pbc.type, + (EMotionType)pbc.type, pbc.layer); settings.mLinearDamping = pbc.linear_damping; settings.mAngularDamping = pbc.angular_damping; settings.mGravityFactor = pbc.gravity_factor; + settings.mRestitution = pbc.restitution; + settings.mFriction = pbc.friction; + settings.mObjectLayer = (ObjectLayer)pbc.layer; - if (psc != nullptr) { - settings.mRestitution = psc->restitution; - settings.mFriction = psc->friction; - } - - pbc.body = body_interface->CreateAndAddBody(settings, pbc.initial_activation_state); + pbc.body = body_interface->CreateAndAddBody(settings, (EActivation)pbc.initial_activation_state); } } @@ -157,14 +167,8 @@ namespace OpenEngine { body_interface->SetPosition(body.body, { pos.x, pos.y, pos.z }, EActivation::Activate); - PhysicsShapeComponent* shape; - if (entity.HasComponent()) { - shape = &entity.GetComponents(); - - body_interface->SetRestitution(body.body, shape->restitution); - body_interface->SetFriction(body.body, shape->friction); - } - + body_interface->SetRestitution(body.body, body.restitution); + body_interface->SetFriction(body.body, body.friction); } OnUpdatePhysics(); @@ -209,14 +213,13 @@ namespace OpenEngine { for (const auto& e : view) { auto [transform, mesh] = view.get(e); - - Material* material; - Entity entity(e, this); - if (entity.HasComponent()) - material = &entity.GetComponents().material; - Renderer3D::DrawMesh(mesh.mesh, *material, GetTransformFromComp(transform)); + Material material; + if (entity.HasComponent()) + material = entity.GetComponents().material; + + Renderer3D::DrawMesh(mesh.mesh, material, GetTransformFromComp(transform)); /* if (sprite.texture) Renderer2D::DrawQuad(GetTransformFromComp(transform), @@ -247,7 +250,8 @@ namespace OpenEngine { if (_entity.HasComponent()) material = _entity.GetComponents().material; - Renderer3D::DrawMesh(mesh.mesh, material, GetTransformFromComp(transform)); + if (mesh.mesh) + Renderer3D::DrawMesh(mesh.mesh, material, GetTransformFromComp(transform)); } Renderer3D::EndScene(); @@ -328,7 +332,12 @@ namespace OpenEngine { } template<> - void Scene::OnComponentAdded(Entity entity, PhysicsShapeComponent& component) + void Scene::OnComponentAdded(Entity entity, SphereShapeComponent& component) + { + } + + template<> + void Scene::OnComponentAdded(Entity entity, BoxShapeComponent& component) { } } diff --git a/open_engine/src/open_engine/scene/scene_serializer.cpp b/open_engine/src/open_engine/scene/scene_serializer.cpp index c217544..818e3d1 100644 --- a/open_engine/src/open_engine/scene/scene_serializer.cpp +++ b/open_engine/src/open_engine/scene/scene_serializer.cpp @@ -115,8 +115,7 @@ namespace OpenEngine { out << YAML::EndMap; // TransformComponent } - if (entity.HasComponent()) - { + if (entity.HasComponent()) { out << YAML::Key << "CameraComponent"; out << YAML::BeginMap; // CameraComponent @@ -151,8 +150,7 @@ namespace OpenEngine { out << YAML::EndMap; // SpriteRendererComponent } - if (entity.HasComponent()) - { + if (entity.HasComponent()) { out << YAML::Key << "MeshComponent"; out << YAML::BeginMap; // MeshComponent @@ -162,8 +160,7 @@ namespace OpenEngine { out << YAML::EndMap; // MeshComponent } - if (entity.HasComponent()) - { + if (entity.HasComponent()) { out << YAML::Key << "MaterialComponent"; out << YAML::BeginMap; // MaterialComponent @@ -177,6 +174,44 @@ namespace OpenEngine { out << YAML::EndMap; // MaterialComponent } + if (entity.HasComponent()) { + out << YAML::Key << "PhysicsBodyComponent"; + out << YAML::BeginMap; // PhysicsBodyComponent + + auto& pbc = entity.GetComponents(); + out << YAML::Key << "LinearDamping" << YAML::Value << pbc.linear_damping; + out << YAML::Key << "AngularDamping" << YAML::Value << pbc.angular_damping; + out << YAML::Key << "GravityFactor" << YAML::Value << pbc.gravity_factor; + out << YAML::Key << "Restitution" << YAML::Value << pbc.restitution; + out << YAML::Key << "Friction" << YAML::Value << pbc.friction; + + out << YAML::Key << "Type" << YAML::Value << pbc.type; + out << YAML::Key << "ActivationState" << YAML::Value << pbc.initial_activation_state; + out << YAML::Key << "Layer" << YAML::Value << pbc.layer; + + out << YAML::EndMap; // PhysicsBodyComponent + } + + if (entity.HasComponent()) { + out << YAML::Key << "BoxShapeComponent"; + out << YAML::BeginMap; //BoxShapeComponent + + auto& bsc = entity.GetComponents(); + out << YAML::Key << "Size" << YAML::Value << bsc.size; + + out << YAML::EndMap; //BoxShapeComponent + } + + if (entity.HasComponent()) { + out << YAML::Key << "SphereShapeComponent"; + out << YAML::BeginMap; //SphereShapeComponent + + auto& ssc = entity.GetComponents(); + out << YAML::Key << "Radius" << YAML::Value << ssc.radius; + + out << YAML::EndMap; //SphereShapeComponent + } + out << YAML::EndMap; } @@ -292,8 +327,7 @@ namespace OpenEngine { } auto material_component = entity["MaterialComponent"]; - if (material_component) - { + if (material_component) { auto& material = deserializedEntity.AddComponent(); material.material.albedo = material_component["Albedo"].as(); material.material.roughness = material_component["Roughness"].as(); @@ -301,6 +335,35 @@ namespace OpenEngine { material.material.ambient_strength = material_component["AmbiantStrength"].as(); material.material.specular_strength = material_component["SpecularStrength"].as(); } + + auto physics_body_component = entity["PhysicsBodyComponent"]; + if (physics_body_component) { + auto& pbc = deserializedEntity.AddComponent(); + + pbc.linear_damping = physics_body_component["LinearDamping"].as(); + pbc.angular_damping = physics_body_component["AngularDamping"].as(); + pbc.gravity_factor = physics_body_component["GravityFactor"].as(); + pbc.restitution = physics_body_component["Restitution"].as(); + pbc.friction = physics_body_component["Friction"].as(); + + pbc.type = physics_body_component["Type"].as(); + pbc.initial_activation_state = physics_body_component["ActivationState"].as(); + pbc.layer = physics_body_component["Layer"].as(); + } + + auto box_shape_component = entity["BoxShapeComponent"]; + if (box_shape_component) { + auto& bsc = deserializedEntity.AddComponent(); + + bsc.size = box_shape_component["Size"].as(); + } + + auto sphere_shape_component = entity["SphereShapeComponent"]; + if (sphere_shape_component) { + auto& ssc = deserializedEntity.AddComponent(); + + ssc.radius = sphere_shape_component["Radius"].as(); + } } }