feat(parameters): signal on parameter change

This commit is contained in:
parker
2025-07-24 02:34:36 +01:00
parent 9880aa0b05
commit 90cc821ffc
7 changed files with 51 additions and 19 deletions

View File

@@ -15,7 +15,19 @@ enzo::nt::OpId enzo::nt::NetworkManager::addOperator(op::OpInfo opInfo)
{ {
maxOpId_++; maxOpId_++;
gopStore_.emplace(maxOpId_, std::make_unique<GeometryOperator>(maxOpId_, opInfo)); std::unique_ptr<GeometryOperator> newOp = std::make_unique<GeometryOperator>(maxOpId_, opInfo);
newOp->nodeDirtied.connect(
[this](nt::OpId opId)
{
cookOp(opId);
if(getDisplayOp()==opId)
{
enzo::nt::GeometryOperator& displayOp = getGeoOperator(opId);
updateDisplay(displayOp.getOutputGeo(0));
}
});
gopStore_.emplace(maxOpId_, std::move(newOp));
std::cout << "adding operator " << maxOpId_ << "\n"; std::cout << "adding operator " << maxOpId_ << "\n";
return maxOpId_; return maxOpId_;
@@ -51,27 +63,25 @@ bool enzo::nt::NetworkManager::isValidOp(nt::OpId opId)
void enzo::nt::NetworkManager::setDisplayOp(OpId opId) void enzo::nt::NetworkManager::setDisplayOp(OpId opId)
{ {
std::cout << "gop size before: " << gopStore_.size() <<"\n";
displayOp_=opId; displayOp_=opId;
std::vector<enzo::nt::OpId> dependencyGraph = getDependencyGraph(opId);
enzo::geo::Geometry prevGeometry;
std::cout << "size: " << dependencyGraph.size() << "\n";
for(enzo::nt::OpId dependencyOpId : dependencyGraph) cookOp(opId);
{
cookOp(dependencyOpId);
}
std::cout << "gop size middle: " << gopStore_.size() <<"\n"; // <- size: 1
enzo::nt::GeometryOperator& displayOp = getGeoOperator(opId); enzo::nt::GeometryOperator& displayOp = getGeoOperator(opId);
updateDisplay(displayOp.getOutputGeo(0)); updateDisplay(displayOp.getOutputGeo(0));
std::cout << "gop size after: " << gopStore_.size() <<"\n"; displayNodeChanged();
} }
void enzo::nt::NetworkManager::cookOp(enzo::nt::OpId opId) void enzo::nt::NetworkManager::cookOp(enzo::nt::OpId opId)
{ {
enzo::nt::GeometryOperator& op = getGeoOperator(opId); std::vector<enzo::nt::OpId> dependencyGraph = getDependencyGraph(opId);
enzo::op::Context context(opId, enzo::nt::nm());
op.cookOp(context); for(enzo::nt::OpId dependencyOpId : dependencyGraph)
{
enzo::nt::GeometryOperator& op = getGeoOperator(dependencyOpId);
enzo::op::Context context(dependencyOpId, enzo::nt::nm());
op.cookOp(context);
}
} }
std::vector<enzo::nt::OpId> enzo::nt::NetworkManager::getDependencyGraph(enzo::nt::OpId opId) std::vector<enzo::nt::OpId> enzo::nt::NetworkManager::getDependencyGraph(enzo::nt::OpId opId)

View File

@@ -24,6 +24,8 @@ public:
GeometryOperator& getGeoOperator(nt::OpId opId); GeometryOperator& getGeoOperator(nt::OpId opId);
void setDisplayOp(OpId opId); void setDisplayOp(OpId opId);
boost::signals2::signal<void ()> displayNodeChanged;
#ifdef UNIT_TEST #ifdef UNIT_TEST
void _reset(); void _reset();
#endif #endif
@@ -42,6 +44,8 @@ private:
enzo::nt::OpId maxOpId_=0; enzo::nt::OpId maxOpId_=0;
// operator selected for displaying in the viewport // operator selected for displaying in the viewport
std::optional<OpId> displayOp_=std::nullopt; std::optional<OpId> displayOp_=std::nullopt;
Q_SIGNALS: Q_SIGNALS:
void updateDisplay(enzo::geo::Geometry& geometry); void updateDisplay(enzo::geo::Geometry& geometry);

View File

@@ -41,16 +41,24 @@ void nt::GeometryOperator::initParameters()
{ {
std::cout << "name: " << t->getName() << "\n"; std::cout << "name: " << t->getName() << "\n";
// create parameter // create parameter
parameters_.push_back( auto parameter = std::make_shared<prm::Parameter>(*t);
std::make_shared<prm::Parameter>(*t) parameter->valueChanged.connect(boost::bind(&GeometryOperator::dirtyNode, this));
);
parameters_.push_back(parameter);
} }
} }
void enzo::nt::GeometryOperator::dirtyNode()
{
dirty_=true;
nodeDirtied(opId_);
}
void enzo::nt::GeometryOperator::cookOp(op::Context context) void enzo::nt::GeometryOperator::cookOp(op::Context context)
{ {
opDef_->cookOp(context); opDef_->cookOp(context);
dirty_=false;
} }
geo::Geometry& enzo::nt::GeometryOperator::getOutputGeo(unsigned outputIndex) geo::Geometry& enzo::nt::GeometryOperator::getOutputGeo(unsigned outputIndex)

