not working yet
This commit is contained in:
@@ -37,27 +37,18 @@ Assembly::Assembly(const Assembly ©)
|
||||
m_GroupSelection(copy.m_GroupSelection) {}
|
||||
|
||||
Assembly::~Assembly() {
|
||||
for (auto const& [obj, conn] : m_ChildConnections) {
|
||||
conn.disconnect();
|
||||
}
|
||||
m_ChildConnections.clear();
|
||||
}
|
||||
|
||||
void Assembly::AddObject(Object *obj) {
|
||||
if (!obj || obj == this) return;
|
||||
|
||||
if (auto *at = dynamic_cast<AffineTransform *>(obj)) {
|
||||
at->SetParent(this);
|
||||
}
|
||||
|
||||
// Base class already handles the list and child->parent update connection
|
||||
ObjectsContext::AddObject(obj);
|
||||
|
||||
// Connect to child updates to recompute AABB
|
||||
m_ChildConnections[obj] = Object::connect(obj, &Object::Updated, [this](){
|
||||
this->ComputeBoundingBox();
|
||||
this->Updated(); // Signal that assembly itself changed (AABB-wise)
|
||||
});
|
||||
|
||||
// Parent -> Child propagation for world matrix updates
|
||||
Object::connect(this, &Object::Updated, obj, &Object::Updated);
|
||||
|
||||
this->ComputeBoundingBox();
|
||||
}
|
||||
|
||||
@@ -67,12 +58,6 @@ void Assembly::RemoveObject(Object *obj) {
|
||||
at->SetParent(nullptr);
|
||||
}
|
||||
|
||||
auto itConn = m_ChildConnections.find(obj);
|
||||
if (itConn != m_ChildConnections.end()) {
|
||||
itConn->second.disconnect();
|
||||
m_ChildConnections.erase(itConn);
|
||||
}
|
||||
|
||||
ObjectsContext::RemoveObject(obj);
|
||||
this->ComputeBoundingBox();
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "Math/Transform.h"
|
||||
|
||||
namespace uLib {
|
||||
namespace Vtk { class Assembly; }
|
||||
|
||||
/**
|
||||
* @brief Assembly groups geometric objects (ContainerBox, Cylinder, etc.)
|
||||
@@ -46,6 +47,7 @@ namespace uLib {
|
||||
class Assembly : public ObjectsContext, public TRS {
|
||||
public:
|
||||
uLibTypeMacro(Assembly, ObjectsContext, TRS)
|
||||
friend class Vtk::Assembly;
|
||||
|
||||
|
||||
Assembly();
|
||||
@@ -112,7 +114,6 @@ private:
|
||||
bool m_ShowBoundingBox;
|
||||
bool m_GroupSelection;
|
||||
bool m_InUpdated = false;
|
||||
std::map<Object*, Connection> m_ChildConnections;
|
||||
|
||||
ULIB_DECLARE_PROPERTIES(Assembly)
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user