From 6dad8896071837119e15d345445635cfe41c480c Mon Sep 17 00:00:00 2001
From: John Mitchell <startoaster23@gmail.com>
Date: Mon, 14 Nov 2022 14:38:19 -0500
Subject: [PATCH] Run cargo fmt.
---
examples/multi_context.rs | 1 +
src/render/extract.rs | 18 ++++++++++++++----
src/render/font/extract.rs | 2 +-
src/render/image/extract.rs | 6 +++++-
src/render/mod.rs | 2 +-
src/render/nine_patch/extract.rs | 2 +-
src/render/quad/extract.rs | 5 ++++-
src/render/texture_atlas/extract.rs | 2 +-
src/render/unified/pipeline.rs | 2 +-
9 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/examples/multi_context.rs b/examples/multi_context.rs
index e69de29..8b13789 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 858c3ae..e0a4ded 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 fc8251b..e6051cc 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 4b0bbdc..933271b 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 57ed353..67dbf1c 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 ac361e8..56c6f4b 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 ebe9848..a5ec9a1 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 336ad11..9b1c750 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 4c4cd04..d8a7130 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,
--
GitLab