Merge branch 'master' of https://github.com/BehaviorTree/BehaviorTree.CPP

daf@blue-ocean-robotics.com · daf@blue-ocean-robotics.com · commit 927c9132239b · 2020-04-16T19:24:53.000+02:00
diff --git a/include/behaviortree_cpp_v3/decorators/subtree_node.h b/include/behaviortree_cpp_v3/decorators/subtree_node.h
@@ -29,7 +29,7 @@ class SubtreeNode : public DecoratorNode
 };
 
 /**
- * @brief The TransparentSubtreeNode is a way to wrap an entire Subtree.
+ * @brief The SubtreeWrapperNode is a way to wrap an entire Subtree.
  * It does NOT have a separated BlackBoard and does not need ports remapping.
  */
 class SubtreeWrapperNode : public DecoratorNode
diff --git a/src/basic_types.cpp b/src/basic_types.cpp
@@ -208,7 +208,7 @@ NodeType convertFromString<NodeType>(StringView str)
     if( str == "Condition" ) return NodeType::CONDITION;
     if( str == "Control" )   return NodeType::CONTROL;
     if( str == "Decorator" ) return NodeType::DECORATOR;
-    if( str == "SubTree" || str == "Subtree" ) return NodeType::SUBTREE;
+    if( str == "SubTree" || str == "SubtreeWrapper" ) return NodeType::SUBTREE;
     return NodeType::UNDEFINED;
 }
 
diff --git a/src/decorators/subtree_node.cpp b/src/decorators/subtree_node.cpp
@@ -20,7 +20,7 @@ BT::NodeStatus BT::SubtreeNode::tick()
 BT::SubtreeWrapperNode::SubtreeWrapperNode(const std::string &name) :
      DecoratorNode(name, {} )
 {
-  setRegistrationID("TransparentSubtree");
+  setRegistrationID("SubtreeWrapper");
 }
 
 BT::NodeStatus BT::SubtreeWrapperNode::tick()

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ NodeType convertFromString<NodeType>(StringView str)`
`208`	`208`	`if( str == "Condition" ) return NodeType::CONDITION;`
`209`	`209`	`if( str == "Control" ) return NodeType::CONTROL;`
`210`	`210`	`if( str == "Decorator" ) return NodeType::DECORATOR;`
`211`		`- if( str == "SubTree" \|\| str == "Subtree" ) return NodeType::SUBTREE;`
	`211`	`+ if( str == "SubTree" \|\| str == "SubtreeWrapper" ) return NodeType::SUBTREE;`
`212`	`212`	`return NodeType::UNDEFINED;`
`213`	`213`	`}`
`214`	`214`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ BT::NodeStatus BT::SubtreeNode::tick()`
`20`	`20`	`BT::SubtreeWrapperNode::SubtreeWrapperNode(const std::string &name) :`
`21`	`21`	`DecoratorNode(name, {} )`
`22`	`22`	`{`
`23`		`- setRegistrationID("TransparentSubtree");`
	`23`	`+ setRegistrationID("SubtreeWrapper");`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`BT::NodeStatus BT::SubtreeWrapperNode::tick()`