Merge branch 'bbparam-editor'

limbonaut · Dec 10, 2023 · a3594e1 · a3594e1
2 parents b94428b + dfa3324
commit a3594e1
Show file tree

Hide file tree

Showing 11 changed files with 589 additions and 4 deletions.
diff --git a/blackboard/bb_param/bb_param.h b/blackboard/bb_param/bb_param.h
@@ -41,8 +41,6 @@ class BBParam : public Resource {
 protected:
 	static void _bind_methods();
 
-	virtual Variant::Type get_type() const { return Variant::NIL; }
-
 	_FORCE_INLINE_ void _assign_default_value() {
 		Callable::CallError err;
 		Variant::construct(get_type(), saved_value, nullptr, 0, err);
@@ -51,6 +49,8 @@ class BBParam : public Resource {
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public:
+	virtual Variant::Type get_type() const { return Variant::NIL; }
+
 	void set_value_source(ValueSource p_value);
 	ValueSource get_value_source() const { return value_source; }
 

diff --git a/blackboard/bb_param/bb_variant.h b/blackboard/bb_param/bb_variant.h
@@ -25,10 +25,10 @@ class BBVariant : public BBParam {
 protected:
 	static void _bind_methods();
 
+public:
 	virtual Variant::Type get_type() const override;
 	void set_type(Variant::Type p_type);
 
-public:
 	BBVariant();
 };
 

diff --git a/demo/ai/tasks/arrive_pos.gd b/demo/ai/tasks/arrive_pos.gd
@@ -11,7 +11,6 @@
 
 @tool
 @icon("res://icon.png")
-class_name ArrivePos
 extends BTAction
 
 @export var target_position_var := "target_position"

diff --git a/demo/project.godot b/demo/project.godot
@@ -11,6 +11,7 @@ config_version=5
 [application]
 
 config/name="LimboAI Test"
+config/tags=PackedStringArray("demo")
 run/main_scene="res://examples/waypoints/example_waypoints.tscn"
 config/features=PackedStringArray("4.2")
 config/icon="res://icon.png"

diff --git a/demo/tests/blackboard_parameters/test_bb_params.gd b/demo/tests/blackboard_parameters/test_bb_params.gd
@@ -0,0 +1,37 @@
+@tool
+class_name TestBBParams
+extends Resource
+
+@export var bool_param: BBBool
+@export var int_param: BBInt
+@export var float_param: BBFloat
+@export var string_param: BBString
+@export var vec2_param: BBVector2
+@export var vec2i_param: BBVector2i
+@export var rect2_param: BBRect2
+@export var rect2i_param: BBRect2i
+@export var vector3_param: BBVector3
+@export var vector3i_param: BBVector3i
+@export var vector4_param: BBVector4
+@export var vector4i_param: BBVector4i
+@export var transform2d_param: BBTransform2D
+@export var plane_param: BBPlane
+@export var quaternion_param: BBQuaternion
+@export var aabb_param: BBAabb
+@export var basis_param: BBBasis
+@export var transform3d_param: BBTransform3D
+#@export var projection_param: BBProjection
+@export var color_param: BBColor
+@export var stringname_param: BBStringName
+@export var node_param: BBNode
+@export var dictionary_param: BBDictionary
+@export var array_param: BBArray
+@export var byte_array_param: BBByteArray
+@export var int_array_param: BBIntArray
+@export var float_array_param: BBFloatArray
+@export var string_array_param: BBStringArray
+@export var vector2_array_param: BBVector2Array
+@export var vector3_array_param: BBVector2Array
+@export var color_array_param: BBColorArray
+@export var variant_param: BBVariant
+