Skip to content

Fix singlepass mode #455

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.

Sign up for GitHub

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

Merged
vladbat00 merged 1 commit into from
Dec 20, 2025
Merged

Fix singlepass mode #455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,12 @@ use bevy_asset::{AssetEvent, AssetId, Assets, Handle, load_internal_asset};
use bevy_camera::NormalizedRenderTarget;
use bevy_derive::{Deref, DerefMut};
use bevy_ecs::{
lifecycle::HookContext,
prelude::*,
query::{QueryData, QueryEntityError, QuerySingleError},
schedule::{InternedScheduleLabel, ScheduleLabel},
system::SystemParam,
world::DeferredWorld,
};
#[cfg(feature = "render")]
use bevy_image::{Image, ImageSampler};
Expand Down Expand Up @@ -554,9 +556,19 @@ pub struct EguiPrimaryContextPass;

/// A marker component for a primary Egui context.
#[derive(Component, Clone)]
#[require(EguiMultipassSchedule::new(EguiPrimaryContextPass))]
#[require(EguiContext)]
#[component(on_insert = insert_schedule_if_multipass)]
pub struct PrimaryEguiContext;

fn insert_schedule_if_multipass(mut world: DeferredWorld, context: HookContext) {
if world.contains_resource::<EnableMultipassForPrimaryContext>() {
world
.commands()
.entity(context.entity)
.insert(EguiMultipassSchedule::new(EguiPrimaryContextPass));
}
}

/// Add this component to your additional Egui contexts (e.g. when rendering to a new window or an image),
/// to enable multi-pass support. Note that each Egui context running in the multi-pass mode must use a unique schedule.
#[derive(Component, Clone)]
Expand Down Expand Up @@ -1440,7 +1452,6 @@ pub struct EguiManagedTexture {
pub fn setup_primary_egui_context_system(
mut commands: Commands,
new_cameras: Query<(Entity, Option<&EguiContext>), Added<bevy_camera::Camera>>,
enable_multipass_for_primary_context: Option<Res<EnableMultipassForPrimaryContext>>,
mut egui_context_exists: Local<bool>,
) -> Result {
for (camera_entity, context) in new_cameras {
Expand All @@ -1455,9 +1466,6 @@ pub fn setup_primary_egui_context_system(
// See the list of required components to check the full list of components we add.
let mut camera_commands = commands.get_entity(camera_entity)?;
camera_commands.insert((context, PrimaryEguiContext));
if enable_multipass_for_primary_context.is_some() {
camera_commands.insert(EguiMultipassSchedule::new(EguiPrimaryContextPass));
}
*egui_context_exists = true;
}

Expand Down