ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: dirty system now dirties and cooks descendents of change

Browse Source
This commit is contained in:
parker
2025-07-30 17:12:13 +01:00
parent 83e0977d5d
commit e72e6bce96
6 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Engine/Network/NetworkManager.cpp
View File

@@ -19,15 +19,31 @@ enzo::nt::OpId enzo::nt::NetworkManager::addOperator(op::OpInfo opInfo)
maxOpId_++;
std::unique_ptr<GeometryOperator> newOp = std::make_unique<GeometryOperator>(maxOpId_, opInfo);
newOp->nodeDirtied.connect(
[this](nt::OpId opId)
[this](nt::OpId opId, bool dirtyDescendents)
{
cookOp(opId);
if(getDisplayOp()==opId)
IC();
if(dirtyDescendents)
{
enzo::nt::GeometryOperator& displayOp = getGeoOperator(opId);
updateDisplay(displayOp.getOutputGeo(0));
IC();
std::vector<OpId> dependentIds = getDependentsGraph(opId);
for(OpId dependentId : dependentIds)
{
IC();
// dirty node
enzo::nt::GeometryOperator& dependentOp = getGeoOperator(opId);
std::cout << "dirtying id: " << dependentId << "\n";
dependentOp.dirtyNode(false);
// cook display op
if(getDisplayOp().has_value() && getDisplayOp().value()==dependentId)
{
IC();
cookOp(dependentId);
updateDisplay(dependentOp.getOutputGeo(0));
}
}
}
});
gopStore_.emplace(maxOpId_, std::move(newOp));
std::cout << "adding operator " << maxOpId_ << "\n";
@@ -96,7 +112,6 @@ std::vector<enzo::nt::OpId> enzo::nt::NetworkManager::getDependencyGraph(enzo::n
while(traversalBuffer.size()!=0)
{
enzo::nt::OpId currentOp = traversalBuffer.top();
std::cout << "cooking node: " << currentOp << "\n";
traversalBuffer.pop();
auto inputConnections = getGeoOperator(currentOp).getInputConnections();
for(auto connection : inputConnections)
@@ -114,6 +129,31 @@ std::vector<enzo::nt::OpId> enzo::nt::NetworkManager::getDependencyGraph(enzo::n
return dependencyGraph;
}
std::vector<enzo::nt::OpId> enzo::nt::NetworkManager::getDependentsGraph(enzo::nt::OpId opId)
{
std::stack<enzo::nt::OpId> traversalBuffer;
std::vector<enzo::nt::OpId> dependencyGraph;
traversalBuffer.push(opId);
dependencyGraph.push_back(opId);
while(traversalBuffer.size()!=0)
{
enzo::nt::OpId currentOp = traversalBuffer.top();
traversalBuffer.pop();
auto outputConnections = getGeoOperator(currentOp).getOutputConnections();
for(auto connection : outputConnections)
{
if(auto connectionPtr = connection.lock())
{
traversalBuffer.push(connectionPtr->getOutputOpId());
dependencyGraph.push_back(connectionPtr->getOutputOpId());
}
else { throw std::runtime_error("Connection weak ptr invalid"); }
}
}
return dependencyGraph;
}
std::optional<enzo::nt::OpId> enzo::nt::NetworkManager::getDisplayOp()
{

1
src/Engine/Network/NetworkManager.h
View File

@@ -36,6 +36,7 @@ private:
// functions
void cookOp(enzo::nt::OpId opId);
std::vector<enzo::nt::OpId> getDependencyGraph(enzo::nt::OpId opId);
std::vector<enzo::nt::OpId> getDependentsGraph(enzo::nt::OpId opId);
// variables
// store for geometry operators