remove debugger test scene

extension/src/nodes/beehave_tree.cpp

@@ -36,14 +36,15 @@ using namespace godot;
 BeehaveTree::BeehaveTree() :
 	context(Ref<BeehaveContext>(memnew(BeehaveContext))),
 	tick_status(BeehaveTreeNode::TickStatus::PENDING),
-    tick_rate(1) {
+    tick_rate(1),
+	_internal_blackboard(memnew(BeehaveBlackboard)),
+	blackboard(nullptr),
+	actor(nullptr) {
 }
 
 BeehaveTree::~BeehaveTree() {
-	if (_internal_blackboard) {
-		memfree(_internal_blackboard);
-		_internal_blackboard = nullptr;
-	}
+	memfree(_internal_blackboard);
+	_internal_blackboard = nullptr;
 }
 
 void BeehaveTree::_bind_methods() {
@@ -75,14 +76,11 @@ void BeehaveTree::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "process_thread", PROPERTY_HINT_ENUM, "Idle,Physics"), "set_process_thread", "get_process_thread");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "tick_rate"), "set_tick_rate", "get_tick_rate");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "actor", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_actor", "get_actor");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_RESOURCE_TYPE, "BeehaveBlackboard", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_blackboard", "get_blackboard");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "actor", PROPERTY_HINT_NODE_TYPE, "Node"), "set_actor", "get_actor");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_NODE_TYPE, "BeehaveBlackboard"), "set_blackboard", "get_blackboard");
 }
 
 void BeehaveTree::_ready() {
-	if (blackboard.is_null()) {
-		_internal_blackboard = memnew(BeehaveBlackboard);
-	}
 	set_physics_process(enabled && process_thread == ProcessThread::PHYSICS);
 	set_process(enabled && process_thread == ProcessThread::IDLE);
 
@@ -109,27 +107,20 @@ void BeehaveTree::_physics_process(double delta) {
 	}
 }
 
-void BeehaveTree::set_actor(Ref<Node> actor) {
+void BeehaveTree::set_actor(Node* actor) {
 	this->actor = actor;
 }
 
-Ref<Node> BeehaveTree::get_actor() const {
+Node* BeehaveTree::get_actor() const {
 	return actor;
 }
 
-void BeehaveTree::set_blackboard(Ref<BeehaveBlackboard> blackboard) {
-	if (blackboard.is_valid() && _internal_blackboard) {
-		memfree(_internal_blackboard);
-		_internal_blackboard = nullptr;
-	} else if (blackboard.is_null()) {
-		_internal_blackboard = memnew(BeehaveBlackboard);
-	} else {
-		this->blackboard = blackboard;
-	}
+void BeehaveTree::set_blackboard(BeehaveBlackboard *blackboard) {
+	this->blackboard = blackboard;
 
 }
 
-Ref<BeehaveBlackboard> BeehaveTree::get_blackboard() const {
+BeehaveBlackboard *BeehaveTree::get_blackboard() const {
 	return blackboard;
 }
 
@@ -183,11 +174,11 @@ void BeehaveTree::process_internally(double delta) {
 }
 
 BeehaveTreeNode::TickStatus BeehaveTree::tick() {
-	context->set_blackboard(blackboard.ptr());
 	context->set_tree(this);
-	context->set_actor(get_actor().ptr());
+	context->set_actor(actor ? actor : get_parent());
+	context->set_blackboard(blackboard ? blackboard : _internal_blackboard);
 
-	if (get_child_count() == 0 || get_actor() == nullptr) {
+	if (get_child_count() == 0 || context->get_actor() == nullptr) {
 		tick_status = BeehaveTreeNode::FAILURE;
 		return tick_status;
 	}

extension/src/nodes/beehave_tree.h

@@ -49,8 +49,8 @@ class BeehaveTree : public Node {
 private:
 	int tick_rate;
 	bool enabled;
-	Ref<Node> actor;
-	Ref<BeehaveBlackboard> blackboard;
+	Node *actor;
+	BeehaveBlackboard *blackboard;
 	BeehaveBlackboard *_internal_blackboard = nullptr;
 	Ref<BeehaveContext> context;
 	BeehaveTreeNode::TickStatus tick_status;
@@ -76,10 +76,10 @@ class BeehaveTree : public Node {
 	void disable();
 	void set_enabled(bool enabled);
 	bool is_enabled() const;
-	void set_actor(Ref<Node> actor);
-	Ref<Node> get_actor() const;
-	void set_blackboard(Ref<BeehaveBlackboard> blackboard);
-	Ref<BeehaveBlackboard> get_blackboard() const;
+	void set_actor(Node *actor);
+	Node *get_actor() const;
+	void set_blackboard(BeehaveBlackboard *blackboard);
+	BeehaveBlackboard *get_blackboard() const;
 	BeehaveTreeNode::TickStatus tick();
 	BeehaveTreeNode::TickStatus get_tick_status() const;
 	void set_tick_rate(int tick_rate);

extension/src/nodes/leaves/beehave_action.cpp

@@ -32,7 +32,6 @@
 using namespace godot;
 
 void BeehaveAction::_bind_methods() {
-
 }
 
 BeehaveAction::BeehaveAction() {

extension/src/nodes/leaves/beehave_action.h

@@ -27,8 +27,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BEEHAVE_ACTION
-#define BEEHAVE_ACTION
+#ifndef BEEHAVE_ACTION_H
+#define BEEHAVE_ACTION_H
 
 #include "nodes/leaves/beehave_leaf.h"
 
@@ -45,4 +45,4 @@ namespace godot {
 	};
 }
 
-#endif //BEEHAVE_ACTION
+#endif //BEEHAVE_ACTION_H

project.godot

@@ -17,11 +17,6 @@ boot_splash/image="res://splash.png"
 boot_splash/fullsize=false
 config/icon="res://icon.png"
 
-[autoload]
-
-BeehaveGlobalMetrics="*res://addons/beehave/metrics/beehave_global_metrics.gd"
-BeehaveGlobalDebugger="*res://addons/beehave/debug/global_debugger.gd"
-
 [dotnet]
 
 project/assembly_name="Beehave"

test/actions/clear_count_action.gd

@@ -2,9 +2,9 @@ class_name ClearCountAction extends BeehaveAction
 
 @export var key = "custom_value"
 
-func tick(_context: BeehaveContext) -> int:
-	if blackboard.has_value(key):
-		blackboard.erase_value(key)
+func tick(context: BeehaveContext) -> int:
+	if context.get_blackboard().has_value(key):
+		context.get_blackboard().erase_value(key)
 		return SUCCESS
 	else:
 		return FAILURE

test/actions/count_up_action.gd

@@ -5,6 +5,7 @@ class_name CountUpAction extends BeehaveAction
 var count = 0
 var status = SUCCESS
 
+
 func tick(context: BeehaveContext) -> int:
 	count += 1
 	context.get_blackboard().set_value(key, count)

test/unit_test_scene.tscn

@@ -7,6 +7,7 @@ script = ExtResource("1_1kcjy")
 
 [node name="BeehaveTree" type="BeehaveTree" parent="."]
 process_thread = 0
+enabled = true
 unique_name_in_owner = true
 
 [node name="BeehaveSucceeder" type="BeehaveSucceeder" parent="BeehaveTree"]