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

fix: remove duplicate inputs in engine, add icecream for debugging

Browse Source
This commit is contained in:
parker
2025-07-28 18:03:17 +01:00
parent 93fe708646
commit 7347db34ea
5 changed files with 5905 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Engine/Operator/GeometryOperator.cpp
View File

@@ -6,6 +6,7 @@
#include "Engine/Parameter/Parameter.h"
#include "Engine/Parameter/Template.h"
#include <iostream>
#include "icecream.hpp"
using namespace enzo;
@@ -66,11 +67,29 @@ geo::Geometry& enzo::nt::GeometryOperator::getOutputGeo(unsigned outputIndex)
return opDef_->getOutputGeo(outputIndex);
}
void nt::GeometryOperator::addInputConnection(std::shared_ptr<nt::GeometryConnection> connection)
void nt::GeometryOperator::addInputConnection(std::shared_ptr<nt::GeometryConnection> newConnection)
{
std::cout << "Input connection added\nConnecting ops " << connection->getInputOpId() << " -> " << connection->getOutputOpId() << "\n";
std::cout << "Connecting index " << connection->getInputIndex() << " -> " << connection->getOutputIndex() << "\n";
inputConnections_.push_back(connection);
// delete previous input
IC();
for(auto it=inputConnections_.begin(); it!=inputConnections_.end();)
{
IC();
if((*it)->getOutputIndex()==newConnection->getOutputIndex())
{
IC();
inputConnections_.erase(it);
}
else
{
++it;
}
}
IC();
std::cout << "Input newConnection added\nConnecting ops " << newConnection->getInputOpId() << " -> " << newConnection->getOutputOpId() << "\n";
std::cout << "Connecting index " << newConnection->getInputIndex() << " -> " << newConnection->getOutputIndex() << "\n";
// add new newConnection
inputConnections_.push_back(newConnection);
std::cout << "size: " << inputConnections_.size() << "\n";
}

7
src/OpDefs/CMakeLists.txt
View File

@@ -26,5 +26,8 @@ target_link_libraries(${libName} PRIVATE Qt6::Core Qt6::Widgets Qt6::SvgWidgets
MESSAGE("CURRENT SOURCE DIR" ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${libName} PUBLIC ../)
target_include_directories(${libName} PUBLIC .)
target_include_directories(${libName} PUBLIC
../
.
../../extern/icecream-cpp/include
)