From 7afddb9fc31b5752b3f159e6907fcecdfa33259a Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 13 Jan 2023 22:04:30 +0100 Subject: [PATCH] Make include guard style consistent with the rest of the engine in the new module. --- .../agents/gsai_kinematic_body_2d_agent.h | 4 ++-- .../agents/gsai_kinematic_body_3d_agent.h | 4 ++-- .../steering_ai/agents/gsai_rigid_body_2d_agent.h | 4 ++-- .../steering_ai/agents/gsai_rigid_body_3d_agent.h | 4 ++-- .../steering_ai/agents/gsai_specialized_agent.h | 4 ++-- modules/steering_ai/behaviors/gsai_arrive.h | 4 ++-- .../steering_ai/behaviors/gsai_avoid_collisions.h | 4 ++-- modules/steering_ai/behaviors/gsai_blend.h | 4 ++-- modules/steering_ai/behaviors/gsai_cohesion.h | 4 ++-- modules/steering_ai/behaviors/gsai_evade.h | 4 ++-- modules/steering_ai/behaviors/gsai_face.h | 4 ++-- modules/steering_ai/behaviors/gsai_flee.h | 4 ++-- modules/steering_ai/behaviors/gsai_follow_path.h | 4 ++-- .../behaviors/gsai_look_where_you_go.h | 4 ++-- .../behaviors/gsai_match_orientation.h | 4 ++-- modules/steering_ai/behaviors/gsai_priority.h | 4 ++-- modules/steering_ai/behaviors/gsai_pursue.h | 4 ++-- modules/steering_ai/behaviors/gsai_seek.h | 4 ++-- modules/steering_ai/behaviors/gsai_separation.h | 4 ++-- modules/steering_ai/gsai_agent_location.h | 4 ++-- modules/steering_ai/gsai_group_behavior.h | 4 ++-- modules/steering_ai/gsai_path.h | 4 ++-- modules/steering_ai/gsai_steering_agent.h | 4 ++-- modules/steering_ai/gsai_steering_behavior.h | 4 ++-- modules/steering_ai/gsai_target_acceleration.h | 15 ++++++++++----- modules/steering_ai/gsai_utils.h | 4 ++-- .../proximities/gsai_infinite_proximity.h | 4 ++-- modules/steering_ai/proximities/gsai_proximity.h | 4 ++-- .../proximities/gsai_radius_proximity.h | 4 ++-- 29 files changed, 66 insertions(+), 61 deletions(-) diff --git a/modules/steering_ai/agents/gsai_kinematic_body_2d_agent.h b/modules/steering_ai/agents/gsai_kinematic_body_2d_agent.h index 1d755a4cb..0fd76a562 100644 --- a/modules/steering_ai/agents/gsai_kinematic_body_2d_agent.h +++ b/modules/steering_ai/agents/gsai_kinematic_body_2d_agent.h @@ -1,5 +1,5 @@ -#ifndef GSAIKINEMATICBODY2DAGENT_H -#define GSAIKINEMATICBODY2DAGENT_H +#ifndef GSAI_KINEMATIC_BODY_2D_AGENT_H +#define GSAI_KINEMATIC_BODY_2D_AGENT_H class GSAIKinematicBody2DAgent : public GSAISpecializedAgent { GDCLASS(GSAIKinematicBody2DAgent, GSAISpecializedAgent); diff --git a/modules/steering_ai/agents/gsai_kinematic_body_3d_agent.h b/modules/steering_ai/agents/gsai_kinematic_body_3d_agent.h index 82d03a6f4..899b86a22 100644 --- a/modules/steering_ai/agents/gsai_kinematic_body_3d_agent.h +++ b/modules/steering_ai/agents/gsai_kinematic_body_3d_agent.h @@ -1,5 +1,5 @@ -#ifndef GSAIKINEMATICBODY3DAGENT_H -#define GSAIKINEMATICBODY3DAGENT_H +#ifndef GSAI_KINEMATIC_BODY_3D_AGENT_H +#define GSAI_KINEMATIC_BODY_3D_AGENT_H class GSAIKinematicBody3DAgent : public GSAISpecializedAgent { GDCLASS(GSAIKinematicBody3DAgent, GSAISpecializedAgent); diff --git a/modules/steering_ai/agents/gsai_rigid_body_2d_agent.h b/modules/steering_ai/agents/gsai_rigid_body_2d_agent.h index 2c8d1451a..11969a32e 100644 --- a/modules/steering_ai/agents/gsai_rigid_body_2d_agent.h +++ b/modules/steering_ai/agents/gsai_rigid_body_2d_agent.h @@ -1,5 +1,5 @@ -#ifndef GSAIRIGIDBODY2DAGENT_H -#define GSAIRIGIDBODY2DAGENT_H +#ifndef GSAI_RIGID_BODY_2D_AGENT_H +#define GSAI_RIGID_BODY_2D_AGENT_H class GSAIRigidBody2DAgent : public GSAISpecializedAgent { GDCLASS(GSAIRigidBody2DAgent, GSAISpecializedAgent); diff --git a/modules/steering_ai/agents/gsai_rigid_body_3d_agent.h b/modules/steering_ai/agents/gsai_rigid_body_3d_agent.h index 816cea4b6..ce2988515 100644 --- a/modules/steering_ai/agents/gsai_rigid_body_3d_agent.h +++ b/modules/steering_ai/agents/gsai_rigid_body_3d_agent.h @@ -1,5 +1,5 @@ -#ifndef GSAIRIGIDBODY3DAGENT_H -#define GSAIRIGIDBODY3DAGENT_H +#ifndef GSAI_RIGID_BODY_3D_AGENT_H +#define GSAI_RIGID_BODY_3D_AGENT_H class GSAIRigidBody3DAgent : public GSAISpecializedAgent { GDCLASS(GSAIRigidBody3DAgent, GSAISpecializedAgent); diff --git a/modules/steering_ai/agents/gsai_specialized_agent.h b/modules/steering_ai/agents/gsai_specialized_agent.h index 6022fc8f3..f68cde820 100644 --- a/modules/steering_ai/agents/gsai_specialized_agent.h +++ b/modules/steering_ai/agents/gsai_specialized_agent.h @@ -1,5 +1,5 @@ -#ifndef GSAISPECIALIZEDAGENT_H -#define GSAISPECIALIZEDAGENT_H +#ifndef GSAI_SPECIALIZED_AGENT_H +#define GSAI_SPECIALIZED_AGENT_H class GSAISpecializedAgent : public GSAISteeringAgent { GDCLASS(GSAISpecializedAgent, GSAISteeringAgent); diff --git a/modules/steering_ai/behaviors/gsai_arrive.h b/modules/steering_ai/behaviors/gsai_arrive.h index a52c40b6a..ec8e324fb 100644 --- a/modules/steering_ai/behaviors/gsai_arrive.h +++ b/modules/steering_ai/behaviors/gsai_arrive.h @@ -1,5 +1,5 @@ -#ifndef GSAIARRIVE_H -#define GSAIARRIVE_H +#ifndef GSAI_ARRIVE_H +#define GSAI_ARRIVE_H class GSAIArrive : public GSAISteeringBehavior { GDCLASS(GSAIArrive, GSAISteeringBehavior); diff --git a/modules/steering_ai/behaviors/gsai_avoid_collisions.h b/modules/steering_ai/behaviors/gsai_avoid_collisions.h index 3457788ea..756b276a0 100644 --- a/modules/steering_ai/behaviors/gsai_avoid_collisions.h +++ b/modules/steering_ai/behaviors/gsai_avoid_collisions.h @@ -1,5 +1,5 @@ -#ifndef GSAIAVOIDCOLLISIONS_H -#define GSAIAVOIDCOLLISIONS_H +#ifndef GSAI_AVOID_COLLISIONS_H +#define GSAI_AVOID_COLLISIONS_H class GSAIAvoidCollisions : public GSAIGroupBehavior { GDCLASS(GSAIAvoidCollisions, GSAIGroupBehavior); diff --git a/modules/steering_ai/behaviors/gsai_blend.h b/modules/steering_ai/behaviors/gsai_blend.h index 9c727dd50..237491c3c 100644 --- a/modules/steering_ai/behaviors/gsai_blend.h +++ b/modules/steering_ai/behaviors/gsai_blend.h @@ -1,5 +1,5 @@ -#ifndef GSAIBLEND_H -#define GSAIBLEND_H +#ifndef GSAI_BLEND_H +#define GSAI_BLEND_H class GSAIBlend : public GSAISteeringBehavior { GDCLASS(GSAIBlend, GSAISteeringBehavior); diff --git a/modules/steering_ai/behaviors/gsai_cohesion.h b/modules/steering_ai/behaviors/gsai_cohesion.h index 10eed5087..d5ebe6acc 100644 --- a/modules/steering_ai/behaviors/gsai_cohesion.h +++ b/modules/steering_ai/behaviors/gsai_cohesion.h @@ -1,5 +1,5 @@ -#ifndef GSAICOHESION_H -#define GSAICOHESION_H +#ifndef GSAI_COHESION_H +#define GSAI_COHESION_H class GSAICohesion : public GSAIGroupBehavior { GDCLASS(GSAICohesion, GSAIGroupBehavior); diff --git a/modules/steering_ai/behaviors/gsai_evade.h b/modules/steering_ai/behaviors/gsai_evade.h index 117277af1..8dd80fd63 100644 --- a/modules/steering_ai/behaviors/gsai_evade.h +++ b/modules/steering_ai/behaviors/gsai_evade.h @@ -1,5 +1,5 @@ -#ifndef GSAIEVADE_H -#define GSAIEVADE_H +#ifndef GSAI_EVADE_H +#define GSAI_EVADE_H class GSAIEvade : public GSAIPursue { GDCLASS(GSAIEvade, GSAIPursue); diff --git a/modules/steering_ai/behaviors/gsai_face.h b/modules/steering_ai/behaviors/gsai_face.h index c7022dc0f..4536cd081 100644 --- a/modules/steering_ai/behaviors/gsai_face.h +++ b/modules/steering_ai/behaviors/gsai_face.h @@ -1,5 +1,5 @@ -#ifndef GSAIFACE_H -#define GSAIFACE_H +#ifndef GSAI_FACE_H +#define GSAI_FACE_H class GSAIFace : public GSAIMatchOrientation { GDCLASS(GSAIFace, GSAIMatchOrientation); diff --git a/modules/steering_ai/behaviors/gsai_flee.h b/modules/steering_ai/behaviors/gsai_flee.h index 9a0aaf6a1..7a61abdc7 100644 --- a/modules/steering_ai/behaviors/gsai_flee.h +++ b/modules/steering_ai/behaviors/gsai_flee.h @@ -1,5 +1,5 @@ -#ifndef GSAIFLEE_H -#define GSAIFLEE_H +#ifndef GSAI_FLEE_H +#define GSAI_FLEE_H class GSAIFlee : public GSAISeek { GDCLASS(GSAIFlee, GSAISeek); diff --git a/modules/steering_ai/behaviors/gsai_follow_path.h b/modules/steering_ai/behaviors/gsai_follow_path.h index 306c49d7b..98231d979 100644 --- a/modules/steering_ai/behaviors/gsai_follow_path.h +++ b/modules/steering_ai/behaviors/gsai_follow_path.h @@ -1,5 +1,5 @@ -#ifndef GSAIFOLLOWPATH_H -#define GSAIFOLLOWPATH_H +#ifndef GSAI_FOLLOW_PATH_H +#define GSAI_FOLLOW_PATH_H class GSAIFollowPath : public GSAIArrive { GDCLASS(GSAIFollowPath, GSAIArrive); diff --git a/modules/steering_ai/behaviors/gsai_look_where_you_go.h b/modules/steering_ai/behaviors/gsai_look_where_you_go.h index 8e1fe10fa..43d21a55f 100644 --- a/modules/steering_ai/behaviors/gsai_look_where_you_go.h +++ b/modules/steering_ai/behaviors/gsai_look_where_you_go.h @@ -1,5 +1,5 @@ -#ifndef GSAILOOKWHEREYOUGO_H -#define GSAILOOKWHEREYOUGO_H +#ifndef GSAI_LOOK_WHERE_YOU_GO_H +#define GSAI_LOOK_WHERE_YOU_GO_H class GSAILookWhereYouGo : public GSAIMatchOrientation { GDCLASS(GSAILookWhereYouGo, GSAIMatchOrientation); diff --git a/modules/steering_ai/behaviors/gsai_match_orientation.h b/modules/steering_ai/behaviors/gsai_match_orientation.h index e4f3e8a43..7a7b75722 100644 --- a/modules/steering_ai/behaviors/gsai_match_orientation.h +++ b/modules/steering_ai/behaviors/gsai_match_orientation.h @@ -1,5 +1,5 @@ -#ifndef GSAIMATCHORIENTATION_H -#define GSAIMATCHORIENTATION_H +#ifndef GSAI_MATCH_ORIENTATION_H +#define GSAI_MATCH_ORIENTATION_H class GSAIMatchOrientation : public GSAISteeringBehavior { GDCLASS(GSAIMatchOrientation, GSAISteeringBehavior); diff --git a/modules/steering_ai/behaviors/gsai_priority.h b/modules/steering_ai/behaviors/gsai_priority.h index 4cb488b7c..295be1e44 100644 --- a/modules/steering_ai/behaviors/gsai_priority.h +++ b/modules/steering_ai/behaviors/gsai_priority.h @@ -1,5 +1,5 @@ -#ifndef GSAIPRIORITY_H -#define GSAIPRIORITY_H +#ifndef GSAI_PRIORITY_H +#define GSAI_PRIORITY_H class GSAIPriority : public GSAISteeringBehavior { GDCLASS(GSAIPriority, GSAISteeringBehavior); diff --git a/modules/steering_ai/behaviors/gsai_pursue.h b/modules/steering_ai/behaviors/gsai_pursue.h index 54356ebe2..21b5e63dd 100644 --- a/modules/steering_ai/behaviors/gsai_pursue.h +++ b/modules/steering_ai/behaviors/gsai_pursue.h @@ -1,5 +1,5 @@ -#ifndef GSAIPURSUE_H -#define GSAIPURSUE_H +#ifndef GSAI_PURSUE_H +#define GSAI_PURSUE_H class GSAIPursue : public GSAISteeringBehavior { GDCLASS(GSAIPursue, GSAISteeringBehavior); diff --git a/modules/steering_ai/behaviors/gsai_seek.h b/modules/steering_ai/behaviors/gsai_seek.h index f0ed8058a..5d5d34217 100644 --- a/modules/steering_ai/behaviors/gsai_seek.h +++ b/modules/steering_ai/behaviors/gsai_seek.h @@ -1,5 +1,5 @@ -#ifndef GSAISEEK_H -#define GSAISEEK_H +#ifndef GSAI_SEEK_H +#define GSAI_SEEK_H class GSAISeek : public GSAISteeringBehavior { GDCLASS(GSAISeek, GSAISteeringBehavior); diff --git a/modules/steering_ai/behaviors/gsai_separation.h b/modules/steering_ai/behaviors/gsai_separation.h index 7c7bb333a..e694ee016 100644 --- a/modules/steering_ai/behaviors/gsai_separation.h +++ b/modules/steering_ai/behaviors/gsai_separation.h @@ -1,5 +1,5 @@ -#ifndef GSAISEPARATION_H -#define GSAISEPARATION_H +#ifndef GSAI_SEPARATION_H +#define GSAI_SEPARATION_H class GSAISeparation : public GSAIGroupBehavior { GDCLASS(GSAISeparation, GSAIGroupBehavior); diff --git a/modules/steering_ai/gsai_agent_location.h b/modules/steering_ai/gsai_agent_location.h index 8a5623ecb..1b9b50efd 100644 --- a/modules/steering_ai/gsai_agent_location.h +++ b/modules/steering_ai/gsai_agent_location.h @@ -1,5 +1,5 @@ -#ifndef GSAIAGENTLOCATION_H -#define GSAIAGENTLOCATION_H +#ifndef GSAI_AGENT_LOCATION_H +#define GSAI_AGENT_LOCATION_H class GSAIAgentLocation : public Reference { GDCLASS(GSAIAgentLocation, Reference); diff --git a/modules/steering_ai/gsai_group_behavior.h b/modules/steering_ai/gsai_group_behavior.h index 1e0a292a7..64bb31933 100644 --- a/modules/steering_ai/gsai_group_behavior.h +++ b/modules/steering_ai/gsai_group_behavior.h @@ -1,5 +1,5 @@ -#ifndef GSAIGROUPBEHAVIOR_H -#define GSAIGROUPBEHAVIOR_H +#ifndef GSAI_GROUP_BEHAVIOR_H +#define GSAI_GROUP_BEHAVIOR_H class GSAIGroupBehavior : public GSAISteeringBehavior { GDCLASS(GSAIGroupBehavior, GSAISteeringBehavior); diff --git a/modules/steering_ai/gsai_path.h b/modules/steering_ai/gsai_path.h index 17a845345..addbf0945 100644 --- a/modules/steering_ai/gsai_path.h +++ b/modules/steering_ai/gsai_path.h @@ -1,5 +1,5 @@ -#ifndef GSAIPATH_H -#define GSAIPATH_H +#ifndef GSAI_PATH_H +#define GSAI_PATH_H class GSAIPath : public Reference { GDCLASS(GSAIPath, Reference); diff --git a/modules/steering_ai/gsai_steering_agent.h b/modules/steering_ai/gsai_steering_agent.h index c8dc7b893..4cbae9bff 100644 --- a/modules/steering_ai/gsai_steering_agent.h +++ b/modules/steering_ai/gsai_steering_agent.h @@ -1,5 +1,5 @@ -#ifndef GSAISTEERINGAGENT_H -#define GSAISTEERINGAGENT_H +#ifndef GSAI_STEERING_AGENT_H +#define GSAI_STEERING_AGENT_H class GSAISteeringAgent : public GSAIAgentLocation { GDCLASS(GSAISteeringAgent, GSAIAgentLocation); diff --git a/modules/steering_ai/gsai_steering_behavior.h b/modules/steering_ai/gsai_steering_behavior.h index 7e7c6fde8..859b8d321 100644 --- a/modules/steering_ai/gsai_steering_behavior.h +++ b/modules/steering_ai/gsai_steering_behavior.h @@ -1,5 +1,5 @@ -#ifndef GSAISTEERINGBEHAVIOR_H -#define GSAISTEERINGBEHAVIOR_H +#ifndef GSAI_STEERING_BEHAVIOR_H +#define GSAI_STEERING_BEHAVIOR_H class GSAISteeringBehavior : public Reference { GDCLASS(GSAISteeringBehavior, Reference); diff --git a/modules/steering_ai/gsai_target_acceleration.h b/modules/steering_ai/gsai_target_acceleration.h index c6766d66f..bbfdb06b2 100644 --- a/modules/steering_ai/gsai_target_acceleration.h +++ b/modules/steering_ai/gsai_target_acceleration.h @@ -1,5 +1,13 @@ -#ifndef GSAITARGETACCELERATION_H -#define GSAITARGETACCELERATION_H +#ifndef GSAI_TARGET_ACCELERATION_H +#define GSAI_TARGET_ACCELERATION_H + +#include "core/int_types.h" +#include "core/math/vector3.h" +#include "core/object/reference.h" + +// A desired linear and angular amount of acceleration requested by the steering +// system. +//Base type class GSAITargetAcceleration : public Reference { GDCLASS(GSAITargetAcceleration, Reference); @@ -22,9 +30,6 @@ public: protected: static void _bind_methods(); - // A desired linear and angular amount of acceleration requested by the steering - // system. - // @category - Base types // Linear acceleration Vector3 linear = Vector3.ZERO; // Angular acceleration diff --git a/modules/steering_ai/gsai_utils.h b/modules/steering_ai/gsai_utils.h index 26b227f1a..5cac04e48 100644 --- a/modules/steering_ai/gsai_utils.h +++ b/modules/steering_ai/gsai_utils.h @@ -1,5 +1,5 @@ -#ifndef GSAIUTILS_H -#define GSAIUTILS_H +#ifndef GSAI_UTILS_H +#define GSAI_UTILS_H #include "core/int_types.h" #include "core/math/math_funcs.h" diff --git a/modules/steering_ai/proximities/gsai_infinite_proximity.h b/modules/steering_ai/proximities/gsai_infinite_proximity.h index 724111678..e891af3a0 100644 --- a/modules/steering_ai/proximities/gsai_infinite_proximity.h +++ b/modules/steering_ai/proximities/gsai_infinite_proximity.h @@ -1,5 +1,5 @@ -#ifndef GSAIINFINITEPROXIMITY_H -#define GSAIINFINITEPROXIMITY_H +#ifndef GSAI_INFINITE_PROXIMITY_H +#define GSAI_INFINITE_PROXIMITY_H class GSAIInfiniteProximity : public GSAIProximity { GDCLASS(GSAIInfiniteProximity, GSAIProximity); diff --git a/modules/steering_ai/proximities/gsai_proximity.h b/modules/steering_ai/proximities/gsai_proximity.h index 0fb15f4df..9ef32a011 100644 --- a/modules/steering_ai/proximities/gsai_proximity.h +++ b/modules/steering_ai/proximities/gsai_proximity.h @@ -1,5 +1,5 @@ -#ifndef GSAIPROXIMITY_H -#define GSAIPROXIMITY_H +#ifndef GSAI_PROXIMITY_H +#define GSAI_PROXIMITY_H class GSAIProximity : public Reference { GDCLASS(GSAIProximity, Reference); diff --git a/modules/steering_ai/proximities/gsai_radius_proximity.h b/modules/steering_ai/proximities/gsai_radius_proximity.h index 875daa622..14e03d75a 100644 --- a/modules/steering_ai/proximities/gsai_radius_proximity.h +++ b/modules/steering_ai/proximities/gsai_radius_proximity.h @@ -1,5 +1,5 @@ -#ifndef GSAIRADIUSPROXIMITY_H -#define GSAIRADIUSPROXIMITY_H +#ifndef GSAI_RADIUS_PROXIMITY_H +#define GSAI_RADIUS_PROXIMITY_H class GSAIRadiusProximity : public GSAIProximity { GDCLASS(GSAIRadiusProximity, GSAIProximity);