From 769f8aaff2d97a1fd0d212ba63ea418385fda7fb Mon Sep 17 00:00:00 2001 From: bitbrain Date: Mon, 15 Jan 2024 20:18:43 +0000 Subject: [PATCH] .clang formatting --- .clang-format | 185 +++++++++++++++++++++ README.md | 7 +- extension/src/beehave_context.cpp | 61 +++---- extension/src/beehave_context.h | 49 +++--- extension/src/nodes/beehave_blackboard.cpp | 17 +- extension/src/nodes/beehave_blackboard.h | 15 +- extension/src/nodes/beehave_tree.cpp | 118 ++++++------- extension/src/nodes/beehave_tree.h | 55 +++--- extension/src/nodes/beehave_tree_node.cpp | 24 +-- extension/src/nodes/beehave_tree_node.h | 28 ++-- extension/src/register_types.cpp | 31 ++-- extension/src/register_types.h | 2 +- 12 files changed, 362 insertions(+), 230 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..ab1cc559 --- /dev/null +++ b/.clang-format @@ -0,0 +1,185 @@ +# Commented out parameters are those with the same value as base LLVM style. +# We can uncomment them if we want to change their value, or enforce the +# chosen value in case the base style changes (last sync: Clang 14.0). +--- +### General config, applies to all languages ### +BasedOnStyle: LLVM +AccessModifierOffset: -4 +AlignAfterOpenBracket: DontAlign +# AlignArrayOfStructures: None +# AlignConsecutiveMacros: None +# AlignConsecutiveAssignments: None +# AlignConsecutiveBitFields: None +# AlignConsecutiveDeclarations: None +# AlignEscapedNewlines: Right +AlignOperands: DontAlign +AlignTrailingComments: false +# AllowAllArgumentsOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: false +# AllowShortEnumsOnASingleLine: true +# AllowShortBlocksOnASingleLine: Never +# AllowShortCaseLabelsOnASingleLine: false +# AllowShortFunctionsOnASingleLine: All +# AllowShortLambdasOnASingleLine: All +# AllowShortIfStatementsOnASingleLine: Never +# AllowShortLoopsOnASingleLine: false +# AlwaysBreakAfterDefinitionReturnType: None +# AlwaysBreakAfterReturnType: None +# AlwaysBreakBeforeMultilineStrings: false +# AlwaysBreakTemplateDeclarations: MultiLine +# AttributeMacros: +# - __capability +# BinPackArguments: true +# BinPackParameters: true +# BraceWrapping: +# AfterCaseLabel: false +# AfterClass: false +# AfterControlStatement: Never +# AfterEnum: false +# AfterFunction: false +# AfterNamespace: false +# AfterObjCDeclaration: false +# AfterStruct: false +# AfterUnion: false +# AfterExternBlock: false +# BeforeCatch: false +# BeforeElse: false +# BeforeLambdaBody: false +# BeforeWhile: false +# IndentBraces: false +# SplitEmptyFunction: true +# SplitEmptyRecord: true +# SplitEmptyNamespace: true +# BreakBeforeBinaryOperators: None +# BreakBeforeConceptDeclarations: true +# BreakBeforeBraces: Attach +# BreakBeforeInheritanceComma: false +# BreakInheritanceList: BeforeColon +# BreakBeforeTernaryOperators: true +# BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: AfterColon +# BreakStringLiterals: true +ColumnLimit: 0 +# CommentPragmas: '^ IWYU pragma:' +# QualifierAlignment: Leave +# CompactNamespaces: false +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +# DeriveLineEnding: true +# DerivePointerAlignment: false +# DisableFormat: false +# EmptyLineAfterAccessModifier: Never +# EmptyLineBeforeAccessModifier: LogicalBlock +# ExperimentalAutoDetectBinPacking: false +# PackConstructorInitializers: BinPack +ConstructorInitializerAllOnOneLineOrOnePerLine: true +# AllowAllConstructorInitializersOnNextLine: true +# FixNamespaceComments: true +# ForEachMacros: +# - foreach +# - Q_FOREACH +# - BOOST_FOREACH +# IfMacros: +# - KJ_IF_MAYBE +# IncludeBlocks: Preserve +IncludeCategories: + - Regex: '".*"' + Priority: 1 + - Regex: '^<.*\.h>' + Priority: 2 + - Regex: "^<.*" + Priority: 3 +# IncludeIsMainRegex: '(Test)?$' +# IncludeIsMainSourceRegex: '' +# IndentAccessModifiers: false +IndentCaseLabels: true +# IndentCaseBlocks: false +# IndentGotoLabels: true +# IndentPPDirectives: None +# IndentExternBlock: AfterExternBlock +# IndentRequires: false +IndentWidth: 4 +# IndentWrappedFunctionNames: false +# InsertTrailingCommas: None +# JavaScriptQuotes: Leave +# JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +# LambdaBodyIndentation: Signature +# MacroBlockBegin: '' +# MacroBlockEnd: '' +# MaxEmptyLinesToKeep: 1 +# NamespaceIndentation: None +# PenaltyBreakAssignment: 2 +# PenaltyBreakBeforeFirstCallParameter: 19 +# PenaltyBreakComment: 300 +# PenaltyBreakFirstLessLess: 120 +# PenaltyBreakOpenParenthesis: 0 +# PenaltyBreakString: 1000 +# PenaltyBreakTemplateDeclaration: 10 +# PenaltyExcessCharacter: 1000000 +# PenaltyReturnTypeOnItsOwnLine: 60 +# PenaltyIndentedWhitespace: 0 +# PointerAlignment: Right +# PPIndentWidth: -1 +# ReferenceAlignment: Pointer +# ReflowComments: true +# RemoveBracesLLVM: false +# SeparateDefinitionBlocks: Leave +# ShortNamespaceLines: 1 +# SortIncludes: CaseSensitive +# SortJavaStaticImport: Before +# SortUsingDeclarations: true +# SpaceAfterCStyleCast: false +# SpaceAfterLogicalNot: false +# SpaceAfterTemplateKeyword: true +# SpaceBeforeAssignmentOperators: true +# SpaceBeforeCaseColon: false +# SpaceBeforeCpp11BracedList: false +# SpaceBeforeCtorInitializerColon: true +# SpaceBeforeInheritanceColon: true +# SpaceBeforeParens: ControlStatements +# SpaceBeforeParensOptions: +# AfterControlStatements: true +# AfterForeachMacros: true +# AfterFunctionDefinitionName: false +# AfterFunctionDeclarationName: false +# AfterIfMacros: true +# AfterOverloadedOperator: false +# BeforeNonEmptyParentheses: false +# SpaceAroundPointerQualifiers: Default +# SpaceBeforeRangeBasedForLoopColon: true +# SpaceInEmptyBlock: false +# SpaceInEmptyParentheses: false +# SpacesBeforeTrailingComments: 1 +# SpacesInAngles: Never +# SpacesInConditionalStatement: false +# SpacesInContainerLiterals: true +# SpacesInCStyleCastParentheses: false +## Godot TODO: We'll want to use a min of 1, but we need to see how to fix +## our comment capitalization at the same time. +SpacesInLineCommentPrefix: + Minimum: 0 + Maximum: -1 +# SpacesInParentheses: false +# SpacesInSquareBrackets: false +# SpaceBeforeSquareBrackets: false +# BitFieldColonSpacing: Both +# StatementAttributeLikeMacros: +# - Q_EMIT +# StatementMacros: +# - Q_UNUSED +# - QT_REQUIRE_VERSION +TabWidth: 4 +# UseCRLF: false +UseTab: Always +# WhitespaceSensitiveMacros: +# - STRINGIZE +# - PP_STRINGIZE +# - BOOST_PP_STRINGIZE +# - NS_SWIFT_NAME +# - CF_SWIFT_NAME +--- +### C++ specific config ### +Language: Cpp +Standard: c++17 diff --git a/README.md b/README.md index 06b23db8..8090f150 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ To better understand what branch to choose from for which Godot version, please |---|---|--| |`3.x`|`3.x`|`1.x`| |`4.x`|`4.x`|`2.x`| +|`4.x`|`4.x`|`3.x`| Refer to [this guide](https://bitbra.in/2023/09/03/godot-addon-compatibility.html) for more details behind this structure. @@ -58,12 +59,6 @@ Behavior trees are a modular way to build AI logic for your game. For simple AI, [Learn how to beehave on the official wiki!](https://bitbra.in/beehave/#/manual/) -## Tutorial (Godot 3.5+) - -[bitbrain](https://youtube.com/@bitbraindev) recorded this tutorial to show in more depth how to use this addon: - -[![tutorial-thumbnail](https://img.youtube.com/vi/n0gVEA1dyPQ/0.jpg)](https://www.youtube.com/watch?v=n0gVEA1dyPQ) - # 🥰 Credits - logo designs by [@NathanHoad](https://twitter.com/nathanhoad) & [@StuartDeVille](https://twitter.com/StuartDeVille) diff --git a/extension/src/beehave_context.cpp b/extension/src/beehave_context.cpp index 2f264071..28c8284d 100644 --- a/extension/src/beehave_context.cpp +++ b/extension/src/beehave_context.cpp @@ -33,54 +33,45 @@ using namespace godot; -void BeehaveContext::_bind_methods() -{ - ClassDB::bind_method(D_METHOD("set_tree", "tree"), &BeehaveContext::set_tree); - ClassDB::bind_method(D_METHOD("get_tree"), &BeehaveContext::get_tree); - 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); +void BeehaveContext::_bind_methods() { + ClassDB::bind_method(D_METHOD("set_tree", "tree"), &BeehaveContext::set_tree); + ClassDB::bind_method(D_METHOD("get_tree"), &BeehaveContext::get_tree); + 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); } -BeehaveTree* BeehaveContext::get_tree() const -{ - return this->tree; +BeehaveTree *BeehaveContext::get_tree() const { + return this->tree; } -void BeehaveContext::set_tree(BeehaveTree* tree) -{ - this->tree = tree; +void BeehaveContext::set_tree(BeehaveTree *tree) { + this->tree = tree; } -BeehaveBlackboard* BeehaveContext::get_blackboard() const -{ - return this->blackboard; +BeehaveBlackboard *BeehaveContext::get_blackboard() const { + return this->blackboard; } -void BeehaveContext::set_blackboard(BeehaveBlackboard* blackboard) -{ - this->blackboard = blackboard; +void BeehaveContext::set_blackboard(BeehaveBlackboard *blackboard) { + this->blackboard = blackboard; } -Node* BeehaveContext::get_actor() const -{ - return this->actor; +Node *BeehaveContext::get_actor() const { + return this->actor; } -void BeehaveContext::set_actor(Node* actor) -{ - this->actor = actor; +void BeehaveContext::set_actor(Node *actor) { + this->actor = actor; } -double BeehaveContext::get_delta() const -{ - return delta; +double BeehaveContext::get_delta() const { + return delta; } -void BeehaveContext::set_delta(double delta) -{ - this->delta = delta; -} \ No newline at end of file +void BeehaveContext::set_delta(double delta) { + this->delta = delta; +} diff --git a/extension/src/beehave_context.h b/extension/src/beehave_context.h index 3351da9c..8bf5d958 100644 --- a/extension/src/beehave_context.h +++ b/extension/src/beehave_context.h @@ -30,39 +30,40 @@ #ifndef BEEHAVE_CONTEXT_H #define BEEHAVE_CONTEXT_H -#include #include +#include namespace godot { - // Forward declarations to avoid cyclic dependencies. - class BeehaveTree; - class BeehaveBlackboard; +// Forward declarations to avoid cyclic dependencies. +class BeehaveTree; +class BeehaveBlackboard; + +class BeehaveContext : public RefCounted { + GDCLASS(BeehaveContext, RefCounted); + + BeehaveTree *tree; + BeehaveBlackboard *blackboard; + Node *actor; + double delta; - class BeehaveContext : public RefCounted - { - GDCLASS(BeehaveContext, RefCounted); +protected: + static void _bind_methods(); - BeehaveTree* tree; - BeehaveBlackboard* blackboard; - Node* actor; - double delta; - protected: - static void _bind_methods(); - public: - BeehaveTree* get_tree() const; - void set_tree(BeehaveTree* tree); +public: + BeehaveTree *get_tree() const; + void set_tree(BeehaveTree *tree); - BeehaveBlackboard* get_blackboard() const; - void set_blackboard(BeehaveBlackboard* blackboard); + BeehaveBlackboard *get_blackboard() const; + void set_blackboard(BeehaveBlackboard *blackboard); - Node* get_actor() const; - void set_actor(Node* actor); + Node *get_actor() const; + void set_actor(Node *actor); - double get_delta() const; - void set_delta(double delta); - }; + double get_delta() const; + void set_delta(double delta); +}; -} +} //namespace godot #endif // BEEHAVE_CONTEXT_H diff --git a/extension/src/nodes/beehave_blackboard.cpp b/extension/src/nodes/beehave_blackboard.cpp index 886ca5ed..7ee06bcf 100644 --- a/extension/src/nodes/beehave_blackboard.cpp +++ b/extension/src/nodes/beehave_blackboard.cpp @@ -32,22 +32,15 @@ using namespace godot; -BeehaveBlackboard::BeehaveBlackboard() -{ - +BeehaveBlackboard::BeehaveBlackboard() { } -BeehaveBlackboard::~BeehaveBlackboard() -{ - +BeehaveBlackboard::~BeehaveBlackboard() { } -void BeehaveBlackboard::test() -{ - +void BeehaveBlackboard::test() { } -void BeehaveBlackboard::_bind_methods() -{ - ClassDB::bind_method(D_METHOD("test"), &BeehaveBlackboard::test); +void BeehaveBlackboard::_bind_methods() { + ClassDB::bind_method(D_METHOD("test"), &BeehaveBlackboard::test); } diff --git a/extension/src/nodes/beehave_blackboard.h b/extension/src/nodes/beehave_blackboard.h index c0a8d57a..de9c4a99 100644 --- a/extension/src/nodes/beehave_blackboard.h +++ b/extension/src/nodes/beehave_blackboard.h @@ -34,20 +34,19 @@ namespace godot { -class BeehaveBlackboard : public Node -{ - GDCLASS(BeehaveBlackboard, Node); +class BeehaveBlackboard : public Node { + GDCLASS(BeehaveBlackboard, Node); protected: - static void _bind_methods(); + static void _bind_methods(); public: - BeehaveBlackboard(); - ~BeehaveBlackboard(); + BeehaveBlackboard(); + ~BeehaveBlackboard(); - void test(); + void test(); }; -} +} //namespace godot #endif // BEEHAVE_BLACKBOARD_H diff --git a/extension/src/nodes/beehave_tree.cpp b/extension/src/nodes/beehave_tree.cpp index b45bf3c1..39c9d298 100644 --- a/extension/src/nodes/beehave_tree.cpp +++ b/extension/src/nodes/beehave_tree.cpp @@ -32,95 +32,73 @@ using namespace godot; -BeehaveTree::BeehaveTree() - : context(Ref(memnew(BeehaveContext))) -{ - +BeehaveTree::BeehaveTree() : + context(Ref(memnew(BeehaveContext))) { } -BeehaveTree::~BeehaveTree() -{ - +BeehaveTree::~BeehaveTree() { } -void BeehaveTree::_bind_methods() -{ - // signals - ADD_SIGNAL(MethodInfo("enabled")); - ADD_SIGNAL(MethodInfo("disabled")); +void BeehaveTree::_bind_methods() { + // signals + ADD_SIGNAL(MethodInfo("enabled")); + ADD_SIGNAL(MethodInfo("disabled")); - // enums - BIND_ENUM_CONSTANT(IDLE); - BIND_ENUM_CONSTANT(PHYSICS); + // enums + BIND_ENUM_CONSTANT(IDLE); + BIND_ENUM_CONSTANT(PHYSICS); - // methods - ClassDB::bind_method(D_METHOD("enable"), &BeehaveTree::enable); - ClassDB::bind_method(D_METHOD("disable"), &BeehaveTree::disable); + // methods + ClassDB::bind_method(D_METHOD("enable"), &BeehaveTree::enable); + ClassDB::bind_method(D_METHOD("disable"), &BeehaveTree::disable); } -void BeehaveTree::_ready() -{ - +void BeehaveTree::_ready() { } -void BeehaveTree::_process(double delta) -{ - if (process_thread == BeehaveTree::ProcessThread::IDLE) - { - process_internally(delta); - } +void BeehaveTree::_process(double delta) { + if (process_thread == BeehaveTree::ProcessThread::IDLE) { + process_internally(delta); + } } -void BeehaveTree::_physics_process(double delta) -{ - if (process_thread == BeehaveTree::ProcessThread::PHYSICS) - { - process_internally(delta); - } +void BeehaveTree::_physics_process(double delta) { + if (process_thread == BeehaveTree::ProcessThread::PHYSICS) { + process_internally(delta); + } } -void BeehaveTree::enable() -{ - +void BeehaveTree::enable() { } -void BeehaveTree::disable() -{ - +void BeehaveTree::disable() { } -void BeehaveTree::process_internally(double delta) -{ - // ensure that we consider the current tick rate of the tree - if (_last_tick < tick_rate - 1) - { - _last_tick += 1; - return; - } +void BeehaveTree::process_internally(double delta) { + // ensure that we consider the current tick rate of the tree + if (_last_tick < tick_rate - 1) { + _last_tick += 1; + return; + } - context->set_delta(delta); + context->set_delta(delta); - tick(); + tick(); } -BeehaveTreeNode::TickStatus BeehaveTree::tick() -{ - context->set_blackboard(blackboard); - context->set_tree(this); - - for (int i = 0; i < get_child_count(); i++) - { - Node* child = get_child(i); - if (!child) - { - continue; - } - BeehaveTreeNode* tree_node = cast_to(child); - if (tree_node) - { - tick_status = tree_node->tick(context); - } - - } - return tick_status; -} \ No newline at end of file +BeehaveTreeNode::TickStatus BeehaveTree::tick() { + context->set_blackboard(blackboard); + context->set_tree(this); + + for (int i = 0; i < get_child_count(); i++) { + Node *child = get_child(i); + if (!child) { + continue; + } + BeehaveTreeNode *tree_node = cast_to(child); + if (tree_node) { + tick_status = tree_node->tick(context); + } + } + return tick_status; +} diff --git a/extension/src/nodes/beehave_tree.h b/extension/src/nodes/beehave_tree.h index 26d4a044..b6096044 100644 --- a/extension/src/nodes/beehave_tree.h +++ b/extension/src/nodes/beehave_tree.h @@ -30,52 +30,51 @@ #ifndef BEEHAVE_TREE_H #define BEEHAVE_TREE_H -#include #include "beehave_blackboard.h" -#include "beehave_tree_node.h" #include "beehave_context.h" +#include "beehave_tree_node.h" +#include namespace godot { -class BeehaveTree : public Node -{ - GDCLASS(BeehaveTree, Node); +class BeehaveTree : public Node { + GDCLASS(BeehaveTree, Node); public: - enum ProcessThread { - IDLE = 0, - PHYSICS = 1 - }; + enum ProcessThread { + IDLE = 0, + PHYSICS = 1 + }; private: - int tick_rate; - bool enabled; - Node* actor; - BeehaveBlackboard* blackboard; - Ref context; - BeehaveTreeNode::TickStatus tick_status; - ProcessThread process_thread = ProcessThread::PHYSICS; + int tick_rate; + bool enabled; + Node *actor; + BeehaveBlackboard *blackboard; + Ref context; + BeehaveTreeNode::TickStatus tick_status; + ProcessThread process_thread = ProcessThread::PHYSICS; - int _last_tick; + int _last_tick; - void process_internally(double delta); + void process_internally(double delta); protected: - static void _bind_methods(); + static void _bind_methods(); public: - BeehaveTree(); - ~BeehaveTree(); + BeehaveTree(); + ~BeehaveTree(); - void _ready(); - void _process(double delta); - void _physics_process(double delta); - void enable(); - void disable(); - BeehaveTreeNode::TickStatus tick(); + void _ready(); + void _process(double delta); + void _physics_process(double delta); + void enable(); + void disable(); + BeehaveTreeNode::TickStatus tick(); }; -} +} //namespace godot VARIANT_ENUM_CAST(BeehaveTree::ProcessThread); diff --git a/extension/src/nodes/beehave_tree_node.cpp b/extension/src/nodes/beehave_tree_node.cpp index dacfacc2..42060cf2 100644 --- a/extension/src/nodes/beehave_tree_node.cpp +++ b/extension/src/nodes/beehave_tree_node.cpp @@ -32,26 +32,20 @@ using namespace godot; -BeehaveTreeNode::BeehaveTreeNode() -{ - +BeehaveTreeNode::BeehaveTreeNode() { } -BeehaveTreeNode::~BeehaveTreeNode() -{ - +BeehaveTreeNode::~BeehaveTreeNode() { } -BeehaveTreeNode::TickStatus BeehaveTreeNode::tick(Ref context) -{ - return BeehaveTreeNode::FAILURE; +BeehaveTreeNode::TickStatus BeehaveTreeNode::tick(Ref context) { + return BeehaveTreeNode::FAILURE; } -void BeehaveTreeNode::_bind_methods() -{ - ClassDB::bind_method(D_METHOD("tick"), &BeehaveTreeNode::tick); +void BeehaveTreeNode::_bind_methods() { + ClassDB::bind_method(D_METHOD("tick"), &BeehaveTreeNode::tick); - BIND_ENUM_CONSTANT(SUCCESS); - BIND_ENUM_CONSTANT(FAILURE); - BIND_ENUM_CONSTANT(RUNNING); + BIND_ENUM_CONSTANT(SUCCESS); + BIND_ENUM_CONSTANT(FAILURE); + BIND_ENUM_CONSTANT(RUNNING); } diff --git a/extension/src/nodes/beehave_tree_node.h b/extension/src/nodes/beehave_tree_node.h index e4872747..d2ebd050 100644 --- a/extension/src/nodes/beehave_tree_node.h +++ b/extension/src/nodes/beehave_tree_node.h @@ -30,33 +30,31 @@ #ifndef BEEHAVE_TREE_NODE_H #define BEEHAVE_TREE_NODE_H -#include #include "beehave_context.h" +#include namespace godot { -class BeehaveTreeNode : public Node -{ - GDCLASS(BeehaveTreeNode, Node); +class BeehaveTreeNode : public Node { + GDCLASS(BeehaveTreeNode, Node); protected: - static void _bind_methods(); + static void _bind_methods(); public: + enum TickStatus { + SUCCESS = 0, + FAILURE = 1, + RUNNING = 2 + }; - enum TickStatus { - SUCCESS = 0, - FAILURE = 1, - RUNNING = 2 - }; - - BeehaveTreeNode(); - ~BeehaveTreeNode(); + BeehaveTreeNode(); + ~BeehaveTreeNode(); - TickStatus tick(Ref context); + TickStatus tick(Ref context); }; -} +} //namespace godot VARIANT_ENUM_CAST(BeehaveTreeNode::TickStatus); diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp index abd37c6a..3ad7a105 100644 --- a/extension/src/register_types.cpp +++ b/extension/src/register_types.cpp @@ -4,22 +4,21 @@ #include #include -#include "nodes/beehave_tree.h" -#include "nodes/beehave_tree_node.h" #include "beehave_context.h" #include "nodes/beehave_blackboard.h" +#include "nodes/beehave_tree.h" +#include "nodes/beehave_tree_node.h" using namespace godot; -void initialize_beehave_types(ModuleInitializationLevel p_level) -{ +void initialize_beehave_types(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { return; } ClassDB::register_class(); - ClassDB::register_class(); + ClassDB::register_class(); ClassDB::register_class(); - ClassDB::register_class(); + ClassDB::register_class(); } void uninitialize_beehave_types(ModuleInitializationLevel p_level) { @@ -30,16 +29,16 @@ void uninitialize_beehave_types(ModuleInitializationLevel p_level) { extern "C" { - // Initialization. +// Initialization. - GDExtensionBool GDE_EXPORT - beehave_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { - GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); +GDExtensionBool GDE_EXPORT +beehave_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { + GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); - init_obj.register_initializer(initialize_beehave_types); - init_obj.register_terminator(uninitialize_beehave_types); - init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_CORE); + init_obj.register_initializer(initialize_beehave_types); + init_obj.register_terminator(uninitialize_beehave_types); + init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_CORE); - return init_obj.init(); - } -} \ No newline at end of file + return init_obj.init(); +} +} diff --git a/extension/src/register_types.h b/extension/src/register_types.h index 3318c0a5..9cb4b2f1 100644 --- a/extension/src/register_types.h +++ b/extension/src/register_types.h @@ -8,4 +8,4 @@ using namespace godot; void initialize_beehave_types(); void uninitialize_beehave_types(); -#endif // BEEHAVE_REGISTER_TYPES_H \ No newline at end of file +#endif // BEEHAVE_REGISTER_TYPES_H