Skip to content

Commit

Permalink
#1037 Fix dupe word typos
Browse files Browse the repository at this point in the history
  • Loading branch information
Rageking8 authored Sep 5, 2023
1 parent ae0bed2 commit ec237bf
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion docs/Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion docs/Queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion examples/c/queries/group_by/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion examples/c/queries/group_by_callbacks/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion examples/c/queries/group_by_custom/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion examples/c/systems/sync_point_delete/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/queries/group_by/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/queries/group_by_callbacks/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/queries/group_by_custom/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/reflection/portable_type/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <portable_type.h>
#include <iostream>

// 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;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/systems/sync_point_delete/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions flecs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
* @{
Expand Down
6 changes: 3 additions & 3 deletions include/flecs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */

Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion include/flecs/addons/cpp/mixins/filter/decl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
* @{
Expand Down
8 changes: 4 additions & 4 deletions include/flecs/addons/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/api/src/Internals.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit ec237bf

Please sign in to comment.