Anthony/open-story-teller
1
0
Fork 0
mirror of https://github.com/arabine/open-story-teller.git synced 2025-12-06 17:09:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning + label from node base
Some checks are pending
Build-StoryEditor / build_linux (push) Waiting to run
Details
Build-StoryEditor / build_win32 (push) Waiting to run
Details
Deploy-Documentation / deploy (push) Waiting to run
Details

Browse source
This commit is contained in:
anthony@rabine.fr 2025-10-02 18:07:14 +02:00
parent 0be3ff2203
commit 663fa47004
1 changed files with 11 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
story-editor/src/node_editor/node_editor_page.h
View file

@ -10,7 +10,7 @@
#include "node_widget_factory.h" #include "node_widget_factory.h"
#include "i_story_manager.h" #include "i_story_manager.h"
#include "ImNodeFlow.h" #include "ImNodeFlow.h"
#include "base_node.h"
// Generic delegate // Generic delegate
class NodeDelegate : public ImFlow::BaseNode { class NodeDelegate : public ImFlow::BaseNode {
@ -32,9 +32,11 @@ public:
auto port = m_widget->Base()->GetInputPort(i); auto port = m_widget->Base()->GetInputPort(i);
std::string label = (port.type == ::BaseNode::Port::Type::EXECUTION_PORT) ? "" : port.label;
if (port.customSocketIcon) if (port.customSocketIcon)
{ {
ImFlow::BaseNode::addIN<int>("In" + std::to_string(i), 0, ImFlow::ConnectionFilter::SameType())->renderer([this, i](ImFlow::Pin* p) { ImFlow::BaseNode::addIN<int>(label, 0, ImFlow::ConnectionFilter::SameType())->renderer([this, i](ImFlow::Pin* p) {
Nw::Pin pin; Nw::Pin pin;
pin.index = i; pin.index = i;
pin.isConnected = p->isConnected(); pin.isConnected = p->isConnected();
@ -48,7 +50,7 @@ public:
} }
else else
{ {
ImFlow::BaseNode::addIN<int>("In" + std::to_string(i), 0, ImFlow::ConnectionFilter::SameType()); ImFlow::BaseNode::addIN<int>(label, 0, ImFlow::ConnectionFilter::SameType());
} }
} }
@ -56,9 +58,11 @@ public:
for (int i = 0; i < m_widget->Outputs(); ++i) for (int i = 0; i < m_widget->Outputs(); ++i)
{ {
auto port = m_widget->Base()->GetOutputPort(i); auto port = m_widget->Base()->GetOutputPort(i);
// Détermine le label : vide pour les ports d'exécution, utilise port.label pour les ports de données
std::string label = (port.type == ::BaseNode::Port::Type::EXECUTION_PORT) ? "" : port.label;
if (port.customSocketIcon) if (port.customSocketIcon)
{ {
ImFlow::BaseNode::addOUT<int>("Out" + std::to_string(i), nullptr)->renderer([this, i](ImFlow::Pin* p) { ImFlow::BaseNode::addOUT<int>(label, nullptr)->renderer([this, i](ImFlow::Pin* p) {
Nw::Pin pin; Nw::Pin pin;
pin.index = i; pin.index = i;
@ -73,7 +77,7 @@ public:
} }
else else
{ {
ImFlow::BaseNode::addOUT<int>("Out" + std::to_string(i), nullptr)->behaviour([this, i]() { return getInVal<int>("In" + std::to_string(i)) + m_valB; }); ImFlow::BaseNode::addOUT<int>(label, nullptr)->behaviour([this, i]() { return getInVal<int>("In" + std::to_string(i)) + m_valB; });
} }
} }
} }
@ -192,41 +196,10 @@ struct NodeEditorPage : public ImFlow::BaseNode
} }
} }
}); });
/*
for (const auto & n : m_nodes)
{
ImGui::PushID(n->GetInternalId());
n->Draw();
ImGui::PopID();
}
for (const auto& linkInfo : m_links)
{
ed::Link(linkInfo->ed_link->Id, linkInfo->ed_link->OutputId, linkInfo->ed_link->InputId);
}
*/
} }
// bool GetNode(const ed::NodeId &nodeId, std::shared_ptr<BaseNodeWidget> &node) { std::shared_ptr<BaseNodeWidget> GetSelectedNode()
// for (const auto & n : m_nodes) {
// {
// if (n->GetInternalId() == nodeId.Get())
// {
// node = n;
// return true;
// }
// }
// return false;
// }
// void DeleteNode(const ed::NodeId &nodeId) {
// m_nodes.remove_if([nodeId](const std::shared_ptr<BaseNodeWidget>& node) {
// return node->GetInternalId() == nodeId.Get();
// });
// }
std::shared_ptr<BaseNodeWidget> GetSelectedNode() {
std::shared_ptr<BaseNodeWidget> selected; std::shared_ptr<BaseNodeWidget> selected;
@ -251,124 +224,9 @@ struct NodeEditorPage : public ImFlow::BaseNode
} }
} }
// if (ed::GetSelectedObjectCount() > 0)
// {
// ed::NodeId nId;
// int nodeCount = ed::GetSelectedNodes(&nId, 1);
// if (nodeCount > 0)
// {
// for (auto & n : m_nodes)
// {
// if (n->GetInternalId() == nId.Get())
// {
// selected = n;
// }
// }
// }
// }
return selected; return selected;
} }
// void AddNode(std::shared_ptr<BaseNodeWidget> node) {
// m_nodes.push_back(node);
// }
// void Clear() {
// m_nodes.clear();
// m_links.clear();
// }
/*
bool GetModel(ed::LinkId linkId, std::shared_ptr<Connection> &model) {
for (const auto& linkInfo : m_links)
{
if (linkInfo->ed_link->Id == linkId)
{
model = linkInfo->model;
return true;
}
}
return false;
}
void EraseLink(ed::LinkId linkId) {
m_links.remove_if([linkId](const std::shared_ptr<LinkInfo>& linkInfo) {
return linkInfo->ed_link->Id == linkId;
});
}
// retourne 1 si c'est une sortie, 2 une entrée, 0 pas trouvé
int FindNodeAndPin(ed::PinId pinId, int &foundIndex, std::string &foundNodeId)
{
int success = 0;
for (const auto & n : m_nodes)
{
// std::cout << "---> Node: " << n->Base()->GetId() << std::endl;
if (n->HasOnputPinId(pinId, foundIndex))
{
foundNodeId = n->Base()->GetId();
success = 1;
break;
}
if (n->HasInputPinId(pinId, foundIndex))
{
foundNodeId = n->Base()->GetId();
success = 2;
break;
}
}
return success;
}
ed::PinId GetInputPin(const std::string &modelNodeId, int pinIndex)
{
ed::PinId id = 0;
for (auto & n : m_nodes)
{
if (n->Base()->GetId() == modelNodeId)
{
id = n->GetInputPinAt(pinIndex);
break;
}
}
if (id.Get() == 0)
{
std::cout << "Invalid Id: " << modelNodeId << " input pin: " << pinIndex <<" not found" << std::endl;
}
return id;
}
ed::PinId GetOutputPin(const std::string &modelNodeId, int pinIndex)
{
ed::PinId id = 0;
for (auto & n : m_nodes)
{
if (n->Base()->GetId() == modelNodeId)
{
id = n->GetOutputPinAt(pinIndex);
break;
}
}
if (id.Get() == 0)
{
std::cout << "Invalid Id: " << modelNodeId << " output pin: " << pinIndex <<" not found" << std::endl;
}
return id;
}
*/
private: private:
std::string m_uuid; std::string m_uuid;
std::string m_name; std::string m_name;