Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more typos. #1226

Merged
merged 1 commit into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/DesignWithFlecs.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ An application can add phases to the existing list, or define a pipeline from sc
Large applications can often contain many components and systems. Some large commercial projects have reported up to 800 components! Managing all those components and systems becomes important on that scale, and that is what modules are for. Modules are one of those features that you usually don't think about when selecting an ECS, but they can make your life a lot easier.

### Defining Modules
The purpose of modules is really to enable reusability. A well written module can be imported into any project, and will do its thing without any tweaking or tinkering. To achieve this, make sure to define your modules around features. Features seldomly consist out of a single system or component, but can have many. Examples are rendering, collision detection, input management, and so on.
The purpose of modules is really to enable reusability. A well written module can be imported into any project, and will do its thing without any tweaking or tinkering. To achieve this, make sure to define your modules around features. Features seldom consist out of a single system or component, but can have many. Examples are rendering, collision detection, input management, and so on.

### Module Dependencies and Ordering
Modules can depend on each other. In fact, often do! Importing a module twice has no penalties in Flecs, it will not define your systems and components twice. This enables your application code to import the modules it needs, without having to worry about whether they were already loaded.
Expand Down
2 changes: 1 addition & 1 deletion flecs.c
Original file line number Diff line number Diff line change
Expand Up @@ -43529,7 +43529,7 @@ bool flecs_json_serialize_iter_result_sources(
}

if (f == field_count) {
/* All fields are mathced on $this */
/* All fields are matched on $this */
return false;
}

Expand Down
12 changes: 6 additions & 6 deletions flecs.h
Original file line number Diff line number Diff line change
Expand Up @@ -3403,8 +3403,8 @@ struct ecs_observer_t {
ecs_run_action_t run; /**< See ecs_observer_desc_t::run */

void *ctx; /**< Observer context */
void *callback_ctx; /**< Callback language binfding context */
void *run_ctx; /**< Run language binfding context */
void *callback_ctx; /**< Callback language binding context */
void *run_ctx; /**< Run language binding context */

ecs_ctx_free_t ctx_free; /**< Callback to free ctx */
ecs_ctx_free_t callback_ctx_free; /**< Callback to free callback_ctx */
Expand Down Expand Up @@ -7246,7 +7246,7 @@ bool ecs_id_in_use(
* EcsComponent value with size 0, the operation will return 0.
*
* For a pair id the operation will return the type associated with the pair, by
* applying the following querys in order:
* applying the following queries in order:
* - The first pair element is returned if it is a component
* - 0 is returned if the relationship entity has the Tag property
* - The second pair element is returned if it is a component
Expand Down Expand Up @@ -8071,8 +8071,8 @@ int32_t ecs_iter_count(

/** Test if iterator is true.
* This operation will return true if the iterator returns at least one result.
* This is especially useful in combination with fact-checking querys (see the
* querys addon).
* This is especially useful in combination with fact-checking queries (see the
* queries addon).
*
* The operation requires a valid iterator. After the operation is invoked, the
* application should no longer invoke next on the iterator and should treat it
Expand Down Expand Up @@ -28124,7 +28124,7 @@ namespace _ {
ecs_assert(
!ti->size || !ecs_has_id(world_, id, flecs::Union),
ECS_INVALID_PARAMETER,
"use withs() method to add union relationship");
"use with() method to add union relationship");
}
}

Expand Down
10 changes: 5 additions & 5 deletions include/flecs.h
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,8 @@ struct ecs_observer_t {
ecs_run_action_t run; /**< See ecs_observer_desc_t::run */

void *ctx; /**< Observer context */
void *callback_ctx; /**< Callback language binfding context */
void *run_ctx; /**< Run language binfding context */
void *callback_ctx; /**< Callback language binding context */
void *run_ctx; /**< Run language binding context */

ecs_ctx_free_t ctx_free; /**< Callback to free ctx */
ecs_ctx_free_t callback_ctx_free; /**< Callback to free callback_ctx */
Expand Down Expand Up @@ -4074,7 +4074,7 @@ bool ecs_id_in_use(
* EcsComponent value with size 0, the operation will return 0.
*
* For a pair id the operation will return the type associated with the pair, by
* applying the following querys in order:
* applying the following queries in order:
* - The first pair element is returned if it is a component
* - 0 is returned if the relationship entity has the Tag property
* - The second pair element is returned if it is a component
Expand Down Expand Up @@ -4899,8 +4899,8 @@ int32_t ecs_iter_count(

/** Test if iterator is true.
* This operation will return true if the iterator returns at least one result.
* This is especially useful in combination with fact-checking querys (see the
* querys addon).
* This is especially useful in combination with fact-checking queries (see the
* queries addon).
*
* The operation requires a valid iterator. After the operation is invoked, the
* application should no longer invoke next on the iterator and should treat it
Expand Down
2 changes: 1 addition & 1 deletion include/flecs/addons/cpp/utils/signature.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace _ {
ecs_assert(
!ti->size || !ecs_has_id(world_, id, flecs::Union),
ECS_INVALID_PARAMETER,
"use withs() method to add union relationship");
"use with() method to add union relationship");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/addons/json/serialize_iter_result_query.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ bool flecs_json_serialize_iter_result_sources(
}

if (f == field_count) {
/* All fields are mathced on $this */
/* All fields are matched on $this */
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions test/script/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@
"auto_override_pair",
"auto_override_pair_component",
"lowercase_prefab_kind",
"assing_component_to_const",
"assing_component_member_to_const",
"assign_component_to_const",
"assign_component_member_to_const",
"prefab_w_slot",
"prefab_w_slot_no_parent",
"prefab_w_slot_variant",
Expand Down
4 changes: 2 additions & 2 deletions test/script/src/Eval.c
Original file line number Diff line number Diff line change
Expand Up @@ -7606,7 +7606,7 @@ void Eval_lowercase_prefab_kind(void) {
ecs_fini(world);
}

void Eval_assing_component_to_const(void) {
void Eval_assign_component_to_const(void) {
ecs_world_t *world = ecs_init();

ecs_entity_t ecs_id(Position) = ecs_struct_init(world, &(ecs_struct_desc_t){
Expand Down Expand Up @@ -7639,7 +7639,7 @@ void Eval_assing_component_to_const(void) {
ecs_fini(world);
}

void Eval_assing_component_member_to_const(void) {
void Eval_assign_component_member_to_const(void) {
ecs_world_t *world = ecs_init();

ecs_entity_t ecs_id(Position) = ecs_struct(world, {
Expand Down
12 changes: 6 additions & 6 deletions test/script/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ void Eval_auto_override_component(void);
void Eval_auto_override_pair(void);
void Eval_auto_override_pair_component(void);
void Eval_lowercase_prefab_kind(void);
void Eval_assing_component_to_const(void);
void Eval_assing_component_member_to_const(void);
void Eval_assign_component_to_const(void);
void Eval_assign_component_member_to_const(void);
void Eval_prefab_w_slot(void);
void Eval_prefab_w_slot_no_parent(void);
void Eval_prefab_w_slot_variant(void);
Expand Down Expand Up @@ -1605,12 +1605,12 @@ bake_test_case Eval_testcases[] = {
Eval_lowercase_prefab_kind
},
{
"assing_component_to_const",
Eval_assing_component_to_const
"assign_component_to_const",
Eval_assign_component_to_const
},
{
"assing_component_member_to_const",
Eval_assing_component_member_to_const
"assign_component_member_to_const",
Eval_assign_component_member_to_const
},
{
"prefab_w_slot",
Expand Down