remove Node/Imm and Node/Network/Initiator
This commit is contained in:
parent
49f106a951
commit
4851f1eb28
@ -146,7 +146,6 @@ target_sources(nf7
|
||||
file/gl_obj.cc
|
||||
file/luajit_context.cc
|
||||
file/luajit_node.cc
|
||||
file/node_imm.cc
|
||||
file/node_mutex.cc
|
||||
file/node_network.cc
|
||||
file/node_ref.cc
|
||||
|
||||
142
file/node_imm.cc
142
file/node_imm.cc
@ -1,142 +0,0 @@
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <typeinfo>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui_stdlib.h>
|
||||
#include <ImNodes.h>
|
||||
#include <yas/serialize.hpp>
|
||||
#include <yas/types/std/string.hpp>
|
||||
#include <yas/types/std/string_view.hpp>
|
||||
|
||||
#include "nf7.hh"
|
||||
|
||||
#include "common/dir_item.hh"
|
||||
#include "common/file_base.hh"
|
||||
#include "common/generic_memento.hh"
|
||||
#include "common/generic_type_info.hh"
|
||||
#include "common/gui.hh"
|
||||
#include "common/gui_value.hh"
|
||||
#include "common/life.hh"
|
||||
#include "common/node.hh"
|
||||
#include "common/ptr_selector.hh"
|
||||
#include "common/value.hh"
|
||||
|
||||
|
||||
namespace nf7 {
|
||||
namespace {
|
||||
|
||||
class Imm final : public nf7::FileBase,
|
||||
public nf7::DirItem, public nf7::Node {
|
||||
public:
|
||||
static inline const nf7::GenericTypeInfo<Imm> kType = {
|
||||
"Node/Imm", {"nf7::DirItem", "nf7::Node"},
|
||||
"emits an immediate value when get an input"};
|
||||
|
||||
class Lambda;
|
||||
|
||||
Imm(nf7::Env& env, nf7::gui::Value&& v = {}) noexcept :
|
||||
nf7::FileBase(kType, env),
|
||||
nf7::DirItem(nf7::DirItem::kWidget),
|
||||
nf7::Node(nf7::Node::kCustomNode),
|
||||
life_(*this), mem_(*this, std::move(v)) {
|
||||
}
|
||||
|
||||
Imm(nf7::Deserializer& ar) : Imm(ar.env()) {
|
||||
ar(mem_.data());
|
||||
}
|
||||
void Serialize(nf7::Serializer& ar) const noexcept override {
|
||||
ar(mem_.data());
|
||||
}
|
||||
std::unique_ptr<nf7::File> Clone(nf7::Env& env) const noexcept override {
|
||||
return std::make_unique<Imm>(env, nf7::gui::Value {mem_.data()});
|
||||
}
|
||||
|
||||
std::shared_ptr<nf7::Node::Lambda> CreateLambda(
|
||||
const std::shared_ptr<nf7::Node::Lambda>&) noexcept override;
|
||||
nf7::Node::Meta GetMeta() const noexcept override {
|
||||
return {{"in"}, {"out"}};
|
||||
}
|
||||
|
||||
void UpdateNode(nf7::Node::Editor&) noexcept override;
|
||||
void UpdateWidget() noexcept override;
|
||||
|
||||
nf7::File::Interface* interface(const std::type_info& t) noexcept override {
|
||||
return InterfaceSelector<
|
||||
nf7::DirItem, nf7::Memento, nf7::Node>(t).Select(this, &mem_);
|
||||
}
|
||||
|
||||
private:
|
||||
nf7::Life<Imm> life_;
|
||||
|
||||
nf7::GenericMemento<nf7::gui::Value> mem_;
|
||||
};
|
||||
|
||||
class Imm::Lambda final : public nf7::Node::Lambda,
|
||||
public std::enable_shared_from_this<Imm::Lambda> {
|
||||
public:
|
||||
Lambda(Imm& f, const std::shared_ptr<Node::Lambda>& parent) noexcept :
|
||||
nf7::Node::Lambda(f, parent), f_(f.life_) {
|
||||
}
|
||||
|
||||
void Handle(const nf7::Node::Lambda::Msg& in) noexcept override {
|
||||
if (!f_) return;
|
||||
if (in.name == "in") {
|
||||
in.sender->Handle("out", f_->mem_.data().entity(), shared_from_this());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
nf7::Life<Imm>::Ref f_;
|
||||
};
|
||||
std::shared_ptr<nf7::Node::Lambda> Imm::CreateLambda(
|
||||
const std::shared_ptr<nf7::Node::Lambda>& parent) noexcept {
|
||||
return std::make_shared<Imm::Lambda>(*this, parent);
|
||||
}
|
||||
|
||||
|
||||
void Imm::UpdateNode(nf7::Node::Editor&) noexcept {
|
||||
const auto em = ImGui::GetFontSize();
|
||||
|
||||
bool mod = false;
|
||||
ImGui::TextUnformatted("Node/Imm");
|
||||
ImGui::SameLine();
|
||||
mod |= mem_.data().UpdateTypeButton(nullptr, true);
|
||||
|
||||
if (ImNodes::BeginInputSlot("in", 1)) {
|
||||
ImGui::AlignTextToFramePadding();
|
||||
nf7::gui::NodeSocket();
|
||||
ImNodes::EndSlot();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
|
||||
ImGui::PushItemWidth(8*em);
|
||||
mod |= mem_.data().UpdateEditor();
|
||||
ImGui::PopItemWidth();
|
||||
|
||||
ImGui::SameLine();
|
||||
if (ImNodes::BeginOutputSlot("out", 1)) {
|
||||
ImGui::AlignTextToFramePadding();
|
||||
nf7::gui::NodeSocket();
|
||||
ImNodes::EndSlot();
|
||||
}
|
||||
|
||||
if (mod) {
|
||||
mem_.Commit();
|
||||
}
|
||||
}
|
||||
void Imm::UpdateWidget() noexcept {
|
||||
ImGui::TextUnformatted("Node/Imm");
|
||||
if (mem_.data().UpdateEditor()) {
|
||||
mem_.Commit();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace nf7
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
|
||||
namespace nf7 {
|
||||
namespace {
|
||||
|
||||
class MutexNode final : public nf7::FileBase,
|
||||
public nf7::DirItem, public nf7::Node {
|
||||
@ -117,4 +118,5 @@ void MutexNode::UpdateTooltip() noexcept {
|
||||
ImGui::Text("pendings: %zu", mtx_.pendings());
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace nf7
|
||||
|
||||
@ -65,7 +65,6 @@ class Network final : public nf7::FileBase,
|
||||
class Editor;
|
||||
|
||||
// special Node types
|
||||
class Initiator;
|
||||
class Terminal;
|
||||
|
||||
using ItemId = uint64_t;
|
||||
@ -677,58 +676,6 @@ void Network::ExecAddItem(
|
||||
}
|
||||
|
||||
|
||||
// Node that emits a pulse when Network lambda receives the first input.
|
||||
class Network::Initiator final : public nf7::File,
|
||||
public nf7::Node,
|
||||
public Network::InternalNode {
|
||||
public:
|
||||
static inline const nf7::GenericTypeInfo<Initiator> kType = {
|
||||
"Node/Network/Initiator", {},
|
||||
"emits a pulse immediately when Node/Network gets the first input",
|
||||
};
|
||||
|
||||
Initiator(nf7::Env& env) noexcept :
|
||||
nf7::File(kType, env), nf7::Node(nf7::Node::kCustomNode) {
|
||||
}
|
||||
|
||||
Initiator(nf7::Deserializer& ar) : Initiator(ar.env()) {
|
||||
}
|
||||
void Serialize(nf7::Serializer&) const noexcept override {
|
||||
}
|
||||
std::unique_ptr<nf7::File> Clone(nf7::Env& env) const noexcept override {
|
||||
return std::make_unique<Initiator>(env);
|
||||
}
|
||||
|
||||
std::shared_ptr<Node::Lambda> CreateLambda(
|
||||
const std::shared_ptr<Node::Lambda>& parent) noexcept override {
|
||||
class Emitter final : public Node::Lambda,
|
||||
public std::enable_shared_from_this<Emitter> {
|
||||
public:
|
||||
using Node::Lambda::Lambda;
|
||||
void Handle(const nf7::Node::Lambda::Msg& in) noexcept override {
|
||||
if (in.name == "_force" || !std::exchange(done_, true)) {
|
||||
in.sender->Handle("out", nf7::Value::Pulse {}, shared_from_this());
|
||||
}
|
||||
}
|
||||
private:
|
||||
bool done_ = false;
|
||||
};
|
||||
return std::make_shared<Emitter>(*this, parent);
|
||||
}
|
||||
nf7::Node::Meta GetMeta() const noexcept {
|
||||
return {{}, {"out"}};
|
||||
}
|
||||
|
||||
void UpdateNode(nf7::Node::Editor& ed) noexcept override;
|
||||
|
||||
InternalNode::Flags flags() const noexcept override {
|
||||
return InternalNode::kInputHandler;
|
||||
}
|
||||
nf7::File::Interface* interface(const std::type_info& t) noexcept {
|
||||
return nf7::InterfaceSelector<nf7::Node>(t).Select(this);
|
||||
}
|
||||
};
|
||||
|
||||
// Node that emits/receives input or output.
|
||||
class Network::Terminal : public nf7::FileBase,
|
||||
public nf7::Node,
|
||||
@ -1239,25 +1186,6 @@ void Network::Item::UpdateNode(Node::Editor& ed) noexcept {
|
||||
}
|
||||
|
||||
|
||||
void Network::Initiator::UpdateNode(nf7::Node::Editor& ed) noexcept {
|
||||
ImGui::TextUnformatted("INITIATOR");
|
||||
|
||||
if (ImGui::Button("PULSE")) {
|
||||
ed.Emit(*this, "_force", nf7::Value::Pulse {});
|
||||
}
|
||||
if (ImGui::IsItemHovered()) {
|
||||
ImGui::SetTooltip("generates a pulse manually on debug context");
|
||||
}
|
||||
|
||||
ImGui::SameLine();
|
||||
if (ImNodes::BeginOutputSlot("out", 1)) {
|
||||
ImGui::AlignTextToFramePadding();
|
||||
nf7::gui::NodeSocket();
|
||||
ImNodes::EndSlot();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Network::Terminal::UpdateNode(nf7::Node::Editor&) noexcept {
|
||||
const auto UpdateSelector = [&]() {
|
||||
auto net = owner();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user