From e2c4fbc55bc31cdf0550b16de1dae6351a981e2a Mon Sep 17 00:00:00 2001
From: Mathias Paulin <Mathias.Paulin@irit.fr>
Date: Wed, 23 Feb 2022 17:50:17 +0100
Subject: [PATCH] [librender] fix confusion between instance name and type name
---
.../RadiumNBR/NodeGraph/RenderGraph.cpp | 58 +++++++++----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/libRender/RadiumNBR/NodeGraph/RenderGraph.cpp b/src/libRender/RadiumNBR/NodeGraph/RenderGraph.cpp
index e52a737..2bbd657 100644
--- a/src/libRender/RadiumNBR/NodeGraph/RenderGraph.cpp
+++ b/src/libRender/RadiumNBR/NodeGraph/RenderGraph.cpp
@@ -149,7 +149,7 @@ void RenderGraph::loadFromJson( const std::string& jsonFilePath ) {
{
std::cerr << "Error when reading JSON file \"" << jsonFilePath
<< "\": Output index " << fromIndex << " for node \""
- << nodeFrom->getTypeName() << "\" must be between 0 and "
+ << nodeFrom->getInstanceName() << " (" << nodeFrom->getTypeName() << ")\" must be between 0 and "
<< nodeFrom->getOutputs().size() - 1 << ". Link not added." << std::endl;
continue;
}
@@ -172,8 +172,8 @@ void RenderGraph::loadFromJson( const std::string& jsonFilePath ) {
else
{
std::cerr << "Error when reading JSON file \"" << jsonFilePath << "\": Input index "
- << toIndex << " for node \"" << nodeTo->getTypeName()
- << "\" must be between 0 and " << nodeTo->getInputs().size() - 1 << ". Link not added."
+ << toIndex << " for node \"" << nodeFrom->getInstanceName() << " (" << nodeFrom->getTypeName()
+ << ")\" must be between 0 and " << nodeTo->getInputs().size() - 1 << ". Link not added."
<< std::endl;
continue;
}
@@ -201,14 +201,14 @@ void RenderGraph::loadFromJson( const std::string& jsonFilePath ) {
bool RenderGraph::addNode( Node* newNode ) {
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name << "\": trying to add node \""
- << newNode->getName() << "\"..." << std::endl;
+ << newNode->getInstanceName() << "\"..." << std::endl;
#endif
// Check if the new node already exists (= same name)
- if ( findNode( newNode->getTypeName() ) == -1 )
+ if ( findNode( newNode->getInstanceName() ) == -1 )
{
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name << "\": success adding node \""
- << newNode->getName() << "\"!" << std::endl;
+ << newNode->getInstanceName() << "\"!" << std::endl;
#endif
m_nodes.emplace_back( newNode );
return true;
@@ -217,7 +217,7 @@ bool RenderGraph::addNode( Node* newNode ) {
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name << "\": could not add node \""
- << newNode->getName() << "\" (node already exists)." << std::endl;
+ << newNode->getInstanceName() << "\" (node already exists)." << std::endl;
#endif
return false;
}
@@ -226,15 +226,15 @@ bool RenderGraph::addNode( Node* newNode ) {
bool RenderGraph::removeNode( Node* node ) {
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name << "\": trying to remove node \""
- << node->getName() << "\"..." << std::endl;
+ << node->getInstanceName() << "\"..." << std::endl;
#endif
// Check if the new node already exists (= same name)
int index = -1;
- if ( ( index = findNode( node->getTypeName() ) ) == -1 )
+ if ( ( index = findNode( node->getInstanceName() ) ) == -1 )
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name << "\": could not remove node \""
- << node->getName() << "\" (node does not exist)." << std::endl;
+ << node->getInstanceName() << "\" (node does not exist)." << std::endl;
#endif
return false;
}
@@ -242,7 +242,7 @@ bool RenderGraph::removeNode( Node* node ) {
{
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name << "\": success removing node \""
- << node->getName() << "\"!" << std::endl;
+ << node->getInstanceName() << "\"!" << std::endl;
#endif
m_nodes.erase( m_nodes.begin() + index );
return true;
@@ -256,25 +256,25 @@ bool RenderGraph::addLink( Node* nodeFrom,
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name
<< "\": ADD LINK : try to connect output \"" + nodeFromOutputName + "\" of node \"" +
- nodeFrom->getName() + "\" to input \"" + nodeToInputName + "\" of node \"" +
- nodeTo->getName() + "\"."
+ nodeFrom->getInstanceName() + "\" to input \"" + nodeToInputName + "\" of node \"" +
+ nodeTo->getInstanceName() + "\"."
<< std::endl;
#endif
// Check node "from" existence in the graph
- if ( findNode( nodeFrom->getTypeName() ) == -1 )
+ if ( findNode( nodeFrom->getInstanceName() ) == -1 )
{
#ifdef GRAPH_CALL_TRACE
- std::cerr << "ADD LINK : node \"from\" \"" + nodeFrom->getName() + "\" does not exist."
+ std::cerr << "ADD LINK : node \"from\" \"" + nodeFrom->getInstanceName() + "\" does not exist."
<< std::endl;
#endif
return false;
}
// Check node "to" existence in the graph
- if ( findNode( nodeTo->getTypeName() ) == -1 )
+ if ( findNode( nodeTo->getInstanceName() ) == -1 )
{
#ifdef GRAPH_CALL_TRACE
- std::cerr << "ADD LINK : node \"to\" \"" + nodeTo->getName() + "\" does not exist."
+ std::cerr << "ADD LINK : node \"to\" \"" + nodeTo->getInstanceName() + "\" does not exist."
<< std::endl;
#endif
return false;
@@ -296,7 +296,7 @@ bool RenderGraph::addLink( Node* nodeFrom,
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "ADD LINK : output \"" + nodeFromOutputName + "\" for node \"from\" \"" +
- nodeFrom->getName() + "\" does not exist."
+ nodeFrom->getInstanceName() + "\" does not exist."
<< std::endl;
#endif
return false;
@@ -318,7 +318,7 @@ bool RenderGraph::addLink( Node* nodeFrom,
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "ADD LINK : input \"" + nodeToInputName + "\" for target node \"" +
- nodeTo->getName() + "\" does not exist."
+ nodeTo->getInstanceName() + "\" does not exist."
<< std::endl;
#endif
return false;
@@ -329,7 +329,7 @@ bool RenderGraph::addLink( Node* nodeFrom,
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "ADD LINK : cannot connect output \"" + nodeFromOutputName + "\" for node \"" +
- nodeTo->getName() + "\" and input \"" + nodeToInputName +
+ nodeTo->getInstanceName() + "\" and input \"" + nodeToInputName +
"\" for node \"" + nodeFrom->getName() + "\" : type mismatch."
<< std::endl;
#endif
@@ -341,7 +341,7 @@ bool RenderGraph::addLink( Node* nodeFrom,
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "ADD LINK : cannot connect output \"" + nodeFromOutputName + "\" for node \"" +
- nodeTo->getName() + "\" and input \"" + nodeToInputName +
+ nodeTo->getInstanceName() + "\" and input \"" + nodeToInputName +
"\" for node \"" + nodeFrom->getName() + "\" : input already connected."
<< std::endl;
#endif
@@ -353,7 +353,7 @@ bool RenderGraph::addLink( Node* nodeFrom,
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "ADD LINK : cannot connect output \"" + nodeFromOutputName + "\" for node \"" +
- nodeTo->getName() + "\" and input \"" + nodeToInputName +
+ nodeTo->getInstanceName() + "\" and input \"" + nodeToInputName +
"\" for node \"" + nodeFrom->getName() + "\"."
<< std::endl;
#endif
@@ -362,8 +362,8 @@ bool RenderGraph::addLink( Node* nodeFrom,
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name
<< "\": ADD LINK : success connecting output \"" + nodeFromOutputName +
- "\" of node \"" + nodeFrom->getName() + "\" to input \"" + nodeToInputName +
- "\" of node \"" + nodeTo->getName() + "\"."
+ "\" of node \"" + nodeFrom->getInstanceName() + "\" to input \"" + nodeToInputName +
+ "\" of node \"" + nodeTo->getInstanceName() + "\"."
<< std::endl;
#endif
return true;
@@ -371,10 +371,10 @@ bool RenderGraph::addLink( Node* nodeFrom,
bool RenderGraph::removeLink( Node* node, const std::string& nodeInputName ) {
// Check node's existence in the graph
- if ( findNode( node->getTypeName() ) == -1 )
+ if ( findNode( node->getInstanceName() ) == -1 )
{
#ifdef GRAPH_CALL_TRACE
- std::cerr << "REMOVE LINK : node \"" + node->getName() + "\" does not exist." << std::endl;
+ std::cerr << "REMOVE LINK : node \"" + node->getInstanceName() + "\" does not exist." << std::endl;
#endif
return false;
}
@@ -395,7 +395,7 @@ bool RenderGraph::removeLink( Node* node, const std::string& nodeInputName ) {
{
#ifdef GRAPH_CALL_TRACE
std::cerr << "REMOVE LINK : input \"" + nodeInputName + "\" for target node \"" +
- node->getName() + "\" does not exist."
+ node->getInstanceName() + "\" does not exist."
<< std::endl;
#endif
return false;
@@ -405,7 +405,7 @@ bool RenderGraph::removeLink( Node* node, const std::string& nodeInputName ) {
#ifdef GRAPH_CALL_TRACE
std::cout << "\e[32m\e[1mRenderGraph\e[0m \"" << m_name
<< "\": REMOVE LINK : success disconnecting input \"" + nodeInputName +
- "\" of node \"" + node->getName() + "\"."
+ "\" of node \"" + node->getInstanceName() + "\"."
<< std::endl;
#endif
return true;
@@ -414,7 +414,7 @@ bool RenderGraph::removeLink( Node* node, const std::string& nodeInputName ) {
int RenderGraph::findNode( const std::string& name ) {
for ( size_t i = 0; i < m_nodes.size(); i++ )
{
- if ( m_nodes[i]->getTypeName() == name ) { return i; }
+ if ( m_nodes[i]->getInstanceName() == name ) { return i; }
}
return -1;
--
GitLab