From 941b781a0b56f97b23d996b6f833bffac8f92caa Mon Sep 17 00:00:00 2001 From: "Spencer C. Imbleau" Date: Wed, 14 Aug 2024 09:25:30 -0400 Subject: [PATCH] fix: skip text when `SkipEncoding` is present (#77) Text is now properly skipped when a `SkipEncoding` component is present. --- CHANGELOG.md | 8 ++++++++ src/render/extract.rs | 21 ++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df8828e..df78c46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ You can find its changes [documented below](#051---2024-07-04). This release supports Bevy version 0.14 and has an [MSRV][] of 1.80. +### Fixed + +- Text is now properly skipped when a `SkipEncoding` component is present. ([#77] by [@simbleau]) + ## [0.6.0] - 2024-08-09 This release supports Bevy version 0.14 and has an [MSRV][] of 1.80. @@ -225,6 +229,10 @@ This release supports Bevy version 0.13 and has an [MSRV][] of 1.77. - Initial release +[#77]: https://github.com/linebender/bevy_vello/pull/77 + +[@simbleau]: https://github.com/simbleau + [Unreleased]: https://github.com/linebender/bevy_vello/compare/v0.6.0...HEAD [0.6.0]: https://github.com/linebender/bevy_vello/compare/v0.5.1...v0.6.0 [0.5.1]: https://github.com/linebender/bevy_vello/compare/v0.5.0...v0.5.1 diff --git a/src/render/extract.rs b/src/render/extract.rs index 3baded3..68fd37d 100644 --- a/src/render/extract.rs +++ b/src/render/extract.rs @@ -199,15 +199,18 @@ pub struct ExtractedRenderText { pub fn extract_text( mut commands: Commands, query_scenes: Extract< - Query<( - &VelloTextSection, - &VelloTextAnchor, - &GlobalTransform, - &ViewVisibility, - &InheritedVisibility, - &CoordinateSpace, - Option<&RenderLayers>, - )>, + Query< + ( + &VelloTextSection, + &VelloTextAnchor, + &GlobalTransform, + &ViewVisibility, + &InheritedVisibility, + &CoordinateSpace, + Option<&RenderLayers>, + ), + Without, + >, >, ) { for (