diff --git a/examples/multi_context.rs b/examples/multi_context.rs index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 --- a/examples/multi_context.rs +++ b/examples/multi_context.rs @@ -0,0 +1 @@ + diff --git a/src/render/extract.rs b/src/render/extract.rs index 858c3aee097056dfab6c5421849e10334c68f688..e0a4ded369621cd31000a147291965289020d94e 100644 --- a/src/render/extract.rs +++ b/src/render/extract.rs @@ -5,7 +5,7 @@ use crate::{ styles::Corner, }; use bevy::{ - prelude::{Assets, Camera, Color, Commands, Image, Plugin, Query, Rect, Res, Vec2, Entity}, + prelude::{Assets, Camera, Color, Commands, Entity, Image, Plugin, Query, Rect, Res, Vec2}, render::{Extract, RenderApp, RenderStage}, window::Windows, }; @@ -59,7 +59,13 @@ pub fn extract( for (camera_entity, dpi, render_primitive) in render_primitives { match render_primitive { RenderPrimitive::Text { .. } => { - let text_quads = font::extract_texts(camera_entity, &render_primitive, &fonts, &font_mapping, dpi); + let text_quads = font::extract_texts( + camera_entity, + &render_primitive, + &fonts, + &font_mapping, + dpi, + ); extracted_quads.extend(text_quads); } RenderPrimitive::Image { .. } => { @@ -76,8 +82,12 @@ pub fn extract( extracted_quads.extend(nine_patch_quads); } RenderPrimitive::TextureAtlas { .. } => { - let texture_atlas_quads = - texture_atlas::extract_texture_atlas(camera_entity, &render_primitive, &images, dpi); + let texture_atlas_quads = texture_atlas::extract_texture_atlas( + camera_entity, + &render_primitive, + &images, + dpi, + ); extracted_quads.extend(texture_atlas_quads); } RenderPrimitive::Clip { layout } => { diff --git a/src/render/font/extract.rs b/src/render/font/extract.rs index fc8251bb13eda4ef9807901ad50ff29200863b53..e6051ccf5b7c580325259c9dc4973a65faa5676e 100644 --- a/src/render/font/extract.rs +++ b/src/render/font/extract.rs @@ -1,6 +1,6 @@ use bevy::{ math::Vec2, - prelude::{Assets, Rect, Res, Entity}, + prelude::{Assets, Entity, Rect, Res}, }; use kayak_font::KayakFont; diff --git a/src/render/image/extract.rs b/src/render/image/extract.rs index 4b0bbdc00552d184f3f07c07c251452422d0830a..933271bd47cfe16a3ae02d2521c73d6975235516 100644 --- a/src/render/image/extract.rs +++ b/src/render/image/extract.rs @@ -3,7 +3,11 @@ use crate::{ render_primitive::RenderPrimitive, styles::Corner, }; -use bevy::{math::Vec2, prelude::{Rect, Entity}, render::color::Color}; +use bevy::{ + math::Vec2, + prelude::{Entity, Rect}, + render::color::Color, +}; pub fn extract_images( camera_entity: Entity, diff --git a/src/render/mod.rs b/src/render/mod.rs index 57ed35388d656f8391b330ec1c8805fdd14bf232..67dbf1cfd342bc94164963625f34aa1027682ca9 100644 --- a/src/render/mod.rs +++ b/src/render/mod.rs @@ -1,5 +1,5 @@ use bevy::{ - prelude::{App, Commands, Entity, Plugin, Query, With, Camera}, + prelude::{App, Camera, Commands, Entity, Plugin, Query, With}, render::{ render_graph::{RenderGraph, RunGraphOnViewNode, SlotInfo, SlotType}, render_phase::{DrawFunctions, RenderPhase}, diff --git a/src/render/nine_patch/extract.rs b/src/render/nine_patch/extract.rs index ac361e8cf04ca45cb61fea1aacfc48fa657d2b0f..56c6f4ba1b513c071e20ff596133c5fa4f9e1a4e 100644 --- a/src/render/nine_patch/extract.rs +++ b/src/render/nine_patch/extract.rs @@ -5,7 +5,7 @@ use crate::{ }; use bevy::{ math::Vec2, - prelude::{Assets, Rect, Res, Entity}, + prelude::{Assets, Entity, Rect, Res}, render::{color::Color, texture::Image}, }; diff --git a/src/render/quad/extract.rs b/src/render/quad/extract.rs index ebe984867764005d73714ac30026eab07ff5347d..a5ec9a1df23c5ed1ae3f188979c4d34b484756a9 100644 --- a/src/render/quad/extract.rs +++ b/src/render/quad/extract.rs @@ -3,7 +3,10 @@ use crate::{ render_primitive::RenderPrimitive, styles::Corner, }; -use bevy::{math::Vec2, prelude::{Rect, Entity}}; +use bevy::{ + math::Vec2, + prelude::{Entity, Rect}, +}; pub fn extract_quads( camera_entity: Entity, diff --git a/src/render/texture_atlas/extract.rs b/src/render/texture_atlas/extract.rs index 336ad115c3f1d8b4b487d1bbaada7703a2251427..9b1c750c9e02c0669009d890c90334ced90a1275 100644 --- a/src/render/texture_atlas/extract.rs +++ b/src/render/texture_atlas/extract.rs @@ -5,7 +5,7 @@ use crate::{ }; use bevy::{ math::Vec2, - prelude::{Assets, Rect, Res, Entity}, + prelude::{Assets, Entity, Rect, Res}, render::{color::Color, texture::Image}, }; diff --git a/src/render/unified/pipeline.rs b/src/render/unified/pipeline.rs index 4c4cd040d4ab9a94721da70f236a0d8bee25f860..d8a71309ee8d32b1f574106dfd0a401a57f3d9a2 100644 --- a/src/render/unified/pipeline.rs +++ b/src/render/unified/pipeline.rs @@ -339,7 +339,7 @@ pub enum UIQuadType { #[derive(Debug, Component, Clone)] pub struct ExtractedQuad { - pub camera_entity: Entity, + pub camera_entity: Entity, pub rect: Rect, pub color: Color, pub vertex_index: usize,