implement BeehaveContext (#300)

bitbrain · Jan 13, 2024 · 4ad288e · 4ad288e
1 parent 48aa21e
commit 4ad288e
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 12 deletions.
diff --git a/addons/beehave/libs/windows/beehave.windows.editor.x86_64.dll b/addons/beehave/libs/windows/beehave.windows.editor.x86_64.dll
diff --git a/extension/src/beehave_context.cpp b/extension/src/beehave_context.cpp
@@ -31,17 +31,42 @@
 
 using namespace godot;
 
-BeehaveContext::BeehaveContext()
+void BeehaveContext::_bind_methods()
 {
+    ClassDB::bind_method(D_METHOD("set_blackboard", "blackboard"), &BeehaveContext::set_blackboard);
+    ClassDB::bind_method(D_METHOD("get_blackboard"), &BeehaveContext::get_blackboard);
+    ClassDB::bind_method(D_METHOD("set_actor", "actor"), &BeehaveContext::set_actor);
+    ClassDB::bind_method(D_METHOD("get_actor"), &BeehaveContext::get_actor);
+    ClassDB::bind_method(D_METHOD("set_delta", "delta"), &BeehaveContext::set_delta);
+    ClassDB::bind_method(D_METHOD("get_delta"), &BeehaveContext::get_delta);
+}
 
+BeehaveBlackboard* BeehaveContext::get_blackboard() const
+{
+    return this->blackboard;
 }
 
-BeehaveContext::~BeehaveContext()
+void BeehaveContext::set_blackboard(BeehaveBlackboard* blackboard)
 {
+    this->blackboard = blackboard;
+}
 
+Node* BeehaveContext::get_actor() const
+{
+    return this->actor;
 }
 
-void BeehaveContext::_bind_methods()
+void BeehaveContext::set_actor(Node* actor)
 {
-
+    this->actor = actor;
 }
+
+float BeehaveContext::get_delta() const
+{
+    return delta;
+}
+
+void BeehaveContext::set_delta(float delta)
+{
+    this->delta = delta;
+}
diff --git a/extension/src/beehave_context.h b/extension/src/beehave_context.h
@@ -31,19 +31,29 @@
 #define BEEHAVE_CONTEXT_H
 
 #include <classes/ref_counted.hpp>
+#include <classes/node.hpp>
+#include "nodes/beehave_blackboard.h"
 
 namespace godot {
 
     class BeehaveContext : public RefCounted
     {
         GDCLASS(BeehaveContext, RefCounted);
 
+        BeehaveBlackboard* blackboard;
+        Node* actor;
+        float delta;
     protected:
         static void _bind_methods();
     public:
+        BeehaveBlackboard* get_blackboard() const;
+        void set_blackboard(BeehaveBlackboard* blackboard);
 
-        BeehaveContext();
-        ~BeehaveContext();
+        Node* get_actor() const;
+        void set_actor(Node* actor);
+
+        float get_delta() const;
+        void set_delta(float delta);
     };
 
 }

diff --git a/extension/src/nodes/beehave_tree.cpp b/extension/src/nodes/beehave_tree.cpp
@@ -42,11 +42,12 @@ BeehaveTree::~BeehaveTree()
 
 }
 
-void BeehaveTree::test() {
+void BeehaveTree::tick(float delta)
+{
 
 }
 
 void BeehaveTree::_bind_methods()
 {
-    ClassDB::bind_method(D_METHOD("test"), &BeehaveTree::test);
+    ClassDB::bind_method(D_METHOD("tick"), &BeehaveTree::tick);
 }
diff --git a/extension/src/nodes/beehave_tree.h b/extension/src/nodes/beehave_tree.h
@@ -45,7 +45,7 @@ class BeehaveTree : public Node
     BeehaveTree();
     ~BeehaveTree();
 
-    void test();
+    void tick(float delta);
 };
 
 }

diff --git a/extension/src/nodes/beehave_tree_node.cpp b/extension/src/nodes/beehave_tree_node.cpp
@@ -42,13 +42,13 @@ BeehaveTreeNode::~BeehaveTreeNode()
 
 }
 
-void BeehaveTreeNode::test() {
+void BeehaveTreeNode::tick(BeehaveContext *context) {
 
 }
 
 void BeehaveTreeNode::_bind_methods()
 {
-    ClassDB::bind_method(D_METHOD("test"), &BeehaveTreeNode::test);
+    ClassDB::bind_method(D_METHOD("tick"), &BeehaveTreeNode::tick);
 
     BIND_ENUM_CONSTANT(SUCCESS);
     BIND_ENUM_CONSTANT(FAILURE);

diff --git a/extension/src/nodes/beehave_tree_node.h b/extension/src/nodes/beehave_tree_node.h
@@ -31,6 +31,7 @@
 #define BEEHAVE_TREE_NODE_H
 
 #include <classes/node.hpp>
+#include "beehave_context.h"
 
 namespace godot {
 
@@ -52,7 +53,7 @@ class BeehaveTreeNode : public Node
     BeehaveTreeNode();
     ~BeehaveTreeNode();
 
-    void test();
+    void tick(BeehaveContext *context);
 };
 
 }

diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp
@@ -6,6 +6,7 @@
 
 #include "nodes/beehave_tree.h"
 #include "nodes/beehave_tree_node.h"
+#include "beehave_context.h"
 #include "nodes/beehave_blackboard.h"
 
 using namespace godot;
@@ -15,6 +16,7 @@ void initialize_beehave_types(ModuleInitializationLevel p_level)
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;
 	}
+	ClassDB::register_class<BeehaveContext>();
     ClassDB::register_class<BeehaveTree>();
 	ClassDB::register_class<BeehaveTreeNode>();
     ClassDB::register_class<BeehaveBlackboard>();

diff --git a/test/blackboard_test.gd b/test/blackboard_test.gd
@@ -5,6 +5,7 @@ extends GdUnitTestSuite
 @warning_ignore("return_value_discarded")
 
 func test_has_value() -> void:
+	var context := BeehaveContext.new() as BeehaveContext
 	var blackboard = auto_free(BeehaveBlackboard.new())
 	blackboard.set_value("my-key", 123)
 	assert_bool(blackboard.has_value("my-key")).is_true()