From 475247c7ba1096dae6f471a91bd4320d9154fa25 Mon Sep 17 00:00:00 2001 From: Rageking8 Date: Tue, 5 Sep 2023 18:29:05 +0800 Subject: [PATCH] Fix dupe word typos --- docs/Manual.md | 2 +- docs/Queries.md | 2 +- examples/c/queries/group_by/src/main.c | 2 +- examples/c/queries/group_by_callbacks/src/main.c | 2 +- examples/c/queries/group_by_custom/src/main.c | 2 +- examples/c/systems/sync_point_delete/src/main.c | 2 +- examples/cpp/queries/group_by/src/main.cpp | 2 +- .../cpp/queries/group_by_callbacks/src/main.cpp | 2 +- examples/cpp/queries/group_by_custom/src/main.cpp | 2 +- examples/cpp/reflection/portable_type/src/main.cpp | 2 +- .../cpp/systems/sync_point_delete/src/main.cpp | 2 +- flecs.h | 14 +++++++------- include/flecs.h | 6 +++--- include/flecs/addons/cpp/mixins/filter/decl.hpp | 2 +- include/flecs/addons/timer.h | 8 ++++---- test/api/src/Internals.c | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/Manual.md b/docs/Manual.md index 0db4a89ef..250e7a0d2 100644 --- a/docs/Manual.md +++ b/docs/Manual.md @@ -568,7 +568,7 @@ int main() { } ``` -The `ecs_new`, `ecs_add` and `ecs_remove` (not exhaustive) functions are wrapper macros around functions functions that accept a component id. The following code is equivalent to the previous example: +The `ecs_new`, `ecs_add` and `ecs_remove` (not exhaustive) functions are wrapper macros around functions that accept a component id. The following code is equivalent to the previous example: ```c typedef struct Position { diff --git a/docs/Queries.md b/docs/Queries.md index a727e5af7..ecede288b 100644 --- a/docs/Queries.md +++ b/docs/Queries.md @@ -2814,7 +2814,7 @@ When a [transitive relationship](Relationships.md#transitive-relationships) is u > If R(X, Y) and R(Y, Z) then R(X, Z) -In this example, `R` is the transitive relationship and `X`, `Y` and `Z` are entities that are used both as source and second element. A typical example of a transitive relationship is `LocatedIn`. If Bob (X) is located in in Manhattan (Y) and Manhattan (Y) is located in New York (Z), then Bob (X) is also located in New York (Z). Therefore "located in" is transitive. +In this example, `R` is the transitive relationship and `X`, `Y` and `Z` are entities that are used both as source and second element. A typical example of a transitive relationship is `LocatedIn`. If Bob (X) is located in Manhattan (Y) and Manhattan (Y) is located in New York (Z), then Bob (X) is also located in New York (Z). Therefore "located in" is transitive. A relationship can be made transitive by adding the [transitive](Relationships.md#transitive-property) property. This would ensure that both `(LocatedIn, ManHattan)` and `(LocatedIn, NewYork)` queries would match `Bob`. When the location is replaced with a variable, the variable will assume all values encountered while traversing the transitive relationship. For example, `(LocatedIn, $Place)` would return results with `Place = [ManHattan, NewYork]` for `Bob`, and a result with `Place = [NewYork]` for `ManHattan`. diff --git a/examples/c/queries/group_by/src/main.c b/examples/c/queries/group_by/src/main.c index d6e7be243..acd4647ad 100644 --- a/examples/c/queries/group_by/src/main.c +++ b/examples/c/queries/group_by/src/main.c @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) { ECS_COMPONENT(ecs, Position); ECS_TAG(ecs, Tag); // Dummy tag to put entities in different tables - // Create a relationship to use for for the group_by function. Tables will + // Create a relationship to use for the group_by function. Tables will // be assigned the relationship target as group id ECS_TAG(ecs, Group); diff --git a/examples/c/queries/group_by_callbacks/src/main.c b/examples/c/queries/group_by_callbacks/src/main.c index 7d8bd375a..2aaafb56f 100644 --- a/examples/c/queries/group_by_callbacks/src/main.c +++ b/examples/c/queries/group_by_callbacks/src/main.c @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) { ECS_COMPONENT(ecs, Position); ECS_TAG(ecs, Tag); // Dummy tag to put entities in different tables - // Create a relationship to use for for the group_by function. Tables will + // Create a relationship to use for the group_by function. Tables will // be assigned the relationship target as group id ECS_TAG(ecs, Group); diff --git a/examples/c/queries/group_by_custom/src/main.c b/examples/c/queries/group_by_custom/src/main.c index 88e5ec60c..fe36ec469 100644 --- a/examples/c/queries/group_by_custom/src/main.c +++ b/examples/c/queries/group_by_custom/src/main.c @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) { ECS_COMPONENT(ecs, Position); ECS_TAG(ecs, Tag); // Dummy tag to put entities in different tables - // Create a relationship to use for for the group_by function. Tables will + // Create a relationship to use for the group_by function. Tables will // be assigned the relationship target as group id ECS_TAG(ecs, Group); diff --git a/examples/c/systems/sync_point_delete/src/main.c b/examples/c/systems/sync_point_delete/src/main.c index 88c01034d..857e95e2d 100644 --- a/examples/c/systems/sync_point_delete/src/main.c +++ b/examples/c/systems/sync_point_delete/src/main.c @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { ecs_world_t *ecs = ecs_init_w_args(argc, argv); // This example shows how to annotate systems that delete entities, in a way - // that allows the scheduler to to correctly insert sync points. See the + // that allows the scheduler to correctly insert sync points. See the // sync_point example for more details on sync points. // // While annotating a system for a delete operation follows the same diff --git a/examples/cpp/queries/group_by/src/main.cpp b/examples/cpp/queries/group_by/src/main.cpp index a07e3c89f..da11af143 100644 --- a/examples/cpp/queries/group_by/src/main.cpp +++ b/examples/cpp/queries/group_by/src/main.cpp @@ -26,7 +26,7 @@ struct Position { // Dummy tag to put entities in different tables struct Tag { }; -// Create a relationship to use for for the group_by function. Tables will +// Create a relationship to use for the group_by function. Tables will // be assigned the relationship target as group id struct Group { }; diff --git a/examples/cpp/queries/group_by_callbacks/src/main.cpp b/examples/cpp/queries/group_by_callbacks/src/main.cpp index a53318f75..072414505 100644 --- a/examples/cpp/queries/group_by_callbacks/src/main.cpp +++ b/examples/cpp/queries/group_by_callbacks/src/main.cpp @@ -20,7 +20,7 @@ int group_counter = 0; // Dummy tag to put entities in different tables struct Tag { }; -// Create a relationship to use for for the group_by function. Tables will +// Create a relationship to use for the group_by function. Tables will // be assigned the relationship target as group id struct Group { }; diff --git a/examples/cpp/queries/group_by_custom/src/main.cpp b/examples/cpp/queries/group_by_custom/src/main.cpp index 1396b3ef6..fbf7bb496 100644 --- a/examples/cpp/queries/group_by_custom/src/main.cpp +++ b/examples/cpp/queries/group_by_custom/src/main.cpp @@ -12,7 +12,7 @@ struct Position { // Dummy tag to put entities in different tables struct Tag { }; -// Create a relationship to use for for the group_by function. Tables will +// Create a relationship to use for the group_by function. Tables will // be assigned the relationship target as group id struct Group { }; diff --git a/examples/cpp/reflection/portable_type/src/main.cpp b/examples/cpp/reflection/portable_type/src/main.cpp index 4d617c7c1..4c5fa19c5 100644 --- a/examples/cpp/reflection/portable_type/src/main.cpp +++ b/examples/cpp/reflection/portable_type/src/main.cpp @@ -1,7 +1,7 @@ #include #include -// The actual types of of int32_t and uintptr_t vary between platforms. +// The actual types of int32_t and uintptr_t vary between platforms. struct PortableType { int32_t i32; uintptr_t intptr; diff --git a/examples/cpp/systems/sync_point_delete/src/main.cpp b/examples/cpp/systems/sync_point_delete/src/main.cpp index e23a01725..e3782ccc8 100644 --- a/examples/cpp/systems/sync_point_delete/src/main.cpp +++ b/examples/cpp/systems/sync_point_delete/src/main.cpp @@ -13,7 +13,7 @@ int main(int, char *[]) { flecs::world ecs; // This example shows how to annotate systems that delete entities, in a way - // that allows the scheduler to to correctly insert sync points. See the + // that allows the scheduler to correctly insert sync points. See the // sync_point example for more details on sync points. // // While annotating a system for a delete operation follows the same diff --git a/flecs.h b/flecs.h index 61ba7d43a..d194ab3c7 100644 --- a/flecs.h +++ b/flecs.h @@ -3694,7 +3694,7 @@ typedef struct ecs_bulk_desc_t { int32_t _canary; ecs_entity_t *entities; /**< Entities to bulk insert. Entity ids provided by - * the application application must be empty (cannot + * the application must be empty (cannot * have components). If no entity ids are provided, the * operation will create 'count' new entities. */ @@ -7862,7 +7862,7 @@ ecs_id_t ecs_field_id( /** Return index of matched table column. * This function only returns column indices for fields that have been matched - * on the the $this variable. Fields matched on other tables will return -1. + * on the $this variable. Fields matched on other tables will return -1. * * @param it The iterator. * @param index The index of the field in the iterator. @@ -10596,7 +10596,7 @@ typedef struct EcsRateFilter { * * The timer is synchronous, and is incremented each frame by delta_time. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -10622,7 +10622,7 @@ ecs_entity_t ecs_set_timeout( * * The timer is synchronous, and is incremented each frame by delta_time. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -10643,7 +10643,7 @@ ecs_ftime_t ecs_get_timeout( * * The timer is synchronous, and is incremented each frame by delta_time. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -10734,7 +10734,7 @@ void ecs_randomize_timers( * If no tick source is provided, the rate filter will use the frame tick as * source, which corresponds with the number of times ecs_progress is called. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -16912,7 +16912,7 @@ namespace flecs { /** * @defgroup cpp_core_filters Filters - * @brief Filters are are cheaper to create, but slower to iterate than flecs::query. + * @brief Filters are cheaper to create, but slower to iterate than flecs::query. * * \ingroup cpp_core * @{ diff --git a/include/flecs.h b/include/flecs.h index 9ebf225a9..e98550b62 100644 --- a/include/flecs.h +++ b/include/flecs.h @@ -918,7 +918,7 @@ typedef struct ecs_bulk_desc_t { int32_t _canary; ecs_entity_t *entities; /**< Entities to bulk insert. Entity ids provided by - * the application application must be empty (cannot + * the application must be empty (cannot * have components). If no entity ids are provided, the * operation will create 'count' new entities. */ @@ -5065,7 +5065,7 @@ ecs_id_t ecs_field_id( /** Return index of matched table column. * This function only returns column indices for fields that have been matched - * on the the $this variable. Fields matched on other tables will return -1. + * on the $this variable. Fields matched on other tables will return -1. * * @param it The iterator. * @param index The index of the field in the iterator. @@ -5089,7 +5089,7 @@ ecs_entity_t ecs_field_src( int32_t index); /** Return field type size. - * Return type size of the field field. Returns 0 if the field has no data. + * Return type size of the field. Returns 0 if the field has no data. * * @param it The iterator. * @param index The index of the field in the iterator. diff --git a/include/flecs/addons/cpp/mixins/filter/decl.hpp b/include/flecs/addons/cpp/mixins/filter/decl.hpp index 4fc87d699..c71ac0436 100644 --- a/include/flecs/addons/cpp/mixins/filter/decl.hpp +++ b/include/flecs/addons/cpp/mixins/filter/decl.hpp @@ -9,7 +9,7 @@ namespace flecs { /** * @defgroup cpp_core_filters Filters - * @brief Filters are are cheaper to create, but slower to iterate than flecs::query. + * @brief Filters are cheaper to create, but slower to iterate than flecs::query. * * \ingroup cpp_core * @{ diff --git a/include/flecs/addons/timer.h b/include/flecs/addons/timer.h index 118e96c73..ee3c9984a 100644 --- a/include/flecs/addons/timer.h +++ b/include/flecs/addons/timer.h @@ -58,7 +58,7 @@ typedef struct EcsRateFilter { * * The timer is synchronous, and is incremented each frame by delta_time. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -84,7 +84,7 @@ ecs_entity_t ecs_set_timeout( * * The timer is synchronous, and is incremented each frame by delta_time. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -105,7 +105,7 @@ ecs_ftime_t ecs_get_timeout( * * The timer is synchronous, and is incremented each frame by delta_time. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. @@ -196,7 +196,7 @@ void ecs_randomize_timers( * If no tick source is provided, the rate filter will use the frame tick as * source, which corresponds with the number of times ecs_progress is called. * - * The tick_source entity will be be a tick source after this operation. Tick + * The tick_source entity will be a tick source after this operation. Tick * sources can be read by getting the EcsTickSource component. If the tick * source ticked this frame, the 'tick' member will be true. When the tick * source is a system, the system will tick when the timer ticks. diff --git a/test/api/src/Internals.c b/test/api/src/Internals.c index 6dbc15184..cf2b5aab0 100644 --- a/test/api/src/Internals.c +++ b/test/api/src/Internals.c @@ -127,7 +127,7 @@ void Internals_activate_deactivate_activate_other(void) { ecs_delete(world, e1); ecs_delete(world, e2); - /* Add entities of different type type to trigger new table activation */ + /* Add entities of different type to trigger new table activation */ ECS_ENTITY(world, e3, Position, Velocity); ECS_ENTITY(world, e4, Position, Velocity);