From 23a7ba1d4a22e823de6bb44161cd93c89d99441c Mon Sep 17 00:00:00 2001 From: codeboss <2422523675@qq.com> Date: Sat, 5 Jul 2025 01:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Kernel=E6=8B=BC=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ComponentBasic/BehaviorPerform.cpp | 62 +++++++++++++++--------------- ComponentBasic/BehaviorPerform.h | 32 +++++++-------- SimsWorld/BehaviorEditor.cpp | 2 +- SimsWorld/BehaviorEditor.h | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/ComponentBasic/BehaviorPerform.cpp b/ComponentBasic/BehaviorPerform.cpp index 4ad40f0..20866d7 100644 --- a/ComponentBasic/BehaviorPerform.cpp +++ b/ComponentBasic/BehaviorPerform.cpp @@ -50,52 +50,52 @@ QString BehaviorPerformPlugin::name() const } #include -MapKernal::MapKernal(std::shared_ptr ins) +MapKernel::MapKernel(std::shared_ptr ins) :_bind_loader(ins) { } -QList MapKernal::compareTypes() const +QList MapKernel::compareTypes() const { return _compare_types.keys(); } -void MapKernal::registCompare(std::shared_ptr ins) +void MapKernel::registCompare(std::shared_ptr ins) { _compare_types[ins->name()] = ins; emit this->compareTypeListChanged(); } -std::shared_ptr MapKernal::getCompare(const QString& name) const +std::shared_ptr MapKernel::getCompare(const QString& name) const { if (!_compare_types.contains(name)) return nullptr; return _compare_types[name]; } -void MapKernal::registConvert(std::shared_ptr ins) +void MapKernel::registConvert(std::shared_ptr ins) { _convert_types[ins->name()] = ins; emit this->convertTypeListChanged(); } -QList MapKernal::convertTypes() const +QList MapKernel::convertTypes() const { return _convert_types.keys(); } -std::shared_ptr MapKernal::getConvert(const QString& name) const +std::shared_ptr MapKernel::getConvert(const QString& name) const { if (!_convert_types.contains(name)) return nullptr; return _convert_types[name]; } -void MapKernal::registExecute(std::shared_ptr ins) +void MapKernel::registExecute(std::shared_ptr ins) { _execute_types[ins->typeName()] = ins; } -void MapKernal::initial() +void MapKernel::initial() { // 注册基础数据类型 registData(std::make_shared()); @@ -112,12 +112,12 @@ void MapKernal::initial() registNode(std::make_shared(this->shared_from_this())); } -QJSEngine& MapKernal::bindEngine() +QJSEngine& MapKernel::bindEngine() { return this->_core_engine; } -void MapKernal::registData(std::shared_ptr init) +void MapKernel::registData(std::shared_ptr init) { if (_variable_types.contains(init->topicString())) throw new UniException(QString(u8"重复注册类型数据{%1}").arg(init->topicString())); @@ -125,42 +125,42 @@ void MapKernal::registData(std::shared_ptr init) _variable_types[init->topicString()] = init; } -QList MapKernal::dataTypes() const +QList MapKernel::dataTypes() const { return _variable_types.keys(); } -std::shared_ptr MapKernal::getData(const QString& topic) const +std::shared_ptr MapKernel::getData(const QString& topic) const { return _variable_types[topic]; } -QList MapKernal::executeTypes() const +QList MapKernel::executeTypes() const { return _execute_types.keys(); } -std::shared_ptr MapKernal::getExecute(const QString& name) const +std::shared_ptr MapKernel::getExecute(const QString& name) const { return _execute_types[name]; } -void MapKernal::registNode(std::shared_ptr ins) +void MapKernel::registNode(std::shared_ptr ins) { _logicalnode_types[ins->typeName()] = ins; } -QList MapKernal::nodeTypes() const +QList MapKernel::nodeTypes() const { return _logicalnode_types.keys(); } -std::shared_ptr MapKernal::getNode(const QString& name) const +std::shared_ptr MapKernel::getNode(const QString& name) const { return _logicalnode_types[name]; } -std::shared_ptr MapKernal::newDefault() const +std::shared_ptr MapKernel::newDefault() const { return nullptr; } @@ -168,7 +168,7 @@ std::shared_ptr MapKernal::newDefault() const #include #include -void MapKernal::recoveryFrom(const QJsonObject& obj) +void MapKernel::recoveryFrom(const QJsonObject& obj) { QStringList compares, converts, executes, variable_keys; STRLIST_PEAK(executes); @@ -220,7 +220,7 @@ void MapKernal::recoveryFrom(const QJsonObject& obj) } -void MapKernal::saveTo(QJsonObject& obj) const +void MapKernel::saveTo(QJsonObject& obj) const { // 保存比较器代码 QStringList compares = this->compareTypes(); @@ -263,7 +263,7 @@ void MapKernal::saveTo(QJsonObject& obj) const STRLIST_SAVE(variable_keys); } -LogicalNode::LogicalNode(NodeKind t, std::shared_ptr kernal) +LogicalNode::LogicalNode(NodeKind t, std::shared_ptr kernal) :_node_type(t), _bind_kernal(kernal) { } @@ -297,7 +297,7 @@ std::shared_ptr LogicalNode::bindMap() const return std::dynamic_pointer_cast(node_temp); } -std::shared_ptr LogicalNode::getKernal() const +std::shared_ptr LogicalNode::getKernal() const { return _bind_kernal; } @@ -322,7 +322,7 @@ std::weak_ptr LogicalNode::parent() const return this->_parent_bind; } -BehaviorMapNode::BehaviorMapNode(std::shared_ptr core) +BehaviorMapNode::BehaviorMapNode(std::shared_ptr core) :LogicalNode(NodeKind::MAPNODE, core) { } @@ -436,7 +436,7 @@ QHash> BehaviorMapNode::outputList() const } -SequenceNode::SequenceNode(std::shared_ptr kernal) +SequenceNode::SequenceNode(std::shared_ptr kernal) : LogicalNode(NodeKind::SEQUENCENODE, kernal) { } @@ -548,7 +548,7 @@ void LogicalNode::remove(std::shared_ptr node) _child_list.removeAll(node); } -SelectorNode::SelectorNode(std::shared_ptr kernal) +SelectorNode::SelectorNode(std::shared_ptr kernal) : LogicalNode(NodeKind::SEQUENCENODE, kernal) { } @@ -667,7 +667,7 @@ std::shared_ptr ParallelNode::newDefault() const return std::make_shared(this->getKernal()); } -ParallelNode::ParallelNode(std::shared_ptr kernal) +ParallelNode::ParallelNode(std::shared_ptr kernal) : LogicalNode(NodeKind::PARALLELNODE, kernal) { } @@ -738,7 +738,7 @@ std::shared_ptr CompareNode::newDefault() const return std::make_shared(getKernal()); } -CompareNode::CompareNode(std::shared_ptr ins) +CompareNode::CompareNode(std::shared_ptr ins) : LogicalNode(NodeKind::COMPARENODE, ins) { _data_map[u8"左值"] = std::make_shared(); _data_map[u8"右值"] = std::make_shared(); @@ -848,7 +848,7 @@ void CompareDelegate::saveTo(QJsonObject& obj) const { } -ConvertDelegate::ConvertDelegate(std::shared_ptr host, QJSEngine& bind_engine, const QString& func) +ConvertDelegate::ConvertDelegate(std::shared_ptr host, QJSEngine& bind_engine, const QString& func) : _host_bind(host), _script_engine(bind_engine), _function_name(func) { } @@ -897,7 +897,7 @@ void ConvertDelegate::saveTo(QJsonObject& obj) const } -ExecuteNode::ExecuteNode(std::shared_ptr ins) +ExecuteNode::ExecuteNode(std::shared_ptr ins) : LogicalNode(NodeKind::ACTIONNODE, ins) { } @@ -993,7 +993,7 @@ void ExecuteNode::saveTo(QJsonObject& obj) const } } -ModifiedNode::ModifiedNode(std::shared_ptr kernal) +ModifiedNode::ModifiedNode(std::shared_ptr kernal) : LogicalNode(NodeKind::MODIFYNODE, kernal) { } diff --git a/ComponentBasic/BehaviorPerform.h b/ComponentBasic/BehaviorPerform.h index bb24ccb..e821955 100644 --- a/ComponentBasic/BehaviorPerform.h +++ b/ComponentBasic/BehaviorPerform.h @@ -28,9 +28,9 @@ struct COMPONENTBASIC_EXPORT GeneralData : public TopicData { /// /// 行为树实例化节点 /// -class COMPONENTBASIC_EXPORT MapKernal : +class COMPONENTBASIC_EXPORT MapKernel : public QObject, virtual public Serializable, - public std::enable_shared_from_this { + public std::enable_shared_from_this { Q_OBJECT private: /// @@ -74,8 +74,8 @@ signals: public: - MapKernal(std::shared_ptr ins); - virtual ~MapKernal() = default; + MapKernel(std::shared_ptr ins); + virtual ~MapKernel() = default; void initial(); QJSEngine& bindEngine(); @@ -222,7 +222,7 @@ public: /// 数据类型管理核心 /// /// - ConvertDelegate(std::shared_ptr host, QJSEngine& bind_engine, const QString& func); + ConvertDelegate(std::shared_ptr host, QJSEngine& bind_engine, const QString& func); /// /// 转换器名称：JS函数名 /// @@ -261,7 +261,7 @@ public: void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; private: - std::shared_ptr _host_bind; + std::shared_ptr _host_bind; QJSEngine& _script_engine; QString _function_name; @@ -333,7 +333,7 @@ class COMPONENTBASIC_EXPORT LogicalNode : virtual public Serializable, public st private: int _node_id = 0; NodeKind _node_type = NodeKind::ACTIONNODE; - std::shared_ptr _bind_kernal; + std::shared_ptr _bind_kernal; std::weak_ptr _parent_bind; QList> _child_list; @@ -345,7 +345,7 @@ private: void _set_parent_node(std::weak_ptr pnode); public: - LogicalNode(NodeKind t, std::shared_ptr kernal); + LogicalNode(NodeKind t, std::shared_ptr kernal); virtual ~LogicalNode() = default; /// @@ -364,7 +364,7 @@ public: /// /// std::shared_ptr bindMap() const; - std::shared_ptr getKernal() const; + std::shared_ptr getKernal() const; /// /// 回退节点 @@ -476,7 +476,7 @@ private: ExecuteResult _state_value = ExecuteResult::FAILURE; public: - BehaviorMapNode(std::shared_ptr kernal); + BehaviorMapNode(std::shared_ptr kernal); /// /// 设置变量，如果类型错误会抛出UniException异常 @@ -559,7 +559,7 @@ private: QHash _state_map; public: - SequenceNode(std::shared_ptr kernal); + SequenceNode(std::shared_ptr kernal); QList> getForwards() const override; QString typeName() const override; @@ -584,7 +584,7 @@ private: QHash _state_map; public: - SelectorNode(std::shared_ptr kernal); + SelectorNode(std::shared_ptr kernal); QList> getForwards() const override; QString typeName() const override; @@ -609,7 +609,7 @@ private: QHash _state_map; public: - ParallelNode(std::shared_ptr kernal); + ParallelNode(std::shared_ptr kernal); QList> getForwards() const override; QString typeName() const override; @@ -635,7 +635,7 @@ private: QHash> _data_map; public: - CompareNode(std::shared_ptr kernal); + CompareNode(std::shared_ptr kernal); QString delegateName() const; void bindDelegate(std::shared_ptr ins); @@ -665,7 +665,7 @@ private: std::shared_ptr _bind_delegate; public: - ExecuteNode(std::shared_ptr kernal); + ExecuteNode(std::shared_ptr kernal); QString delegateName() const; void bindDelegate(std::shared_ptr ins); @@ -702,7 +702,7 @@ private: ExecuteResult _result_store = ExecuteResult::UNDEFINED; public: - ModifiedNode(std::shared_ptr kernal); + ModifiedNode(std::shared_ptr kernal); ModifyType modifyType() const; void resetModify(ModifyType t); diff --git a/SimsWorld/BehaviorEditor.cpp b/SimsWorld/BehaviorEditor.cpp index 8bc0812..12186cd 100644 --- a/SimsWorld/BehaviorEditor.cpp +++ b/SimsWorld/BehaviorEditor.cpp @@ -458,7 +458,7 @@ BehaviorEditor::BehaviorEditor(QWidget* parent /*= nullptr*/) _logs_present(new QTextBrowser(this)) { _global_loader = std::make_shared(); - _global_kernal = std::make_shared(_global_loader); + _global_kernal = std::make_shared(_global_loader); _global_kernal->initial(); this->_map_root = std::make_shared(_global_kernal); diff --git a/SimsWorld/BehaviorEditor.h b/SimsWorld/BehaviorEditor.h index 85a645e..e0168b4 100644 --- a/SimsWorld/BehaviorEditor.h +++ b/SimsWorld/BehaviorEditor.h @@ -151,7 +151,7 @@ protected: class BehaviorEditor : public QMainWindow { private: std::shared_ptr _global_loader; - std::shared_ptr _global_kernal; + std::shared_ptr _global_kernal; NodeTypesView* const _type_view; QStandardItemModel* const _type_model;