From 7904e8bf085eb9f6654ae02dc15475847045f3ed Mon Sep 17 00:00:00 2001
From: StarArawn <toasterthegamer@gmail.com>
Date: Wed, 24 Nov 2021 16:36:35 -0500
Subject: [PATCH] Cleanup warnings.
---
bevy_kayak_ui/src/camera/camera.rs | 2 +-
bevy_kayak_ui/src/render/mod.rs | 8 +-------
bevy_kayak_ui/src/render/ui_pass.rs | 4 ++--
bevy_kayak_ui/src/render/ui_pass_driver.rs | 2 +-
bevy_kayak_ui/src/render/unified/font/extract.rs | 3 +--
bevy_kayak_ui/src/render/unified/pipeline.rs | 13 ++++++-------
6 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/bevy_kayak_ui/src/camera/camera.rs b/bevy_kayak_ui/src/camera/camera.rs
index f0ed588..be8d0b4 100644
--- a/bevy_kayak_ui/src/camera/camera.rs
+++ b/bevy_kayak_ui/src/camera/camera.rs
@@ -1,7 +1,7 @@
use bevy::{
prelude::{Bundle, GlobalTransform, Transform},
render2::{
- camera::{Camera, CameraPlugin, CameraProjection, DepthCalculation, WindowOrigin},
+ camera::{Camera, CameraProjection, DepthCalculation, WindowOrigin},
primitives::Frustum,
view::VisibleEntities,
},
diff --git a/bevy_kayak_ui/src/render/mod.rs b/bevy_kayak_ui/src/render/mod.rs
index 051005c..6b41bf0 100644
--- a/bevy_kayak_ui/src/render/mod.rs
+++ b/bevy_kayak_ui/src/render/mod.rs
@@ -1,15 +1,9 @@
use bevy::{
- prelude::{Commands, Entity, Plugin, Query, Res, ResMut, With},
+ prelude::{Commands, Plugin, Res},
render2::{
camera::ActiveCameras,
render_graph::{EmptyNode, RenderGraph, SlotInfo, SlotType},
render_phase::{sort_phase_system, DrawFunctions, RenderPhase},
- render_resource::{
- Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
- },
- renderer::RenderDevice,
- texture::TextureCache,
- view::{ExtractedView, ViewDepthTexture},
RenderApp, RenderStage,
},
};
diff --git a/bevy_kayak_ui/src/render/ui_pass.rs b/bevy_kayak_ui/src/render/ui_pass.rs
index d04383c..784c67c 100644
--- a/bevy_kayak_ui/src/render/ui_pass.rs
+++ b/bevy_kayak_ui/src/render/ui_pass.rs
@@ -6,9 +6,9 @@ use bevy::render2::render_resource::{CachedPipelineId, RenderPassColorAttachment
use bevy::render2::{
render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
render_phase::{DrawFunctions, RenderPhase, TrackedRenderPass},
- render_resource::{LoadOp, Operations, RenderPassDepthStencilAttachment, RenderPassDescriptor},
+ render_resource::{LoadOp, Operations, RenderPassDescriptor},
renderer::RenderContext,
- view::{ExtractedView, ViewDepthTexture, ViewTarget},
+ view::{ExtractedView, ViewTarget},
};
pub struct TransparentUI {
diff --git a/bevy_kayak_ui/src/render/ui_pass_driver.rs b/bevy_kayak_ui/src/render/ui_pass_driver.rs
index edce5b8..afefcf6 100644
--- a/bevy_kayak_ui/src/render/ui_pass_driver.rs
+++ b/bevy_kayak_ui/src/render/ui_pass_driver.rs
@@ -1,6 +1,6 @@
use bevy::ecs::world::World;
use bevy::render2::{
- camera::{CameraPlugin, ExtractedCameraNames},
+ camera::ExtractedCameraNames,
render_graph::{Node, NodeRunError, RenderGraphContext, SlotValue},
renderer::RenderContext,
};
diff --git a/bevy_kayak_ui/src/render/unified/font/extract.rs b/bevy_kayak_ui/src/render/unified/font/extract.rs
index 2b55316..877c688 100644
--- a/bevy_kayak_ui/src/render/unified/font/extract.rs
+++ b/bevy_kayak_ui/src/render/unified/font/extract.rs
@@ -1,7 +1,6 @@
use bevy::{
math::Vec2,
- prelude::{Assets, Bundle, Commands, Handle, Res, ResMut},
- render2::color::Color,
+ prelude::{Assets, Commands, Res, ResMut},
sprite2::Rect,
};
use kayak_core::render_primitive::RenderPrimitive;
diff --git a/bevy_kayak_ui/src/render/unified/pipeline.rs b/bevy_kayak_ui/src/render/unified/pipeline.rs
index 043f0c5..5d01dcd 100644
--- a/bevy_kayak_ui/src/render/unified/pipeline.rs
+++ b/bevy_kayak_ui/src/render/unified/pipeline.rs
@@ -4,8 +4,8 @@ use bevy::{
lifetimeless::{Read, SQuery, SRes},
SystemState,
},
- math::{const_vec3, Mat4, Quat, Vec2, Vec3},
- prelude::{Bundle, Commands, Entity, FromWorld, Handle, Query, Res, ResMut, World},
+ math::{const_vec3, Mat4, Quat, Vec3},
+ prelude::{Bundle, Entity, FromWorld, Handle, Query, Res, ResMut, World},
render2::{
color::Color,
render_phase::{Draw, DrawFunctions, RenderPhase, TrackedRenderPass},
@@ -13,10 +13,9 @@ use bevy::{
BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout,
BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingType, BlendComponent,
BlendFactor, BlendOperation, BlendState, BufferBindingType, BufferSize, BufferUsages,
- BufferVec, CachedPipelineId, ColorTargetState, ColorWrites, CompareFunction,
- DepthBiasState, DepthStencilState, DynamicUniformVec, FragmentState, FrontFace,
- MultisampleState, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPipelineCache,
- RenderPipelineDescriptor, Shader, ShaderStages, StencilFaceState, StencilState,
+ BufferVec, CachedPipelineId, ColorTargetState, ColorWrites, DynamicUniformVec,
+ FragmentState, FrontFace, MultisampleState, PolygonMode, PrimitiveState,
+ PrimitiveTopology, RenderPipelineCache, RenderPipelineDescriptor, Shader, ShaderStages,
TextureFormat, TextureSampleType, TextureViewDimension, VertexAttribute,
VertexBufferLayout, VertexFormat, VertexState, VertexStepMode,
},
@@ -31,7 +30,7 @@ use crevice::std140::AsStd140;
use super::font::{FontTextureCache, KayakFont};
use super::UNIFIED_SHADER_HANDLE;
-use crate::{render::ui_pass::TransparentUI, BevyContext};
+use crate::render::ui_pass::TransparentUI;
pub struct UnifiedPipeline {
view_layout: BindGroupLayout,
--
GitLab