From 33b455f8d9aa88fb2afad735d9d4135aa9221358 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Fri, 19 Jan 2024 17:05:01 +0100 Subject: [PATCH] Add BBParam missing types --- .github/workflows/test_builds.yml | 8 +++---- blackboard/bb_param/bb_float32_array.h | 24 +++++++++++++++++++ .../{bb_float_array.h => bb_float64_array.h} | 14 +++++------ blackboard/bb_param/bb_int32_array.h | 24 +++++++++++++++++++ .../{bb_int_array.h => bb_int64_array.h} | 14 +++++------ blackboard/bb_param/bb_param.h | 4 ++-- blackboard/bb_param/bb_projection.h | 24 +++++++++++++++++++ config.py | 7 ++++-- doc_classes/BBFloat32Array.xml | 10 ++++++++ doc_classes/BBFloat64Array.xml | 10 ++++++++ doc_classes/BBInt32Array.xml | 10 ++++++++ doc_classes/BBInt64Array.xml | 10 ++++++++ doc_classes/BBIntArray.xml | 10 -------- .../{BBFloatArray.xml => BBProjection.xml} | 4 ++-- register_types.cpp | 16 +++++++++---- 15 files changed, 150 insertions(+), 39 deletions(-) create mode 100644 blackboard/bb_param/bb_float32_array.h rename blackboard/bb_param/{bb_float_array.h => bb_float64_array.h} (67%) create mode 100644 blackboard/bb_param/bb_int32_array.h rename blackboard/bb_param/{bb_int_array.h => bb_int64_array.h} (68%) create mode 100644 blackboard/bb_param/bb_projection.h create mode 100644 doc_classes/BBFloat32Array.xml create mode 100644 doc_classes/BBFloat64Array.xml create mode 100644 doc_classes/BBInt32Array.xml create mode 100644 doc_classes/BBInt64Array.xml delete mode 100644 doc_classes/BBIntArray.xml rename doc_classes/{BBFloatArray.xml => BBProjection.xml} (65%) diff --git a/.github/workflows/test_builds.yml b/.github/workflows/test_builds.yml index b099151..0779628 100644 --- a/.github/workflows/test_builds.yml +++ b/.github/workflows/test_builds.yml @@ -8,8 +8,8 @@ on: - "README.md" - "LICENSE" - "**/*.png" - - "demo/*" - - "doc/*" + - "demo/**" + - "doc/**" pull_request: branches: [ master ] @@ -17,8 +17,8 @@ on: - "README.md" - "LICENSE" - "**/*.png" - - "demo/*" - - "doc/*" + - "demo/**" + - "doc/**" concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/blackboard/bb_param/bb_float32_array.h b/blackboard/bb_param/bb_float32_array.h new file mode 100644 index 0000000..9c480fa --- /dev/null +++ b/blackboard/bb_param/bb_float32_array.h @@ -0,0 +1,24 @@ +/** + * bb_float32_array.h + * ============================================================================= + * Copyright 2021-2024 Serhii Snitsaruk + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + * ============================================================================= + */ + +#ifndef BB_FLOAT32_ARRAY_H +#define BB_FLOAT32_ARRAY_H + +#include "bb_param.h" + +class BBFloat32Array : public BBParam { + GDCLASS(BBFloat32Array, BBParam); + +protected: + virtual Variant::Type get_type() const override { return Variant::PACKED_FLOAT32_ARRAY; } +}; + +#endif // BB_FLOAT32_ARRAY_H diff --git a/blackboard/bb_param/bb_float_array.h b/blackboard/bb_param/bb_float64_array.h similarity index 67% rename from blackboard/bb_param/bb_float_array.h rename to blackboard/bb_param/bb_float64_array.h index f5c0838..f2654b6 100644 --- a/blackboard/bb_param/bb_float_array.h +++ b/blackboard/bb_param/bb_float64_array.h @@ -1,7 +1,7 @@ /** - * bb_float_array.h + * bb_float64_array.h * ============================================================================= - * Copyright 2021-2023 Serhii Snitsaruk + * Copyright 2021-2024 Serhii Snitsaruk * * Use of this source code is governed by an MIT-style * license that can be found in the LICENSE file or at @@ -9,16 +9,16 @@ * ============================================================================= */ -#ifndef BB_FLOAT_ARRAY_H -#define BB_FLOAT_ARRAY_H +#ifndef BB_FLOAT64_ARRAY_H +#define BB_FLOAT64_ARRAY_H #include "bb_param.h" -class BBFloatArray : public BBParam { - GDCLASS(BBFloatArray, BBParam); +class BBFloat64Array : public BBParam { + GDCLASS(BBFloat64Array, BBParam); protected: virtual Variant::Type get_type() const override { return Variant::PACKED_FLOAT64_ARRAY; } }; -#endif // BB_FLOAT_ARRAY_H \ No newline at end of file +#endif // BB_FLOAT64_ARRAY_H diff --git a/blackboard/bb_param/bb_int32_array.h b/blackboard/bb_param/bb_int32_array.h new file mode 100644 index 0000000..a6d8205 --- /dev/null +++ b/blackboard/bb_param/bb_int32_array.h @@ -0,0 +1,24 @@ +/** + * bb_int32_array.h + * ============================================================================= + * Copyright 2021-2024 Serhii Snitsaruk + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + * ============================================================================= + */ + +#ifndef BB_INT32_ARRAY_H +#define BB_INT32_ARRAY_H + +#include "bb_param.h" + +class BBInt32Array : public BBParam { + GDCLASS(BBInt32Array, BBParam); + +protected: + virtual Variant::Type get_type() const override { return Variant::PACKED_INT32_ARRAY; } +}; + +#endif // BB_INT32_ARRAY_H diff --git a/blackboard/bb_param/bb_int_array.h b/blackboard/bb_param/bb_int64_array.h similarity index 68% rename from blackboard/bb_param/bb_int_array.h rename to blackboard/bb_param/bb_int64_array.h index 15981ad..5cb1697 100644 --- a/blackboard/bb_param/bb_int_array.h +++ b/blackboard/bb_param/bb_int64_array.h @@ -1,7 +1,7 @@ /** - * bb_int_array.h + * bb_int64_array.h * ============================================================================= - * Copyright 2021-2023 Serhii Snitsaruk + * Copyright 2021-2024 Serhii Snitsaruk * * Use of this source code is governed by an MIT-style * license that can be found in the LICENSE file or at @@ -9,16 +9,16 @@ * ============================================================================= */ -#ifndef BB_INT_ARRAY_H -#define BB_INT_ARRAY_H +#ifndef BB_INT64_ARRAY_H +#define BB_INT64_ARRAY_H #include "bb_param.h" -class BBIntArray : public BBParam { - GDCLASS(BBIntArray, BBParam); +class BBInt64Array : public BBParam { + GDCLASS(BBInt64Array, BBParam); protected: virtual Variant::Type get_type() const override { return Variant::PACKED_INT64_ARRAY; } }; -#endif // BB_INT_ARRAY_H \ No newline at end of file +#endif // BB_INT64_ARRAY_H diff --git a/blackboard/bb_param/bb_param.h b/blackboard/bb_param/bb_param.h index 96044c5..ba35623 100644 --- a/blackboard/bb_param/bb_param.h +++ b/blackboard/bb_param/bb_param.h @@ -1,7 +1,7 @@ /** * bb_param.h * ============================================================================= - * Copyright 2021-2023 Serhii Snitsaruk + * Copyright 2021-2024 Serhii Snitsaruk * * Use of this source code is governed by an MIT-style * license that can be found in the LICENSE file or at @@ -84,4 +84,4 @@ public: BBParam(); }; -#endif // BB_PARAM_H \ No newline at end of file +#endif // BB_PARAM_H diff --git a/blackboard/bb_param/bb_projection.h b/blackboard/bb_param/bb_projection.h new file mode 100644 index 0000000..acbfb09 --- /dev/null +++ b/blackboard/bb_param/bb_projection.h @@ -0,0 +1,24 @@ +/** + * bb_projection.h + * ============================================================================= + * Copyright 2021-2024 Serhii Snitsaruk + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + * ============================================================================= + */ + +#ifndef BB_PROJECTION_H +#define BB_PROJECTION_H + +#include "bb_param.h" + +class BBProjection : public BBParam { + GDCLASS(BBProjection, BBParam); + +protected: + virtual Variant::Type get_type() const override { return Variant::PROJECTION; } +}; + +#endif // BB_PROJECTION_H diff --git a/config.py b/config.py index d456416..e5a8134 100644 --- a/config.py +++ b/config.py @@ -28,12 +28,15 @@ def get_doc_classes(): "BBColorArray", "BBDictionary", "BBFloat", - "BBFloatArray", + "BBFloat32Array", + "BBFloat64Array", "BBInt", - "BBIntArray", + "BBInt32Array", + "BBInt64Array", "BBNode", "BBParam", "BBPlane", + "BBProjection", "BBQuat", "BBQuaternion", "BBRealArray", diff --git a/doc_classes/BBFloat32Array.xml b/doc_classes/BBFloat32Array.xml new file mode 100644 index 0000000..c736d24 --- /dev/null +++ b/doc_classes/BBFloat32Array.xml @@ -0,0 +1,10 @@ + + + + PackedFloat32Array-type parameter for [BehaviorTree] tasks. See [BBParam]. + + + + + + diff --git a/doc_classes/BBFloat64Array.xml b/doc_classes/BBFloat64Array.xml new file mode 100644 index 0000000..8db65c2 --- /dev/null +++ b/doc_classes/BBFloat64Array.xml @@ -0,0 +1,10 @@ + + + + PackedFloat64Array-type parameter for [BehaviorTree] tasks. See [BBParam]. + + + + + + diff --git a/doc_classes/BBInt32Array.xml b/doc_classes/BBInt32Array.xml new file mode 100644 index 0000000..0c50317 --- /dev/null +++ b/doc_classes/BBInt32Array.xml @@ -0,0 +1,10 @@ + + + + PackedInt32Array-type parameter for [BehaviorTree] tasks. See [BBParam]. + + + + + + diff --git a/doc_classes/BBInt64Array.xml b/doc_classes/BBInt64Array.xml new file mode 100644 index 0000000..f969bd1 --- /dev/null +++ b/doc_classes/BBInt64Array.xml @@ -0,0 +1,10 @@ + + + + PackedInt64Array-type parameter for [BehaviorTree] tasks. See [BBParam]. + + + + + + diff --git a/doc_classes/BBIntArray.xml b/doc_classes/BBIntArray.xml deleted file mode 100644 index 45f4a47..0000000 --- a/doc_classes/BBIntArray.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - IntArray-type parameter for [BehaviorTree] tasks. See [BBParam]. - - - - - - diff --git a/doc_classes/BBFloatArray.xml b/doc_classes/BBProjection.xml similarity index 65% rename from doc_classes/BBFloatArray.xml rename to doc_classes/BBProjection.xml index 8642137..48d2ed4 100644 --- a/doc_classes/BBFloatArray.xml +++ b/doc_classes/BBProjection.xml @@ -1,7 +1,7 @@ - + - FloatArray-type parameter for [BehaviorTree] tasks. See [BBParam]. + Projection-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/register_types.cpp b/register_types.cpp index e3f78be..4d6edf9 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -1,7 +1,7 @@ /** * register_types.cpp * ============================================================================= - * Copyright 2021-2023 Serhii Snitsaruk + * Copyright 2021-2024 Serhii Snitsaruk * * Use of this source code is governed by an MIT-style * license that can be found in the LICENSE file or at @@ -20,12 +20,15 @@ #include "blackboard/bb_param/bb_color_array.h" #include "blackboard/bb_param/bb_dictionary.h" #include "blackboard/bb_param/bb_float.h" -#include "blackboard/bb_param/bb_float_array.h" +#include "blackboard/bb_param/bb_float32_array.h" +#include "blackboard/bb_param/bb_float64_array.h" #include "blackboard/bb_param/bb_int.h" -#include "blackboard/bb_param/bb_int_array.h" +#include "blackboard/bb_param/bb_int32_array.h" +#include "blackboard/bb_param/bb_int64_array.h" #include "blackboard/bb_param/bb_node.h" #include "blackboard/bb_param/bb_param.h" #include "blackboard/bb_param/bb_plane.h" +#include "blackboard/bb_param/bb_projection.h" #include "blackboard/bb_param/bb_quaternion.h" #include "blackboard/bb_param/bb_rect2.h" #include "blackboard/bb_param/bb_rect2i.h" @@ -196,11 +199,14 @@ void initialize_limboai_module(ModuleInitializationLevel p_level) { GDREGISTER_CLASS(BBColorArray); GDREGISTER_CLASS(BBDictionary); GDREGISTER_CLASS(BBFloat); - GDREGISTER_CLASS(BBFloatArray); + GDREGISTER_CLASS(BBFloat32Array); + GDREGISTER_CLASS(BBFloat64Array); GDREGISTER_CLASS(BBInt); - GDREGISTER_CLASS(BBIntArray); + GDREGISTER_CLASS(BBInt32Array); + GDREGISTER_CLASS(BBInt64Array); GDREGISTER_CLASS(BBNode); GDREGISTER_CLASS(BBPlane); + GDREGISTER_CLASS(BBProjection); GDREGISTER_CLASS(BBQuaternion); GDREGISTER_CLASS(BBRect2); GDREGISTER_CLASS(BBRect2i);