View File

@@ -29,10 +29,16 @@ public:
std::vector<std::weak_ptr<prm::Parameter>> getParameters(); std::vector<std::weak_ptr<prm::Parameter>> getParameters();
std::weak_ptr<prm::Parameter> getParameter(std::string parameterName); std::weak_ptr<prm::Parameter> getParameter(std::string parameterName);
void dirtyNode();
unsigned int getMaxInputs() const; unsigned int getMaxInputs() const;
unsigned int getMaxOutputs() const; unsigned int getMaxOutputs() const;
// signals
boost::signals2::signal<void (nt::OpId)> nodeDirtied;
private: private:
void initParameters(); void initParameters();
@@ -46,5 +52,6 @@ private:
std::unique_ptr<enzo::nt::GeometryOpDef> opDef_; std::unique_ptr<enzo::nt::GeometryOpDef> opDef_;
enzo::nt::OpId opId_; enzo::nt::OpId opId_;
enzo::op::OpInfo opInfo_; enzo::op::OpInfo opInfo_;
bool dirty_ = true;
}; };
} }

View File

@@ -1,7 +1,6 @@
#include "Engine/Parameter/Parameter.h" #include "Engine/Parameter/Parameter.h"
#include <iostream> #include <iostream>
enzo::prm::Parameter::Parameter(Template prmTemplate) enzo::prm::Parameter::Parameter(Template prmTemplate)
: template_{prmTemplate} : template_{prmTemplate}
{ {
@@ -21,5 +20,6 @@ enzo::bt::floatT enzo::prm::Parameter::evalFloat() const
void enzo::prm::Parameter::setFloat(bt::floatT value) void enzo::prm::Parameter::setFloat(bt::floatT value)
{ {
floatValue_ = value; floatValue_ = value;
valueChanged();
} }

View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Engine/Parameter/Template.h" #include "Engine/Parameter/Template.h"
#include "Engine/Types.h" #include "Engine/Types.h"
#include <boost/signals2.hpp>
namespace enzo::prm namespace enzo::prm
{ {
@@ -11,6 +12,7 @@ public:
std::string getName() const; std::string getName() const;
bt::floatT evalFloat() const; bt::floatT evalFloat() const;
void setFloat(bt::floatT value); void setFloat(bt::floatT value);
boost::signals2::signal<void ()> valueChanged;
private: private:
Template template_; Template template_;
bt::floatT floatValue_ = 0; bt::floatT floatValue_ = 0;

View File

@@ -55,7 +55,8 @@ EnzoUI::EnzoUI()
// connect signals // connect signals
connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, viewport, &Viewport::geometryChanged); connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, viewport, &Viewport::geometryChanged);
connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, parametersPanel, &ParametersPanel::selectionChanged); enzo::nt::nm().displayNodeChanged.connect([parametersPanel](){parametersPanel->selectionChanged();});
// connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, parametersPanel, &ParametersPanel::selectionChanged);
// ─── end of EnzoUI ctor ─── // ─── end of EnzoUI ctor ───
QTimer::singleShot(0, this, [=] { QTimer::singleShot(0, this, [=] {