Skip to content
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Check for typos
uses: crate-ci/typos@v1.29.5
uses: crate-ci/typos@v1.29.6
- name: Typos info
if: failure()
run: |
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ecs/src/entity/entity_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ unsafe impl<I: EntitySetIterator> EntitySetIterator for iter::StepBy<I> {}
/// Conversion from an `EntitySetIterator`.
///
/// Some collections, while they can be constructed from plain iterators,
/// benefit strongly from the additional uniqeness guarantee [`EntitySetIterator`] offers.
/// benefit strongly from the additional uniqueness guarantee [`EntitySetIterator`] offers.
/// Mirroring [`Iterator::collect`]/[`FromIterator::from_iter`], [`EntitySetIterator::collect_set`] and
/// `FromEntitySetIterator::from_entity_set_iter` can be used for construction.
///
Expand Down
14 changes: 7 additions & 7 deletions crates/bevy_mikktspace/src/generated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pub struct SGroup {
pub iNrFaces: i32,
pub pFaceIndices: *mut i32,
pub iVertexRepresentative: i32,
pub bOrientPreservering: bool,
pub bOrientPreserving: bool,
}

impl SGroup {
Expand All @@ -145,7 +145,7 @@ impl SGroup {
iNrFaces: 0,
pFaceIndices: null_mut(),
iVertexRepresentative: 0,
bOrientPreservering: false,
bOrientPreserving: false,
}
}
}
Expand Down Expand Up @@ -576,11 +576,11 @@ unsafe fn GenerateTSpaces<I: Geometry>(
if (*pTS_out).iCounter == 1i32 {
*pTS_out = AvgTSpace(pTS_out, &mut pSubGroupTspace[l]);
(*pTS_out).iCounter = 2i32;
(*pTS_out).bOrient = (*pGroup).bOrientPreservering
(*pTS_out).bOrient = (*pGroup).bOrientPreserving
} else {
*pTS_out = pSubGroupTspace[l];
(*pTS_out).iCounter = 1i32;
(*pTS_out).bOrient = (*pGroup).bOrientPreservering
(*pTS_out).bOrient = (*pGroup).bOrientPreserving
}
i += 1
}
Expand Down Expand Up @@ -838,7 +838,7 @@ unsafe fn Build4RuleGroups(
*fresh2 = ptr::from_mut(&mut *pGroups.offset(iNrActiveGroups as isize));
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize])
.iVertexRepresentative = vert_index;
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).bOrientPreservering =
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).bOrientPreserving =
(*pTriInfos.offset(f as isize)).iFlag & 8i32 != 0i32;
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).iNrFaces = 0i32;
let ref mut fresh3 =
Expand Down Expand Up @@ -927,7 +927,7 @@ unsafe fn AssignRecur(
&& (*pMyTriInfo).AssignedGroup[2usize].is_null()
{
(*pMyTriInfo).iFlag &= !8i32;
(*pMyTriInfo).iFlag |= if (*pGroup).bOrientPreservering {
(*pMyTriInfo).iFlag |= if (*pGroup).bOrientPreserving {
8i32
} else {
0i32
Expand All @@ -939,7 +939,7 @@ unsafe fn AssignRecur(
} else {
false
};
if bOrient != (*pGroup).bOrientPreservering {
if bOrient != (*pGroup).bOrientPreserving {
return false;
}
AddTriToGroup(pGroup, iMyTriIndex);
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_pbr/src/render/pbr_functions.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ fn bend_normal_for_anisotropy(lighting_input: ptr<function, lighting::LightingIn
(*lighting_input).layers[LAYER_BASE].R = R;
}

#endif // STANDARD_MATERIAL_ANISTROPY
#endif // STANDARD_MATERIAL_ANISOTROPY

// NOTE: Correctly calculates the view vector depending on whether
// the projection is orthographic or perspective.
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_pbr/src/ssr/raymarch.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ struct DepthRayMarchResult {
/// Range: `0..=1` as a lerp factor over `ray_start_cs..=ray_end_cs`.
hit_t: f32,

/// UV correspindong to `hit_t`.
/// UV corresponding to `hit_t`.
hit_uv: vec2<f32>,

/// The distance that the hit point penetrates into the hit surface.
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_picking/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//! allows you to express more complex interactions, like detecting when a touch input drags a UI
//! element and drops it on a 3d mesh rendered to a different camera.
//!
//! Pointer events bubble up the entity hieararchy and can be used with observers, allowing you to
//! Pointer events bubble up the entity hierarchy and can be used with observers, allowing you to
//! succinctly express rich interaction behaviors by attaching pointer callbacks to entities:
//!
//! ```rust
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_reflect/src/func/args/count.rs
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ mod tests {
}

#[test]
fn should_allow_removeting_nonexistent_count() {
fn should_allow_removing_nonexistent_count() {
let mut count = ArgCount::default();

assert_eq!(count.len(), 0);
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_reflect/src/func/dynamic_function_internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ mod tests {
}

#[test]
fn should_merge_overloaed_into_single() {
fn should_merge_overload_into_single() {
let mut func_a = DynamicFunctionInternal {
functions: vec!['a', 'b'],
info: FunctionInfo::new(SignatureInfo::anonymous().with_arg::<i8>("arg0"))
Expand Down
1 change: 1 addition & 0 deletions typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ LOD = "LOD" # Level of detail
reparametrization = "reparametrization" # Mathematical term in curve context (reparameterize)
reparametrize = "reparametrize"
reparametrized = "reparametrized"
implementors = "implementors" # Can probably remove after next typos release. https://github.com/crate-ci/typos/issues/1226

# Match a Whole Word - Case Sensitive
[default.extend-identifiers]
Expand Down
Loading