diff --git a/.gitignore b/.gitignore index e1e596b7..d16e5d05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ /CMakeLists.txt.user -/build* /test_data/*_test.xml /test/CMakeLists.txt.user -/bin -/.vscode + +.vscode/ +.ionide/ +.history/ +build/ +bin/ +aoihosizora/ diff --git a/README.md b/README.md index 79e5bfbd..5c7ef703 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Groot (forked) +# Groot for Windows + This is a forked modified Groot repo by [Aoi-hosizora](https://github.com/Aoi-hosizora). This is used by SCUT xxx (private) project. + For old README, please visit [README_old.md](./README_old.md). + Note that depended [BehaviorTree.CPP](https://github.com/BehaviorTree/BehaviorTree.CPP), [cppzmq](https://github.com/zeromq/cppzmq) and [libzmq](https://github.com/zeromq/libzmq) are all submodule-deinited. -## Build Groot in Windows and MinGW-x64 +## Build Groot on Windows and MinGW-x64 ```bash # Change to Your Qt path (line 12) diff --git a/bt_editor/bt_editor_base.cpp b/bt_editor/bt_editor_base.cpp index e459df78..29609aab 100644 --- a/bt_editor/bt_editor_base.cpp +++ b/bt_editor/bt_editor_base.cpp @@ -195,6 +195,7 @@ const NodeModels &BuiltinNodeModels() factory.registerNodeType("Root"); NodeModels out; + // <<<<<<<<<<<<<<<<<<<<<<< for( const auto& it: factory.manifests()) { const auto& model_name = it.first; diff --git a/bt_editor/graphic_container.cpp b/bt_editor/graphic_container.cpp index 421400c8..6bdd5c5e 100644 --- a/bt_editor/graphic_container.cpp +++ b/bt_editor/graphic_container.cpp @@ -482,7 +482,10 @@ void GraphicContainer::createMorphSubMenu(QtNodes::Node &node, QMenu* nodeMenu) } else { - for(auto& name: names_in_category) + std::vector v;; + v.insert(v.end(), names_in_category.begin(), names_in_category.end()); + std::sort(v.begin(), v.end()); + for(auto& name: v) { auto action = new QAction(name, morph_submenu); morph_submenu->addAction(action);