From e81002b879284b88b86d996b4d3133128b7ae7f1 Mon Sep 17 00:00:00 2001
From: StarArawn <toasterthegamer@gmail.com>
Date: Sat, 11 Dec 2021 10:39:50 -0500
Subject: [PATCH] Fixed most of the warnings.
---
bevy_kayak_ui/src/render/unified/font/mod.rs | 9 ++-------
examples/counter.rs | 1 -
examples/full_ui.rs | 1 -
kayak_font/examples/bevy.rs | 1 -
kayak_font/src/font.rs | 2 +-
kayak_font/src/lib.rs | 1 -
kayak_font/src/renderer/font_texture_cache.rs | 7 +++----
kayak_font/src/sdf.rs | 3 ++-
8 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/bevy_kayak_ui/src/render/unified/font/mod.rs b/bevy_kayak_ui/src/render/unified/font/mod.rs
index 82a6e94..b1783cd 100644
--- a/bevy_kayak_ui/src/render/unified/font/mod.rs
+++ b/bevy_kayak_ui/src/render/unified/font/mod.rs
@@ -1,18 +1,13 @@
use bevy::{
- prelude::{
- AddAsset, AssetEvent, AssetServer, Assets, Commands, EventReader, Handle, Local, Plugin,
- Res, ResMut,
- },
+ prelude::{Plugin, Res, ResMut},
render2::{
render_asset::RenderAssets,
- render_resource::{FilterMode, TextureFormat, TextureUsages},
renderer::{RenderDevice, RenderQueue},
texture::Image,
RenderApp, RenderStage,
},
- utils::HashSet,
};
-use kayak_font::{FontTextureCache, KayakFont, KayakFontPlugin};
+use kayak_font::{FontTextureCache, KayakFontPlugin};
mod extract;
mod font_mapping;
diff --git a/examples/counter.rs b/examples/counter.rs
index 9f924cf..4e5c163 100644
--- a/examples/counter.rs
+++ b/examples/counter.rs
@@ -7,7 +7,6 @@ use bevy::{
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle};
use kayak_components::{Button, Text, Window};
use kayak_core::{
- context::KayakContext,
styles::{Style, StyleProp, Units},
EventType, Index, OnEvent,
};
diff --git a/examples/full_ui.rs b/examples/full_ui.rs
index 46eba9f..9eed459 100644
--- a/examples/full_ui.rs
+++ b/examples/full_ui.rs
@@ -7,7 +7,6 @@ use bevy::{
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, ImageManager, UICameraBundle};
use kayak_components::{NinePatch, Text};
use kayak_core::{
- context::KayakContext,
layout_cache::Space,
styles::{LayoutType, Style, StyleProp, Units},
widget, Children, EventType, Index, OnEvent,
diff --git a/kayak_font/examples/bevy.rs b/kayak_font/examples/bevy.rs
index 1521e46..2596886 100644
--- a/kayak_font/examples/bevy.rs
+++ b/kayak_font/examples/bevy.rs
@@ -7,7 +7,6 @@ use kayak_font::{KayakFont, KayakFontPlugin};
fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
let font_handle: Handle<KayakFont> = asset_server.load("roboto.kayak_font");
-
dbg!(font_handle);
}
diff --git a/kayak_font/src/font.rs b/kayak_font/src/font.rs
index 74e73d1..b50fedf 100644
--- a/kayak_font/src/font.rs
+++ b/kayak_font/src/font.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, path::PathBuf};
+use std::collections::HashMap;
use bevy::{
asset::{AssetLoader, AssetPath, BoxedFuture, LoadContext, LoadedAsset},
diff --git a/kayak_font/src/lib.rs b/kayak_font/src/lib.rs
index 23a4753..a9050ec 100644
--- a/kayak_font/src/lib.rs
+++ b/kayak_font/src/lib.rs
@@ -12,7 +12,6 @@ use bevy::{
},
render2::{
render_resource::{FilterMode, TextureFormat, TextureUsages},
- renderer::{RenderDevice, RenderQueue},
texture::Image,
RenderApp, RenderStage,
},
diff --git a/kayak_font/src/renderer/font_texture_cache.rs b/kayak_font/src/renderer/font_texture_cache.rs
index e170a25..dfebc0d 100644
--- a/kayak_font/src/renderer/font_texture_cache.rs
+++ b/kayak_font/src/renderer/font_texture_cache.rs
@@ -7,12 +7,11 @@ use bevy::{
render_resource::{
AddressMode, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout,
BindingResource, CommandEncoderDescriptor, Extent3d, FilterMode, ImageCopyTexture,
- ImageDataLayout, Origin3d, SamplerDescriptor, TextureAspect, TextureDescriptor,
- TextureDimension, TextureFormat, TextureUsages, TextureViewDescriptor,
- TextureViewDimension,
+ Origin3d, SamplerDescriptor, TextureAspect, TextureDescriptor, TextureDimension,
+ TextureFormat, TextureUsages, TextureViewDescriptor, TextureViewDimension,
},
renderer::{RenderDevice, RenderQueue},
- texture::{GpuImage, Image, TextureFormatPixelInfo},
+ texture::{GpuImage, Image},
},
utils::HashMap,
};
diff --git a/kayak_font/src/sdf.rs b/kayak_font/src/sdf.rs
index 485e213..f8000bb 100644
--- a/kayak_font/src/sdf.rs
+++ b/kayak_font/src/sdf.rs
@@ -1,4 +1,4 @@
-use crate::{atlas::Atlas, glyph::Glyph, metrics::Metrics, SDFType};
+use crate::{atlas::Atlas, glyph::Glyph, metrics::Metrics};
use bevy::math::Vec2;
use serde::Deserialize;
@@ -68,6 +68,7 @@ impl Sdf {
#[test]
fn test_sdf_loader() {
+ use crate::SDFType;
let sdf = Sdf::from_string(include_str!("../assets/roboto.kayak_font").to_string());
assert!(sdf.max_glyph_size() == Vec2::new(30.0, 36.0));
assert!(sdf.atlas.width == 212);
--
GitLab