slapin/ogre-prototype
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed crashes

Browse Source
This commit is contained in:
Sergey Lapin
2026-04-03 18:43:54 +03:00
parent ec2695bc6c
commit d4061386ec
3 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/features/editScene/gizmo/Gizmo.cpp
View File

@@ -42,10 +42,32 @@ Gizmo::Gizmo(Ogre::SceneManager *sceneMgr)
Gizmo::~Gizmo()
{
if (m_axisX) m_sceneMgr->destroyManualObject(m_axisX);
if (m_axisY) m_sceneMgr->destroyManualObject(m_axisY);
if (m_axisZ) m_sceneMgr->destroyManualObject(m_axisZ);
if (m_gizmoNode) m_sceneMgr->destroySceneNode(m_gizmoNode);
// Detach objects from node first to avoid double-delete
if (m_gizmoNode) {
if (m_axisX) m_gizmoNode->detachObject(m_axisX);
if (m_axisY) m_gizmoNode->detachObject(m_axisY);
if (m_axisZ) m_gizmoNode->detachObject(m_axisZ);
}
// Now destroy the manual objects
if (m_axisX) {
m_sceneMgr->destroyManualObject(m_axisX);
m_axisX = nullptr;
}
if (m_axisY) {
m_sceneMgr->destroyManualObject(m_axisY);
m_axisY = nullptr;
}
if (m_axisZ) {
m_sceneMgr->destroyManualObject(m_axisZ);
m_axisZ = nullptr;
}
// Finally destroy the node
if (m_gizmoNode) {
m_sceneMgr->destroySceneNode(m_gizmoNode);
m_gizmoNode = nullptr;
}
}
void Gizmo::attachTo(flecs::entity entity)

8
src/features/editScene/systems/EditorUISystem.cpp
View File

@@ -648,6 +648,14 @@ void EditorUISystem::deleteEntity(flecs::entity entity)
deleteEntity(child);
}
// Clean up physics body before removing component
if (entity.has<RigidBodyComponent>()) {
auto &rigidBody = entity.get_mut<RigidBodyComponent>();
if (m_physicsSystem && rigidBody.bodyCreated) {
m_physicsSystem->removeRigidBody(rigidBody);
}
}
// Clean up transform node
if (entity.has<TransformComponent>()) {
auto &transform = entity.get_mut<TransformComponent>();

6
src/features/editScene/systems/PhysicsSystem.hpp
View File

@@ -33,6 +33,9 @@ public:
bool isInitialized() const { return m_initialized; }
// Remove a rigid body (public for external cleanup)
void removeRigidBody(RigidBodyComponent& rigidBody);
private:
// Create a shape from collider component
JPH::ShapeRefC createShape(PhysicsColliderComponent& collider);
@@ -44,9 +47,6 @@ private:
void updateRigidBody(flecs::entity entity, RigidBodyComponent& rigidBody,
class TransformComponent& transform);
// Remove a rigid body
void removeRigidBody(RigidBodyComponent& rigidBody);
flecs::world& m_world;
Ogre::SceneManager* m_sceneMgr;